Merge branch 'main' into feat/tup-706-news-on-other-sites

TACC · Sep 13, 2024 · 22c6ac3 · 22c6ac3
2 parents 49edd04 + 8490e4c
commit 22c6ac3
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/taccsite_cms/settings_custom.example.py b/taccsite_cms/settings_custom.example.py
@@ -40,6 +40,10 @@
     ('guides/data_transfer.html', 'Guide: Data Transfer'),
     ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
     ('guides/portal_technology.html', 'Guide: Portal Technology Stack'),
+
+    # WARNING: Not intuitive to unset, so only enable as needed e.g.
+    #          - serve Blog such that it can be injected into another CMS
+    # ('raw.html', 'Raw'),
 )
 
 ########################

diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html
@@ -70,15 +70,22 @@
   <main id="cms-content">
   {% block content %}
 
-    {# To allow extra Container in page structure by hiding extra padding #}
+    {# To hide extra space that a nested/redundant Container would add #}
     <style type="text/css">
-      .container > .s-breadcrumbs + .container { padding-inline: 0; }
+      #cms-content-container.container .container { padding-inline: 0; }
     </style>
-
-    {# To wrap breadcrumbs in Container without relying on CMS editor #}
-    <div class="container">
-      {% include "nav_cms_breadcrumbs.html" %}
-      {% placeholder "content" %}
+    {# To wrap content in Container without relying on CMS editor #}
+    <div class="container" id="cms-content-container">
+      {% block breadcrumbs %}
+        {% include "nav_cms_breadcrumbs.html" %}
+      {% endblock breadcrumbs %}
+
+      {% block cms_content %}
+        {% placeholder "content" %}
+      {% endblock cms_content %}
+
+      {# To isolate content editor cannot change layout of (e.g. Blog) #}
+      {% block app_content %}{% endblock app_content %}
     </div>
 
   {% endblock content %}

diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html
@@ -13,11 +13,12 @@
     {% endif %}
 {% endblock meta %}
 
-{# TACC (do not let blog usurp Content placeholder): #}
-{% block fixed_content %}
+{# TACC (to not let editor add content to every blog page): #}
+{% block cms_content %}{% endblock cms_content %}
 {# /TACC #}
-{# TACC (wrap list in container to mimic other page layouts): #}
-<div class="container">
+
+{# TACC (to not let blog usurp `{% block "content" %}`): #}
+{% block app_content %}
 {# /TACC #}
 
 {% if settings.TACC_CORE_STYLES_VERSION == 0 %}
@@ -38,9 +39,6 @@
     {% block content_blog %}{% endblock %}
 </div>
 
-{# TACC (wrap list in container to mimic other page layouts): #}
-</div>
-{# /TACC #}
-{# TACC (do not let blog usurp Content placeholder): #}
-{% endblock fixed_content %}
+{# TACC (to not let blog usurp `{% block "content" %}`): #}
+{% endblock app_content %}
 {# /TACC #}
diff --git a/taccsite_cms/templates/fullwidth.html b/taccsite_cms/templates/fullwidth.html
@@ -5,5 +5,8 @@
 
 {# To remove container and breadcrumbs #}
 {% block content %}
-{% placeholder "content" %}
+  {% block cms_content %}
+    {% placeholder "content" %}
+  {% endblock cms_content %}
+  {% block app_content %}{% endblock app_content %}
 {% endblock content %}
diff --git a/taccsite_cms/templates/raw.html b/taccsite_cms/templates/raw.html
@@ -1,8 +1,10 @@
 {# To reduce output to only content #}
 {% load cms_tags %}
 
+{# To remove container and breadcrumbs #}
 {% block content %}
-{% placeholder "content" %}
+  {% block cms_content %}
+    {% placeholder "content" %}
+  {% endblock cms_content %}
+  {% block app_content %}{% endblock app_content %}
 {% endblock content %}
-{% block fixed_content %}
-{% endblock fixed_content %}
diff --git a/taccsite_custom b/taccsite_custom
+5 −1		_3dem_cms/templates/fullwidth.html
+5 −1		texascale_cms/templates/fullwidth.html