diff options
Diffstat (limited to 'templates/web/zurich')
| -rw-r--r-- | templates/web/zurich/admin/header.html | 1 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit-sdm.html | 4 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 4 | ||||
| -rw-r--r-- | templates/web/zurich/header.html | 1 | ||||
| -rw-r--r-- | templates/web/zurich/report/new/fill_in_details_form.html | 29 | ||||
| -rw-r--r-- | templates/web/zurich/report/new/sidebar.html | 22 | ||||
| -rwxr-xr-x | templates/web/zurich/reports/index.html | 29 |
7 files changed, 47 insertions, 43 deletions
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index 929df8352..a423cf22f 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -23,7 +23,6 @@ .overdue { background-color: #ffcccc; } select { width: auto; } .admin-report-edit select { max-width: 100%; } - #fms_pan_zoom { top: 13em !important; } </style> <script> $(function(){ diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 63c6b5e6f..3cdf3d8c3 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -10,6 +10,8 @@ [% map_html %] </div> +<div id="map_sidebar"> + <form method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > @@ -143,6 +145,8 @@ </div> </form> +</div> + <div id="print_report_map" class="print-only"> [% INCLUDE 'maps/noscript_map.html' map=print_report_map nsm_prefix="large_" %] </div> diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index dd876935c..512ea4708 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -10,6 +10,8 @@ [% map_html %] </div> +<div id="map_sidebar"> + [% pstate = problem.get_extra_metadata('closure_status') || problem.state %] <form id="report_edit" method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> @@ -296,6 +298,8 @@ </form> +</div> + <script type="text/javascript"> $(function(){ var form_fields_changed = false; diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index ee00b851c..b87dd913b 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -23,7 +23,6 @@ <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css"> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html index 1e9db6b31..21acab609 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -1,33 +1,8 @@ +[% sidebar_html %] + <div id="report-a-problem-main"> <h1>[% loc('Reporting a problem') %]</h1> - <div id="report-a-problem-sidebar"> - <!-- - The text for this section needs checking, but I can't work out which bit comes from where - --> - <div class="sidebar-tips"> - [% IF report.used_map %] - [% IF partial_token %] - <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> - [% END %] - <p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> - [% END %] - - <p> - [% IF report.used_map %] - [% INCLUDE 'report/new/fill_in_details_text.html' %] - [% ELSE %] - [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] - [% END %] - </p> - </div> - - <div class="sidebar-notes"> - [% INCLUDE 'report/new/notes.html' %] - </div> - - </div> - [% INCLUDE 'errors.html' %] <fieldset> <div id="problem_form"> diff --git a/templates/web/zurich/report/new/sidebar.html b/templates/web/zurich/report/new/sidebar.html new file mode 100644 index 000000000..2e3d148d2 --- /dev/null +++ b/templates/web/zurich/report/new/sidebar.html @@ -0,0 +1,22 @@ +<div id="report-a-problem-sidebar"> + <div class="sidebar-tips"> + [% IF report.used_map %] + [% IF partial_token %] + <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> + [% END %] + <p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> + [% END %] + + <p> + [% IF report.used_map %] + [% INCLUDE 'report/new/fill_in_details_text.html' %] + [% ELSE %] + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] + [% END %] + </p> + </div> + + <div class="sidebar-notes"> + [% INCLUDE 'report/new/notes.html' %] + </div> +</div> diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html index fd0efcf94..5f7613a1c 100755 --- a/templates/web/zurich/reports/index.html +++ b/templates/web/zurich/reports/index.html @@ -7,24 +7,25 @@ [% map_html %] </div> -<div id="side"> +<div id="map_sidebar"> + <div id="side"> -<h1>[% loc('All Reports') %]</h1> + <h1>[% loc('All Reports') %]</h1> -[% INCLUDE 'pagination.html', param = 'p' %] + [% INCLUDE 'pagination.html', param = 'p' %] -<section class="full-width"> - [% IF problems.0 %] - <ul class="item-list item-list--reports"> - [% FOREACH problem IN problems.0 %] - [% INCLUDE 'reports/_list-entry.html' %] - [% END %] - </ul> - [% END %] -</section> + <section class="full-width"> + [% IF problems.0 %] + <ul class="item-list item-list--reports"> + [% FOREACH problem IN problems.0 %] + [% INCLUDE 'reports/_list-entry.html' %] + [% END %] + </ul> + [% END %] + </section> -[% INCLUDE 'pagination.html', param = 'p' %] + [% INCLUDE 'pagination.html', param = 'p' %] + </div> </div> [% INCLUDE 'footer.html' %] - |