diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html index 161a10bb7..e8fea82a3 100755 --- a/taccsite_cms/templates/base.html +++ b/taccsite_cms/templates/base.html @@ -70,15 +70,22 @@
{% block content %} - {# To allow extra Container in page structure by hiding extra padding #} + {# To hide extra space that a nested/redundant Container would add #} - - {# To wrap breadcrumbs in Container without relying on CMS editor #} -
- {% include "nav_cms_breadcrumbs.html" %} - {% placeholder "content" %} + {# To wrap content in Container without relying on CMS editor #} +
+ {% 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 %}
{% endblock content %} diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html index 4e4688fb7..3ed1dc497 100644 --- a/taccsite_cms/templates/djangocms_blog/base.html +++ b/taccsite_cms/templates/djangocms_blog/base.html @@ -13,7 +13,13 @@ {% endif %} {% endblock meta %} -{% block content %} +{# TACC (to not let editor add content to every blog page): #} +{% block cms_content %}{% endblock cms_content %} +{# /TACC #} + +{# TACC (to not let blog usurp `{% block "content" %}`): #} +{% block app_content %} +{# /TACC #} {% if settings.TACC_CORE_STYLES_VERSION == 0 %} @@ -33,4 +39,6 @@ {% block content_blog %}{% endblock %}
-{% endblock content %} +{# TACC (to not let blog usurp `{% block "content" %}`): #} +{% endblock app_content %} +{# /TACC #} diff --git a/taccsite_cms/templates/djangocms_blog/post_detail.html b/taccsite_cms/templates/djangocms_blog/post_detail.html index 28929a86f..87add62d3 100644 --- a/taccsite_cms/templates/djangocms_blog/post_detail.html +++ b/taccsite_cms/templates/djangocms_blog/post_detail.html @@ -3,12 +3,7 @@ {% load i18n easy_thumbnails_tags cms_tags blog_post_use_custom_media blog_post_is_show_abstract %} {% block content_blog %}{% spaceless %} -{# TACC (wrap and add breadcrumbs): #} -
-{% include "nav_cms_breadcrumbs.html" %} - -{# /TACC #} {# TACC (define whether this is a special post): #} {% blog_post_use_custom_media post settings.PORTAL_BLOG_CUSTOM_MEDIA_POST_CATEGORY as use_custom_media %} {% blog_post_is_show_abstract post settings.PORTAL_BLOG_SHOW_ABSTRACT_TAG as is_show_abstract_post %} @@ -88,9 +83,6 @@

{% render_model post "subtitle" %}

{% endif %} {# TACC (end wrap and end spaceless-ness later than source): #} - -
{% endspaceless %} - {# /TACC #} {% endblock content_blog %} diff --git a/taccsite_cms/templates/djangocms_blog/post_list.html b/taccsite_cms/templates/djangocms_blog/post_list.html index 921ec7cb5..1d7aa3010 100644 --- a/taccsite_cms/templates/djangocms_blog/post_list.html +++ b/taccsite_cms/templates/djangocms_blog/post_list.html @@ -5,10 +5,6 @@ {% block canonical_url %}{% endblock canonical_url %} {% block content_blog %} -{# TACC (wrap list in container w/ breadcrumbs to mimic other page layouts): #} -
-{% include "nav_cms_breadcrumbs.html" %} -{# /TACC #}
{% block blog_title %} @@ -82,8 +78,5 @@

{% endif %}

-{# TACC (wrap list in container w/ breadcrumbs to mimic other page layouts): #} -
-{# /TACC #} {% endblock %} {% endspaceless %} diff --git a/taccsite_cms/templates/fullwidth.html b/taccsite_cms/templates/fullwidth.html index 9d9155095..57d83af0e 100755 --- 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_custom b/taccsite_custom index e55bfc8c9..e8081e68c 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit e55bfc8c91ccc7520fd38633a1bdf6dc4b7d18cb +Subproject commit e8081e68c77006aeb1f219c320b6c4a62f25f9d1