diff options
Diffstat (limited to 'templates')
33 files changed, 123 insertions, 91 deletions
diff --git a/templates/email/fixmystreet.com/update-confirm-donotsend.txt b/templates/email/fixmystreet.com/update-confirm-donotsend.txt index 8ab91836b..21f3c6ffd 100644 --- a/templates/email/fixmystreet.com/update-confirm-donotsend.txt +++ b/templates/email/fixmystreet.com/update-confirm-donotsend.txt @@ -1,4 +1,4 @@ -[% IF NOT update.problem.to_body_named('Bromley|Stevenage') %] +[% IF NOT problem.updates_sent_to_body %] Note that we do not send updates to [% update.problem.body %] - they are intended as a place for [% site_name %] users to discuss, support, and offer advice. diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt index d64d54e8c..7a76332bd 100644 --- a/templates/email/zurich/problem-confirm.txt +++ b/templates/email/zurich/problem-confirm.txt @@ -8,6 +8,8 @@ Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diese Wir werden Ihr Anliegen innerhalb der nächsten sechs Arbeitstage beantworten. +Achtung: Notfälle müssen der Polizei gemeldet werden via Telefon 117. + Ihre Meldung lautet: diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index ff99bb907..911f4094e 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -135,7 +135,9 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> <li>[% loc('Phone:') %] [% problem.user.phone_display | html %]</li> [% END %] [% IF problem.user.email != problem.user.username %] -<li>[% loc('Email:') %] [% problem.user.email | html %]</li> +<li>[% loc('Email:') %] +<a href="mailto:[% problem.user.email | html %]">[% problem.user.email | html %]</a> +</li> [% END %] <li><label class="inline-text" for="flagged">[% loc('Flagged:') %]</label> <input type="checkbox" id="flagged" name="flagged"[% ' checked' IF problem.flagged %]></li> diff --git a/templates/web/base/around/on_map_list_items.html b/templates/web/base/around/on_map_list_items.html index fafe7f433..e1be87754 100644 --- a/templates/web/base/around/on_map_list_items.html +++ b/templates/web/base/around/on_map_list_items.html @@ -14,7 +14,11 @@ </li> [% ELSE %] <li class="item-list__item item-list__item--empty"> - <p>[% loc('There are no reports to show.') %]</p> + [% IF c.get_param('js') %] + <p>[% loc('Loading reports…') %]</p> + [% ELSE %] + <p>[% loc('There are no reports to show.') %]</p> + [% END %] </li> [% END %] </ul> diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html index 2a8044a54..68f83c445 100644 --- a/templates/web/base/open311/index.html +++ b/templates/web/base/open311/index.html @@ -40,8 +40,8 @@ about future-proofing your communication channels in an easy and economical way [% IF c.cobrand.moniker == 'fixmystreet' %] <p>You may be interested to know about <a -href="https://www.fixmystreet.com/about/professional">FixMyStreet -Professional</a>, our hosted service which sits seamlessly on your council +href="https://www.fixmystreet.com/pro/">FixMyStreet +Pro</a>, our hosted service which sits seamlessly on your council website.</p> <p>We can integrate it with any council back-end system, but if you use diff --git a/templates/web/base/report/photo.html b/templates/web/base/report/photo.html index aa82baef6..5474fad28 100644 --- a/templates/web/base/report/photo.html +++ b/templates/web/base/report/photo.html @@ -1,13 +1,15 @@ -[% IF c.cobrand.allow_photo_display(object) && object.photo %] +[% IF object.photo %] [% IF object.photos.size > 1 %] <div class="update-img-set"> [% END %] [% FOR photo IN object.photos %] - <div class="update-img"> - <a href="[% photo.url_full %]" rel="fancy"> - <img alt="Photo of this report" src="[% photo.url %]"> - <span>zoom</span></a> - </div> + [% IF c.cobrand.allow_photo_display(object, photo.idx) %] + <div class="update-img"> + <a href="[% photo.url_full %]" rel="fancy"> + <img alt="Photo of this report" src="[% photo.url %]"> + <span>zoom</span></a> + </div> + [% END %] [% END %] [% IF object.photos.size > 1 %] </div> diff --git a/templates/web/borsetshire/front/footer-marketing.html b/templates/web/borsetshire/front/footer-marketing.html index 78b4fa89b..7f1f3515a 100644 --- a/templates/web/borsetshire/front/footer-marketing.html +++ b/templates/web/borsetshire/front/footer-marketing.html @@ -1,6 +1,6 @@ <div class="fms-pro-promo"> - <h2>FixMyStreet Professional</h2> + <h2>FixMyStreet Pro</h2> <p class="lead">The one-stop street reporting service for councils.</p> <p>Integrate FixMyStreet with your council system for smooth, end-to-end report fullfilment.</p> - <p><a href="/about/professional" class="btn--borsetshire">Learn more</a></p> + <p><a href="https://www.fixmystreet.com/pro/" class="btn--borsetshire">Learn more</a></p> </div> diff --git a/templates/web/borsetshire/header_site.html b/templates/web/borsetshire/header_site.html index 51f42881b..6db1f950e 100644 --- a/templates/web/borsetshire/header_site.html +++ b/templates/web/borsetshire/header_site.html @@ -1,3 +1,14 @@ +<div class="ms-header clearfix"> + <div class="container"> + <div class="ms-header__logo"> + <a href="https://www.mysociety.org/">mySociety</a> + </div> + <a class="ms-header__back-to-fms" href="https://www.fixmystreet.com/pro/"> + Get <strong>FixMyStreet Pro</strong> – the one-stop street reporting service for councils + </a> + </div> +</div> + <header id="site-header" role="banner"> <div class="container"> [% INCLUDE 'header_logo.html' %] diff --git a/templates/web/bromley/front/footer-marketing.html b/templates/web/bromley/front/footer-marketing.html index c519eba66..189547091 100644 --- a/templates/web/bromley/front/footer-marketing.html +++ b/templates/web/bromley/front/footer-marketing.html @@ -12,7 +12,7 @@ <div id="footer-help"> <p> - Powered by <a class="platform-logo" href="https://www.fixmystreet.com/about/professional">FixMyStreet Platform</a> + Powered by <a class="platform-logo" href="https://www.fixmystreet.com/pro/">FixMyStreet Platform</a> </p> </div> </div> diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html index 59d998959..e8a54e462 100644 --- a/templates/web/eastherts/footer.html +++ b/templates/web/eastherts/footer.html @@ -41,7 +41,7 @@ <p>© 2017 mySociety</p> </div> <div class="footer__goss"> - <a href="https://www.fixmystreet.com/about/professional">Powered by FixMyStreet</a> + <a href="https://www.fixmystreet.com/pro/">Powered by FixMyStreet</a> </div> </div> </div> diff --git a/templates/web/fixmystreet-uk-councils/report/updates-sidebar-notes.html b/templates/web/fixmystreet-uk-councils/report/updates-sidebar-notes.html new file mode 100644 index 000000000..e4f8dda1b --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/report/updates-sidebar-notes.html @@ -0,0 +1,6 @@ +<p> + [% IF NOT problem.updates_sent_to_body %] + [% loc( 'Please note that updates are not sent to the council.' ) %] + [% END %] + [% loc( 'Your information will only be used in accordance with our <a href="/privacy">privacy policy</a>' ) %] +</p> diff --git a/templates/web/fixmystreet.com/about/council-dashboard.html b/templates/web/fixmystreet.com/about/council-dashboard.html index 7acaee207..c109b612f 100644 --- a/templates/web/fixmystreet.com/about/council-dashboard.html +++ b/templates/web/fixmystreet.com/about/council-dashboard.html @@ -6,7 +6,7 @@ [% IF no_body_found %] [% INCLUDE header.html - title = 'FixMyStreet Professional', bodyclass = 'fullwidthpage' + title = 'FixMyStreet Pro', bodyclass = 'fullwidthpage' %] <div class="confirmation-header confirmation-header--inbox"> @@ -17,12 +17,12 @@ [% ELSE %] [% INCLUDE header.html - title = 'FixMyStreet Professional', bodyclass = 'fms-for-councils fullwidthpage' + title = 'FixMyStreet Pro', bodyclass = 'fms-for-councils fullwidthpage' %] <div class="fixed-container"> <div class="council-header"> - <h1 class="councils-logo">FixMyStreet Professional</h1> + <h1 class="councils-logo">FixMyStreet Pro</h1> </div> <div class="councils-hero"> <div class="councils-hero__demo-access"> diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html index 4bc98f7df..0d6b95523 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -357,7 +357,7 @@ categories if you wish. <p>FixMyStreet reports usually come by email. If you reply to the email in your normal way, your response will go directly into the user's inbox. <p>Your reply is not published on the FixMyStreet website (unless you are a -FixMyStreet Professional customer who has chosen this option – see 'Can +FixMyStreet Pro customer who has chosen this option – see 'Can FixMyStreet connect directly with council systems?', below). </dd> @@ -397,11 +397,11 @@ FixMyStreet about as easy to use as possible. <dt>FixMyStreet is better than our own reporting system</dt> <dd> <p>Then why not replace it with FixMyStreet? We now offer a <a -href="/about/professional">complete fault-reporting solution for councils</a>, that +href="/pro/">complete fault-reporting solution for councils</a>, that integrates with your own website. <p>It has all the benefits of FixMyStreet's focus on usability, and is a robust, economical, cloud-based option. -<p><a href="/council">Read case studies here</a>. +<p><a href="/pro/">Read case studies here</a>. </dd> </dl> diff --git a/templates/web/fixmystreet.com/contact/blurb.html b/templates/web/fixmystreet.com/contact/blurb.html index 27412f894..28f6f45a9 100644 --- a/templates/web/fixmystreet.com/contact/blurb.html +++ b/templates/web/fixmystreet.com/contact/blurb.html @@ -12,7 +12,7 @@ please <a href="/">go to the front page</a> and follow the instructions.') %] <h4>From a UK Local Council and interested in finding out about FixMyStreet Pro?</h4> <p> - Please get in touch <a href="/about/professional#order">via our sales enquiry form</a> + Please look at our <a href="/pro/">dedicated site</a>. </p> <h3>Send a message to FixMyStreet's technical support team</h3> diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html index 6edf23b9f..e958ca35c 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -31,7 +31,7 @@ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li> </ul> <ul> - <li><a href="/about/professional">FixMyStreet Professional</a></li> + <li><a href="/pro/">FixMyStreet Pro</a></li> <li><[% IF c.req.uri.path == '/posters' %]span[% ELSE %]a href="[% base %]/posters"[% END %]>[% loc("FixMyStreet Goodies") %]</[% c.req.uri.path == '/posters' ? 'span' : 'a' %]></li> <li><[% IF c.req.uri.path == '/contact' %]span[% ELSE %]a href="[% base %]/contact"[% END diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html index fa9c188d0..2d1acc084 100644 --- a/templates/web/fixmystreet.com/front/footer-marketing.html +++ b/templates/web/fixmystreet.com/front/footer-marketing.html @@ -1,8 +1,8 @@ <div class="fms-pro-promo"> - <h2>FixMyStreet Professional</h2> + <h2>FixMyStreet Pro</h2> <p class="lead">The one-stop street reporting service for councils.</p> <p>Integrate FixMyStreet with your council system for smooth, end-to-end report fullfilment.</p> - <p><a href="/about/professional" class="btn">Learn more</a></p> + <p><a href="/pro/" class="btn">Learn more</a></p> </div> <div class="footer-marketing"> diff --git a/templates/web/fixmystreet.com/report/_report_meta_info.html b/templates/web/fixmystreet.com/report/_report_meta_info.html index f0b3503b9..2eab84c9e 100644 --- a/templates/web/fixmystreet.com/report/_report_meta_info.html +++ b/templates/web/fixmystreet.com/report/_report_meta_info.html @@ -1,6 +1,6 @@ [% problem.meta_line(c) | html %] [% IF c.cobrand.moniker != problem.get_cobrand_logged.moniker AND problem.get_cobrand_logged.is_council %] - using <a href="https://www.fixmystreet.com/about/professional">FixMyStreet Professional</a> + using <a href="https://www.fixmystreet.com/pro/">FixMyStreet Pro</a> [% END %] [% IF c.user_exists AND c.user.id == problem.user_id AND !problem.anonymous %] <small>(<a href="/my/anonymize?problem=[% problem.id | uri %]" class="js-hide-name">[% loc('Hide your name?') %]</a>)</small> diff --git a/templates/web/fixmystreet.com/report/updates-sidebar-notes.html b/templates/web/fixmystreet.com/report/updates-sidebar-notes.html index 17e3ade62..e4f8dda1b 100644 --- a/templates/web/fixmystreet.com/report/updates-sidebar-notes.html +++ b/templates/web/fixmystreet.com/report/updates-sidebar-notes.html @@ -1,5 +1,5 @@ <p> - [% IF NOT problem.send_method_used.match('Open311') OR NOT problem.to_body_named('Bromley|Stevenage') %] + [% IF NOT problem.updates_sent_to_body %] [% loc( 'Please note that updates are not sent to the council.' ) %] [% END %] [% loc( 'Your information will only be used in accordance with our <a href="/privacy">privacy policy</a>' ) %] diff --git a/templates/web/fixmystreet.com/reports/summary.html b/templates/web/fixmystreet.com/reports/summary.html index 8b7f84f59..11ee5df28 100644 --- a/templates/web/fixmystreet.com/reports/summary.html +++ b/templates/web/fixmystreet.com/reports/summary.html @@ -17,8 +17,8 @@ <form method="GET"> <div class="filters"> <p> - <label for="ward">[% loc('Problems reported in area:') %]</label> - <select class="form-control" id="ward" name="ward"> + <label for="area">[% loc('Problems reported in area:') %]</label> + <select class="form-control" id="area" name="area"> <option value="">[% body.name %]</option> [% FOR w IN children.values.sort('name') %] <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> diff --git a/templates/web/greenwich/front/footer-marketing.html b/templates/web/greenwich/front/footer-marketing.html index 773314aa9..c8b4ae416 100644 --- a/templates/web/greenwich/front/footer-marketing.html +++ b/templates/web/greenwich/front/footer-marketing.html @@ -13,7 +13,7 @@ <div id="footer-help"> <p> - Powered by <a class="platform-logo" href="https://www.fixmystreet.com/about/professional">FixMyStreet Platform</a> + Powered by <a class="platform-logo" href="https://www.fixmystreet.com/pro/">FixMyStreet Platform</a> </p> </div> </div> diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html index 01cf76f9d..5a53fb978 100644 --- a/templates/web/hart/footer.html +++ b/templates/web/hart/footer.html @@ -96,7 +96,7 @@ <strong>©</strong> <a href="http://www.hart.gov.uk/disclaimer" title="More information on the Disclaimer" class="hart">Hart District Council</a> </p> - <a href="https://www.fixmystreet.com/about/professional">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + <a href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> </div> </div> </footer> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index b7e3d9829..7dd6b6254 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -12,7 +12,7 @@ <div id="main-nav" role="navigation"> [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %] <ul class="nav-menu"> - <li><a id="mysoc-logo" href="https://www.fixmystreet.com/about/professional">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> + <li><a id="mysoc-logo" href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> </ul> </div> </div> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index fce316bf9..a1d42a777 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -19,6 +19,12 @@ [% INCLUDE 'tracking_code.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> + +<!-- Google Tag Manager (noscript) --> +<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NT76GJ5" +height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> +<!-- End Google Tag Manager (noscript) --> + <div id="oxford-wrapper"> <div id="oxford-header" class="desk-only"> <a href="https://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council</a> diff --git a/templates/web/oxfordshire/tracking_code.html b/templates/web/oxfordshire/tracking_code.html index 7a100f8ad..14afb5de0 100644 --- a/templates/web/oxfordshire/tracking_code.html +++ b/templates/web/oxfordshire/tracking_code.html @@ -1,15 +1,12 @@ [% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] -<script type="text/javascript"> - - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-22094787-2']); - _gaq.push(['_setDomainName', '.oxfordshire.gov.uk']); - _gaq.push(['_setCustomVar',1,'level1','Roads and transport',3]); - _gaq.push(['_setCustomVar',2,'level2','FixMyStreet',3]); - _gaq.push(['_trackPageview']); - -</script> +<!-- Google Tag Manager --> +<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': +new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], +j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= +'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); +})(window,document,'script','dataLayer','GTM-NT76GJ5');</script> +<!-- End Google Tag Manager --> [% ELSE %] <!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index c2944e97b..d276094c1 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -19,7 +19,7 @@ </li> <li> <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/about/professional">Find out about FixMyStreet Professional</a>.') %]</p> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/pro/">Find out about FixMyStreet Pro</a>.') %]</p> </li> </ul> </div> diff --git a/templates/web/warwickshire/around/intro.html b/templates/web/warwickshire/around/intro.html index 41e5088ad..03786e2e7 100644 --- a/templates/web/warwickshire/around/intro.html +++ b/templates/web/warwickshire/around/intro.html @@ -3,5 +3,5 @@ <p> Please use this form for defect reporting except for Street Lighting. <br /> For Street Lighting defects please click here: - <a href="http://www.warwickshire.gov.uk/streetlightingfault">Reporting Street Lighting Faults</a> + <a href="https://www.warwickshire.gov.uk/streetlightingfault">Reporting Street Lighting Faults</a> </p> diff --git a/templates/web/warwickshire/footer.html b/templates/web/warwickshire/footer.html index d6d88535c..6f4007781 100644 --- a/templates/web/warwickshire/footer.html +++ b/templates/web/warwickshire/footer.html @@ -37,7 +37,7 @@ <div class="span2"> <aside class="widget widget_text" id="text-13"> <div class="textwidget"> - <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="http://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a> + <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="https://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a> </div> </aside> </div> diff --git a/templates/web/warwickshire/warwickshire_masthead.html b/templates/web/warwickshire/warwickshire_masthead.html index 1c87d3e89..11afec135 100644 --- a/templates/web/warwickshire/warwickshire_masthead.html +++ b/templates/web/warwickshire/warwickshire_masthead.html @@ -15,13 +15,13 @@ </a> <a href="#maincontent" id="skiptomain">Skip to main content</a> <a alt="Warwickshire County Council logo" class="brand" href="//www.warwickshire.gov.uk/"> - <img alt="Warwickshire County Council" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/corpwhitelogo.png" style="width:85px;"> + <img alt="Warwickshire County Council" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/corpwhitelogo.png" style="width:85px;"> </a> <a alt="Gov Delivery logo" class="gdslogo" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"> - <img alt="GDSl" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;"> + <img alt="GDSl" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;"> </a> <a alt="Gov Delivery logo" class="govdelmobile pull-right" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"> - <img alt="GDSl" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;"> + <img alt="GDSl" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;"> </a> <a class="gdstext" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">Email alerts</a> <div class="nav-collapse collapse pull-left" id="right-topbar"> @@ -64,34 +64,34 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk">Residents<b class="caret"></b></a> <ul class="dropdown-menu"> <li> - <a href="http://www.warwickshire.gov.uk/">Residents - home</a> + <a href="//www.warwickshire.gov.uk/">Residents - home</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/environment">Environment</a> + <a href="//www.warwickshire.gov.uk/environment">Environment</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/health">Health</a> + <a href="//www.warwickshire.gov.uk/health">Health</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/librariesandleisure">Libraries and leisure</a> + <a href="//www.warwickshire.gov.uk/librariesandleisure">Libraries and leisure</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/roadsandtravel">Roads and travel</a> + <a href="//www.warwickshire.gov.uk/roadsandtravel">Roads and travel</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/registrations">Registrations</a> + <a href="//www.warwickshire.gov.uk/registrations">Registrations</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/safetyandcrime">Safety and crime</a> + <a href="//www.warwickshire.gov.uk/safetyandcrime">Safety and crime</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/schoolsandlearning">Schools and learning</a> + <a href="//www.warwickshire.gov.uk/schoolsandlearning">Schools and learning</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/socialcareandhealth">Social care and support</a> + <a href="//www.warwickshire.gov.uk/socialcareandhealth">Social care and support</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/contactus">Customer service and contacts</a> + <a href="//www.warwickshire.gov.uk/contactus">Customer service and contacts</a> </li> </ul> </li> @@ -99,28 +99,28 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk/business">Business <b class="caret"></b></a> <ul class="dropdown-menu"> <li> - <a href="http://www.warwickshire.gov.uk/business">Business - home</a> + <a href="//www.warwickshire.gov.uk/business">Business - home</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/businesssupportorganisations">Business support organisations</a> + <a href="//www.warwickshire.gov.uk/businesssupportorganisations">Business support organisations</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/growingyourbusiness">Growing your business</a> + <a href="//www.warwickshire.gov.uk/growingyourbusiness">Growing your business</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/businesshealthandsafety">Health and safety for businesses</a> + <a href="//www.warwickshire.gov.uk/businesshealthandsafety">Health and safety for businesses</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/locatingyourbusiness">Locating your business</a> + <a href="//www.warwickshire.gov.uk/locatingyourbusiness">Locating your business</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/otherbusinessservices">Other business services</a> + <a href="//www.warwickshire.gov.uk/otherbusinessservices">Other business services</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/businessadvice">Regulatory business service and advice</a> + <a href="//www.warwickshire.gov.uk/businessadvice">Regulatory business service and advice</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/startingabusiness">Starting a business</a> + <a href="//www.warwickshire.gov.uk/startingabusiness">Starting a business</a> </li> </ul> </li> @@ -128,40 +128,40 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk/corporate">The council <b class="caret"></b></a> <ul class="dropdown-menu"> <li> - <a href="http://www.warwickshire.gov.uk/corporate">The council - home</a> + <a href="//www.warwickshire.gov.uk/corporate">The council - home</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/democracy">Democracy</a> + <a href="//www.warwickshire.gov.uk/democracy">Democracy</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/financeandsuppliers">Finance and suppliers</a> + <a href="//www.warwickshire.gov.uk/financeandsuppliers">Finance and suppliers</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/jobs">Jobs</a> + <a href="//www.warwickshire.gov.uk/jobs">Jobs</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/listsanddata">Lists, data and information</a> + <a href="//www.warwickshire.gov.uk/listsanddata">Lists, data and information</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/news">News</a> + <a href="//www.warwickshire.gov.uk/news">News</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/organisation">Organisation</a> + <a href="//www.warwickshire.gov.uk/organisation">Organisation</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/performance">Our performance</a> + <a href="//www.warwickshire.gov.uk/performance">Our performance</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/partnerships">Partnerships</a> + <a href="//www.warwickshire.gov.uk/partnerships">Partnerships</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/policies">Policies, standards and legislation</a> + <a href="//www.warwickshire.gov.uk/policies">Policies, standards and legislation</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/projects">Projects</a> + <a href="//www.warwickshire.gov.uk/projects">Projects</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/strategies">Strategies and priorities</a> + <a href="//www.warwickshire.gov.uk/strategies">Strategies and priorities</a> </li> </ul> </li> @@ -181,10 +181,10 @@ <a href="http://invest.warwickshire.gov.uk/">Invest in Warwickshire</a> </li> <li> - <a href="http://www.warwickshire.gov.uk/jobs">Jobs</a> + <a href="//www.warwickshire.gov.uk/jobs">Jobs</a> </li> <li> - <a href="http://www.livingwellwithdementia.org/">Living well with dementia</a> + <a href="https://dementia.warwickshire.gov.uk/">Living well with dementia</a> </li> <li> <a href="http://laf.warwickshire.gov.uk/">Local Access Forum</a> @@ -216,4 +216,4 @@ </div> </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 07fc9ad36..0319fc565 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -62,7 +62,7 @@ <strong>[% IF problem.name %][% problem.name | html %][% ELSE %][% loc('(No name)') %][% END %]</strong> <input type='hidden' name='name' id='name' value='[% problem.name | html %]'> <br> - [% problem.user.email | html %] + <a href="mailto:[% problem.user.email | html %]">[% problem.user.email | html %]</a> [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] <input type='hidden' id='username' name='username' value='[% problem.user.username | html %]'> <br> diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 7e88fab30..fd03fb044 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -90,7 +90,7 @@ <strong>[% IF problem.name %][% problem.name | html %][% ELSE %][% loc('(No name)') %][% END %]</strong> <input type='hidden' name='name' id='name' value='[% problem.name | html %]'> <br> - [% problem.user.email | html %] + <a href="mailto:[% problem.user.email | html %]">[% problem.user.email | html %]</a> [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] <input type='hidden' id='username' name='username' value='[% problem.user.username | html %]'> <br> @@ -117,10 +117,10 @@ </div> <input type="submit" name="rotate_photo_[% loop.index %]" value="[% loc('Rotate Left') %]" class="screen-only"> <input type="submit" name="rotate_photo_[% loop.index %]" value="[% loc('Rotate Right') %]" class="screen-only"> + <br> + <input type="checkbox" id="publish_photo_[% loop.index %]" name="publish_photo_[% loop.index %]" value="1"[% ' checked' IF problem.extra.publish_photo.${loop.index} %] class="screen-only"> + <label class="inline screen-only" for="publish_photo_[% loop.index %]">[% loc("Publish photo") %]</label></li> [% END %] - <br> - <input type="checkbox" id="publish_photo" name="publish_photo" value="1"[% ' checked' IF problem.extra.publish_photo %] class="screen-only"> - <label class="inline screen-only" for="publish_photo">[% loc("Publish photo") %]</label></li> [% END %] </dl> diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index 560cbac51..ccae84271 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -1,7 +1,9 @@ <li class="item-list__item item-list--reports__item"> <a href="[% c.uri_for('/report', problem.id ) %]"> - [% IF problem.state != 'unconfirmed' AND problem.photo AND c.cobrand.allow_photo_display(problem) %] - <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> + [% photo_to_display = c.cobrand.allow_photo_display(problem) %] + [% IF problem.state != 'unconfirmed' AND problem.photo AND photo_to_display %] + [% photo_idx = photo_to_display - 1 ~%] + <img class="img" height="60" width="90" src="[% problem.photos.${photo_idx}.url_fp %]" alt=""> [% END %] [% IF problem.state != 'unconfirmed' %] <h3 class="item-list__heading">[% problem.title | html %]</h3> diff --git a/templates/web/zurich/report/_main.html b/templates/web/zurich/report/_main.html index b868c03e2..912e8b0c9 100644 --- a/templates/web/zurich/report/_main.html +++ b/templates/web/zurich/report/_main.html @@ -6,9 +6,7 @@ </p> [% IF problem.state != 'unconfirmed' %] - [% IF c.cobrand.allow_photo_display(problem) %] - [% INCLUDE 'report/photo.html' object=problem %] - [% END %] + [% INCLUDE 'report/photo.html' object=problem %] [% problem.detail | add_links | html_para %] [% ELSE %] [% loc('This report is awaiting moderation.') %] diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html index 1389c666c..d6d7a541a 100755 --- a/templates/web/zurich/reports/index.html +++ b/templates/web/zurich/reports/index.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; SET bodyclass = 'mappage'; INCLUDE 'header.html', @@ -13,6 +14,7 @@ <h1>[% loc('All Reports') %]</h1> <section class="full-width"> + [% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 %] <div class="js-pagination"> [% INCLUDE 'pagination.html', param = 'p' %] </div> |