fix: Include sidebar in archive page (#766)

* fix: Include sidebar in archive page * feat: Moved sidebar to partial blade template
helsingborg-stad · Nov 15, 2023 · 62f57f4 · 62f57f4
1 parent c58eec3
commit 62f57f4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/views/v3/partials/navigation/sidebar-wrapper.blade.php b/views/v3/partials/navigation/sidebar-wrapper.blade.php
@@ -0,0 +1,8 @@
+@if ($customizer->secondaryNavigationPosition == $position)
+    @if ($secondaryMenuItems)
+        <div class="u-margin__bottom--4 u-display--none@xs u-display--none@sm u-display--none@md">
+            @paper()
+                @includeIf('partials.navigation.sidebar', ['menuItems' => $secondaryMenuItems])
+            @endpaper </div>
+    @endif
+@endif
diff --git a/views/v3/templates/archive.blade.php b/views/v3/templates/archive.blade.php
@@ -5,18 +5,12 @@
 @stop
 @section('sidebar-left')
     @if ($showSidebars)
-        @if ($customizer->secondaryNavigationPosition == 'left')
-            @if ($secondaryMenuItems)
-                <div class="u-margin__bottom--4 u-display--none@xs u-display--none@sm u-display--none@md">
-                    @paper()
-                        @includeIf('partials.navigation.sidebar', [
-                            'menuItems' => $secondaryMenuItems,
-                        ])
-                    @endpaper
-                </div>
-            @endif
-        @endif
+        @include('partials.navigation.sidebar-wrapper', ['position' => 'left'])
     @endif
+    @include('partials.sidebar', [
+        'id' => 'left-sidebar-bottom',
+        'classes' => ['o-grid'],
+    ])
 @stop
 
 @section('content')
@@ -117,14 +111,10 @@ class="archive s-archive s-archive-template-{{ sanitize_title($template) }}  s-{
 
 @section('sidebar-right')
     @if ($showSidebars)
-        @if ($customizer->secondaryNavigationPosition == 'right')
-            @if ($secondaryMenuItems)
-                <div class="u-margin__bottom--4 u-display--none@xs u-display--none@sm u-display--none@md">
-                    @paper()
-                        @includeIf('partials.navigation.sidebar', ['menuItems' => $secondaryMenuItems])
-                    @endpaper
-                </div>
-            @endif
-        @endif
+        @include('partials.navigation.sidebar-wrapper', ['position' => 'right'])
     @endif
+    @includeIf('partials.sidebar', [
+        'id' => 'right-sidebar',
+        'classes' => ['o-grid'],
+    ])
 @stop