{% if navigation_links %}
- {% block pageTitle %}Notify.gov{% endblock %}
@@ -12,7 +10,7 @@
{# Ensure that older IE versions always render with the correct rendering engine #}
- {% block headIcons %}
+
@@ -22,25 +20,18 @@
- {% 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/components/header.html b/app/templates/new/components/header.html
index e21963fed..cbdc21cf7 100644
--- a/app/templates/new/components/header.html
+++ b/app/templates/new/components/header.html
@@ -1,25 +1,28 @@
{# setting navigation and secondarynavigation #}
-{% set navigation = [
- {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard')},
- {"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')},
- {"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
- {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
-] %}
-
-{% if current_user.platform_admin %}
- {% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin')}] %}
-{% else %}
- {% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile')}] %}
-{% endif %}
-
-{% if current_service %}
- {% set secondaryNavigation = [
- {"href": url_for('main.service_settings', service_id=current_service.id), "text": "Settings", "active": secondary_navigation.is_selected('settings')},
- {"href": url_for('main.sign_out'), "text": "Sign out"}
+{% if current_user.is_authenticated %}
+ {% set navigation = [
+ {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard')},
+ {"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')},
+ {"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
+ {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
] %}
-{% else %}
- {% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %}
+
+ {% if current_user.platform_admin %}
+ {% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin')}] %}
+ {% else %}
+ {% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile')}] %}
+ {% endif %}
+
+ {% if current_service %}
+ {% set secondaryNavigation = [
+ {"href": url_for('main.service_settings', service_id=current_service.id), "text": "Settings", "active": secondary_navigation.is_selected('settings')},
+ {"href": url_for('main.sign_out'), "text": "Sign out"}
+ ] %}
+ {% else %}
+ {% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %}
+ {% endif %}
{% endif %}
+
{# usa header #}
+
-
- {% endblock %}
{% endblock %}
{% endblock %}
diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head.html
index 9ceb9dbc1..dd7519cf4 100644
--- a/app/templates/new/components/head.html
+++ b/app/templates/new/components/head.html
@@ -1,6 +1,4 @@
-
-
{{ sub_navigation(navigation_links) }}
@@ -57,8 +64,6 @@
{% block content_column_content %}{% endblock %}
diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md
index 1c52e75dc..7cd51f1a9 100644
--- a/app/templates/new/templates_glossary.md
+++ b/app/templates/new/templates_glossary.md
@@ -6,10 +6,9 @@ This document serves as a glossary for the templates directory structure of the
## Directory Structure
- `/templates`
- - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `withoutnav_template`, `settings_templates`, and `content_template`.
+ - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `withoutnav_template`, and `content_template`.
- **/layouts**: Contains shared layouts used across the site. Simply put, it defines the overall structure or skeleton of the application (less frequently revised).
- - `withnav_template.html`: A variation of the base layout that includes a sidebar.
- - `org_template.html`: A variaton of the withnav_template
+ - `withnav_template.html`: A variation of org_template and settings_template that includes a sidebar.
- **/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`.
@@ -23,20 +22,15 @@ This document serves as a glossary for the templates directory structure of the
### Best Practices
- Use **inheritance** `{% extends %}` to build on base layouts.
-- Employ **components** `{% include %}` for reusable UI elements to keep the code DRY and facilitate easier updates.
-
-### Observation Notes
-- The macro-options.json files in the header and footer component act as structural guides. They aren't directly used as data passed to the usaFooter function/macro. Instead, these files outline the expected properties and provide a description of their purpose. The `usaFooter` macro component is currently only invoked in the `admin_template`, which will eventually serve as the `base.html` template. This will simplify the approach when we change the footer macros to componenets by eliminating the need to dynamically pass this data from the base.html template. This is also true for `usaHeader` macro component.
-
-
+- Employ **components** `{% include %}` for reusable UI elements.
### Old Layout Templates We Don't Need
-- withoutnav_template.html Delete
-- main_template.html Delete
+- withoutnav_template.html Delete, it is now apart of base.html
+- main_template.html Delete, it is now apart of base.html
- settings_templates.html `withnav_template` can be used to replace `settings_template`.
- settings_nav.html (move to /components/ directory)
- main_nav.html (move to /components/ directory)
- service_navigation.html (move to /components/ directory)
-- org_template, could be under it's own directory called /layout/organization
+- org_template, Delete, it is now apart of withnav_template.html
- org_nav.html (move to /components/ directory)
-- content_template.html Delete
+- content_template.html Delete, it is now apart of base.html
diff --git a/app/templates/org_template.html b/app/templates/org_template.html
index dd3fbee20..5e04003fd 100644
--- a/app/templates/org_template.html
+++ b/app/templates/org_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
{% block per_page_title %}
{% block org_page_title %}{% endblock %} – {{ current_org.name }}
diff --git a/app/templates/settings_template.html b/app/templates/settings_template.html
index 8b086e9f7..a42f043b0 100644
--- a/app/templates/settings_template.html
+++ b/app/templates/settings_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
{% block per_page_title %}
{% block service_page_title %}{% endblock %} – {{ current_service.name }}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 3289dd121..175f958de 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block meta %}
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index 40d2e10f1..3b6ebfbf2 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
{% block per_page_title %}
{% block service_page_title %}{% endblock %} – {{ current_service.name }}
diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html
index d31589086..b6b77088e 100644
--- a/app/templates/withoutnav_template.html
+++ b/app/templates/withoutnav_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
{% set mainClasses = "margin-top-5 padding-bottom-5" %}