#633 Updates sidebar

CuBoulder · Feb 5, 2024 · 001d79f · 001d79f
1 parent 7c0747a
commit 001d79f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/boulder_base.info.yml b/boulder_base.info.yml
@@ -17,14 +17,12 @@ regions:
   breadcrumb: "Breadcrumb Navigation"
   post_wide_title: "Post Wide Title"
   above_content: "Above Content"
-  left_sidebar: "Sidebar First"
   content: "Content"
-  right_sidebar: "Sidebar Second"
+  sidebar: "Sidebar"
   wide_post: "Wide Post"
   below_content: "After Content"
   second_below_content: "After Content 2"
   social: "Social Media Menu"
   footer: "Footer"
   site_information: 'Site Information'
   footer_menu: 'Footer Menu'
-
diff --git a/boulder_base.theme b/boulder_base.theme
@@ -84,6 +84,7 @@ function boulder_base_preprocess_page(array &$variables) {
   $variables['ucb_header_color'] = $headerColor = theme_get_setting('ucb_header_color');
   $variables['ucb_be_boulder'] = theme_get_setting('ucb_be_boulder');
   $variables['ucb_social_share_position'] = theme_get_setting('ucb_social_share_position');
+  $variables['ucb_sidebar_position'] = theme_get_setting('ucb_sidebar_position');
   $variables['ucb_rave_alerts'] = theme_get_setting('ucb_rave_alerts');
   $variables['ucb_sticky_menu'] = theme_get_setting('ucb_sticky_menu');
   $variables['ucb_heading_font'] = theme_get_setting('ucb_heading_font');

diff --git a/config/install/boulder_base.settings.yml b/config/install/boulder_base.settings.yml
@@ -11,7 +11,7 @@ favicon:
   mimetype: image/png
 ucb_campus_header_color: '1'
 ucb_header_color: '3'
-ucb_sidebar_position: '0'
+ucb_sidebar_position: right
 ucb_be_boulder: '1'
 ucb_rave_alerts: 1
 ucb_sticky_menu: 0

diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
@@ -177,40 +177,26 @@
         </div>
       {% endif %}
       {# We are checking for length below to make sure that the sidebars have any content. This is so that sidebar menus don't render the sidebars if the menu is empty #}
-      {% if (page.left_sidebar|render|striptags|trim|length > 0) or (page.right_sidebar|render|striptags|trim|length > 0) %}
-        {% if page.left_sidebar|render and page.right_sidebar|render %}
+      {% if page.sidebar|render|striptags|trim|length > 0 %}
+        {% if ucb_sidebar_position == 'left' %}
           <div class="ucb-layout-container container g-0">
             <div class="layout-row row">
               <div class="ucb-left-sidebar ucb-sidebar col-sm-12 col-md-4 col-lg-3">
-                {{ page.left_sidebar }}
-              </div>
-              <div class="ucb-layout-main col-sm-12 col-md-4 col-lg-6 ucb-has-sidebar">
-                {{ page.content }}
-              </div>
-               <div class="ucb-left-right ucb-sidebar col-sm-12 col-md-4 col-lg-3">
-                {{ page.right_sidebar }}
-              </div>
-            </div>
-          </div>
-        {% elseif page.left_sidebar|render %}
-          <div class="ucb-layout-container container g-0">
-            <div class="layout-row row">
-              <div class="ucb-left-sidebar ucb-sidebar col-sm-12 col-md-4 col-lg-3">
-                {{ page.left_sidebar }}
+                {{ page.sidebar }}
               </div>
               <div class="ucb-layout-main col-sm-12 col-md-8 col-lg-9 ucb-has-sidebar">
                 {{ page.content }}
               </div>
             </div>
           </div>
-        {% elseif page.right_sidebar|render %}
+        {% else %}
           <div class="ucb-layout-container container g-0">
             <div class="layout-row row">
               <div class="ucb-layout-main col-sm-12 col-md-8 col-lg-9 ucb-has-sidebar">
                 {{ page.content }}
               </div>
               <div class="ucb-left-right ucb-sidebar col-sm-12 col-md-4 col-lg-3">
-                {{ page.right_sidebar }}
+                {{ page.sidebar }}
               </div>
             </div>
           </div>