From 02d72d3ea1683fcc126c00d77ccff2cf19f6c677 Mon Sep 17 00:00:00 2001 From: Daniel Pett Date: Mon, 23 May 2022 09:53:50 +0100 Subject: [PATCH] Move cookie preferences link --- .../views/includes/structure/footer.blade.php | 6 +- resources/views/layouts/layout.blade.php | 278 +++++++++--------- 2 files changed, 142 insertions(+), 142 deletions(-) diff --git a/resources/views/includes/structure/footer.blade.php b/resources/views/includes/structure/footer.blade.php index d8a03095..9ee743fc 100644 --- a/resources/views/includes/structure/footer.blade.php +++ b/resources/views/includes/structure/footer.blade.php @@ -111,6 +111,9 @@ privacy & accessibility +
  • + Cookie preferences +
  • Contact us @@ -164,9 +167,6 @@ Code: GPL-V3
    • -
  • - Cookie preferences -
    • diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php index 8bff923b..dd0176c5 100644 --- a/resources/views/layouts/layout.blade.php +++ b/resources/views/layouts/layout.blade.php @@ -6,7 +6,7 @@ @include('includes.css.css') @hasSection('map') - @mapstyles + @mapstyles @endif @include('includes.structure.manifest') @@ -18,142 +18,142 @@ @include('googletagmanager::head') - - @include('googletagmanager::body') - - @include('includes.structure.accessibility') - - @include('includes.structure.nav') - - @if(Request::is('about-us/terms/hockney')) - @include('includes.structure.hockney-header') - @else - @include('includes.structure.head') - @endif - @include('includes.structure.open') - - @hasSection('timeline') - @include('includes.css.timeline-css') - @endif - - @hasSection('360') - @include('includes.css.photosphere-css') - @endif - -
    -
    - @include('includes.structure.breadcrumb') - @yield('press-contact') - @yield('content') - - @yield('adlib') - @yield('timeline') -
    -
    - @yield('audioGuide') - @yield('collection-search') - - @yield('immunity') - - @hasSection('collection-parallax') - @include('includes.structure.parallax') - @endif - @hasSection('theme-carousel') - @yield('theme-carousel') - @endif - - @hasSection('collection-parallax') - @include('includes.structure.parallax') - @endif - - @hasSection('period-carousel') - @yield('period-carousel') - @endif - - @hasSection('collection-parallax') - @include('includes.structure.parallax') - @endif - - @hasSection('context-carousel') - @yield('context-carousel') - @endif - - @hasSection('collection-parallax') - @include('includes.structure.parallax') - @endif - - @hasSection('map') -
    - @yield('map') -
    - @endif - @yield('associated_pages') - - @hasSection('cons-areas') - @yield('cons-areas') - @endif - - @yield('releases') - @yield('resources-plans') - @yield('diy') - @yield('publications') - @yield('research-projects') - @yield('exhibitions-curated') - @yield('departments-affiliated') - @yield('research-funders') - @yield('presenters') - - @yield('themes') - @yield('collections') - @yield('departments') - @yield('curators') - @yield('galleries') - @yield('360') - @yield('youtube') - @yield('sms') - @yield('youtube-playlist') - @yield('sketchfab-collection') - @yield('sketchfab') - @yield('audio-guide') - @yield('pharos-pages') - @yield('podcast-object') - @yield('twitter') - @yield('mlt') - @yield('shopifyPrints') - @yield('shopify') - - - @include('includes.structure.email-signup') - @include('includes.structure.footer') - @hasSection('lookanswers') - @yield('lookanswers') - @endif - - @hasSection('thinkanswers') - @yield('thinkanswers') - @endif - - @hasSection('doanswers') - @yield('doanswers') - @endif - - @include('includes.scripts.javascript') - - @hasSection('360') - @include('includes.scripts.photosphere-js') - @endif - - @hasSection('map') - @mapscripts - @include('includes.scripts.mapjs') - @endif - - @hasSection('timeline') - @include('includes.scripts.timeline-js') - @endif - - @hasSection('datepicker') - @yield('datepicker') - @endif - + + @include('googletagmanager::body') + + @include('includes.structure.accessibility') + + @include('includes.structure.nav') + + @if(Request::is('about-us/terms/hockney')) + @include('includes.structure.hockney-header') + @else + @include('includes.structure.head') + @endif + @include('includes.structure.open') + + @hasSection('timeline') + @include('includes.css.timeline-css') + @endif + + @hasSection('360') + @include('includes.css.photosphere-css') + @endif + +
    +
    + @include('includes.structure.breadcrumb') + @yield('press-contact') + @yield('content') + + @yield('adlib') + @yield('timeline') +
    +
    + @yield('audioGuide') + @yield('collection-search') + + @yield('immunity') + + @hasSection('collection-parallax') + @include('includes.structure.parallax') + @endif + @hasSection('theme-carousel') + @yield('theme-carousel') + @endif + + @hasSection('collection-parallax') + @include('includes.structure.parallax') + @endif + + @hasSection('period-carousel') + @yield('period-carousel') + @endif + + @hasSection('collection-parallax') + @include('includes.structure.parallax') + @endif + + @hasSection('context-carousel') + @yield('context-carousel') + @endif + + @hasSection('collection-parallax') + @include('includes.structure.parallax') + @endif + + @hasSection('map') +
    + @yield('map') +
    + @endif + @yield('associated_pages') + + @hasSection('cons-areas') + @yield('cons-areas') + @endif + + @yield('releases') + @yield('resources-plans') + @yield('diy') + @yield('publications') + @yield('research-projects') + @yield('exhibitions-curated') + @yield('departments-affiliated') + @yield('research-funders') + @yield('presenters') + + @yield('themes') + @yield('collections') + @yield('departments') + @yield('curators') + @yield('galleries') + @yield('360') + @yield('youtube') + @yield('sms') + @yield('youtube-playlist') + @yield('sketchfab-collection') + @yield('sketchfab') + @yield('audio-guide') + @yield('pharos-pages') + @yield('podcast-object') + @yield('twitter') + @yield('mlt') + @yield('shopifyPrints') + @yield('shopify') + + + @include('includes.structure.email-signup') + @include('includes.structure.footer') + @hasSection('lookanswers') + @yield('lookanswers') + @endif + + @hasSection('thinkanswers') + @yield('thinkanswers') + @endif + + @hasSection('doanswers') + @yield('doanswers') + @endif + + @include('includes.scripts.javascript') + + @hasSection('360') + @include('includes.scripts.photosphere-js') + @endif + + @hasSection('map') + @mapscripts + @include('includes.scripts.mapjs') + @endif + + @hasSection('timeline') + @include('includes.scripts.timeline-js') + @endif + + @hasSection('datepicker') + @yield('datepicker') + @endif +