From 9e892c674b3503dad18c6d9e4279af486a0a5851 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 28 Aug 2023 23:11:44 -0500 Subject: [PATCH] chore: move `page_attribute "page_title"` to base There is no reason to do this on every template. I had continued doing it, because I feared breaking things. I know enough about the templates now to know repition was unnecessary. --- taccsite_cms/templates/base.html | 2 +- taccsite_cms/templates/fullwidth.html | 2 -- taccsite_cms/templates/sidebar_left.html | 2 -- taccsite_cms/templates/sidebar_right.html | 2 -- taccsite_cms/templates/standard.html | 2 -- taccsite_custom | 2 +- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html index 0208ca69b..942f38ff9 100755 --- a/taccsite_cms/templates/base.html +++ b/taccsite_cms/templates/base.html @@ -17,7 +17,7 @@ {% include 'analytics.html' %} - {% block title %} This is my new project home page {% endblock title %} + {% block title %}{% page_attribute "page_title" %}{% endblock title %} diff --git a/taccsite_cms/templates/fullwidth.html b/taccsite_cms/templates/fullwidth.html index 9d9155095..32c1b171f 100755 --- a/taccsite_cms/templates/fullwidth.html +++ b/taccsite_cms/templates/fullwidth.html @@ -1,8 +1,6 @@ {% extends "base.html" %} {% load cms_tags %} -{% block title %}{% page_attribute "page_title" %}{% endblock title %} - {# To remove container and breadcrumbs #} {% block content %} {% placeholder "content" %} diff --git a/taccsite_cms/templates/sidebar_left.html b/taccsite_cms/templates/sidebar_left.html index ddc226ef0..54321f921 100755 --- a/taccsite_cms/templates/sidebar_left.html +++ b/taccsite_cms/templates/sidebar_left.html @@ -1,8 +1,6 @@ {% extends "base.html" %} {% load cms_tags %} -{% block title %}{% page_attribute "page_title" %}{% endblock title %} - {% block assets_custom %} {{ block.super }} diff --git a/taccsite_cms/templates/sidebar_right.html b/taccsite_cms/templates/sidebar_right.html index 457f552ae..0d4ed0aaa 100755 --- a/taccsite_cms/templates/sidebar_right.html +++ b/taccsite_cms/templates/sidebar_right.html @@ -1,8 +1,6 @@ {% extends "base.html" %} {% load cms_tags %} -{% block title %}{% page_attribute "page_title" %}{% endblock title %} - {% block assets_custom %} {{ block.super }} diff --git a/taccsite_cms/templates/standard.html b/taccsite_cms/templates/standard.html index 1498c1447..37e384c01 100644 --- a/taccsite_cms/templates/standard.html +++ b/taccsite_cms/templates/standard.html @@ -1,4 +1,2 @@ {% extends "base.html" %} {% load cms_tags %} - -{% block title %}{% page_attribute "page_title" %}{% endblock title %} diff --git a/taccsite_custom b/taccsite_custom index 5197037b9..e6f4cd975 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 5197037b9f72e2405b82716f3d7e4a2a492492fc +Subproject commit e6f4cd9756d3202764586773cf77a7ad0c654597