diff options
Diffstat (limited to 'templates')
58 files changed, 325 insertions, 195 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/admin/user-form.html b/templates/web/base/admin/user-form.html index 9a2c0b9e2..e8e647a09 100644 --- a/templates/web/base/admin/user-form.html +++ b/templates/web/base/admin/user-form.html @@ -18,20 +18,12 @@ </li> <li><label for="email">[% loc('Email:') %]</label> <input type='text' class="form-control" id='email' name='email' value='[% user.email | html %]'></li> - [% IF c.config.SMS_AUTHENTICATION %] <li><label class="inline" for="email_verified">[% loc('Email verified:') %]</label> <input type="checkbox" id="email_verified" name="email_verified" value="1" [% user.email_verified ? ' checked' : '' %]> - [% ELSE %] - <input type="hidden" name="email_verified" value="1"> - [% END %] <li><label for="phone">[% loc('Phone:') %]</label> <input type='text' class="form-control" id='phone' name='phone' value='[% user.phone | html %]'></li> - [% IF c.config.SMS_AUTHENTICATION %] <li><label class="inline" for="phone_verified">[% loc('Phone verified:') %]</label> <input type="checkbox" id="phone_verified" name="phone_verified" value="1" [% user.phone_verified ? ' checked' : '' %]> - [% ELSE %] - <input type="hidden" name="phone_verified" value="0"> - [% END %] [% IF username_in_abuse %] <li> @@ -51,23 +43,27 @@ %] </p> </div> - [% loc('Body:') %] <select class="form-control" id='body' name='body'> + <label for="body">[% loc('Body:') %]</label> + <select class="form-control" id='body' name='body'> <option value=''>[% loc('No body') %]</option> [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected data-originally-selected' IF body.id == user.from_body.id %]>[% body.name %]</option> [% END %] </select> </li> - [% ELSE %] - <li> + [% ELSE %] + <li> <div class="admin-hint"> <p> [% loc("Staff users have permission to log in to the admin.") %] </p> </div> - [% loc('Staff:') %] <input type="checkbox" id="body" name="body" value="[% c.user.from_body.id %]" [% user.from_body.id == c.user.from_body.id ? ' checked' : '' %] [% 'disabled' UNLESS c.user.has_body_permission_to('user_assign_body') %]> + <label> + [% loc('Staff:') %] + <input type="checkbox" id="body" name="body" value="[% c.user.from_body.id %]" [% user.from_body.id == c.user.from_body.id ? ' checked' : '' %] [% 'disabled' UNLESS c.user.has_body_permission_to('user_assign_body') %]> + </label> </li> - [% END %] + [% END %] [% IF areas AND c.cobrand.moniker != 'zurich' %] <li> @@ -79,7 +75,7 @@ %] </p> </div> - [% loc('Area:') %] + <label for="area_id">[% loc('Area:') %]</label> <select class="form-control" id='area_id' name='area_id' [% 'disabled' UNLESS c.user.has_permission_to('user_assign_areas', user.from_body.id) %]> <option value=''>[% loc('No area') %]</option> [% FOREACH area IN areas %] @@ -115,7 +111,10 @@ </p> </div> - [% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]> + <label> + [% loc('Flagged:') %] + <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]> + </label> </li> [% UNLESS user.is_superuser %] @@ -126,8 +125,8 @@ </p> </div> [% IF c.user.is_superuser %] - [% loc('Trusted by bodies:') %]<br /> - <select class="form-control js-multiple" id='body' name='trusted_bodies' multiple> + <label for="trusted_bodies">[% loc('Trusted by bodies:') %]</label> + <select class="form-control js-multiple" id='trusted_bodies' name='trusted_bodies' multiple> [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected' IF user.has_permission_to('trusted', body.id) %]>[% body.name %]</option> [% END %] @@ -148,7 +147,10 @@ [% loc("Superusers have permission to perform <strong>all actions</strong> within the admin.") %] </p> </div> - [% loc('Superuser:') %] <input type="checkbox" id="is_superuser" name="is_superuser"[% user.is_superuser ? ' checked' : '' %]> + <label> + [% loc('Superuser:') %] + <input type="checkbox" id="is_superuser" name="is_superuser"[% user.is_superuser ? ' checked' : '' %]> + </label> </li> [% END %] @@ -185,5 +187,16 @@ [% END %] [% TRY %][% INCLUDE 'admin/user-form-extra-fields.html' %][% CATCH file %][% END %] </ul> - <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" > + <p> + <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" > + </p> + [% IF user AND NOT user.from_body %] + <ul class="no-bullets danger-zone"> + <li><input class="btn-danger" type="submit" name="logout_everywhere" value="[% loc('Log out of all sessions') %]"> + <li><input class="btn-danger" type="submit" name="anon_everywhere" value="[% loc('Make anonymous on all reports and updates') %]"> + <li><input class="btn-danger" type="submit" name="hide_everywhere" value="[% loc('Hide all reports and updates') %]"> + <li><input class="btn-danger" type="submit" name="remove_account" value="[% loc('Remove account details') %]"> + </ul> + [% END %] + </form> 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/auth/2faform.html b/templates/web/base/auth/2faform.html new file mode 100644 index 000000000..bd8d60cdb --- /dev/null +++ b/templates/web/base/auth/2faform.html @@ -0,0 +1,26 @@ +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %] + + <div class="confirmation-header confirmation-header--phone"> + [% IF incorrect_code %] + <h1>[% loc('Sorry, that wasn’t the correct code') %]</h1> + <p>[% loc('Try again') %]:</p> + [% ELSE %] + <h1>[% loc("Nearly done! Now check your phone…") %]</h1> + <p>[% loc("Please generate a two-factor code and enter it below:") %]</p> + [% END %] + <form action="/auth" method="post"> + <input type="hidden" name="username" value="[% c.get_param('username') | html %]"> + <input type="hidden" name="password_sign_in" value="[% c.get_param('password_sign_in') | html %]"> + <input type="hidden" name="r" value="[% c.get_param('r') | html %]"> + <input type="hidden" name="remember_me" value="[% c.get_param('remember_me') | html %]"> + <input type="hidden" name="token" value="[% token | html %]"> + + <label for="2fa_code">[% loc('Code') %]</label> + <div class="form-txt-submit-box"> + <input class="form-control" type="number" id="2fa_code" name="2fa_code" value="" required> + <input type="submit" value="[% loc('Submit') %]" class="btn-primary"> + </div> + </form> + </div> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html index a32dbaf9c..7a38e0134 100644 --- a/templates/web/base/auth/change_password.html +++ b/templates/web/base/auth/change_password.html @@ -1,7 +1,9 @@ [% SET bclass = 'authpage'; SET bclass = 'fullwidthpage' IF password_changed; -INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass +SET title = loc('Set password'); +SET title = loc('Change password') IF c.user.password; +INCLUDE 'header.html', title = title bodyclass = bclass %] [% IF password_changed %] @@ -13,13 +15,15 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass [% ELSE %] -<h1>[% loc('Change password') %]</h1> +<h1>[% title %]</h1> <form action="[% c.uri_for_action('/auth/profile/change_password') %]" method="post" name="change_password" class="fieldset"> <input type="hidden" name="token" value="[% csrf_token %]"> <fieldset> - [% IF password_error; + [% IF password_error == 'failed' %] + <div class="form-error">[% field_errors.password_register %]</div> + [% ELSIF password_error; errors = { missing => loc('Please enter a password'), @@ -31,6 +35,14 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass <div class="form-error">[% loc_password_error %]</div> [% END %] +[% IF c.user.password %] + <div class="form-field"> + <label for="current_password">[% loc('Current password:') %]</label> + <input class="form-control" type="password" name="current_password" value="[% current_password | html %]"> + </div> + <hr> +[% END %] + <div class="form-field"> <label for="new_password">[% loc('New password:') %]</label> <input class="form-control" type="password" name="new_password" value="[% new_password | html %]"> @@ -40,7 +52,7 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass <input class="form-control" type="password" name="confirm" value="[% confirm | html %]"> </div> <div class="final-submit"> - <input type="submit" class="btn" value="[% loc('Change password') %]"> + <input type="submit" class="btn" value="[% title %]"> </div> </fieldset> diff --git a/templates/web/base/auth/change_phone.html b/templates/web/base/auth/change_phone.html index 27a2f63dd..62e9fa6d6 100644 --- a/templates/web/base/auth/change_phone.html +++ b/templates/web/base/auth/change_phone.html @@ -18,7 +18,7 @@ END [% IF c.user.phone_verified OR (c.user.phone AND NOT verifying) %] [% loc('Your phone number') %]: [% c.user.phone_display %] [% ELSIF c.user.phone %] -[% DEFAULT username = c.user.phone %] +[% DEFAULT username = c.user.phone_display %] [% END %] <form method="post" name="change_phone"> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index 8fc5578c1..1e44bb68e 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -60,7 +60,9 @@ [% INCLUDE form_sign_in_yes %] <input type="hidden" name="oauth_need_email" value="1"> [% ELSE %] + [% IF NOT field_errors.password_register %] [% INCLUDE form_sign_in_yes %] + [% END %] [% INCLUDE form_sign_in_no %] [% END %] </div> @@ -114,14 +116,22 @@ <input class="form-control" type="text" name="name" value="" placeholder="[% loc('Your name') %]"> <label for="password_register">[% loc('Password (optional)') %]</label> + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="general-notes"> <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> <div class="form-txt-submit-box"> - <input class="form-control" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn" type="submit" name="sign_in_by_code" value="[% loc('Sign in') %]"> </div> + + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> [% END %] diff --git a/templates/web/base/auth/generate_token.html b/templates/web/base/auth/generate_token.html index 157335047..f7061be45 100644 --- a/templates/web/base/auth/generate_token.html +++ b/templates/web/base/auth/generate_token.html @@ -1,5 +1,5 @@ [% -INCLUDE 'header.html', title = loc('Generate token'), bodyclass = 'fullwidthpage' +INCLUDE 'header.html', title = loc('Security'), bodyclass = 'fullwidthpage' %] [% IF token_generated %] @@ -15,9 +15,28 @@ INCLUDE 'header.html', title = loc('Generate token'), bodyclass = 'fullwidthpage <p><a href="/my">[% loc('Your account') %]</a></p> </div> +[% ELSIF toggle_2fa_on %] + + <div class="confirmation-header"> + <h1>[% loc('Two-factor authentication has been activated') %]</h1> + + <p align="center"><img src="[% qr_code %]"></p> + <p align="center">[% secret32.replace('(....)', '$1 ') %]</p> + + <p><a href="/my">[% loc('Your account') %]</a></p> + </div> + +[% ELSIF toggle_2fa_off %] + + <div class="confirmation-header"> + <h1>[% loc('Two-factor authentication has been deactivated') %]</h1> + + <p><a href="/my">[% loc('Your account') %]</a></p> + </div> + [% ELSE %] -<h1>[% loc('Generate token') %]</h1> +<h1>[% loc('Security') %]</h1> <form action="[% c.uri_for_action('/auth/profile/generate_token') %]" method="post" name="generate_token"> <input type="hidden" name="token" value="[% csrf_token %]"> @@ -31,6 +50,9 @@ INCLUDE 'header.html', title = loc('Generate token'), bodyclass = 'fullwidthpage <p> <input name="generate_token" type="submit" class="btn" value="[% existing_token ? loc('Replace token') : loc('Generate token') %]"> + [% IF c.user.is_superuser %] + <input name="toggle_2fa" type="submit" class="btn" value="[% has_2fa ? loc('Deactivate two-factor authentication') : loc('Activate two-factor authentication') %]"> + [% END %] </p> </form> diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index 749a4f740..541bb1a56 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -14,7 +14,8 @@ <script nonce="[% csp_nonce %]"> window.Modernizr=function(e,t,n){function r(e){p.cssText=e}function o(e,t){return typeof e===t}var a,i,c,l="2.8.3",s={},u=t.documentElement,d="modernizr",f=t.createElement(d),p=f.style,m=({}.toString,{}),h=[],y=h.slice,v=function(e,n,r,o){var a,i,c,l,s=t.createElement("div"),f=t.body,p=f||t.createElement("body");if(parseInt(r,10))for(;r--;)c=t.createElement("div"),c.id=o?o[r]:d+(r+1),s.appendChild(c);return a=["­",'<style id="s',d,'">',e,"</style>"].join(""),s.id=d,(f?s:p).innerHTML+=a,p.appendChild(s),f||(p.style.background="",p.style.overflow="hidden",l=u.style.overflow,u.style.overflow="hidden",u.appendChild(p)),i=n(s,e),f?s.parentNode.removeChild(s):(p.parentNode.removeChild(p),u.style.overflow=l),!!i},g=function(t){var n=e.matchMedia||e.msMatchMedia;if(n)return n(t)&&n(t).matches||!1;var r;return v("@media "+t+" { #"+d+" { position: absolute; } }",function(t){r="absolute"==(e.getComputedStyle?getComputedStyle(t,null):t.currentStyle).position}),r},b={}.hasOwnProperty;c=o(b,"undefined")||o(b.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(e,t){return b.call(e,t)};for(var E in m)c(m,E)&&(i=E.toLowerCase(),s[i]=m[E](),h.push((s[i]?"":"no-")+i));return r(""),f=a=null,s._version=l,s.mq=g,s.testStyles=v,s}(this,this.document); var fixmystreet=fixmystreet||{}; - (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("iel8"),c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" map-fullscreen only-map map-reporting"))})(document); + (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("iel8");c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");"IntersectionObserver"in window&&(a.className+=" lazyload");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" map-fullscreen only-map map-reporting"))})(document); + </script> [% IF robots %] diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index c6902556a..cb6ca154f 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -50,6 +50,7 @@ <label for="ward">[% loc('Council:') %]</label> <select class="form-control" name="body" id="body"><option value=''>[% loc('All') %]</option> [% FOR b IN bodies %] + [% NEXT IF NOT b.get_column("area_count") %] <option value="[% b.id %]">[% b.name %]</option> [% END %] </select> @@ -101,7 +102,7 @@ <li>[% INCLUDE gb new_gb='month' text=loc('Month') %]</li> <li>[% INCLUDE gb new_gb='category+state' text=loc('Category and State') %]</li> <li>[% INCLUDE gb new_gb='device+site' text=loc('Device and Site') %]</li> - <li class="pull-right"><a href="[% c.uri_with({ csv => 1 }) %]">[% loc('Export as CSV') %]</a></li> + <li class="pull-right"><a href="[% c.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a></li> </ul> <table width="100%" id="overview"> diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index ed95335a6..a2e3c16c5 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -1,4 +1,7 @@ [% FILTER collapse %] +var fixmystreet = fixmystreet || {}; +fixmystreet.password_minimum_length = [% c.cobrand.password_minimum_length %]; + translation_strings = { update: '[% loc('Please enter a message') | replace("'", "\\'") %]', title: '[% loc('Please enter a subject') | replace("'", "\\'") %]', @@ -19,6 +22,9 @@ password_sign_in: { required: '[% loc('Please enter a password') | replace("'", "\\'") %]' }, + password_register: { + short: '[% tprintf(loc('Please make sure your password is at least %d characters long'), c.cobrand.password_minimum_length) | replace("'", "\\'") %]', + }, phone: { required: '[% loc('Please enter your phone number') | replace("'", "\\'") %]' }, diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html index e10dd96c8..459fa5266 100644 --- a/templates/web/base/my/my.html +++ b/templates/web/base/my/my.html @@ -62,7 +62,7 @@ li .my-account-buttons a { <p class="my-account-buttons"> <a href="/auth/change_password">[% loc('Change password') %]</a> [% IF c.user AND (c.user.from_body OR c.user.is_superuser) %] - <a href="/auth/generate_token">[% loc('Generate token') %]</a> + <a href="/auth/generate_token">[% loc('Security') %]</a> [% END %] <a href="/auth/sign_out">[% loc('Sign out') %]</a> </p> 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/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 84a9d7efd..12ca36cf2 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -101,9 +101,9 @@ <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> <p class="segmented-control segmented-control--radio"> <input type="radio" name="another" id="another_yes" value="Yes"[% ' checked' IF another == 'Yes' %]> - <label for="another_yes">[% loc('Yes') %]</label> + <label class="btn" for="another_yes">[% loc('Yes') %]</label> <input type="radio" name="another" id="another_no" value="No"[% ' checked' IF another == 'No' %]> - <label for="another_no">[% loc('No') %]</label> + <label class="btn" for="another_no">[% loc('No') %]</label> </p> </div> diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 5088332ce..1893826de 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -17,7 +17,7 @@ [% IF permissions.report_inspect AND problem.user.phone %] <p> <strong>[% loc('Phone Reporter:') %]</strong> - <a href="tel:[% problem.user.phone | html %]">[% problem.user.phone | html %]</a> + <a href="tel:[% problem.user.phone | html %]">[% problem.user.phone_display | html %]</a> </p> [% END %] <p> @@ -65,9 +65,9 @@ data-defect-types='[% category_defect_types.$cat_name %]' data-templates='[% templates_by_category.$cat_name %]'> [% IF cat_name == problem.category %] - [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category %] + [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$cat_name hide_notices=1 %] [% ELSE %] - [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category report_meta='' %] + [% INCLUDE 'report/new/category_extras_fields.html' report_meta='' metas=category_extras.$cat_name hide_notices=1 %] [% END %] </p> [% END %] diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html index 9c2731730..5cbdcc524 100644 --- a/templates/web/base/report/new/category_extras_fields.html +++ b/templates/web/base/report/new/category_extras_fields.html @@ -5,7 +5,7 @@ <input type="hidden" value="" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"> - [% ELSE %] + [% ELSIF meta.variable != 'false' || NOT hide_notices %] <label for="[% cat_prefix %]form_[% meta_name %]">[% meta.description %]</label> [% IF field_errors.$meta_name %] diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index bd4ce1cf7..ad74a5654 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -31,11 +31,11 @@ [% IF c.user.phone_verified %] <label for="form_phone">[% loc('Phone number') %]</label> - <input class="form-control" id="form_phone" name="phone" disabled type="text" value="[% c.user.phone | html %]"> + <input class="form-control" id="form_phone" name="phone" disabled type="text" value="[% c.user.phone_display | html %]"> [% END %] [% IF c.user.email_verified %] - <label for="form_username">[% loc('Email address') %]</label> + <label for="form_username">[% loc('Email address') %]<span class="hidden"> [% loc('(optional)') %]</span></label> <input class="form-control" id="form_username" name="username" [%- IF NOT can_contribute_as_another_user -%] disabled @@ -65,7 +65,7 @@ [% IF NOT c.user.phone_verified %] <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input class="form-control" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone"> + <input class="form-control" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone"> [% END %] [% IF NOT c.user.email_verified %] <label for="form_username">[% loc('Email address (optional)') %]</label> diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html index e9519f573..975dbe704 100644 --- a/templates/web/base/report/new/form_user_loggedout_by_email.html +++ b/templates/web/base/report/new/form_user_loggedout_by_email.html @@ -36,13 +36,20 @@ </div> <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label> - + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="general-notes form-focus-hidden"> <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> <div class="form-txt-submit-box form-focus-hidden"> - <input class="form-control" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]"> </div> + + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> 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/base/report/update.html b/templates/web/base/report/update.html index 6dca226fe..100deb1ea 100644 --- a/templates/web/base/report/update.html +++ b/templates/web/base/report/update.html @@ -69,7 +69,7 @@ <label for="moderation_reason">[% loc('Moderation reason:') %]</label> <input type="text" class="form-control" name="moderation_reason" placeholder="[% loc('Describe why you are moderating this') %]"> - <input type="submit" class="red-btn" value="[% loc('Save changes') %]"> + <input type="submit" class="green-btn" value="[% loc('Save changes') %]"> <input type="button" class="btn cancel" value="[% loc('Discard changes') %]"> </div> </form> diff --git a/templates/web/base/report/update/form_user_loggedout_by_email.html b/templates/web/base/report/update/form_user_loggedout_by_email.html index 7d10fe391..d038cdb23 100644 --- a/templates/web/base/report/update/form_user_loggedout_by_email.html +++ b/templates/web/base/report/update/form_user_loggedout_by_email.html @@ -8,14 +8,21 @@ [% INCLUDE 'report/update/form_name.html' %] <label for="password_register">[% loc('Password (optional)') %]</label> + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="general-notes"> <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> <div class="form-txt-submit-box"> - <input type="password" class="form-control" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input type="password" class="form-control js-password-validate" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"> </div> + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> diff --git a/templates/web/base/reports/index.html b/templates/web/base/reports/index.html index 70f4b3929..9fcf0b4c5 100755 --- a/templates/web/base/reports/index.html +++ b/templates/web/base/reports/index.html @@ -30,7 +30,7 @@ data-values-fixed="[[% problems_fixed_by_period.join(',') %]]" ></canvas> <span class="label" data-datasetindex="0"><strong style="color: #F4A140">[% tprintf(nget("%s problem reported", "%s problems reported", problems_reported_by_period.last), decode(problems_reported) _ '</strong>') %]</span> - <span class="label" data-datasetindex="1"><strong style="color: #62B356">[% tprintf(nget("%s report marked as fixed", "%s reports marked as fixed", problems_fixed_by_period.last), decode(problems_fixed) _ '</strong>') %]</span> + <span class="label" data-datasetindex="1"><strong style="color: #62B356">[% tprintf(nget("%s problem marked as fixed", "%s problems marked as fixed", problems_fixed_by_period.last), decode(problems_fixed) _ '</strong>') %]</span> </div> </div> </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/bristol/maps/noscript_map.html b/templates/web/bristol/maps/noscript_map.html deleted file mode 100644 index 987aa76a6..000000000 --- a/templates/web/bristol/maps/noscript_map.html +++ /dev/null @@ -1,32 +0,0 @@ -<div class="noscript square-map__outer"> - <div class="square-map__inner"> - <div id="[% nsm_prefix %]drag"> - [%- FOR row IN map.tiles -%] - [%- FOR tile IN row -%] - [%- top_px = tile.row_offset * map.tile_size -%] - [%- left_px = tile.col_offset * map.tile_size %] - <[% map.img_type %] - class="square-map__tile" - alt="[% tile.alt %]" - id="[% nsm_prefix %]t[% tile.dotted_id %]" - name="tile_[% tile.dotted_id %]" - src="[% tile.src %]" - style="width: [% 100 / map.cols %]%; height: auto; float: left;"> - [%- END -%] - [% END %] - </div> - <div id="[% nsm_prefix %]pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div> - [% INCLUDE 'maps/_compass.html' %] - </div> -</div> - -[% BLOCK pin %] -[% - SET pin_top = pin.py / ( map.tile_size * map.rows ) * 100; - SET pin_left = pin.px / ( map.tile_size * map.cols ) * 100; - # -24px half of 48px wide image, -64px all of 64px tall image - INCLUDE 'maps/pin.html' - pin_style = 'top:' _ pin_top _ '%; left:' _ pin_left _ '%; position:absolute; margin-left:-24px; margin-top:-64px;' -%] -[% END %] - 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/bromley/report/new/form_user.html b/templates/web/bromley/report/new/form_user.html index e6749f5ab..cce985c95 100644 --- a/templates/web/bromley/report/new/form_user.html +++ b/templates/web/bromley/report/new/form_user.html @@ -91,15 +91,23 @@ </div> <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label> + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="general-notes form-focus-hidden"> <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p> </div> <div class="form-txt-submit-box form-focus-hidden"> - <input class="form-control" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]"> </div> + + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> <div id="form_sign_in_yes" class="form-box"> diff --git a/templates/web/bromley/report/update-form.html b/templates/web/bromley/report/update-form.html index 45d7aed5e..9778a0db3 100644 --- a/templates/web/bromley/report/update-form.html +++ b/templates/web/bromley/report/update-form.html @@ -98,15 +98,23 @@ [% INCLUDE 'report/update/form_name.html' %] <label for="password_register">[% loc('Password (optional)') %]</label> + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="general-notes"> <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> <div class="form-txt-submit-box"> - <input type="password" class="form-control" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input type="password" class="form-control js-password-validate" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"> </div> + + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> <div id="form_sign_in_yes" class="form-box"> <h5>Confirm my report with my FixMyStreet password</h5> 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/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html index 1f7cf2aeb..bbb9864a3 100644 --- a/templates/web/fixamingata/report/new/form_user_loggedout.html +++ b/templates/web/fixamingata/report/new/form_user_loggedout.html @@ -27,23 +27,32 @@ </div> <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input type="text" class="form-control" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + <input type="text" class="form-control" value="[% report.user.phone_display | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> <div class="general-notes form-focus-hidden"> <p>[% loc('We never show your email address or phone number.') %]</p> </div> <label for="password_register">[% loc('Password (optional)') %]</label> + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="general-notes form-focus-hidden"> <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> <div class="form-txt-submit-box"> - <input type="password" class="form-control" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input type="password" class="form-control js-password-validate" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]"> </div> + + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> + <div id="form_sign_in_yes" class="form-box"> <h5>Jag har ett lösenord sedan tidigare:</h5> 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 8c38b2cdb..0d6b95523 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -216,7 +216,7 @@ bet is to describe the problem location in as much detail as possible, as well as using the map to pinpoint it. <p>Ordnance Survey will accept requests for amendments to their maps: contact them on customerservices@ordnancesurvey.co.uk or via the post to Ordnance -Survey, Adanac Drive, Southampton, SO16 0AS or telephone 08456 05 05 05. +Survey, Adanac Drive, Southampton, SO16 0AS or telephone 03456 05 05 05. </dd> <dt>There are too many pins on the map; I can't make a report</dt> @@ -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 819943f67..e958ca35c 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -9,11 +9,11 @@ </div> <div class="fms-app-badges"> - <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> - <img alt="FixMyStreet app on the App Store" src="[% base %]/cobrands/fixmystreet/images/itunes_store_logo.png" srcset="[% base %]/cobrands/fixmystreet/images/itunes_store_logo.png 1x, [% base %]/cobrands/fixmystreet/images/itunes_store_logo@2.png 2x" /> + <a class="js-lazyload fms-app-badge fms-app-badge--ios" href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> + FixMyStreet app on the App Store </a> - <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> - <img alt="FixMyStreet Android app on Google Play" src="[% base %]/cobrands/fixmystreet/images/google_play_logo.png" srcset="[% base %]/cobrands/fixmystreet/images/google_play_logo.png 1x, [% base %]/cobrands/fixmystreet/images/google_play_logo@2.png 2x" /> + <a class="js-lazyload fms-app-badge fms-app-badge--android" href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> + FixMyStreet Android app on Google Play </a> </div> </div> @@ -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 @@ -59,11 +59,11 @@ <div class="mysoc-footer__orgs"> <p class="mysoc-footer__org"> Built by - <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a> + <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+logo&utm_medium=link&utm_campaign=mysoc_footer" class="js-lazyload mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a> </p> <p class="mysoc-footer__org"> Powered by - <a href="http://fixmystreet.org" class="mysoc-footer__org__logo mysoc-footer__org__logo--fms-platform">FixMyStreet Platform</a> + <a href="http://fixmystreet.org" class="js-lazyload mysoc-footer__org__logo mysoc-footer__org__logo--fms-platform">FixMyStreet Platform</a> </p> </div> </div> @@ -76,9 +76,9 @@ <div class="col-sm-2"> <ul class="mysoc-footer__badges"> - <li role="presentation"><a href="https://github.com/mysociety/fixmystreet" class="mysoc-footer__badge mysoc-footer__badge--github">Github</a></li> - <li role="presentation"><a href="https://twitter.com/fixmystreet/" class="mysoc-footer__badge mysoc-footer__badge--twitter">Twitter</a></li> - <li role="presentation"><a href="https://www.facebook.com/FixMyStreet" class="mysoc-footer__badge mysoc-footer__badge--facebook">Facebook</a></li> + <li role="presentation"><a href="https://github.com/mysociety/fixmystreet" class="js-lazyload mysoc-footer__badge mysoc-footer__badge--github">Github</a></li> + <li role="presentation"><a href="https://twitter.com/fixmystreet/" class="js-lazyload mysoc-footer__badge mysoc-footer__badge--twitter">Twitter</a></li> + <li role="presentation"><a href="https://www.facebook.com/FixMyStreet" class="js-lazyload mysoc-footer__badge mysoc-footer__badge--facebook">Facebook</a></li> </ul> </div> diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html index cb1b78743..0e0300af7 100644 --- a/templates/web/fixmystreet.com/footer_extra_js.html +++ b/templates/web/fixmystreet.com/footer_extra_js.html @@ -1,4 +1,7 @@ [% +scripts.push( + version('/js/lazyload.js'), +); IF bodyclass.match('mappage'); scripts.push( version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'), 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/header.html b/templates/web/fixmystreet.com/header.html index 6f01f4184..a1f66945d 100644 --- a/templates/web/fixmystreet.com/header.html +++ b/templates/web/fixmystreet.com/header.html @@ -27,8 +27,8 @@ [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] <body class="[% bodyclass | html IF bodyclass %]"> <div class="top_banner top_banner--donate"><p> - <strong>We’re hiring for an exciting new project.</strong> - <a href="https://mysociety.workable.com/">Come and join our friendly team</a>. + <strong>Help keep our sites running in 2018.</strong> + <a href="https://www.mysociety.org/donate/">Please donate today</a>. </p></div> <div class="wrapper"> 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/auth/general.html b/templates/web/zurich/auth/general.html index 899f0ca71..555a72374 100644 --- a/templates/web/zurich/auth/general.html +++ b/templates/web/zurich/auth/general.html @@ -1,16 +1,6 @@ [% INCLUDE 'header.html', title = loc('Sign in or create an account') %] -[% IF username_error; - - # other keys include fqdn, mxcheck if you'd like to write a custom error message - - errors = { - missing_email = loc('Please enter your email'), - other_email = loc('Please check your email address is correct') - }; - - loc_username_error = errors.$username_error || errors.other_email; -END %] +[% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %] <form action="/auth" method="post" name="general_auth_login" class="validate"> <fieldset> @@ -61,11 +51,18 @@ END %] <input type="text" class="required" name="name" value="" placeholder="[% loc('Your name') %]"> <label for="password_register">[% loc('Password (optional)') %]</label> + [% IF field_errors.password_register %] + <p class='form-error'>[% field_errors.password_register %]</p> + [% END %] <div class="form-txt-submit-box"> - <input type="password" class="required" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input type="password" class="required js-password-validate" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn" type="submit" name="sign_in_by_code" value="Registrieren"> </div> + <div class="general-notes"> + <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p> + </div> + </div> </fieldset> </form> 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> |