Merge branch 'master' into remove-stats-from-send

app/templates/partials/jobs/count.html

@@ -1,5 +1,5 @@
 {% from "components/pill.html" import pill %}
 
 <div class="bottom-gutter">
-  {{ pill('Status', counts, status) }}
+  {{ pill('Status', counts, request.args.get('status', '')) }}
 </div>

app/templates/partials/jobs/notifications.html

@@ -4,12 +4,18 @@
   <div class="dashboard-table">
 {% endif %}
 
-  {% if notifications and not help %}
-    <p class="bottom-gutter">
-      <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
-      &emsp;
-      <span id="time-left">{{ time_left }}</span>
-    </p>
+  {% if not help %}
+    {% if percentage_complete < 100 %}
+      <p class="bottom-gutter-1-2 hint">
+        Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
+      </p>
+    {% elif notifications %}
+      <p class="bottom-gutter-1-2">
+        <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
+        &emsp;
+        <span id="time-left">{{ time_left }}</span>
+      </p>
+    {% endif %}
   {% endif %}
 
   {% call(item, row_number) list_table(
@@ -44,6 +50,12 @@
     {% endcall %}
   {% endcall %}
 
+  {% if more_than_one_page %}
+    <p class="table-show-more-link">
+      Only showing the first 50 rows
+    </p>
+  {% endif %}
+
 {% if notifications %}
   </div>
 {% endif %}

app/templates/partials/templates/guidance-character-count.html

@@ -1,12 +1,8 @@
-<details>
-  <summary class="button tertiary-button">Message length</summary>
-  <div id="guidance-personalisation">
-    <p>
-      If your message is long then it will
-      cost more.
-    </p>
-    <p>
-      See <a href="{{ url_for('.pricing') }}">pricing</a> for details.
-    </p>
-  </div>
-</details>
+<h2 class="heading-medium">Message length</h2>
+<p>
+  If your message is long then it will
+  cost more.
+</p>
+<p>
+  See <a href="{{ url_for('.pricing') }}">pricing</a> for details.
+</p>

app/templates/partials/templates/guidance-formatting.html

@@ -0,0 +1,27 @@
+<h2 class="heading-medium">Formatting</h2>
+<p>
+  To put a title in your template, use a hash:
+</p>
+<div class="panel panel-border-wide">
+  <p>
+    # This is a title
+  </p>
+</div>
+<p>
+  To make bullet points, use asterisks:
+</p>
+<div class="panel panel-border-wide">
+  <p>
+    * point 1<br/>
+    * point 2<br/>
+    * point 3<br/>
+  </p>
+</div>
+<p>
+  To add a callout, use a caret:
+</p>
+<div class="panel panel-border-wide">
+  <p>
+    ^ You must tell us if your circumstances change
+  </p>
+</div>

app/templates/partials/templates/guidance-links.html

@@ -1,8 +1,9 @@
-<details>
-  <summary class="button tertiary-button">Links and URLs</summary>
-  <div id="guidance-personalisation">
-    <p>
-      Always use full URLs, starting with https://
-    </p>
-  </div>
-</details>
+<h2 class="heading-medium">Links and URLs</h2>
+<p>
+  Always use full URLs, starting with https://
+</p>
+<div class="panel panel-border-wide">
+  <p>
+    Apply now at https://www.gov.uk/example
+  </p>
+</div>

app/templates/partials/templates/guidance-personalisation.html

@@ -1,14 +1,11 @@
-<details>
-  <summary class="button tertiary-button">Personalisation</summary>
-  <div id="guidance-personalisation">
-    <p>
-      Use double brackets to add personalisation.
-    </p>
-    <p>
-      Correct: ((name))
-    </p>
-    <p>
-      Incorrect: ((Helen))
-    </p>
-  </div>
-</details>
+<h2 class="heading-medium">
+  Personalisation
+</h2>
+<p>
+  Use double brackets to personalise your message:
+</p>
+<div class="panel panel-border-wide">
+  <p>
+    Hello ((first name)), your reference is ((ref number))
+  </p>
+</div>