aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2012-10-22 17:39:21 +0100
committerStruan Donald <struan@exo.org.uk>2012-10-22 17:39:21 +0100
commit6c1807c1e9ae25f0b51cc6623c08e357307c9cfd (patch)
treed5faf25a9f2aea51df5a1f4947b2afd90aede1ba
parent1197e4ce772e433927a146c39cc13ee96e17fd17 (diff)
re-order the photo bits of the form so the various messages
are a bit better associated. Especially in regard to displaying an error message if you happen to have extra fields added by e.g. open311
-rw-r--r--templates/web/fixmystreet/report/new/fill_in_details_form.html12
1 files changed, 5 insertions, 7 deletions
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 237533657..57d9ef98e 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -87,11 +87,7 @@
[%- END %]
[% IF c.cobrand.allow_photo_upload %]
- [% IF field_errors.photo %]
- <p class='form-error'>[% field_errors.photo %]</p>
- [% END %]
-
-
+ <label for="form_photo">[% loc('Photo') %]</label>
[% IF upload_fileid || report.photo %]
[% IF upload_fileid %]
<img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt="">
@@ -104,8 +100,10 @@
<img align="right" src="/photo/[% report.id %].jpeg">
[% END %]
[% END %]
-
- <label for="form_photo">[% loc('Photo') %]</label>
+
+ [% IF field_errors.photo %]
+ <p class='form-error'>[% field_errors.photo %]</p>
+ [% END %]
<input type="file" name="photo" id="form_photo">
[% END %]