Merge branch 'master' into login-errors

# Conflicts:
#	app/main/views/index.py

app/main/views/index.py

@@ -76,3 +76,28 @@ def emailnotreceived():
 @main.route("/text-not-received")
 def textnotreceived():
     return render_template('text-not-received.html')
+
+
+@main.route("/send-email")
+def sendemail():
+    return render_template('send_email.html')
+
+
+@main.route("/check-email")
+def checkemail():
+    return render_template('check_email.html')
+
+
+@main.route("/jobs")
+def showjobs():
+    return render_template('jobs.html')
+
+
+@main.route("/jobs/job")
+def showjob():
+    return render_template('job.html')
+
+
+@main.route("/jobs/job/notification")
+def shownotification():
+    return render_template('notification.html')

app/templates/check_email.html

@@ -0,0 +1,21 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Send email
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">Send email</h1>
+
+		<p>This page will be where we check the email messages we're about to send</p>
+
+  	<p>
+  	<a class="button" href="dashboard" role="button">Send email messages</a>
+  	</p>
+	</div>
+</div>
+
+{% endblock %}

app/templates/dashboard.html

@@ -1,7 +1,7 @@
 {% extends "admin_template.html" %}
 
 {% block page_title %}
-Hello world!
+GOV.UK Notify | Dashboard
 {% endblock %}
 
 {% block content %}
@@ -10,8 +10,12 @@ Hello world!
 	<div class="column-two-thirds">
 		<h1 class="heading-xlarge">Dashboard</h1>
 
-		<p>Insert dashboard here.</p>
+		<ul>
+			<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>
+  		</ul>
 	</div>
 </div>
 
-{% endblock %}
+{% endblock %}

app/templates/job.html

@@ -0,0 +1,22 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Notifications activity
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">Notifications for a specific job</h1>
+
+		<p>This page will be where we list the notifications for a specific job.</p>
+
+  	<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>
+  	</ul>
+	</div>
+</div>
+
+{% endblock %}

app/templates/jobs.html

@@ -0,0 +1,21 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Notifications activity
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">Notifications activity</h1>
+
+		<p>This page will be where we show the list of jobs that this service has processed</p>
+
+  	<p>
+  	<a href="jobs/job">view a particular notification job</a>
+  	</p>
+	</div>
+</div>
+
+{% endblock %}

app/templates/notification.html

@@ -0,0 +1,21 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Notifications activity
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">A specific notification</h1>
+
+		<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>
+  	</p>
+	</div>
+</div>
+
+{% endblock %}

app/templates/send_email.html

@@ -0,0 +1,21 @@
+{% extends "admin_template.html" %}
+
+{% block page_title %}
+GOV.UK Notify | Send email
+{% endblock %}
+
+{% block content %}
+
+<div class="grid-row">
+	<div class="column-two-thirds">
+		<h1 class="heading-xlarge">Send email</h1>
+
+		<p>This page will be where we construct email messages</p>
+
+  	<p>
+  	<a class="button" href="check-email" role="button">Continue</a>
+  	</p>
+	</div>
+</div>
+
+{% endblock %}

appspec.yml

@@ -0,0 +1,14 @@
+version: 0.0
+os: linux
+files:
+  - source: /
+    destination: /home/ubuntu/
+hooks:
+  AfterInstall:
+    - location: scripts/install_dependencies.sh
+      timeout: 300
+      runas: root
+  ApplicationStart:
+    - location: scripts/run_app.sh
+      timeout: 300
+      runas: root

scripts/install_dependencies.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+pip install -r /home/ubuntu/notifications-admin/requirements.txt