Add mocked service ID to all service-specific pages

app/templates/views/api-keys.html

@@ -7,13 +7,13 @@ GOV.UK Notify | API keys and documentation
 
 {% block maincolumn_content %}
 
-		<h1 class="heading-xlarge">API keys and documentation</h1>
+    <h1 class="heading-xlarge">API keys and documentation</h1>
 
-		<p>Here's where developers can access information about the API and access keys</p>
+    <p>Here's where developers can access information about the API and access keys</p>
 
-		{{ page_footer(
-			back_link=url_for('.dashboard'),
-			back_link_text='Back to dashboard'
-		) }}
+    {{ page_footer(
+      back_link=url_for('.dashboard', service_id=service_id),
+      back_link_text='Back to dashboard'
+    ) }}
 
 {% endblock %}

app/templates/views/check-sms.html

@@ -17,7 +17,7 @@
 		{% for rejected in upload_result.rejects %}
 			<p>Line {{rejected.line_number}}: {{rejected.phone }}</a>
 		{% endfor %}
-		<p><a href="{{url_for('.sendsms')}}" class="button">Go back and resolve errors</a></p>
+		<p><a href="{{url_for('.sendsms', service_id=service_id)}}" class="button">Go back and resolve errors</a></p>
 
 	{% else %}
 
@@ -26,7 +26,7 @@
 
 			{{ page_footer(
 					button_text = "Send {} text messages".format(upload_result.valid|count),
-					back_link = url_for(".sendsms")
+					back_link = url_for(".sendsms", service_id=service_id)
 			)}}
 
 			{% if upload_result.valid | count > 6 %}
@@ -56,7 +56,7 @@
 
 			{{ page_footer(
 					button_text = "Send {} text messages".format(upload_result.valid|count),
-					back_link = url_for(".sendsms")
+					back_link = url_for(".sendsms", service_id=service_id)
 			)}}
 
 		</form>

app/templates/views/dashboard.html

@@ -30,10 +30,10 @@
       field_headings=['Job', 'File', 'Time', 'Status']
     ) %}
 			{% call field() %}
-				<a href="{{ url_for('.showjob') }}">{{ item.file }}</a>
+				<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.file }}</a>
 			{% endcall %}
 			{% call field() %}
-				<a href="{{ url_for('.showjob') }}">{{ item.job }}</a>
+				<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.job }}</a>
 			{% endcall %}
 			{% call field() %}
 				{{ item.time }}
@@ -43,7 +43,7 @@
 			{% endcall %}
     {% endcall %}
     <p>
-      <a href={{ url_for('.showjobs') }}>See all notifications activity</a>
+      <a href={{ url_for('.showjobs', service_id=service_id) }}>See all notifications activity</a>
     </p>
 
 

app/templates/views/edit-template.html

@@ -15,7 +15,7 @@ GOV.UK Notify | Edit template
 			{{ textbox(form.template_body, highlight_tags=True) }}
 			{{ page_footer(
 				'Save and continue',
-				back_link=url_for('.dashboard'),
+				back_link=url_for('.dashboard', service_id=service_id),
 				back_link_text='Back to manage templates'
 			) }}
 		</form>

app/templates/views/job.html

@@ -38,7 +38,7 @@ GOV.UK Notify | Notifications activity
 		</ul>
 
     <p>
-      Sent with template <a href="{{ url_for('.edit_template') }}">{{ template_used }}</a> at {{ uploaded_file_time }}
+      Sent with template <a href="{{ url_for('.edit_template', service_id=service_id) }}">{{ template_used }}</a> at {{ uploaded_file_time }}
     </p>
 
     {% call(item) list_table(
@@ -52,10 +52,10 @@ GOV.UK Notify | Notifications activity
       ]
     ) %}
       {% call field() %}
-        <a href="{{ url_for('.shownotification', notification_id=item.id) }}">{{item.phone}}</a>
+        <a href="{{ url_for('.shownotification', service_id=service_id, notification_id=item.id) }}">{{item.phone}}</a>
       {% endcall %}
       {% call field() %}
-        <a href="{{ url_for('.shownotification', notification_id=item.id) }}">{{item.message[:50]}}…</a>
+        <a href="{{ url_for('.shownotification', service_id=service_id, notification_id=item.id) }}">{{item.message[:50]}}…</a>
       {% endcall %}
       {% call field(
         align='right',

app/templates/views/jobs.html

@@ -16,10 +16,10 @@ GOV.UK Notify | Notifications activity
 			field_headings=['Job', 'File', 'Time', 'Status']
 		) %}
 			{% call field() %}
-				<a href="{{ url_for('.showjob') }}">{{ item.file }}</a>
+				<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.file }}</a>
 			{% endcall %}
 			{% call field() %}
-				<a href="{{ url_for('.showjob') }}">{{ item.job }}</a>
+				<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.job }}</a>
 			{% endcall %}
 			{% call field() %}
 				{{ item.time }}

app/templates/views/manage-templates.html

@@ -12,11 +12,11 @@ GOV.UK Notify | Manage templates
     <p>Here's where you can view templates, choose to add one, or edit/delete one.</p>
 
     <p>
-      <a href="{{ url_for('.edit_template') }}">Here is my first template</a>
+      <a href="{{ url_for('.edit_template', service_id=service_id) }}">Here is my first template</a>
     </p>
 
     <p>
-      <a class="button" href="{{ url_for('.edit_template') }}" role="button">Add a new message template</a>
+      <a class="button" href="{{ url_for('.edit_template', service_id=service_id) }}" role="button">Add a new message template</a>
     </p>
 
 

app/templates/views/manage-users.html

