adding condition that you must be on a gallery as well as in the test…

… for slimheader
guardian · Apr 20, 2016 · fa60873 · fa60873
1 parent f993987
commit fa60873
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/common/app/views/fragments/header.scala.html b/common/app/views/fragments/header.scala.html
@@ -9,7 +9,7 @@
     @fragments.newHeader()
 } else {
     <header id="header"
-            class="l-header u-cf @if(page.metadata.hasSlimHeader) {l-header--is-slim l-header--no-navigation} @if(mvt.ABGalleryRedesignVariant.isParticipating){l-header--is-slim l-header--no-navigation l-header--new-gallery} js-header"
+            class="l-header u-cf @if(page.metadata.hasSlimHeader) {l-header--is-slim l-header--no-navigation} @if(mvt.ABGalleryRedesignVariant.isParticipating && page.metadata.contentType.toLowerCase == "gallery"){l-header--is-slim l-header--no-navigation l-header--new-gallery} js-header"
             role="banner"
             data-link-name="global navigation: header">
         <div class="js-navigation-header navigation-container navigation-container--collapsed">
@@ -105,7 +105,7 @@
                     } else {
                         <a href="@LinkTo{/}" data-link-name="site logo" id="logo" class="logo-wrapper" data-component="logo">
                             <span class="u-h">The Guardian</span>
-                            @if(page.metadata.hasSlimHeader || mvt.ABGalleryRedesignVariant.isParticipating) {
+                            @if(page.metadata.hasSlimHeader || (mvt.ABGalleryRedesignVariant.isParticipating && page.metadata.contentType.toLowerCase == "gallery")) {
                                 @* CRAZY HACK TO FIX IE8 RENDERING ISSUE WITH LOGO SVG MARKUP *@
                                 <!--[if (gt IE 8)|(IEMobile)]><!-->
                                     @fragments.inlineSvg("guardian-logo-160", "logo")
@@ -128,7 +128,7 @@
                             }
                         </a>
                     }
-                    @if(page.metadata.hasSlimHeader || mvt.ABGalleryRedesignVariant.isParticipating) {
+                    @if(page.metadata.hasSlimHeader || (mvt.ABGalleryRedesignVariant.isParticipating && page.metadata.contentType.toLowerCase == "gallery")) {
                         @fragments.nav.navigationToggle()
                     }
                 </div>

diff --git a/common/app/views/fragments/nav/navigation.scala.html b/common/app/views/fragments/nav/navigation.scala.html
@@ -34,7 +34,8 @@
                         @fragments.nav.topNavigation(page, navigation)
                     </nav>
                 </div>
-                @if(!page.metadata.hasSlimHeader && !mvt.ABGalleryRedesignVariant.isParticipating) {
+                @* Don't show navigation toggle if slimHeader, or participating in the gallery redesign test*@
+                @if(!page.metadata.hasSlimHeader && (!(mvt.ABGalleryRedesignVariant.isParticipating && page.metadata.contentType.toLowerCase == "gallery"))) {
                     @fragments.nav.navigationToggle()
                 }
             </div>