Merge pull request #1480 from GSA/1464-switch-to-the-new-withnav_template

Switch to the new withnav_template

app/templates/old/main_nav.html

@@ -0,0 +1,32 @@
+{# This template is an old version #}
+{% if help %}
+  {% include 'partials/tour.html' %}
+{% else %}
+<nav class="nav margin-bottom-4">
+  <a class="usa-button margin-top-1 margin-bottom-5 width-full"
+    href="{{ url_for('.choose_template', service_id=current_service.id) }}">Send messages</a>
+  <ul class="usa-sidenav">
+  {% if current_user.has_permissions() %}
+    {% if current_user.has_permissions('view_activity') %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
+    {% endif %}
+      {# <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('templates') }}" href="{{ url_for('.choose_template', service_id=current_service.id) }}">Send messages</a></li> #}
+    {% if not current_user.has_permissions('view_activity') %}
+      <li class="usa-sidenav__item"><a class="{{ casework_navigation.is_selected('sent-messages') }}" href="{{ url_for('.view_notifications', service_id=current_service.id, status='sending,delivered,failed') }}">Sent messages</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
+      {# <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li> #}
+    {% endif %}
+    <!-- {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}" href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
+    {% endif %} -->
+    {% if current_user.has_permissions('manage_api_keys') %}
+      <!-- <li><a class="usa-link{{ main_navigation.is_selected('api-integration') }}" href="{{ url_for('.api_integration', service_id=current_service.id) }}">API integration</a></li> -->
+    {% endif %}
+  {% elif current_user.has_permissions(allow_org_user=True) %}
+    <li class="usa-sidenav__item"><a class="usa-link{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
+    <li class="usa-sidenav__item"><a class="usa-link{{ main_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
+  {% endif %}
+  </ul>
+</nav>
+{% endif %}

app/templates/old/org_nav.html

@@ -0,0 +1,12 @@
+{# This template is an old version #}
+<nav class="navigation">
+  <ul>
+    <li><a class="usa-link{{ org_navigation.is_selected('dashboard') }}" href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}">Usage</a></li>
+    <li><a class="usa-link{{ org_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_org_users', org_id=current_org.id) }}">Team members</a></li>
+    {% if current_user.platform_admin %}
+    <li><a class="usa-link{{ org_navigation.is_selected('settings') }}" href="{{ url_for('.organization_settings', org_id=current_org.id) }}">Settings</a></li>
+    <li><a class="usa-link{{ org_navigation.is_selected('trial-services') }}" href="{{ url_for('.organization_trial_mode_services', org_id=current_org.id) }}">Trial mode services</a></li>
+    <li><a class="usa-link{{ org_navigation.is_selected('billing') }}" href="{{ url_for('.organization_billing', org_id=current_org.id) }}">Billing</a></li>
+    {% endif %}
+  </ul>
+</nav>

app/templates/old/org_template.html

@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+
+{% block per_page_title %}
+  {% block org_page_title %}{% endblock %} – {{ current_org.name }}
+{% endblock %}
+
+{% block main %}
+  <div class="grid-container">
+    <div class="navigation-service usa-breadcrumb">
+      {% if current_user.platform_admin %}
+        <a href="{{ url_for('.organizations') }}" class="usa-link navigation-organization-link">Organizations</a>
+      {% endif %}
+      <div class="navigation-service">
+        {{ current_org.name }}
+      </div>
+      <a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service">Switch service</a>
+    </div>
+    <div class="grid-row">
+      <div class="grid-col-3">
+        {% include "org_nav.html" %}
+      </div>
+      <div class="grid-col-9">
+        {% block beforeContent %}
+          {% block backLink %}{% endblock %}
+        {% endblock %}
+        <main class="main" id="main-content" role="main" >
+          {% block content %}
+            {% include 'flash_messages.html' %}
+            {% block maincolumn_content %}{% endblock %}
+          {% endblock %}
+        </main>
+      </div>
+    </div>
+  </div>
+{% endblock %}

app/templates/old/service_navigation.html

@@ -0,0 +1,20 @@
+{# This template is an old version #}
+{% macro navigation_service_name(service) %}
+  <div class="font-body-2xl text-bold">
+    {{ service.name }}
+    {% if not service.active %}
+      <span class="navigation-service-name navigation-service-type--suspended">Suspended</span>
+    {% endif %}
+  </div>
+{% endmacro %}
+
+<div class="navigation-service margin-top-5 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
+  {% if current_service.organization_id %}
+    {% if current_user.platform_admin or
+      (current_user.belongs_to_organization(current_service.organization_id) and current_service.live) %}
+      <a href="{{ url_for('.organization_dashboard', org_id=current_service.organization_id) }}" class="usa-link navigation-organization-link">{{ current_service.organization_name }}</a>
+    {% endif %}
+  {% endif %}
+  {{ navigation_service_name(current_service) }}
+  <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
+</div>

app/templates/old/settings_nav.html

@@ -0,0 +1,17 @@
+{# This template is an old version #}
+{% if help %}
+{% include 'partials/tour.html' %}
+{% else %}
+<nav class="nav">
+  <ul class="usa-sidenav">
+    {# {% if current_user.has_permissions() %} #}
+    <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}"
+      href="{{ url_for('main.service_settings', service_id=current_service.id) }}">General</a></li>
+    <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('user-profile') }}"
+      href="{{ url_for('main.user_profile', service_id=current_service.id) }}">User profile</a></li>
+    <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('team-members') }}"
+        href="{{ url_for('main.manage_users', service_id=current_service.id) }}">Team members</a></li>
+    {# {% endif %} #}
+  </ul>
+</nav>
+{% endif %}

app/templates/old/settings_template.html

@@ -0,0 +1,35 @@
+{# This template is an old version #}
+{% extends "admin_template.html" %}
+
+{% block per_page_title %}
+  {% block service_page_title %}{% endblock %} – {{ current_service.name }}
+{% endblock %}
+
+{% block main %}
+  <div class="grid-container">
+    <div class="grid-row margin-top-5">
+      {% if help %}
+        <div class="tablet:grid-col-3">
+      {% else %}
+        <div class="tablet:grid-col-3 margin-bottom-4">
+      {% endif %}
+          {% include "settings_nav.html" %}
+        </div>
+      {% if help %}
+        <div class="tablet:grid-col-8">
+      {% else %}
+        <div class="tablet:grid-col-9 tablet:padding-left-4">
+      {% endif %}
+        {% block beforeContent %}
+          {% block backLink %}{% endblock %}
+        {% endblock %}
+        <main id="main-content" role="main" class="usa-prose site-prose margin-bottom-10">
+        {% block content %}
+          {% include 'flash_messages.html' %}
+          {% block maincolumn_content %}{% endblock %}
+        {% endblock %}
+        </main>
+      </div>
+    </div>
+  </div>
+{% endblock %}

app/templates/old/withnav_template.html

@@ -0,0 +1,36 @@
+{# This template is an old version #}
+{% extends "admin_template.html" %}
+
+{% block per_page_title %}
+  {% block service_page_title %}{% endblock %} – {{ current_service.name }}
+{% endblock %}
+
+{% block main %}
+  <div class="grid-container">
+    {% include "service_navigation.html" %}
+    <div class="grid-row margin-top-5">
+      {% if help %}
+        <div class="tablet:grid-col-3">
+      {% else %}
+        <div class="tablet:grid-col-3">
+      {% endif %}
+          {% include "main_nav.html" %}
+        </div>
+      {% if help %}
+        <div class="grid-col-8">
+      {% else %}
+        <div class="tablet:grid-col-9 tablet:padding-left-4">
+      {% endif %}
+        {% block beforeContent %}
+          {% block backLink %}{% endblock %}
+        {% endblock %}
+        <main id="main-content" role="main" class="usa-prose site-prose margin-bottom-10">
+        {% block content %}
+          {% include 'flash_messages.html' %}
+          {% block maincolumn_content %}{% endblock %}
+        {% endblock %}
+        </main>
+      </div>
+    </div>
+  </div>
+{% endblock %}