diff --git a/app/templates/base.html b/app/templates/base.html index 8a6ba1ea8..4a6421afb 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -47,7 +47,7 @@ {% endblock %} {% block content %} {% block flash_messages %} - {% include 'flash_messages.html' %} + {% include 'new/components/flash_messages.html' %} {% endblock %} {% block maincolumn_content %}
diff --git a/app/templates/flash_messages.html b/app/templates/new/components/flash_messages.html similarity index 100% rename from app/templates/flash_messages.html rename to app/templates/new/components/flash_messages.html diff --git a/app/templates/new/components/service_navigation.html b/app/templates/new/components/service_nav.html similarity index 100% rename from app/templates/new/components/service_navigation.html rename to app/templates/new/components/service_nav.html diff --git a/app/templates/settings_nav.html b/app/templates/new/components/settings_nav.html similarity index 100% rename from app/templates/settings_nav.html rename to app/templates/new/components/settings_nav.html diff --git a/app/templates/new/layouts/withnav_template.html b/app/templates/new/layouts/withnav_template.html deleted file mode 100644 index 30d38b4bc..000000000 --- a/app/templates/new/layouts/withnav_template.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "/new/base.html" %} - -{% block per_page_title %} - {% block service_page_title %}{% endblock %}{% if current_service.name %} – {{ current_service.name }}{% endif %} - {% block org_page_title %}{% endblock %}{% if current_org.name %} – {{ current_org.name }}{% endif %} -{% endblock %} - -{% block main %} -
- {% block serviceNavigation %} - {% if current_org.name %} - {% else %} - {% include "new/components/service_navigation.html" %} - {% endif %} - {% endblock %} - {# - The withnav_template can serve as a replacement for both settings_template and org_template.html. - - The file service_navigation.html is included only in withnav_template. It's not used in settings_template. That is one out of the two differences between settings template and withnav template. As a result, when other templates extend settings_template, they include the serviceNavigation block but keep it empty. The settings_template.html is specifically used for these pages in the app: manage-users.html, service-settings.html, and user-profile.html. - - In addition, serviceNavigation should be empty on templates that previously extended org_template. For templates that previously extended org_template.html, there's an addition of the orgNavBreadcrumb block. - {% block orgNavBreadcrumb %} - {% include "/new/components/org_nav_breadcrumb.html" %} - {% endblock %} - #} - {% if current_org.name %} - {% block orgNavBreadcrumb %}{% include "/new/components/org_nav_breadcrumb.html" %}{% endblock %} - {% endif %} -
-
- {% block sideNavigation %} - {% if org_navigation_links %} - {% include "/new/components/org_nav.html" %} - {% else %} - {% include "/new/components/main_nav.html" %} - {% endif %} - {# - Include settings_nav.html for child templates that previously extended settings_template. - - Include "org_nav.html" for child templates that previously extended org_template html - #} - {% endblock %} -
-
- {% block beforeContent %} - {% block backLink %}{% endblock %} - {% endblock %} -
- {% block content %} - {% include 'flash_messages.html' %} - {% block maincolumn_content %}{% endblock %} - {% endblock %} -
-
-
-
-{% endblock %} diff --git a/app/templates/main_nav.html b/app/templates/old/main_nav.html similarity index 98% rename from app/templates/main_nav.html rename to app/templates/old/main_nav.html index 4aac354d9..4357dc654 100644 --- a/app/templates/main_nav.html +++ b/app/templates/old/main_nav.html @@ -1,3 +1,4 @@ +{# This template is an old version #} {% if help %} {% include 'partials/tour.html' %} {% else %} diff --git a/app/templates/org_nav.html b/app/templates/old/org_nav.html similarity index 96% rename from app/templates/org_nav.html rename to app/templates/old/org_nav.html index f7f7a5b93..0511eb9ff 100644 --- a/app/templates/org_nav.html +++ b/app/templates/old/org_nav.html @@ -1,3 +1,4 @@ +{# This template is an old version #}