2 files changed, 31 insertions, 2 deletions
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
index b06154083..0937e73cf 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/default/contact/index.html
@@ -70,20 +70,31 @@ please <a href="/">go to the front page</a> and follow the instructions.') %]
 </p> 
 
 
+[% IF field_errors.name %]
+   <div class="form-error">[% field_errors.name %]</div>
+[% END %]
 <div class="form-field">
 <label for="form_name">Your name:</label>
-
 <input type="text" name="name" id="form_name" value="[% form_name %]" size="30"></div>
 
 
+[% IF field_errors.em %]
+   <div class="form-error">[% field_errors.em %]</div>
+[% END %]
 <div class="form-field">
 <label for="form_email">Your&nbsp;email:</label>
-<input type="text" name="em" id="form_email" value="[% email %]" size="30"></div>
+<input type="text" name="em" id="form_email" value="[% em %]" size="30"></div>
 
+[% IF field_errors.subject %]
+   <div class="form-error">[% field_errors.subject %]</div>
+[% END %]
 <div class="form-field">
 <label for="form_subject">Subject:</label>
 <input type="text" name="subject" id="form_subject" value="[% subject %]" size="30"></div>
 
+[% IF field_errors.message %]
+   <div class="form-error">[% field_errors.message %]</div>
+[% END %]
 <div class="form-field">
 <label for="form_message">Message:</label>
 
diff --git a/templates/web/default/contact/submit.html b/templates/web/default/contact/submit.html
new file mode 100644
index 000000000..12f3f30a6
--- /dev/null
+++ b/templates/web/default/contact/submit.html
@@ -0,0 +1,18 @@
+[% INCLUDE 'header.html', title => loc('Contact Us') %]
+
+<h1>[% loc('Contact the team') %]</h1>
+ 
+<form method="post" action="/contact/submit">
+
+<input type="hidden" name="submit_form" value="1">
+
+
+<p>
+[% IF success %]
+    [% loc("Thanks for your feedback.  We'll get back to you as soon as we can!") %]
+[% ELSE %]
+    [% tprintf( loc('Failed to send message.  Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %]
+[% END %]
+</p>
+
+[% INCLUDE 'footer.html' %]