From 05563a70513b9eec884902eb6fde1157690cf197 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 25 Mar 2024 15:26:12 -0700 Subject: [PATCH 1/4] moved footer and head to base.html --- .../components/components/footer/template.njk | 34 +------- app/templates/new/base.html | 79 ++----------------- .../new/components/{footer => }/footer.html | 54 +++---------- .../new/components/{head => }/head.html | 0 app/templates/org_template.html | 2 +- app/templates/settings_template.html | 2 +- app/templates/views/signedout.html | 2 +- app/templates/withnav_template.html | 2 +- app/templates/withoutnav_template.html | 2 +- 9 files changed, 21 insertions(+), 156 deletions(-) rename app/templates/new/components/{footer => }/footer.html (56%) rename app/templates/new/components/{head => }/head.html (100%) diff --git a/app/templates/components/components/footer/template.njk b/app/templates/components/components/footer/template.njk index f540b8337..07bcd4f3e 100644 --- a/app/templates/components/components/footer/template.njk +++ b/app/templates/components/components/footer/template.njk @@ -4,38 +4,6 @@ #}
-
-
- {# {% if params.navigation %} - - {% endif %} #} -
-
{% if params.meta %}

{{ params.meta.visuallyHiddenTitle | default("Support links") }}

@@ -114,4 +82,4 @@ Visit USA.gov
-
\ No newline at end of file +
diff --git a/app/templates/new/base.html b/app/templates/new/base.html index 3502642bc..ced3b8703 100644 --- a/app/templates/new/base.html +++ b/app/templates/new/base.html @@ -1,12 +1,11 @@ {% from "../components/banner.html" import banner %} {% from "../components/components/skip-link/macro.njk" import usaSkipLink -%} {% from "../components/components/header/macro.njk" import usaHeader -%} -{% from "../components/components/footer/macro.njk" import usaFooter -%} - {% include "new/components/head/head.html" %} + {% include "new/components/head.html" %} {% block bodyStart %} @@ -205,80 +204,12 @@ {% if current_service and current_service.research_mode %} {% set meta_suffix = 'Built by the Technology Transformation Servicesresearch mode' %} {% else %} - {% set meta_suffix = 'Built by the Technology Transformation Services' %} + {% set commit_hash = ", Latest version: " + config['COMMIT_HASH'] %} + {% set long_link = 'Technology Transformation Services' %} + {% set meta_suffix = "Built by the " + long_link + commit_hash %} {% endif %} - {{ usaFooter({ - "classes": "js-footer", - "navigation": [ - { - "title": "About Notify", - "columns": 1, - "items": [ - { - "href": url_for("main.features"), - "text": "Features" - }, - { - "href": url_for("main.roadmap"), - "text": "Roadmap" - }, - { - "href": url_for("main.security"), - "text": "Security" - }, - { - "href": url_for("main.terms"), - "text": "Terms of use" - }, - ] - }, - { - "title": "Using Notify", - "columns": 1, - "items": [ - { - "href": url_for("main.get_started"), - "text": "Get started" - }, - { - "href": url_for("main.pricing"), - "text": "Pricing" - }, - { - "href": url_for("main.trial_mode_new"), - "text": "Trial mode" - }, - { - "href": url_for("main.message_status"), - "text": "Delivery status" - }, - { - "href": url_for("main.guidance_index"), - "text": "Guidance" - }, - { - "href": url_for("main.documentation"), - "text": "API documentation" - } - ] - }, - { - "title": "Support", - "columns": 1, - "items": [ - { - "href": url_for('main.support'), - "text": "Contact us" - }, - ] - }, - ], - "meta": { - "items": meta_items, - "html": meta_suffix - } - }) }} + {% include "new/components/footer.html" %} {% if current_user.is_authenticated %} {% block sessionUserWarning %} diff --git a/app/templates/new/components/footer/footer.html b/app/templates/new/components/footer.html similarity index 56% rename from app/templates/new/components/footer/footer.html rename to app/templates/new/components/footer.html index fa22b6a88..f24a334d8 100644 --- a/app/templates/new/components/footer/footer.html +++ b/app/templates/new/components/footer.html @@ -1,48 +1,14 @@