5 files changed, 40 insertions, 33 deletions
diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html
index f58d13d80..a143e90a2 100644
--- a/templates/web/default/around/around_index.html
+++ b/templates/web/default/around/around_index.html
@@ -1,34 +1,24 @@
-[% INCLUDE 'header.html', title => loc('Reporting a problem') %]
-
-[%
-    # NOTE ON PARTIAL REPORTS:
-    #
-    # partial reports get a bit of extra text added, the form goes to
-    # '/report/new' and the partial hidden field is added to the form.
-%]
-
-[% INCLUDE 'around/postcode_form.html' %]
-
-[% IF location_error %]
-    <p class="error">[% location_error %]</p>
-[% END %]
-
-[% IF possible_location_matches %]
-    <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p>
-    <ul class="pc_alternatives">
-        [% FOREACH match IN possible_location_matches %]
-        <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li>
-        [% END %]
-    </ul>
-[% END %]
-
-[% IF partial_token %]
-    <p style="margin-top: 0; color: #cc0000;">
-        <img align="right" src="/photo/[% report.id %].jpeg" hspace="5">
-        [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below&nbsp;:") %]
-    </p>
-[% END %]
-
-
+[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass = 'mappage' %]
+
+<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
+    <div id="side-form">
+        <div id="report-a-problem-main">
+            [% INCLUDE 'around/postcode_form.html' %]
+
+            [% IF location_error %]
+                <p class="error">[% location_error %]</p>
+            [% END %]
+
+            [% IF possible_location_matches %]
+                <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p>
+                <ul class="pc_alternatives">
+                    [% FOREACH match IN possible_location_matches %]
+                    <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li>
+                    [% END %]
+                </ul>
+            [% END %]
+        </div>
+    </div>
+</form>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index 9d32164f7..4839249ac 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -1,6 +1,7 @@
 [% USE date %][% USE Math %]
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
+<script type="text/javascript" src="/js/validation_rules.js?[% Math.int( date.now / 3600 ) %]"></script>
 <script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
 
 <script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script>
diff --git a/templates/web/default/js/validation_rules.html b/templates/web/default/js/validation_rules.html
new file mode 100644
index 000000000..409d0971f
--- /dev/null
+++ b/templates/web/default/js/validation_rules.html
@@ -0,0 +1,7 @@
+    validation_rules = {
+        title: { required: true },
+        detail: { required: true },
+        email: { required: true },
+        update: { required: true },
+        rznvy: { required: true }
+    };
diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html
index 8bff539c4..49be4d25d 100644
--- a/templates/web/default/report/new/category.html
+++ b/templates/web/default/report/new/category.html
@@ -3,7 +3,7 @@
     [% IF category;
         category = category | lower;
        END; %]
-    <label for='form_category'>[% category_label | html %]</label>
+    <label for='form_category' id="form_category_label">[% category_label | html %]</label>
     <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]>
         [% FOREACH cat_op IN category_options %]
         [% cat_op_lc = cat_op | lower %]
diff --git a/templates/web/default/report_created.html b/templates/web/default/report_created.html
new file mode 100644
index 000000000..81083654b
--- /dev/null
+++ b/templates/web/default/report_created.html
@@ -0,0 +1,9 @@
+[% INCLUDE 'header.html', title => loc('Report created') %]
+
+<h1>[% loc("Report created") %]</h1>
+
+<p>
+[% loc('Your report has been created and will shortly be sent.') %] 
+</p>
+
+[% INCLUDE 'footer.html' %]