Merge and push back up

app/templates/admin_template.html

@@ -43,6 +43,11 @@
   {% if current_user.is_authenticated %}
     {% if current_user.platform_admin %}
       {% 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",
@@ -75,6 +80,11 @@
       ] %}
     {% else %}
       {% 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",
@@ -92,7 +102,7 @@
         },
         {
           "href": url_for('main.user_profile'),
-          "text": current_user.name,
+          "text": "User profile",
           "active": header_navigation.is_selected('user-profile')
         },
         {

app/templates/error/500.html

@@ -4,16 +4,10 @@
   <div class="grid-row">
     <div class="grid-col-8">
       <h1 class="heading-large">
-        Sorry, there’s a problem with Notify.gov
+        Sorry, we can't deliver what you asked for right now.
       </h1>
       <p class="usa-body">
-        Try again later.
-      </p>
-      <!-- <p class="usa-body">
-        You can check our <a class="usa-link" href="https://status.notifications.service.gov.uk">system status</a> page to see if there are any known issues.
-      </p> -->
-      <p class="usa-body">
-        To report a problem, please email <a class="usa-link" href="mailto:notify-support@gsa.gov">notify-support@gsa.gov</a>.
+        Please try again later or <a class="usa-link" href="mailto:notify-support@gsa.gov"></a>email us</a> for more information.</p>
       </p>
     </div>
   </div>

app/templates/main_nav.html

@@ -1,13 +1,15 @@
 {% if help %}
   {% include 'partials/tour.html' %}
 {% else %}
-<nav class="nav margin-bottom-5">
+<nav class="nav">
+  <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>
+      {# <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 %}

app/templates/service_navigation.html

@@ -7,7 +7,7 @@
   </div>
 {% endmacro %}
 
-<div class="navigation-service margin-top-2 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
+<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) %}

app/templates/views/dashboard/write-first-messages.html

@@ -1,4 +1,4 @@
-<h2 class="font-body-lg">Get started</h2>
-<a class="usa-button" href="{{ url_for('.choose_template', service_id=current_service.id) }}">
+<h2 class="font-body-lg margin-top-0 margin-bottom-1">Get started</h2>
+<a class="usa-button margin-bottom-5" href="{{ url_for('.choose_template', service_id=current_service.id) }}">
   Create your first template
 </a>

app/templates/views/user-profile.html

@@ -3,16 +3,16 @@
 {% from "components/table.html" import mapping_table, row, text_field, optional_text_field, edit_field, field, boolean_field with context %}
 
 {% block per_page_title %}
-  Your profile
+  User profile
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  <h1 class="font-body-2xl margin-bottom-3">Your profile</h1>
+  <h1 class="font-body-2xl margin-bottom-3">User profile</h1>
 
   <div class="body-copy-table">
     {% call mapping_table(
-      caption='Your profile',
+      caption='User profile',
       field_headings_visible=False,
       caption_visible=False
     ) %}

app/templates/withoutnav_template.html

@@ -4,9 +4,9 @@
 
 {% block beforeContent %}
     {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %}
-    <div class="navigation-service usa-breadcrumb">
+    <!-- <div class="navigation-service usa-breadcrumb">
       <a href="{{ url_for('main.show_accounts_or_dashboard') }}" class="usa-link usa-breadcrumb__link usa-breadcrumb-back-to">Back to {{ current_service.name }}</a>
-    </div>
+    </div> -->
     {% endif %}
     {% block backLink %}{% endblock %}
 {% endblock %}