diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/report/display.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/new/fill_in_details.html | 48 | ||||
| -rw-r--r-- | templates/web/bromley/report/display.html | 3 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details.html | 36 |
5 files changed, 40 insertions, 55 deletions
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index fd7580ac1..a7181942f 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -16,6 +16,10 @@ <div id="side"> +[% IF login_success %] + <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> +[% END %] + [% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html index 22d1ee739..1b8a866fc 100644 --- a/templates/web/base/report/new/fill_in_details.html +++ b/templates/web/base/report/new/fill_in_details.html @@ -1,35 +1,45 @@ [% + SET bodyclass = ''; + SET bodyclass = 'mappage' IF report.used_map; PROCESS "maps/${map.type}.html" IF report.used_map; - INCLUDE 'header.html', title => loc('Reporting a problem') + INCLUDE 'header.html', title => loc('Reporting a problem'); %] [% IF report.used_map %] + <form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> -[% IF c.req.params.map_override %] -<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> -[% END %] -<input type="hidden" name="pc" value="[% pc | html %]"> + [% IF c.req.params.map_override %] + <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> + [% END %] + + <input type="hidden" name="pc" value="[% pc | html %]"> + [% ELSE %] + <form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> -<input type="hidden" name="pc" value="[% pc | html %]"> -<input type="hidden" name="skipped" value="1"> + <input type="hidden" name="pc" value="[% pc | html %]"> + <input type="hidden" name="skipped" value="1"> + [% END %] -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> -[% IF report.used_map %] - [% map_html %] - </div> - <div id="side"> -[% ELSE %] - <div id="skipped-map"> -[% END %] + [% IF report.used_map %] + [% map_html %] + </div> + <div id="side"> + [% ELSE %] + <div id="skipped-map"> + [% END %] -[% PROCESS 'report/new/fill_in_details_form.html' %] + [% IF login_success %] + <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> + [% END %] -</div> + [% PROCESS 'report/new/fill_in_details_form.html' %] + + </div> </form> [% INCLUDE 'footer.html' %] - diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 60edd0e79..f30b4b86d 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -14,6 +14,9 @@ </div> +[% IF login_success %] + <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> +[% END %] [% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 2b150f768..3534572c6 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -20,6 +20,10 @@ </div> +[% IF login_success %] + <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> +[% END %] + [% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] diff --git a/templates/web/fixmystreet/report/new/fill_in_details.html b/templates/web/fixmystreet/report/new/fill_in_details.html deleted file mode 100644 index 8cf0dfdd9..000000000 --- a/templates/web/fixmystreet/report/new/fill_in_details.html +++ /dev/null @@ -1,36 +0,0 @@ -[% - SET bodyclass = ''; - SET bodyclass = 'mappage' IF report.used_map; - PROCESS "maps/${map.type}.html" IF report.used_map; - INCLUDE 'header.html', title => loc('Reporting a problem'); -%] - -[% IF report.used_map %] - -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> - [% IF c.req.params.map_override %] - <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> - [% END %] - - <input type="hidden" name="pc" value="[% pc | html %]"> - -[% ELSE %] - -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> - <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="skipped" value="1"> - -[% END %] - - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> - - [% IF report.used_map %] - [% map_html %] - </div> - [% END %] - - [% PROCESS 'report/new/fill_in_details_form.html' %] -</form> - -[% INCLUDE 'footer.html' %] |