-
Notifications
You must be signed in to change notification settings - Fork 29
Add gallery affiliate link disclaimer #14303
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b02fcd1
add affiliate link disclaimer to web galleries
marjisound 57c3c0d
place web meta and disclaimer in a container.
marjisound 5424d90
handle affiliate simlinks in image caption texts
marjisound 956fa82
set caption href rel to undefined if not simlink
marjisound 1a62843
Merge branch 'main' into add-gallery-affiliate-link-disclaimer
marjisound e06909d
Merge branch 'main' into add-gallery-affiliate-link-disclaimer
marjisound c9ac19c
Add disclaimer to both Web and App gallery articles
marjisound e22d756
Fix naming
marjisound File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| import { css } from '@emotion/react'; | ||
| import { from, palette as sourcePalette } from '@guardian/source/foundations'; | ||
| import { | ||
| from, | ||
| palette as sourcePalette, | ||
| space, | ||
| } from '@guardian/source/foundations'; | ||
| import { GalleryAffiliateDisclaimer } from '../components/AffiliateDisclaimer'; | ||
| import { AppsFooter } from '../components/AppsFooter.importable'; | ||
| import { ArticleHeadline } from '../components/ArticleHeadline'; | ||
| import { ArticleMetaApps } from '../components/ArticleMeta.apps'; | ||
|
|
@@ -51,6 +56,23 @@ const headerStyles = css` | |
| } | ||
| `; | ||
|
|
||
| const webMetaAndDisclaimerContainer = css` | ||
|
||
| ${grid.column.centre} | ||
| padding-bottom: ${space[6]}px; | ||
| ${from.tablet} { | ||
| position: relative; | ||
| &::before { | ||
| content: ''; | ||
| position: absolute; | ||
| left: -10px; | ||
| top: 0; | ||
| bottom: 0; | ||
| width: 1px; | ||
| background-color: ${palette('--article-border')}; | ||
| } | ||
| } | ||
| `; | ||
|
|
||
| export const GalleryLayout = (props: WebProps | AppProps) => { | ||
| const gallery = props.gallery; | ||
| const frontendData = gallery.frontendData; | ||
|
|
@@ -123,30 +145,36 @@ export const GalleryLayout = (props: WebProps | AppProps) => { | |
| isMainMedia={true} | ||
| /> | ||
| {isWeb ? ( | ||
| <ArticleMeta | ||
| branding={ | ||
| frontendData.commercialProperties[ | ||
| frontendData.editionId | ||
| ].branding | ||
| } | ||
| format={format} | ||
| pageId={frontendData.pageId} | ||
| webTitle={frontendData.webTitle} | ||
| byline={frontendData.byline} | ||
| tags={frontendData.tags} | ||
| primaryDateline={ | ||
| frontendData.webPublicationDateDisplay | ||
| } | ||
| secondaryDateline={ | ||
| frontendData.webPublicationSecondaryDateDisplay | ||
| } | ||
| isCommentable={frontendData.isCommentable} | ||
| discussionApiUrl={ | ||
| frontendData.config.discussionApiUrl | ||
| } | ||
| shortUrlId={frontendData.config.shortUrlId} | ||
| /> | ||
| <div css={webMetaAndDisclaimerContainer}> | ||
| <ArticleMeta | ||
| branding={ | ||
| frontendData.commercialProperties[ | ||
| frontendData.editionId | ||
| ].branding | ||
| } | ||
| format={format} | ||
| pageId={frontendData.pageId} | ||
| webTitle={frontendData.webTitle} | ||
| byline={frontendData.byline} | ||
| tags={frontendData.tags} | ||
| primaryDateline={ | ||
| frontendData.webPublicationDateDisplay | ||
| } | ||
| secondaryDateline={ | ||
| frontendData.webPublicationSecondaryDateDisplay | ||
| } | ||
| isCommentable={frontendData.isCommentable} | ||
| discussionApiUrl={ | ||
| frontendData.config.discussionApiUrl | ||
| } | ||
| shortUrlId={frontendData.config.shortUrlId} | ||
| /> | ||
| {!!frontendData.affiliateLinksDisclaimer && ( | ||
| <GalleryAffiliateDisclaimer /> | ||
| )} | ||
| </div> | ||
| ) : null} | ||
|
|
||
| {isApps ? ( | ||
| <ArticleMetaApps | ||
| branding={ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might want to set this to undefined if not a skimlink?
Or we could check with CP how they expect rel attributes to be propagated on caption links in DCR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yes, we had made the change together in the call, but I'd forgotten to push to repo :)
For now lets leave it as undefined (not to impose any change to the existing functionality in prod), but I'll email CP and ask about this