merge from main

app/templates/admin_template.html

@@ -31,7 +31,7 @@
   {% endblock %}
   {% block meta %}
   {% endblock %}
-  <script type="text/javascript" src="{{ asset_url('js/gtm_head.js') }}"></script>
+  <!-- <script type="text/javascript" src="{{ asset_url('js/gtm_head.js') }}"></script> -->
 {% endblock %}
 
 {% block pageTitle %}
@@ -51,6 +51,16 @@
   {% if current_user.is_authenticated %}
     {% if current_user.platform_admin %}
       {% set navigation = [
+        {
+          "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.user_profile'),
           "text": current_user.name,

app/templates/partials/count.html

@@ -5,9 +5,12 @@
   {% if notifications_deleted %}
     <div class="govuk-grid-row bottom-gutter-1-2">
       {% for label, query_param, url, count in counts %}
-        <div class="govuk-grid-column-one-quarter">
-          {{ big_number(count, label, smaller=True) }}
-        </div>
+        {% if query_param == 'pending' %}
+            <div class="govuk-grid-column-one-quarter">{{ big_number(count, query_param, smaller=True) }}</div>
+        {% else %}
+          <div class="govuk-grid-column-one-quarter">{{ big_number(count, label, smaller=True) }}</div>
+        {% endif %}
+
       {% endfor %}
     </div>
   {% else %}

app/templates/partials/notifications/status.html

@@ -1,3 +1,4 @@
+
 <div class="ajax-block-container">
   {% set field_status = notification.status|format_notification_status_as_field_status(notification.notification_type) %}
   {% set status_url = notification.status|format_notification_status_as_url(notification.notification_type) %}
@@ -5,9 +6,18 @@
     {% if status_url %}
       <a class="govuk-link govuk-link--destructive" href="{{ status_url }}">
     {% endif %}
+
+    {% if notification.status != 'sending' %}
     {{ notification.status|format_notification_status(
       notification.template.template_type
     ) }}
+    {% endif %}
+
+    {% if notification.status == 'sending' %}
+  <p class="notification-status {{ field_status }}">
+     Pending. Messages will remain in pending state until carrier status is received, typically 5 minutes.
+     </p>
+    {% endif %}
     {% if status_url %}
       </a>
     {% endif %}
@@ -15,4 +25,5 @@
       (test)
     {% endif %}
   </p>
+
 </div>

app/templates/views/activity/counts.html

@@ -1,5 +1,4 @@
 {% from "components/pill.html" import pill %}
-
 <div class='bottom-gutter ajax-block-container'>
   {{ pill(
     status_filters,

app/templates/views/dashboard/_jobs.html

@@ -50,7 +50,7 @@
             {{ big_number(
               item.notifications_sending,
               smallest=True,
-              label='sending',
+              label='pending',
             ) }}
           </div>
           <div class="govuk-grid-column-one-third">

app/templates/views/jobs/job.html

@@ -17,6 +17,6 @@
     {{ ajax_block(partials, updates_url, 'counts', finished=job.processing_finished) }}
     {{ ajax_block(partials, updates_url, 'notifications', finished=job.processing_finished) }}
 
-    <div>&nbsp;</div>
+    <div> </div>
 
 {% endblock %}

app/templates/views/notifications.html

@@ -25,6 +25,11 @@
     'counts'
   ) }}
 
+
+  <p class="notification-status {{ field_status }}">
+    Messages will remain in pending state until carrier status is received, typically 5 minutes.
+  </p>
+
   {% call form_wrapper(
     action=url_for('.view_notifications', service_id=current_service.id, message_type=message_type),
     class="usa-search margin-bottom-2"
@@ -50,6 +55,10 @@
   
   {% endcall %}
 
+
+
+
+
   {% call form_wrapper(id="search-form") %}
     <input type="hidden" name="to" {% if search_form.to.data %}value="{{ search_form.to.data }}{%  endif %}">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">

app/templates/views/templates/choose.html

@@ -50,7 +50,7 @@
       </div>
       {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
         <div class="govuk-grid-column-one-sixth">
-          <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="govuk-link govuk-link--no-visited-state folder-heading-manage-link">Manage<span class="usa-sr-only"> this folder</span></a>
+          <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="usa-link folder-heading-manage-link">Manage<span class="usa-sr-only"> this folder</span></a>
         </div>
       {% endif %}
     </div>