@@ -12,7 +12,7 @@ GOV.UK Notify | Manage users
 		<p>Here's where you can add or remove users of a service.</p>
 
 		{{ page_footer(
-			back_link = url_for('.dashboard'),
+			back_link = url_for('.dashboard', service_id=service_id),
 			back_link_text = 'Back to dashboard'
 		) }}
 

app/templates/views/notification.html

@@ -26,7 +26,7 @@ GOV.UK Notify | Notifications activity
 		</div>
 
 		{{ page_footer(
-			back_link = url_for('.showjob'),
+			back_link = url_for('.showjob', service_id=service_id),
 			back_link_text = 'View other messages in this job'
 		) }}
 

app/templates/views/send-sms.html

@@ -26,7 +26,7 @@
 				{% endfor %}
 
 				<p>
-					or <a href="{{ url_for(".add_template") }}">create a new template</a>
+					or <a href="{{ url_for(".add_template", service_id=service_id) }}">create a new template</a>
 				</p>
 
 				<h2 class="heading-medium">2. Add recipients</h2>

app/templates/views/service-settings.html

@@ -12,26 +12,26 @@
     {{ browse_list([
       {
         'title': 'Change your service name',
-        'link': url_for('.name'),
+        'link': url_for('.name', service_id=service_id),
         'hint': 'Your service name ({}) is included in every sent notification'.format(service.name)
       },
       {
         'title': 'Request to go live and turn off sending restrictions',
-        'link': url_for('.request_to_go_live'),
+        'link': url_for('.request_to_go_live', service_id=service_id),
         'hint': 'A live service can send notifications to any phone number or email address',
       } if not service.live else {
       },
       {
         'title': 'Turn off all outgoing notifications',
-        'link': url_for('.status'),
+        'link': url_for('.status', service_id=service_id),
         'destructive': True
       } if service.active else {
         'title': 'Restart sending notifications',
-        'link': url_for('.status')
+        'link': url_for('.status', service_id=service_id)
       },
       {
         'title': 'Delete this service from Notify',
-        'link': url_for('.delete'),
+        'link': url_for('.delete', service_id=service_id),
         'destructive': True
       },
     ]) }}

app/templates/views/service-settings/confirm.html

@@ -18,7 +18,7 @@ GOV.UK Notify | Service settings
       {{ page_footer(
         'Confirm',
         destructive=destructive,
-        back_link=url_for('.service_settings')
+        back_link=url_for('.service_settings', service_id=service_id)
       ) }}
     </form>
     </div>

app/templates/views/service-settings/delete.html

@@ -35,7 +35,7 @@
         {{ page_footer(
           'Yes, delete ‘{}’'.format(service.name),
           destructive=True,
-          back_link=url_for('.service_settings')
+          back_link=url_for('.service_settings', service_id=service_id)
         ) }}
       </form>
 

app/templates/views/service-settings/name.html

@@ -24,7 +24,7 @@ GOV.UK Notify | Service settings
         {{ textbox(form.service_name) }}
         {{ page_footer(
           'Save',
-          back_link=url_for('.service_settings')
+          back_link=url_for('.service_settings', service_id=service_id)
         ) }}
       </form>
     </div>

app/templates/views/service-settings/request-to-go-live.html

@@ -39,7 +39,7 @@
       <form method="post">
         {{ page_footer(
           'Send request',
-          back_link=url_for('.service_settings')
+          back_link=url_for('.service_settings', service_id=service_id)
         ) }}
       </form>
 

app/templates/views/service-settings/status.html

@@ -25,7 +25,7 @@ GOV.UK Notify | Service settings
         {{ page_footer(
           'Turn off all outgoing notifications',
           destructive=True,
-          back_link=url_for('.service_settings')
+          back_link=url_for('.service_settings', service_id=service_id)
         ) }}
       </form>
 

app/templates/views/user-profile.html

@@ -1,11 +1,11 @@
-{% extends "withnav_template.html" %}
+{% extends "admin_template.html" %}
 {% from "components/table.html" import list_table, row, field %}
 
 {% block page_title %}
   GOV.UK Notify | Your profile
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block fullwidth_content %}
 
   <h1 class="heading-xlarge">Your profile</h1>
 

app/templates/views/user-profile/authenticate.html

@@ -1,4 +1,4 @@
-{% extends "withnav_template.html" %}
+{% extends "admin_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 
@@ -6,7 +6,7 @@
 GOV.UK Notify | Service settings
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block fullwidth_content %}
 
   <h1 class="heading-xlarge">Change your {{ thing }}</h1>
 

app/templates/views/user-profile/change-password.html

@@ -1,4 +1,4 @@
-{% extends "withnav_template.html" %}
+{% extends "admin_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 
@@ -6,7 +6,7 @@
 GOV.UK Notify | Service settings
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block fullwidth_content %}
 
   <h1 class="heading-xlarge">Change your password</h1>
 

app/templates/views/user-profile/change.html

@@ -1,4 +1,4 @@
-{% extends "withnav_template.html" %}
+{% extends "admin_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 
@@ -6,7 +6,7 @@
 GOV.UK Notify | Service settings
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block fullwidth_content %}
 
   <h1 class="heading-xlarge">Change your {{ thing }}</h1>
 

app/templates/views/user-profile/confirm.html

@@ -1,4 +1,4 @@
-{% extends "withnav_template.html" %}
+{% extends "admin_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 
@@ -6,7 +6,7 @@
 GOV.UK Notify | Service settings
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block fullwidth_content %}
 
   <h1 class="heading-xlarge">Change your {{ thing }}</h1>
 
@@ -20,7 +20,7 @@ GOV.UK Notify | Service settings
         {{ page_footer(
           'Confirm',
           destructive=destructive,
-          back_link=url_for('.service_settings')
+          back_link=url_for('.userprofile')
         ) }}
       </form>
     </div>