diff options
Diffstat (limited to 'templates')
40 files changed, 170 insertions, 216 deletions
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html index a7199949d..19e9e7f68 100644 --- a/templates/web/angus/header.html +++ b/templates/web/angus/header.html @@ -50,15 +50,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% INCLUDE 'post_header_extra.html' %] [% pre_container_extra %] diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index 7bf62e528..337b97b8e 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -7,7 +7,7 @@ = pc ? c.uri_for( "/rss/pc", pc ) : c.uri_for( "/rss/l/$latitude,$longitude" ); - + email_url = c.uri_for( '/alert/list', { @@ -28,6 +28,7 @@ ); PROCESS "maps/${map.type}.html" around_page = 1; + sidebar_html = PROCESS 'report/new/sidebar.html' js = 1 report.used_map = 1; SET bodyclass = 'mappage'; SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ]; @@ -71,32 +72,32 @@ </div> + <div id="map_sidebar"> - - <div id="side"> - - [% IF allow_creation %] + <div id="side"> + [% IF allow_creation %] [% INCLUDE 'around/_report_banner.html' %] [% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] - [% END %] - - [% INCLUDE 'around/_updates.html' %] + [% END %] + + [% INCLUDE 'around/_updates.html' %] + <section class="full-width"> + [% INCLUDE "around/tabbed_lists.html" %] + </section> + </div> + + [% IF allow_creation %] + <div style="display:none" id="side-form"> + [% INCLUDE "report/new/fill_in_details_form.html" + js = 1, + report.used_map = 1 + report.name = c.user.name + %] + </div> + [% END %] - <section class="full-width"> - [% INCLUDE "around/tabbed_lists.html" %] - </section> </div> - [% IF allow_creation %] - <div style="display:none" id="side-form"> - [% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 - report.name = c.user.name - %] - </div> - [% END %] - [% IF allow_creation %] </form> [% END %] diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index c10d9c008..d046d6297 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -23,7 +23,7 @@ >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="[% base %]/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="[% base %]/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 7ef37675a..8e5cb3c73 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -34,7 +34,6 @@ <![endif]--> <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 %] @@ -57,15 +56,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html index c3911d4c1..4d5fed1cd 100644 --- a/templates/web/base/my/my.html +++ b/templates/web/base/my/my.html @@ -7,14 +7,23 @@ [% IF problems.size %] [% map_html %] </div> - <div id="side"> + <div id="map_sidebar"> + <div id="side"> [% ELSE %] - <div id="skipped-map"> + <div id="map_sidebar"> + <div id="skipped-map"> [% END %] -<h1>[% loc('Your Reports') %]</h1> +<h1>[% loc('Your account') %]</h1> -<p><a href="/auth/change_password">[% loc('Change password') %]</a></p> +<p>[% c.user.name %] [% c.user.email %]</p> + +<p class="my-account-buttons"> + <a href="/auth/change_password">[% loc('Change password') %]</a> + <a href="/auth/sign_out">[% loc('Sign out') %]</a> +</p> + +<h2>[% loc('Your reports') %]</h2> [% IF ! has_content %] [% tprintf( loc('You haven’t created any reports yet. <a href="%s">Report a problem now.</a>'), @@ -63,6 +72,7 @@ [% "</ul>" IF loop.last %] [% END %] -</div> + </div> + </div> [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 1068e21e3..312300b9d 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -9,6 +9,8 @@ </div> +<div id="map_sidebar"> + <h1>[% loc('Questionnaire') %]</h1> <h2 class="questionnaire-report-header">[% loc('Your report') %]</h2> @@ -107,4 +109,6 @@ </form> +</div> + [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index 05e07d501..e9f0b2914 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -1,4 +1,4 @@ -[% +[% SET bodyclass = 'mappage'; PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; @@ -13,6 +13,8 @@ [% map_html %] </div> +<div id="map_sidebar"> + [% IF login_success %] <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> [% INCLUDE 'report/update-form.html' %] @@ -41,4 +43,6 @@ [% INCLUDE 'report/update-form.html' %] [% END %] +</div> + [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html index 55b3a5207..fc272b533 100644 --- a/templates/web/base/report/new/fill_in_details.html +++ b/templates/web/base/report/new/fill_in_details.html @@ -1,6 +1,9 @@ [% + sidebar_html = PROCESS 'report/new/sidebar.html'; + SET bodyclass = ''; SET bodyclass = 'mappage' IF report.used_map; + SET bodyclass = bodyclass _ " with-notes" IF sidebar_html; PROCESS "maps/${map.type}.html" IF report.used_map; INCLUDE 'header.html', title => loc('Reporting a problem'); %] @@ -25,24 +28,27 @@ <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> - [% IF report.used_map %] - [% map_html %] - </div> + [% IF report.used_map %] + [% map_html %] + </div> + <div id="map_sidebar"> <div id="side"> - [% ELSE %] + [% ELSE %] + <div id="map_sidebar"> <div id="skipped-map"> - [% END %] + [% END %] + + <div id="report-a-problem-main"> + [% IF login_success %] + [% PROCESS 'report/new/login_success_form.html' %] + [% ELSIF oauth_need_email %] + [% PROCESS 'report/new/oauth_email_form.html' %] + [% ELSE %] + [% PROCESS 'report/new/fill_in_details_form.html' %] + [% END %] + </div> - <div id="report-a-problem-main"> - [% IF login_success %] - [% PROCESS 'report/new/login_success_form.html' %] - [% ELSIF oauth_need_email %] - [% PROCESS 'report/new/oauth_email_form.html' %] - [% ELSE %] - [% PROCESS 'report/new/fill_in_details_form.html' %] - [% END %] </div> - </div> </form> diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index f9da3753f..663b13e6a 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -23,7 +23,7 @@ <p class="form-error">[% loc('Sorry, we could not log you in. Please fill in the form below.') %]</p> [% END %] -[% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %] +[% sidebar_html %] [% INCLUDE 'errors.html' %] diff --git a/templates/web/base/report/new/fill_in_details_text.html b/templates/web/base/report/new/fill_in_details_text.html index 05527bb24..686c8bde5 100644 --- a/templates/web/base/report/new/fill_in_details_text.html +++ b/templates/web/base/report/new/fill_in_details_text.html @@ -1,7 +1,7 @@ [% - IF area_ids_to_list.size != 0; + IF bodies_to_list.size != 0; loc('The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc.'); - IF category_extras; + IF category_extras.size; ' ' _ loc('Some categories may require additional information.'); END; ELSE; diff --git a/templates/web/base/report/new/login_success_form.html b/templates/web/base/report/new/login_success_form.html index 45d0221a7..2eade7c7d 100644 --- a/templates/web/base/report/new/login_success_form.html +++ b/templates/web/base/report/new/login_success_form.html @@ -2,7 +2,7 @@ <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> -[% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %] +[% sidebar_html %] [% INCLUDE 'errors.html' %] diff --git a/templates/web/base/report/new/oauth_email_form.html b/templates/web/base/report/new/oauth_email_form.html index c897aaeea..2c9b1a3ca 100644 --- a/templates/web/base/report/new/oauth_email_form.html +++ b/templates/web/base/report/new/oauth_email_form.html @@ -5,7 +5,7 @@ [% loc('We need your email address, please give it below.') %] </p> -[% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %] +[% sidebar_html %] [% INCLUDE 'errors.html' %] diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index 2ec409765..55f9a0881 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -27,7 +27,8 @@ [% map_html %] </div> -<div id="side"> +<div id="map_sidebar"> + <div id="side"> <h1 id="reports_heading"> [% IF ward %] @@ -66,5 +67,6 @@ [% INCLUDE 'pagination.html', param = 'p' %] + </div> </div> [% INCLUDE 'footer.html' %] diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 6412ec03c..87d244480 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -14,7 +14,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index da83e005f..06db8f001 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -1,4 +1,4 @@ -[% +[% PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; @@ -11,9 +11,10 @@ %] [% map_html %] - </div> +<div id="map_sidebar"> + [% IF login_success %] <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> [% END %] @@ -107,12 +108,12 @@ </select> [% ELSE %] [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] - + <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> - + [% ELSIF !problem.is_fixed %] - + <div class="checkbox-group"> <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label> @@ -124,9 +125,9 @@ [% IF c.user_exists %] [% INCLUDE name %] - + <input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"> - + [% ELSE %] @@ -146,7 +147,7 @@ <h5>Confirm my report by email</h5> [% INCLUDE name %] - + <label for="password_register">[% loc('Password (optional)') %]</label> <div class="general-notes"> @@ -185,7 +186,7 @@ </form> </div> - +</div> [% INCLUDE 'footer.html' %] diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template index d80d4101a..325d1b6e6 100644 --- a/templates/web/eastsussex/header.html.template +++ b/templates/web/eastsussex/header.html.template @@ -10,7 +10,6 @@ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script> diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index f5088bcb4..8bc9f5d4f 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -18,7 +18,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 5bc0eaf4b..3e77e89ca 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -23,7 +23,6 @@ <![endif]--> <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 %] @@ -42,15 +41,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html index d7703388a..08ec155f5 100644 --- a/templates/web/fiksgatami/nn/footer.html +++ b/templates/web/fiksgatami/nn/footer.html @@ -18,7 +18,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index a3cf589b9..5364c0b60 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -14,7 +14,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/fixmindelo/footer.html b/templates/web/fixmindelo/footer.html index afd8984c7..76ebef40c 100644 --- a/templates/web/fixmindelo/footer.html +++ b/templates/web/fixmindelo/footer.html @@ -36,7 +36,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html index 7ff0dd0af..a7c939358 100644 --- a/templates/web/greenwich/footer.html +++ b/templates/web/greenwich/footer.html @@ -14,7 +14,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports/Royal+Borough+of+Greenwich' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html index 625096b32..a37f94a35 100644 --- a/templates/web/harrogate/footer.html +++ b/templates/web/harrogate/footer.html @@ -19,7 +19,7 @@ [% selected = c.req.uri.path == '/my' %] <li> <[% IF selected %]span[% ELSE %]a href="/my"[% END %]> - [% loc("Your reports") %]</[% selected ? 'span' : 'a' %]></li> + [% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% selected ? 'span' : 'a' %]></li> [% selected = c.req.uri.path == '/reports/Harrogate' %] <li> diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index 451832dda..8612cb3f8 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -23,7 +23,6 @@ <![endif]--> <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 %] @@ -46,15 +45,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index 6337aad64..ed5d2fed4 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -24,21 +24,8 @@ <![endif]--> <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 %] - <script type="text/javascript"> - $(function(){ - var $html = $('html'); - $(window).resize(function(){ - if(!$html.hasClass('mobile')) { - // Hart has a bigger header and so needs more room for - // the map controls - $('#fms_pan_zoom').css({ top: '17.75em' }); - } - }).resize(); - }); - </script> <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico"> @@ -57,7 +44,7 @@ <li> <a href="#main-nav"><div class="menu-icon"> </div></a> </ul> </div> - <div class="header-container"> + <div class="container"> <a id="site-logo" href="http://www.hart.gov.uk">Hart District Council</a> </div> </header> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index 3153125fd..26bdf7ab2 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -18,7 +18,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index e69757dad..6c4427414 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -21,7 +21,6 @@ <![endif]--> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] @@ -39,15 +38,6 @@ <div style="clear:both"></div> <span class="header"><a href="/">Report a road or street problem</a></span> - [% IF c.user_exists %] - <div class="oxford-user"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('Sign out') %]</a> - </p> - </div> - [% END %] - <div id="navigation"> <div class="menubar"> <div class="menu-inner"> @@ -57,7 +47,7 @@ </li> <li> <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> </li> <li> <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END @@ -88,15 +78,6 @@ </div> </header> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/seesomething/around/display_location.html b/templates/web/seesomething/around/display_location.html index b54311264..3ed7cac46 100644 --- a/templates/web/seesomething/around/display_location.html +++ b/templates/web/seesomething/around/display_location.html @@ -11,6 +11,7 @@ ); PROCESS "maps/${map.type}.html"; + sidebar_html = PROCESS 'report/new/sidebar.html', js = 1, report.used_map = 1; INCLUDE 'header.html', title => loc('Viewing a location') @@ -29,19 +30,20 @@ <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% map_html %] - </div> - <div id="side"> + <div id="map_sidebar"> + <div id="side"> [% INCLUDE 'around/_report_banner.html' %] - </div> - - <div style="display:none" id="side-form"> - [% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 - report.name = c.user.name - %] + </div> + + <div style="display:none" id="side-form"> + [% INCLUDE "report/new/fill_in_details_form.html" + js = 1, + report.used_map = 1 + report.name = c.user.name + %] + </div> </div> </form> diff --git a/templates/web/seesomething/tokens/confirm_problem.html b/templates/web/seesomething/tokens/confirm_problem.html index 4a11d14b4..0a455434b 100644 --- a/templates/web/seesomething/tokens/confirm_problem.html +++ b/templates/web/seesomething/tokens/confirm_problem.html @@ -11,19 +11,23 @@ %] - [% IF report.used_map %] +[% IF report.used_map %] [% map_html %] - </div> - [% END %] + <div id="map_sidebar"> +[% END %] + + <div id="side"> + <div id="report-a-problem-main"> + <h1>Complete</h1> + <p>Your report has been sent. If you included contact details we may be in touch to follow up or request more details.</p> + <p>Thank you for saying something and making our transport safer.</p> + <p><img src="../cobrands/seesomething/images/btp-wmp-logos.png" alt="British Transport Police and the West Midlands Police" width="271" height="116"></p> + </div> + </div> - <div id="side"> -<div id="report-a-problem-main"> - <h1>Complete</h1> - <p>Your report has been sent. If you included contact details we may be in touch to follow up or request more details.</p> - <p>Thank you for saying something and making our transport safer.</p> - <p><img src="../cobrands/seesomething/images/btp-wmp-logos.png" alt="British Transport Police and the West Midlands Police" width="271" height="116"></p> -</div> +[% IF report.used_map %] </div> +[% END %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index b81a949a1..3fcd9b5a1 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -94,7 +94,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports/Stevenage' %]span[% ELSE %]a href="/reports/Stevenage"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index ffcc9ec86..fb6f2ae5b 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -19,7 +19,6 @@ <![endif]--> <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] @@ -36,16 +35,6 @@ <a href="#main-nav" id="nav-link">Main Navigation</a> </div> </header> - - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/trinidadtobago/footer.html b/templates/web/trinidadtobago/footer.html index bace22e71..ac90417d6 100644 --- a/templates/web/trinidadtobago/footer.html +++ b/templates/web/trinidadtobago/footer.html @@ -20,7 +20,7 @@ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index c6d2bc048..b76ecc2ae 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -27,7 +27,6 @@ <![endif]--> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] 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' %] - |