4 files changed, 141 insertions, 0 deletions
diff --git a/templates/web/default/contact/address.html b/templates/web/default/contact/address.html
new file mode 100644
index 000000000..b7ff37e5c
--- /dev/null
+++ b/templates/web/default/contact/address.html
@@ -0,0 +1,11 @@
+<div class="contact-details">
+<p>FixMyStreet is a service provided by mySociety, which is the project of a 
+registered charity. The charity is called UK Citizens Online Democracy and is charity number 1076346.</p>
+<p>mySociety can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
+or by post at:</p>
+<p>mySociety<br>
+483 Green Lanes<br>
+London<br>
+N13 4BS<br>
+UK</p>
+</div>
diff --git a/templates/web/default/contact/blurb.html b/templates/web/default/contact/blurb.html
new file mode 100644
index 000000000..22c9a3cef
--- /dev/null
+++ b/templates/web/default/contact/blurb.html
@@ -0,0 +1,9 @@
+<p>
+[% loc('Please do <strong>not</strong> report problems through this form; messages go to
+the team behind FixMyStreet, not a council. To report a problem,
+please <a href="/">go to the front page</a> and follow the instructions.') %]
+</p>
+
+<p>
+[% tprintf( loc("We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:"), contact_email, contact_email) %]
+</p> 
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
new file mode 100644
index 000000000..dc64dd554
--- /dev/null
+++ b/templates/web/default/contact/index.html
@@ -0,0 +1,101 @@
+[% INCLUDE 'header.html',
+    title = loc('Contact Us')
+    robots = 'noindex,nofollow'
+%]
+
+<h1>[% loc('Contact the team') %]</h1>
+ 
+<form method="post" action="/contact/submit">
+
+[% INCLUDE 'errors.html' %]
+
+[% IF update %]
+
+    <p>
+    [% loc('You are reporting the following update for being abusive, containing personal information, or similar:') %]
+    </p>
+
+    <blockquote>
+        <p>
+            [% IF update.anonymous %]
+                [% tprintf( loc('Update below added anonymously at %s'), prettify_epoch( update.confirmed_local.epoch ) ) %]
+            [% ELSE %]
+                [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html %]
+            [% END %]
+        </p>
+
+        <p>
+            [% update.text | html %]
+        </p>
+
+    </blockquote>
+    <input type="hidden" name="update_id" value="[% update.id %]">
+    <input type="hidden" name="id" value="[% update.problem_id %]">
+
+[% ELSIF problem %]
+    <p>
+    [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %]
+    </p>
+    
+    <blockquote>
+        <h2>[% problem.title | html %]</h2>
+
+        <p>
+            [% IF problem.anonymous %]
+                [% tprintf( loc('Reported anonymously at %s'), prettify_epoch( problem.confirmed_local.epoch ) ) %]
+            [% ELSE %]
+                [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_epoch( problem.confirmed_local.epoch ) ) | html %]
+            [% END %]
+        </p>
+
+        <p>
+            [% problem.detail | html %]
+        </p>
+
+    </blockquote>
+    <input type="hidden" name="id" value="[% problem.id %]">
+
+[% ELSE %]
+
+    [% INCLUDE 'contact/blurb.html' %]
+
+[% END %]
+
+[% IF field_errors.name %]
+   <div class="form-error">[% field_errors.name %]</div>
+[% END %]
+<div class="form-field">
+<label for="form_name">[% loc('Your name:') %]</label>
+<input type="text" name="name" id="form_name" value="[% form_name | html %]" size="30"></div>
+
+
+[% IF field_errors.em %]
+   <div class="form-error">[% field_errors.em %]</div>
+[% END %]
+<div class="form-field">
+<label for="form_email">[% loc('Your&nbsp;email:') %]</label>
+<input type="text" name="em" id="form_email" value="[% em | html %]" size="30"></div>
+
+[% IF field_errors.subject %]
+   <div class="form-error">[% field_errors.subject %]</div>
+[% END %]
+<div class="form-field">
+<label for="form_subject">[% loc('Subject:') %]</label>
+<input type="text" name="subject" id="form_subject" value="[% subject | html %]" size="30"></div>
+
+[% IF field_errors.message %]
+   <div class="form-error">[% field_errors.message %]</div>
+[% END %]
+<div class="form-field">
+<label for="form_message">[% loc('Message:') %]</label>
+
+<textarea name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div>
+<div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div>
+
+[% c.cobrand.form_elements('contactForm') %]
+
+</form>
+
+[% INCLUDE 'contact/address.html' %]
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/contact/submit.html b/templates/web/default/contact/submit.html
new file mode 100644
index 000000000..3845e9210
--- /dev/null
+++ b/templates/web/default/contact/submit.html
@@ -0,0 +1,20 @@
+[% INCLUDE 'header.html', title = loc('Contact Us') %]
+
+<h1>[% loc('Contact the team') %]</h1>
+ 
+[% IF success %]
+
+    <p>
+    [% loc("Thanks for your feedback.  We'll get back to you as soon as we can!") %]
+    </p>
+    [% display_crosssell_advert( em, form_name, 'emailunvalidated', 1 ) %]
+
+[% ELSE %]
+
+    <p>
+    [% tprintf( loc('Failed to send message.  Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %]
+    </p>
+
+[% END %]
+
+[% INCLUDE 'footer.html' %]