Merged from master

app/main/views/index.py

@@ -60,12 +60,12 @@ def twofactor():
 
 @main.route("/send-sms")
 def sendsms():
-    return render_template('send_sms.html')
+    return render_template('send-sms.html')
 
 
 @main.route("/check-sms")
 def checksms():
-    return render_template('check_sms.html')
+    return render_template('check-sms.html')
 
 
 @main.route("/email-not-received")
@@ -80,12 +80,12 @@ def textnotreceived():
 
 @main.route("/send-email")
 def sendemail():
-    return render_template('send_email.html')
+    return render_template('send-email.html')
 
 
 @main.route("/check-email")
 def checkemail():
-    return render_template('check_email.html')
+    return render_template('check-email.html')
 
 
 @main.route("/jobs")
@@ -111,3 +111,23 @@ def forgotpassword():
 @main.route("/new-password")
 def newpassword():
     return render_template('new-password.html')
+
+
+@main.route("/user-profile")
+def userprofile():
+    return render_template('user-profile.html')
+
+
+@main.route("/manage-users")
+def manageusers():
+    return render_template('manage-users.html')
+
+
+@main.route("/service-settings")
+def servicesettings():
+    return render_template('service-settings.html')
+
+
+@main.route("/api-keys")
+def apikeys():
+    return render_template('api-keys.html')

app/templates/api-keys.html

@@ -0,0 +1,20 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | API keys and documentation
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<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><a href="dashboard">Back to dashboard</a></p>
+
+	</div>
+</div>
+
+{% endblock %}

app/templates/dashboard.html

@@ -14,6 +14,10 @@ GOV.UK Notify | Dashboard
 			<li><a href="send-sms">Send text messages</a></li>
 			<li><a href="send-email">Send email messages</a></li>
 			<li><a href="jobs">View notifications activity</a></li>
+			<li><a href="user-profile">User profile</a></li>
+			<li><a href="manage-users">Manage users</a></li>
+			<li><a href="service-settings">Service settings</a></li>
+			<li><a href="api-keys">API keys and documentation</a></li>
   		</ul>
 	</div>
 </div>

app/templates/job.html

@@ -14,7 +14,7 @@ GOV.UK Notify | Notifications activity
 
   	<ul>
   		<li><a href="/jobs/job/notification">view a specific notification</a></li>
-		<li><a href="jobs">view all the activity for this service</a></li>
+		<li><a href="/jobs">view all the activity for this service</a></li>
   	</ul>
 	</div>
 </div>

app/templates/manage-users.html

@@ -0,0 +1,20 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Manage users
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">Manage users</h1>
+
+		<p>Here's where you can add or remove users of a service.</p>
+
+  	<p><a href="dashboard">Back to dashboard</a></p>
+
+	</div>
+</div>
+
+{% endblock %}

app/templates/notification.html

@@ -13,7 +13,7 @@ GOV.UK Notify | Notifications activity
 		<p>This page will be where we show what happened for a specific notification.</p>
 
   	<p>
-  	<a href="job">View other notifications in this job</a>
+  	<a href="/job">View other notifications in this job</a>
   	</p>
 	</div>
 </div>

app/templates/service-settings.html

@@ -0,0 +1,20 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Service settings
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">Service settings</h1>
+
+		<p>Here's where users can update their service profile.</p>
+
+  	<p><a href="dashboard">Back to dashboard</a></p>
+
+	</div>
+</div>
+
+{% endblock %}

app/templates/user-profile.html

@@ -0,0 +1,20 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | User settings
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">User profile</h1>
+
+		<p>Here's where users can update their profile, password etc.</p>
+
+  	<p><a href="dashboard">Back to dashboard</a></p>
+
+	</div>
+</div>
+
+{% endblock %}