Add regions, make sidebars content aware

ubc-web-services · Feb 16, 2023 · 85d7ad2 · 85d7ad2
1 parent bc4a695
commit 85d7ad2
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 28 deletions.
diff --git a/kraken.info.yml b/kraken.info.yml
@@ -32,6 +32,8 @@ ckeditor_stylesheets:
   - css/drupal.ckeditor.iframe.css
 
 regions:
+  pre_content: 'Pre-content'
+  search: 'Search'
   primary_menu: 'Primary menu'
   secondary_menu: 'Secondary menu'
   alert_region: 'Alert region'

diff --git a/templates/includes/header.clf7.html.twig b/templates/includes/header.clf7.html.twig
@@ -6,8 +6,11 @@
     <div class="collapse expand" id="ubc7-global-menu">
   {% endif %}
       <div id="ubc7-search" class="expand">
-        <div class="clf-container">
-          <div id="ubc7-search-box">
+         <div class="clf-container">
+          <div id="ubc7-search-box" class="mx-auto max-w-[360px]">
+            {% if page.search %}
+              {{ page.search }}
+            {% else %}
             <form class="form-search" method="get" action="https://www.ubc.ca/search/refine/" role="search">
               <label for="q" class="hidden">Search UBC</label>
               {% if searchlabel_option %}
@@ -23,6 +26,7 @@
               {% endif %}
               <button type="submit" class="btn">Search</button>
             </form>
+            {% endif %}
           </div>
         </div> <!-- /clf-container -->
       </div>

diff --git a/templates/layout/page--node-type--awards.html.twig b/templates/layout/page--node-type--awards.html.twig
@@ -64,6 +64,8 @@
 {% set sidebar_secondary_attributes = create_attribute() %}
 {% set secondary_content_attributes = create_attribute() %}
 {% set prefooter_attributes = create_attribute() %}
+{% set sidebar_primary_exists = page.sidebar_primary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
+{% set sidebar_secondary_exists = page.sidebar_secondary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
 {%
   set grid_classes = [
     'container',
@@ -113,7 +115,7 @@
     'col-span-full',
   ]
 %}
-{% if not page.sidebar_primary and not page.sidebar_secondary %}
+{% if not sidebar_primary_exists and not page.sidebar_secondary %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -123,7 +125,7 @@
     ]
   %}
 {% endif %}
-{% if page.sidebar_primary and not page.sidebar_secondary %}
+{% if sidebar_primary_exists and not page.sidebar_secondary %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -143,7 +145,7 @@
     ]
   %}
 {% endif %}
