Merge branch 'master' into platform-admin

Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py

app/templates/views/choose-template.html

@@ -37,9 +37,9 @@
       {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'], or_=True) %}
       {{ banner(
         """
-          Send yourself a test message
+          Send yourself a test
         """,
-        subhead='Next step',
+        subhead='Next step:',
         type="tip"
       )}}
       {% endif %}

app/templates/views/cookies.html

@@ -0,0 +1,81 @@
+{% extends "withoutnav_template.html" %}
+
+{% block page_title %}
+  Cookies – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-xlarge">Cookies</h1>
+    <p class="summary">
+        GOV.UK Notify puts small files (known as ‘cookies’)
+        on to your computer.
+    </p>
+    <p>These cookies are used to remember you once you’ve logged in</p>
+    <p>
+        Find out <a href="http://www.aboutcookies.org/">how to manage cookies</a>.
+    </p>
+
+    <h2 class="heading-medium">Session cookies</h2>
+    <p>
+        We store session cookies on your computer to help keep your information
+        secure while you use the service.
+    </p>
+    <table>
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Purpose</th>
+                <th>Expires</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>
+                  notify_admin_session
+                </td>
+                <td width="50%">
+                  Used to keep you logged in
+                </td>
+                <td>
+                  1 hour
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <h2 class="heading-medium">Introductory message cookie</h2>
+    <p>
+        When you first use the service, you may see a pop-up ‘welcome’ message.
+        Once you’ve seen the message, we store a cookie on your computer so it
+        knows not to show it again.
+    </p>
+    <table>
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Purpose</th>
+                <th>Expires</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>
+                  seen_cookie_message
+                </td>
+                <td width="50%">
+                    Saves a message to let us know that you have seen our cookie
+                    message
+                </td>
+                <td>
+                  1 month
+                </td>
+            </tr>
+        </tbody>
+    </table>
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/dashboard/dashboard.html

@@ -0,0 +1,20 @@
+{% extends "withnav_template.html" %}
+
+{% block page_title %}
+  {{ session.get('service_name', 'Dashboard') }} – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  {% if service.restricted %}
+    {% include 'views/dashboard/trial-mode-banner.html' %}
+  {% endif %}
+
+  {% if not jobs %}
+    {% include 'views/dashboard/get-started.html' %}
+  {% else %}
+    {% include 'views/dashboard/today.html' %}
+    {% include 'views/dashboard/jobs.html' %}
+  {% endif %}
+
+{% endblock %}

app/templates/views/dashboard/get-started.html

@@ -0,0 +1,19 @@
+{% from "components/banner.html" import banner_wrapper %}
+
+<h2 class="heading-medium">Get started</h2>
+<ol class="grid-row">
+  {% if current_user.has_permissions(['manage_templates']) %}
+    <li class="column-half">
+      {% call banner_wrapper(type="tip", subhead='1.' if not templates else None, with_tick=templates|length) %}
+        <a href='{{ url_for(".add_service_template", service_id=service_id, template_type="sms") }}'>Add a template</a>
+      {% endcall %}
+    </li>
+  {% endif %}
+  {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
+    <li class="column-half">
+      {% call banner_wrapper(type="tip", subhead='2.') %}
+        <a href='{{ url_for(".choose_template", service_id=service_id, template_type="sms") }}'>Send yourself a message</a>
+      {% endcall %}
+    </li>
+  {% endif %}
+</ol>

app/templates/views/dashboard/jobs.html

@@ -0,0 +1,28 @@
+{% from "components/table.html" import list_table, field, right_aligned_field_heading, hidden_field_heading %}
+
+{% call(item) list_table(
+  jobs,
+  caption="Recent batch jobs",
+  empty_message='You haven’t sent any text messages yet',
+  field_headings=['File', 'Started', right_aligned_field_heading('Rows'), right_aligned_field_heading('Sent')]
+) %}
+  {% call field() %}
+    <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
+  {% endcall %}
+  {% call field() %}
+    {{ item.created_at|format_datetime }}
+  {% endcall %}
+  {% call field(align='right') %}
+    {{ item.notification_count }}
+  {% endcall %}
+  {% call field(align='right') %}
+    {{ item.notifications_sent }}
+  {% endcall %}
+{% endcall %}
+{% if more_jobs_to_show %}
+  {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
+    <p class="table-show-more-link">
+      <a href="{{ url_for('.view_jobs', service_id=service_id) }}">See all sent text messages</a>
+    </p>
+  {% endif %}
+{% endif %}

app/templates/views/dashboard/today.html

@@ -0,0 +1,25 @@
+{% from "components/big-number.html" import big_number_with_status %}
+
+<h2 class="heading-medium">
+  Sent today
+</h2>
+<div class="grid-row">
+  <div class="column-half">
+    {{ big_number_with_status(
+      statistics.get('emails_requested', 0),
+      'email' if statistics.get('emails_requested') == 1 else 'emails',
+      '{}%'.format(statistics.get('emails_failure_rate', 0)),
+      'failed',
+      statistics.get('emails_percentage_of_danger_zone', 0)
+    ) }}
+  </div>
+  <div class="column-half">
+    {{ big_number_with_status(
+      statistics.get('sms_requested', 0),
+      'text message' if statistics.get('sms_requested') == 1 else 'text messages',
+      '{}%'.format(statistics.get('sms_failure_rate', 0)),
+      'failed',
+      statistics.get('sms_percentage_of_danger_zone', 0)
+    ) }}
+  </div>
+</div>

app/templates/views/dashboard/trial-mode-banner.html

@@ -0,0 +1,25 @@
+{% from "components/banner.html" import banner_wrapper %}
+{% from "components/big-number.html" import big_number %}
+
+{% call banner_wrapper(type="mode") %}
+
+  <h2 class="heading-medium">Trial mode</h2>
+  <div class="grid-row">
+    <div class="column-one-half">
+      <p>
+        We’ll only deliver messages to you and members of your team
+        <br>
+        <a href="{{ url_for(".help", _anchor="trial-mode") }}">Find out more</a>
+      </p>
+    </div>
+    <div class="column-one-sixth">
+      &nbsp;
+    </div>
+    <div class="column-one-third">
+      {{ big_number(
+        service.limit - statistics.get('emails_requested', 0) - statistics.get('sms_requested', 0),
+        'messages left today'
+      ) }}
+    </div>
+  </div>
+{% endcall %}

app/templates/views/email-not-received.html

@@ -1,24 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
-
-{% block page_title %}
-  Check your email address – GOV.UK Notify
-{% endblock %}
-
-{% block maincolumn_content %}
-
-<div class="grid-row">
-  <div class="column-two-thirds">
-    <h1 class="heading-large">Check your email address</h1>
-
-    <p>Check your email address is correct and then resend the confirmation code.</p>
-
-    <form autocomplete="off" method="post">
-      {{ textbox(form.email_address, hint='Your email address must end in .gov.uk') }}
-      {{ page_footer('Resend confirmation code') }}
-    </form>
-  </div>
-</div>
-
-{% endblock %}

app/templates/views/help.html

@@ -0,0 +1,79 @@
+{% extends "withoutnav_template.html" %}
+
+{% block page_title %}
+  Cookies – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-xlarge">Help</h1>
+
+    <h2 class="heading-large" id="trial-mode">Trial mode</h2>
+
+    <p>
+      When you create a service on GOV.UK&nbsp;Notify, you start off in trial
+      mode. This means:
+    </p>
+    <ul class="list list-bullet">
+      <li>
+        you can only send messages to yourself and your team members
+      </li>
+      <li>
+        you can only send 50 messages per day
+      </li>
+    </ul>
+
+    <p>
+      Anyone working in central government can create an account on
+      GOV.UK&nbsp;Notify and try it out. So it’s important that you start off
+      with some restrictions in place.
+    </p>
+
+    <h3 class="heading-medium">To remove these restrictions</h3>
+
+    <p>
+      You need to request to go live:
+    </p>
+    <ul class="list list-bullet">
+      <li>
+        You’ll need to agree to our terms of use
+      </li>
+      <li>
+        If you plan to send more than 250,000 text messages per year, you’ll
+        need to agree to pay for what you use – take a look at our pricing
+      </li>
+      <li>
+        We’ll check your templates to make sure they’re consistent with our
+        design patterns, style guide and information security principles
+      </li>
+    </ul>
+
+    <h3 class="heading-medium">
+      All other aspects of GOV.UK&nbsp;Notify are exactly the same
+    </h2>
+
+    <p>
+      You can still:
+    </p>
+    <ul class="list list-bullet">
+      <li>
+        upload a batch of recipients
+      </li>
+      <li>
+        do an API integration
+      </li>
+    </ul>
+
+    <p>
+      We’ll send the messages you have permission to send. The messages you
+      don’t have permission to send will still be listed on your
+      GOV.UK&nbsp;Notify dashboard but won’t actually get sent. This means you
+      can check that everything is fully working without accidentally sending
+      hundreds of text messages or emails.
+    </p>
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/notifications.html

@@ -0,0 +1,42 @@
+{% extends "withnav_template.html" %}
+{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
+{% from "components/previous-next-navigation.html" import previous_next_navigation %}
+
+{% block page_title %}
+  Notifications activity – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+    <h1 class="heading-large">Notifications activity</h1>
+
+    {% call(item) list_table(
+      notifications,
+      caption="Recent activity",
+      caption_visible=False,
+      empty_message='You haven’t sent any notifications yet',
+      field_headings=['Recipient', 'Template', 'Type', 'Job', 'Status', 'Time'])
+    %}
+      {% call field() %}
+        {{ item.to }}
+      {% endcall %}
+      {% call field() %}
+        <a href="{{ url_for(".choose_template", service_id=service_id, template_type=item.template.template_type, _anchor=item.template.name|linkable_name) }}">{{ item.template.name }}</a>
+      {% endcall %}
+      {% call field() %}
+        {{ item.template.template_type }}
+      {% endcall %}
+      {% call field() %}
+        {% if item.job %}
+          <a href="{{ url_for(".view_job", service_id=service_id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>
+        {% endif %}
+      {% endcall %}
+      {% call field() %}
+        {{ item.status }}
+      {% endcall %}
+      {% call field() %}
+        {{ item.created_at | format_datetime}}
+      {% endcall %}
+    {% endcall %}
+    {{ previous_next_navigation(prev_page, next_page) }}
+{% endblock %}

app/templates/views/registration-continue.html

@@ -0,0 +1,16 @@
+{% extends "withoutnav_template.html" %}
+
+{% block page_title %}
+  Check your email – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-large">​Now check your email​</h1>
+    <p>Click the link in the email we’ve sent you to continue your registration</p>
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/resend-email-verification.html

@@ -0,0 +1,18 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block page_title %}
+  Check your email – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-large">Check your email</h1>
+    <p>In order to verify your email address we've sent a new confirmation link to {{email}}</p>
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/service_dashboard.html

@@ -65,7 +65,7 @@
       {% if more_jobs_to_show %}
         {% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters']) %}
           <p class="table-show-more-link">
-            <a href="{{ url_for('.view_jobs', service_id=service_id) }}">See all sent text messages</a>
+            <a href="{{ url_for('.view_notifications', service_id=service_id) }}">See all sent text messages</a>
           </p>
         {% endif %}
       {% endif %}

app/templates/views/verify.html

@@ -1,53 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
-
-{% block page_title %}
-  {% if form.email_code %}
-    Enter the codes we’ve sent you – GOV.UK Notify
-  {% else %}
-    Enter the code we’ve sent you – GOV.UK Notify
-  {% endif %}
-{% endblock %}
-
-{% block maincolumn_content %}
-
-<div class="grid-row">
-  <div class="column-two-thirds">
-    {% if form.email_code %}
-      <h1 class="heading-large">Enter the codes we’ve sent you</h1>
-    {% else %}
-      <h1 class="heading-large">Enter the code we’ve sent you</h1>
-    {% endif %}
-    {% if form.email_code %}
-      <p>
-        We’ve sent you confirmation codes by email and text message.
-      </p>
-    {% else %}
-      <p>
-        We’ve sent you a confirmation code by text message.
-      </p>
-    {% endif %}
-    <form autocomplete="off" method="post">
-      {% if form.sms_code %}
-      {{ textbox(
-          form.sms_code,
-          width='5em',
-          help_link=url_for('.check_and_resend_text_code'),
-          help_link_text='I haven’t received a text message'
-        ) }}
-      {% endif %}
-      {% if form.email_code %}
-        {{ textbox(
-          form.email_code,
-          width='5em',
-          help_link=url_for('.check_and_resend_email_code'),
-          help_link_text='I haven’t received an email'
-        ) }}
-      {% endif %}
-      {{ page_footer("Continue") }}
-    </form>
-  </div>
-</div>
-
-{% endblock %}