Merge master back in

 🐿 v2.8.0

bower.json

@@ -27,12 +27,12 @@
     "n-topic-search": "^1.0.0",
     "n-ui-foundations": "^3.0.0",
     "next-session-client": "^2.3.1",
-    "o-ads": "^8.3.0",
+    "o-ads": "^9.0.2",
     "o-cookie-message": "^3.1.1",
     "o-errors": "^3.5.1",
     "o-expander": "^4.2.2",
     "o-footer": "^6.0.0",
-    "o-header": "^7.5.1",
+    "o-header": "^7.5.6",
     "o-tracking": "^1.3.8",
     "logo-images": "^1.5.2"
   }

components/n-ui/ads/js/oAdsConfig.js

@@ -106,6 +106,7 @@ module.exports = function (flags, appName, adOptions) {
 			page: getContextualTargeting(appName),
 			usePageZone: true
 		},
+		disableConsentCookie: flags.get('adsDisableCookieConsent'),
 		validateAdsTraffic: flags.get('validateAdsTraffic')
 	};
 

components/n-ui/header/partials/header/top-no-links.html

@@ -0,0 +1,14 @@
+<div class="o-header__row o-header__top" data-trackable="header-top">
+	<div class="o-header__container">
+		<div class="o-header__top-wrapper">
+			<div class="o-header__top-column o-header__top-column--center">
+				<div class="o-header__top-logo {{#if @root.flags.perfJanky}}o-header__top-logo--inlined{{/if}}">
+					{{#if @root.flags.perfJanky}}
+					{{#inline file='logo-images/src/brand-ft-masthead.svg'}}{{/inline}}
+					{{/if}}
+					<span class="o-header__visually-hidden">Financial Times</span>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

components/n-ui/header/template.html

@@ -17,29 +17,35 @@
 {{/ifEquals}}
 
 
-
-	{{#ifEquals nUi.header.variant 'logo-only'}}
-		{{> n-ui/header/partials/header/top}}
+	{{#if @root.flags.hideOutboundLinks}}
+		{{> n-ui/header/partials/header/top-no-links}}
 	{{else}}
+		{{#ifEquals nUi.header.variant 'logo-only'}}
+		{{> n-ui/header/partials/header/top}}
+		{{else}}
 		{{> n-ui/header/partials/header/anon}}
 
 		{{> n-ui/header/partials/header/top}}
 		{{> n-ui/header/partials/header/search context="primary"}}
 		{{> n-ui/header/partials/header/nav}}
 
-	{{/ifEquals}}
+		{{/ifEquals}}
 
-	{{#outputBlock 'sub-header'}}{{/outputBlock}}
+		{{#outputBlock 'sub-header'}}{{/outputBlock}}
 
-	{{#unlessEquals nUi.header.variant 'logo-only'}}
+		{{#unlessEquals nUi.header.variant 'logo-only'}}
 		{{>n-ui/header/partials/subnav/template}}
-	{{/unlessEquals}}
+		{{/unlessEquals}}
+	{{/if}}
+
 </header>
 
 {{#unless nUi.header.disableSticky}}
-	<header class="o-header o-header--simple o-header--sticky o--if-js" aria-hidden="true" data-o-header--sticky>
-		{{> n-ui/header/partials/header/sticky}}
+	{{#unless @root.flags.hideOutboundLinks}}
+		<header class="o-header o-header--simple o-header--sticky o--if-js" aria-hidden="true" data-o-header--sticky>
+			{{> n-ui/header/partials/header/sticky}}
 
-		{{> n-ui/header/partials/header/search context="sticky"}}
-	</header>
+			{{> n-ui/header/partials/header/search context="sticky"}}
+		</header>
+	{{/unless}}
 {{/unless}}