-{% if not page.sidebar_primary and page.sidebar_secondary %}
+{% if sidebar_secondary_exists and not sidebar_primary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -169,6 +171,10 @@
 
 <div id="main-content">
 
+  {% if page.pre_content %}
+    {{ page.pre_content }}
+  {% endif %}
+
   {% if (clf_version == '8') %}
     {% include '@kraken/includes/header.html.twig' %}
   {% else %}
@@ -205,13 +211,13 @@
           </section>
         </div>
 
-        {% if page.sidebar_primary %}
+        {% if sidebar_primary_exists %}
           <section{{ sidebar_primary_attributes.addClass(sidebar_primary_classes).setAttribute('id', 'sidebar-primary') }}>
             {{ page.sidebar_primary }}
           </section>
         {% endif %}
 
-        {% if page.sidebar_secondary %}
+        {% if sidebar_secondary_exists %}
           <section{{ sidebar_secondary_attributes.addClass(sidebar_secondary_classes).setAttribute('id', 'sidebar-secondary') }}>
             {{ page.sidebar_secondary }}
           </section>

diff --git a/templates/layout/page--node-type--homepage.html.twig b/templates/layout/page--node-type--homepage.html.twig
@@ -64,6 +64,8 @@
 {% set sidebar_secondary_attributes = create_attribute() %}
 {% set secondary_content_attributes = create_attribute() %}
 {% set prefooter_attributes = create_attribute() %}
+{% set sidebar_primary_exists = page.sidebar_primary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
+{% set sidebar_secondary_exists = page.sidebar_secondary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
 {%
   set grid_classes = [
     'container',
@@ -105,15 +107,15 @@
     'col-span-full',
   ]
 %}
-{% if not page.sidebar_primary and not page.sidebar_secondary %}
+{% if not sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
       'mt-12',
     ]
   %}
 {% endif %}
-{% if page.sidebar_primary and not page.sidebar_secondary %}
+{% if sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -133,8 +135,8 @@
     ]
   %}
 {% endif %}
-{% if page.sidebar_secondary and not page.sidebar_primary %}
-    {%
+{% if sidebar_secondary_exists and not sidebar_primary_exists %}
+  {%
     set main_content_classes = [
       'col-span-full',
       'md--col-span-8',
@@ -157,6 +159,10 @@
 
 <div id="main-content">
 
+  {% if page.pre_content %}
+    {{ page.pre_content }}
+  {% endif %}
+
   {% if (clf_version == '8') %}
     {% include '@kraken/includes/header.html.twig' %}
   {% else %}
@@ -187,13 +193,13 @@
           </section>
         </div>
 
-        {% if page.sidebar_primary %}
+        {% if sidebar_primary_exists %}
           <section{{ sidebar_primary_attributes.addClass(sidebar_primary_classes).setAttribute('id', 'sidebar-primary') }}>
             {{ page.sidebar_primary }}
           </section>
         {% endif %}
 
-        {% if page.sidebar_secondary %}
+        {% if sidebar_secondary_exists %}
           <section{{ sidebar_secondary_attributes.addClass(sidebar_secondary_classes).setAttribute('id', 'sidebar-secondary') }}>
             {{ page.sidebar_secondary }}
           </section>

diff --git a/templates/layout/page--node-type--ubc-landing-page.html.twig b/templates/layout/page--node-type--ubc-landing-page.html.twig
@@ -64,6 +64,8 @@
 {% set sidebar_secondary_attributes = create_attribute() %}
 {% set secondary_content_attributes = create_attribute() %}
 {% set prefooter_attributes = create_attribute() %}
+{% set sidebar_primary_exists = page.sidebar_primary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
+{% set sidebar_secondary_exists = page.sidebar_secondary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
 {%
   set grid_classes = [
     'container',
@@ -113,15 +115,15 @@
     'col-span-full',
   ]
 %}
-{% if not page.sidebar_primary and not page.sidebar_secondary %}
+{% if not sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
       'mt-12',
     ]
   %}
 {% endif %}
-{% if page.sidebar_primary and not page.sidebar_secondary %}
+{% if sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -141,7 +143,7 @@
     ]
   %}
 {% endif %}
-{% if page.sidebar_secondary and not page.sidebar_primary %}
+{% if sidebar_secondary_exists and not sidebar_primary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -167,6 +169,10 @@
 
 <div id="main-content">
 
+  {% if page.pre_content %}
+    {{ page.pre_content }}
+  {% endif %}
+
   {% if (clf_version == '8') %}
     {% include '@kraken/includes/header.html.twig' %}
   {% else %}
@@ -203,13 +209,13 @@
           </section>
         </div>
 
-        {% if page.sidebar_primary %}
+        {% if sidebar_primary_exists %}
           <section{{ sidebar_primary_attributes.addClass(sidebar_primary_classes).setAttribute('id', 'sidebar-primary') }}>
             {{ page.sidebar_primary }}
           </section>
         {% endif %}
 
-        {% if page.sidebar_secondary %}
+        {% if sidebar_secondary_exists %}
           <section{{ sidebar_secondary_attributes.addClass(sidebar_secondary_classes).setAttribute('id', 'sidebar-secondary') }}>
             {{ page.sidebar_secondary }}
           </section>

diff --git a/templates/layout/page--node-type--ubc-page.html.twig b/templates/layout/page--node-type--ubc-page.html.twig
@@ -64,6 +64,8 @@
 {% set sidebar_secondary_attributes = create_attribute() %}
 {% set secondary_content_attributes = create_attribute() %}
 {% set prefooter_attributes = create_attribute() %}
+{% set sidebar_primary_exists = page.sidebar_primary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
+{% set sidebar_secondary_exists = page.sidebar_secondary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
 {%
   set grid_classes = [
     'container',
@@ -113,15 +115,15 @@
     'col-span-full',
   ]
 %}
-{% if not page.sidebar_primary and not page.sidebar_secondary %}
+{% if not sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
       'mt-12',
     ]
   %}
 {% endif %}
-{% if page.sidebar_primary and not page.sidebar_secondary %}
+{% if sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -141,7 +143,7 @@
     ]
   %}
 {% endif %}
-{% if page.sidebar_secondary and not page.sidebar_primary %}
+{% if sidebar_secondary_exists and not sidebar_primary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -167,6 +169,10 @@
 
 <div id="main-content">
 
+  {% if page.pre_content %}
+    {{ page.pre_content }}
+  {% endif %}
+
   {% if (clf_version == '8') %}
     {% include '@kraken/includes/header.html.twig' %}
   {% else %}
@@ -203,13 +209,13 @@
           </section>
         </div>
 
-        {% if page.sidebar_primary %}
+        {% if sidebar_primary_exists %}
           <section{{ sidebar_primary_attributes.addClass(sidebar_primary_classes).setAttribute('id', 'sidebar-primary') }}>
             {{ page.sidebar_primary }}
           </section>
         {% endif %}
 
-        {% if page.sidebar_secondary %}
+        {% if sidebar_secondary_exists %}
           <section{{ sidebar_secondary_attributes.addClass(sidebar_secondary_classes).setAttribute('id', 'sidebar-secondary') }}>
             {{ page.sidebar_secondary }}
           </section>

diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
@@ -64,6 +64,8 @@
 {% set sidebar_secondary_attributes = create_attribute() %}
 {% set secondary_content_attributes = create_attribute() %}
 {% set prefooter_attributes = create_attribute() %}
+{% set sidebar_primary_exists = page.sidebar_primary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
+{% set sidebar_secondary_exists = page.sidebar_secondary|render|striptags('<img><video><audio><drupal-render-placeholder>')|trim is not empty %}
 {%
   set grid_classes = [
     'container',
@@ -113,7 +115,7 @@
     'col-span-full',
   ]
 %}
-{% if not page.sidebar_primary and not page.sidebar_secondary %}
+{% if not sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -125,7 +127,7 @@
     ]
   %}
 {% endif %}
-{% if page.sidebar_primary and not page.sidebar_secondary %}
+{% if sidebar_primary_exists and not sidebar_secondary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -145,7 +147,7 @@
     ]
   %}
 {% endif %}
-{% if page.sidebar_secondary and not page.sidebar_primary %}
+{% if sidebar_secondary_exists and not sidebar_primary_exists %}
   {%
     set main_content_classes = [
       'col-span-full',
@@ -171,6 +173,10 @@
 
 <div id="main-content">
 
+  {% if page.pre_content %}
+    {{ page.pre_content }}
+  {% endif %}
+
   {% if (clf_version == '8') %}
     {% include '@kraken/includes/header.html.twig' %}
   {% else %}
@@ -207,13 +213,13 @@
           </section>
         </div>
 
-        {% if page.sidebar_primary %}
+        {% if sidebar_primary_exists %}
           <section{{ sidebar_primary_attributes.addClass(sidebar_primary_classes).setAttribute('id', 'sidebar-primary') }}>
             {{ page.sidebar_primary }}
           </section>
         {% endif %}
 
-        {% if page.sidebar_secondary %}
+        {% if sidebar_secondary_exists %}
           <section{{ sidebar_secondary_attributes.addClass(sidebar_secondary_classes).setAttribute('id', 'sidebar-secondary') }}>
             {{ page.sidebar_secondary }}
           </section>