diff --git a/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala index 5505a87db66..c9d825dbbc4 100644 --- a/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala +++ b/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala @@ -32,7 +32,6 @@ import play.api.libs.json._ import play.api.mvc.RequestHeader import services.NewsletterData import views.support.{CamelCase, ContentLayout, JavaScriptPage} -import views.html.fragments.affiliateLinksDisclaimer // ----------------------------------------------------------------- // DCR DataModel // ----------------------------------------------------------------- @@ -41,7 +40,6 @@ case class DotcomRenderingDataModel( version: Int, headline: String, standfirst: String, - affiliateLinksDisclaimer: Option[String], webTitle: String, mainMediaElements: List[PageElement], main: String, @@ -123,7 +121,6 @@ object DotcomRenderingDataModel { "version" -> model.version, "headline" -> model.headline, "standfirst" -> model.standfirst, - "affiliateLinksDisclaimer" -> model.affiliateLinksDisclaimer, "webTitle" -> model.webTitle, "mainMediaElements" -> model.mainMediaElements, "main" -> model.main, @@ -548,13 +545,6 @@ object DotcomRenderingDataModel { val selectedTopics = topicResult.map(topic => Seq(Topic(topic.`type`, topic.name))) - def getAffiliateLinksDisclaimer(shouldAddAffiliateLinks: Boolean) = { - if (shouldAddAffiliateLinks) { - Some(affiliateLinksDisclaimer("article").body) - } else { - None - } - } DotcomRenderingDataModel( author = author, badge = Badges.badgeFor(content).map(badge => DCRBadge(badge.seriesTag, badge.imageUrl)), @@ -608,7 +598,6 @@ object DotcomRenderingDataModel { showBottomSocialButtons = ContentLayout.showBottomSocialButtons(content), slotMachineFlags = request.slotMachineFlags, standfirst = TextCleaner.sanitiseLinks(edition)(content.fields.standfirst.getOrElse("")), - affiliateLinksDisclaimer = getAffiliateLinksDisclaimer(shouldAddAffiliateLinks), starRating = content.content.starRating, subMetaKeywordLinks = content.content.submetaLinks.keywords.map(SubMetaLink.apply), subMetaSectionLinks = diff --git a/common/app/views/fragments/affiliateLinksDisclaimer.scala.html b/common/app/views/fragments/affiliateLinksDisclaimer.scala.html index 40779093e22..7ff2ebb8117 100644 --- a/common/app/views/fragments/affiliateLinksDisclaimer.scala.html +++ b/common/app/views/fragments/affiliateLinksDisclaimer.scala.html @@ -1,27 +1,24 @@ -@(contentType: String) @articleDisclaimer() = { +@(contentType: String) + + +@articleDisclaimer() = {

- The Guardian’s product and service reviews are independent and are - in no way influenced by any advertiser or commercial initiative. We - will earn a commission from the retailer if you buy something - through an affiliate link. - Learn more. + This article contains affiliate links, which means we may earn a small commission if a reader clicks through and + makes a purchase. All our journalism is independent and is in no way influenced by any advertiser or commercial initiative. + By clicking on an affiliate link, you accept that third-party cookies will be set. + More information.

-} @galleryDisclaimer() = { -
- The Guardian’s product and service reviews are independent and are in no - way influenced by any advertiser or commercial initiative. We will earn a - commission from the retailer if you buy something through an affiliate link. - Learn more. +} + +@galleryDisclaimer() = { +
This article contains affiliate links, which means we may earn a small commission if a reader clicks through and + makes a purchase. All our journalism is independent and is in no way influenced by any advertiser or commercial initiative. + By clicking on an affiliate link, you accept that third-party cookies will be set. + More information. -} @{contentType match { +} + +@{contentType match { case "gallery" => galleryDisclaimer() case "article" => articleDisclaimer() case _ => Html("")