6 files changed, 108 insertions, 1 deletions
diff --git a/templates/email/default/auth_new_account_welcome b/templates/email/default/auth_new_account_welcome
new file mode 100644
index 000000000..1270c7d96
--- /dev/null
+++ b/templates/email/default/auth_new_account_welcome
@@ -0,0 +1,13 @@
+Subject: [% loc('Your new FixMyStreet.com account') %]
+
+Hello,
+
+We've just created an account on FIXME for you.
+
+Please use the following link to confirm that your email works - we need to do
+this before sending reports to the council on your behalf.
+
+  [% c.uri_for( '/auth/confirm', c.user.create_confirm_token ) %]
+
+Yours,
+  FIXME team.
+\ No newline at end of file
diff --git a/templates/email/default/test b/templates/email/default/test
index 2d52e7f31..1200b8726 100644
--- a/templates/email/default/test
+++ b/templates/email/default/test
@@ -1,4 +1,4 @@
-Subject: test email
+Subject: test email ☺
 From: bad-sender@duff.com
 
 Hello,
@@ -7,5 +7,9 @@ This is a test email where foo: [% foo %].
 
 utf8: 我们应该能够无缝处理UTF8编码
 
+  indented_text
+
+long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
 Yours,
   FixMyStreet.
diff --git a/templates/web/default/auth/confirm.html b/templates/web/default/auth/confirm.html
new file mode 100644
index 000000000..fc3abeeba
--- /dev/null
+++ b/templates/web/default/auth/confirm.html
@@ -0,0 +1,23 @@
+[% INCLUDE 'header.html', title => loc('Confirm account') %]
+
+[% IF user_now_confirmed %]
+
+<h1>[% loc('Account now confirmed') %]</h1>
+
+<p>Your account has been confirmed - thank you!</p>
+
+[% ELSE %]
+
+<h1>[% loc('Error') %]</h1>
+
+<p>We have not been able to confirm your account - sorry. This may be because:</p>
+
+<ul>
+    <li>Link too old or already used</li>
+    <li>URL not copied correctly</li>
+    <li>FIXME - reasons here</li>
+</ul>
+
+[% END %]
+
+[% INCLUDE 'footer.html' %]
+\ No newline at end of file
diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html
new file mode 100644
index 000000000..f68843f41
--- /dev/null
+++ b/templates/web/default/auth/general.html
@@ -0,0 +1,48 @@
+[% INCLUDE 'header.html', title => loc('About Us') %]
+
+<h1>[% loc('Login or create an account') %]</h1>
+
+
+<form action="[% c.uri_for() %]" method="post" name="general_auth">
+    
+    [% IF email_error;
+
+        # other keys include fqdn, mxcheck if you'd like to write a custom error message
+
+        errors = {
+            missing => loc('Please enter an email address'),
+            other   => loc('Please check your email address is correct')
+        };
+        
+        loc_email_error = errors.$email_error || errors.other;
+    END %]
+    
+    
+    <div>
+        <span class="error">[% loc_email_error %]</span><br>
+        <label for="email">[% loc('Your email:') %]</label>
+        <input type="text" name="email" value="[% email || '' | html %]">
+    </div>    
+
+
+    <div>
+        <h3>I already have an account</h3>
+        <label for="password">[% loc('Your password:') %]</label>
+        <input type="password" name="password" value="">
+        <input type="submit" name="login" value="[% loc('Log me in') %]">
+    </div>
+
+    <div>
+        <h3>I don't have an account...</h3>
+        <input type="submit" name="create_account" value="[% loc('...create a new account now') %]">
+    </div>
+
+    <div>
+        <h3>I've forgotten my password...</h3>
+        <input type="submit" name="email_reset" value="[% loc('...email me a reset link') %]">
+    </div>
+    
+</form>
+
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/auth/logout.html b/templates/web/default/auth/logout.html
new file mode 100644
index 000000000..9f3390f0a
--- /dev/null
+++ b/templates/web/default/auth/logout.html
@@ -0,0 +1,8 @@
+[% INCLUDE 'header.html', title => loc('Logout') %]
+
+<h1>[% loc('You have been logged out') %]</h1>
+
+<p>Please feel free to <a href="[% c.uri_for('/auth/') %]">login again</a>.</p>
+
+
+[% INCLUDE 'footer.html' %]
+\ No newline at end of file
diff --git a/templates/web/default/auth/welcome.html b/templates/web/default/auth/welcome.html
new file mode 100644
index 000000000..5727f82ad
--- /dev/null
+++ b/templates/web/default/auth/welcome.html
@@ -0,0 +1,11 @@
+[% INCLUDE 'header.html', title => loc('Welcome') %]
+
+<h1>[% loc('Welcome') %]</h1>
+
+<p>Your new account on FIXME has been created!</p>
+
+FIXME - add blurb about being sent an email with a confirmation link to confirm
+account.
+
+
+[% INCLUDE 'footer.html' %]
+\ No newline at end of file