Merge branch 'master' into testing-doc

This commit is contained in:
Rebecca Law
2017-01-31 16:36:03 +00:00
13 changed files with 26 additions and 47 deletions

View File

@@ -95,6 +95,7 @@
<li><a href="{{ url_for("main.trial_mode") }}">Trial mode</a></li>
<li><a href="{{ url_for("main.pricing") }}">Pricing</a></li>
<li><a href="{{ url_for("main.delivery_and_failure") }}">Delivery and failure</a></li>
<li><a href="https://www.gov.uk/performance/govuk-notify">Performance</a></li>
</ul>
</div>
<div class="column-one-third">

View File

@@ -6,11 +6,7 @@
{% block maincolumn_content %}
<div class="grid-row bottom-gutter">
<div class="column-half">
<h2 class="heading-large">Templates sent</h2>
</div>
</div>
<h2 class="heading-large">All templates used this year</h2>
{% include 'views/dashboard/template-statistics.html' %}

View File

@@ -111,7 +111,7 @@
</li>
{% if current_service.active %}
<li class="bottom-gutter">
<a href="{{ url_for('.deactivate_service', service_id=current_service.id) }}" class="button">
<a href="{{ url_for('.archive_service', service_id=current_service.id) }}" class="button">
Archive service
</a>
</li>

View File

@@ -121,7 +121,7 @@
<div class="grid-row bottom-gutter">
<div class="column-half">
<h3 class="visually-hidden">Services</h3>
<div class="product-page-big-number">27</div>
<div class="product-page-big-number">28</div>
services
</div>
<div class="column-half">