From f10d854617bf08e9a985639e0c75627b59aa3d68 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 12 Mar 2024 12:28:30 -0400 Subject: [PATCH 1/4] 1258 - Updated the template --- app/templates/new/base.html | 1 + app/templates/new/components/head.html | 42 +++++++++++++++++++++++++ app/templates/new/templates_glossary.md | 1 + 3 files changed, 44 insertions(+) create mode 100644 app/templates/new/components/head.html diff --git a/app/templates/new/base.html b/app/templates/new/base.html index b175cff51..88938b065 100644 --- a/app/templates/new/base.html +++ b/app/templates/new/base.html @@ -6,6 +6,7 @@ + {# {% include "new/components/head.html" %} #} diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head.html new file mode 100644 index 000000000..fe634d3ee --- /dev/null +++ b/app/templates/new/components/head.html @@ -0,0 +1,42 @@ +<head> + <meta charset="utf-8" /> + <title>{% block pageTitle %}Notify.gov{% endblock %} + + + + + {% if config['NR_MONITOR_ON'] %} + {% include "partials/newrelic.html" -%} + {% endif %} + + {# Ensure that older IE versions always render with the correct rendering engine #} + + + {% block headIcons %} + + + + + + {% endblock %} + + + {% block extra_stylesheets %}{% endblock %} + + {% block meta_format_detection %} + + {% endblock %} + {% block og_image %} + + + + {% endblock %} + {# google #} + + + {% if g.hide_from_search_engines %} + + {% endif %} + + {% block head %}{% endblock %} + diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md index 81325e26c..bb6b247d6 100644 --- a/app/templates/new/templates_glossary.md +++ b/app/templates/new/templates_glossary.md @@ -11,6 +11,7 @@ This document serves as a glossary for the templates directory structure of the - `withnav_template.html`: A variation of the base layout that includes a sidebar. - `org_template.html`: A variaton of the withnav_template - **/components**: Houses reusable UI components that can be included in multiple templates and can be tailored with different content or links depending on the context.(more frequently revised or customized) + - `head.html`: Template for the site's , included in `base.html`. - `header.html`: Template for the site's header, included in `base.html`. - `footer.html`: Template for the site's footer, included in `base.html`. - **/views** (or **/pages**): Individual page templates that use the base layouts, components, and partials to present content. From bd7ef33c637ea8b8676ccec311c5366ee0890ba3 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 12 Mar 2024 12:44:42 -0400 Subject: [PATCH 2/4] Update to one of the favicon-adjacent files --- app/templates/new/components/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head.html index fe634d3ee..1978e3a55 100644 --- a/app/templates/new/components/head.html +++ b/app/templates/new/components/head.html @@ -14,7 +14,7 @@ {% block headIcons %} - + From 45c9018365143c41b6d3019ffc00b5067bc7c6dc Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 13 Mar 2024 10:51:38 -0400 Subject: [PATCH 3/4] Update of head from another issue focusing on the favicon area --- app/templates/new/components/head.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head.html index 1978e3a55..9ceb9dbc1 100644 --- a/app/templates/new/components/head.html +++ b/app/templates/new/components/head.html @@ -13,11 +13,15 @@ {% block headIcons %} - - + + + + - + + + {% endblock %} From 8afacfa89b01cab149ba53fc40b0bbb5fd4851fd Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 21 Mar 2024 12:48:36 -0400 Subject: [PATCH 4/4] Moved the and removed the comment for base.html --- app/templates/new/base.html | 45 +------------------ .../new/components/{ => head}/head.html | 0 2 files changed, 1 insertion(+), 44 deletions(-) rename app/templates/new/components/{ => head}/head.html (100%) diff --git a/app/templates/new/base.html b/app/templates/new/base.html index 88938b065..3502642bc 100644 --- a/app/templates/new/base.html +++ b/app/templates/new/base.html @@ -6,50 +6,7 @@ - {# {% include "new/components/head.html" %} #} - - - - {% block pageTitle %} - {% block per_page_title %} {% endblock %}Notify.gov - <!-- on templates that were using content_template.html, we might need to use the {{ content_page_title }} variable for the per_page_title --> - {% endblock %} - - - - - {% if config['NR_MONITOR_ON'] %} - {% include "partials/newrelic.html" -%} - {% endif %} - {# Ensure that older IE versions always render with the correct rendering engine #} - - {% block headIcons %} - - - - - {% endblock %} - - {% block head %} - - {% block extra_stylesheets %} - {% endblock %} - {% if g.hide_from_search_engines %} - - {% endif %} - - {# The default og:image is added below head so that scrapers see any custom metatags first, and this is just a fallback #} - {% block meta_format_detection %} - - {% endblock %} - {% block meta %} - - - {% endblock %} - - {% endblock %} - - + {% include "new/components/head/head.html" %} {% block bodyStart %} diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head/head.html similarity index 100% rename from app/templates/new/components/head.html rename to app/templates/new/components/head/head.html