diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/admin/category_edit.html | 11 | ||||
| -rw-r--r-- | templates/web/base/admin/user-form.html | 8 | ||||
| -rw-r--r-- | templates/web/base/report/_main.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/display_tools.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/update.html | 2 | ||||
| -rw-r--r-- | templates/web/bristol/footer_extra_js.html | 1 | ||||
| -rw-r--r-- | templates/web/bristol/maps/bristol.html | 1 | ||||
| -rwxr-xr-x | templates/web/fixmystreet.com/about/privacy.html | 53 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/header_extra.html | 2 |
9 files changed, 62 insertions, 22 deletions
diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html index 7fe1a10d3..7cc45f80f 100644 --- a/templates/web/base/admin/category_edit.html +++ b/templates/web/base/admin/category_edit.html @@ -19,7 +19,7 @@ [% END %] </p> -<form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> +<form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" id="category_edit"> <p><strong>[% loc('Category:') %] </strong>[% contact.category | html %] <input type="hidden" name="category" value="[% contact.category | html %]" > <input type="hidden" name="token" value="[% csrf_token %]" > @@ -47,6 +47,15 @@ [% END %] </p> + [% IF c.cobrand.moniker != 'zurich' %] + <p [% 'class=hidden' UNLESS contact.get_extra_metadata('inspection_required') %]> + <label> + [% loc('Reputation threshold:') %] + <input type="text" name="reputation_threshold" id="reputation_threshold" value="[% contact.get_extra_metadata('reputation_threshold') | html %]" size="30"> + </label> + </p> + [% END %] + <p><strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40"></textarea> [% IF body.can_be_devolved %] diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html index 1dfd35cee..5adc200a1 100644 --- a/templates/web/base/admin/user-form.html +++ b/templates/web/base/admin/user-form.html @@ -110,6 +110,14 @@ </label> [% END %] </li> + <li> + <div class="admin-hint"> + <p> + [% loc("Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors.") %] + </p> + </div> + [% loc('Reputation:') %] [% user.get_extra_metadata('reputation') %] + </li> [% END %] [% IF c.user.is_superuser %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 20982c30c..469ee5bc5 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -126,7 +126,7 @@ %] <div class="moderate-display segmented-control" role="menu"> [% IF permissions.moderate %] - <a class="btn" id="moderate-report" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> + <a class="js-moderate btn" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> [% END %] [% IF !hide_inspect_button AND permissions.keys.grep('report_inspect|report_edit_category|report_edit_priority').size %] <a class="btn" href="/report/[% problem.id %]/inspect#side-inspect" role="menuitem"> diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html index 5279829e9..f27ed8da5 100644 --- a/templates/web/base/report/display_tools.html +++ b/templates/web/base/report/display_tools.html @@ -3,7 +3,7 @@ [% IF c.user_exists AND c.cobrand.users_can_hide AND c.user.belongs_to_body( problem.bodies_str ) %] <li><form method="post" action="/report/delete/[% problem.id %]" id="remove-from-site-form"> <input type="hidden" name="token" value="[% csrf_token %]"> - <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" value="[% loc('Remove from site') %]"> + <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site" value="[% loc('Remove from site') %]"> </form></li> [% ELSIF c.cobrand.moniker != 'zurich' %] <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse' ) %]</a></li> @@ -43,7 +43,9 @@ <fieldset> <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label> <div class="form-txt-submit-box"> + [% IF NOT c.user_exists %] <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30" placeholder="[% loc('Your email') %]"> + [% END %] <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> </div> <input type="hidden" name="token" value="[% csrf_token %]"> diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html index 0c85c132b..7c2c39eb2 100644 --- a/templates/web/base/report/update.html +++ b/templates/web/base/report/update.html @@ -9,7 +9,7 @@ [% IF moderating; original_update = update.moderation_original_data %] <form method="post" action="/moderate/report/[% problem.id %]/update/[% update.id %]"> <input type="hidden" name="token" value="[% csrf_token %]"> - <input type="button" class="btn moderate moderate-display" value="Moderate this update"> + <input type="button" class="btn js-moderate moderate-display" value="Moderate this update"> <div class="moderate-edit"> <label><input type="checkbox" class="hide-document" name="update_hide"> Hide update completely?</label> diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html deleted file mode 100644 index cf8fa7301..000000000 --- a/templates/web/bristol/footer_extra_js.html +++ /dev/null @@ -1 +0,0 @@ -<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> diff --git a/templates/web/bristol/maps/bristol.html b/templates/web/bristol/maps/bristol.html index 42cb86bf2..7a4a5fbcf 100644 --- a/templates/web/bristol/maps/bristol.html +++ b/templates/web/bristol/maps/bristol.html @@ -1,6 +1,5 @@ [% map_js = BLOCK %] <script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script> -<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-bristol.js') %]"></script> diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html index 2492eee89..8b06d8726 100755 --- a/templates/web/fixmystreet.com/about/privacy.html +++ b/templates/web/fixmystreet.com/about/privacy.html @@ -75,7 +75,9 @@ the cookies and services that this site can use. <p>We use Google Analytics to collect information about how people use this site. We do this to make sure it’s meeting its users’ needs and to understand -how we could do it better. Google Analytics stores information such as what +how we could do it better. + +<p>Google Analytics stores information such as what pages you visit, how long you are on the site, how you got here, what you click on, and information about your web browser. IP addresses are masked (only a portion is stored) and personal information is only reported in aggregate. We @@ -83,18 +85,25 @@ do not allow Google to use or share our analytics data for any purpose besides providing us with analytics information, and we recommend that any user of Google Analytics does the same. -<p>If you’re unhappy with data about your visit to be used in this way, you can -install the <a href="http://tools.google.com/dlpage/gaoptout">official browser -plugin for blocking Google Analytics</a>. - -<p>The cookies set by Google Analytics are as follows: - -<table cellpadding=5> -<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> -<tr><td>_ga</td><td>Used to distinguish users</td><td>2 years</td></tr> -<tr><td>_gat</td><d>Used to throtle request rate</td><td>10 minutes</td></tr> -<tr><td>__utmx / __utmxx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> -</table> +<p>We have also enabled the Advertising Features of Google +Analytics. In particular, we use <b>Demographics and Interest +reporting</b> to identify trends in the types of users visiting our +site, which may be used for internal reporting and improvement of +the site content. + +<p>In technical speak, this allows Google to collect data about your +traffic via Google +<a href="https://www.google.com/policies/technologies/types/">advertising +cookies</a> and +<a href="https://www.google.com/policies/privacy/key-terms/#toc-terms-identifier">anonymous +identifiers</a>, in addition to data collected through a standard +Google Analytics implementation. Regardless of the source of the +data, we strictly adhere to +<a href="https://support.google.com/analytics/answer/2700409">Google’s +policy requirements</a> in our treatment of your data. We do not +facilitate the merging of personally-identifiable information with +non-personally identifiable information collected through any Google +advertising product or feature. <h4>Google’s Official Statement about Analytics Data</h4> @@ -115,8 +124,22 @@ this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p> -<p><a href="https://www.mysociety.org/privacy-online/">More general information -on how third party services work</a></p> +<h3>Opting out</h3> +<p>If you’re unhappy with the idea of sharing the fact you +visited our site (and any other sites) with Google, you can +<a href="https://tools.google.com/dlpage/gaoptout/">install the +official browser plugin for blocking Google Analytics</a>. + +<p>If you want to disable advertising-based tracking, you can +<a href="https://www.google.com/settings/ads">adjust your Google Ads +Settings</a>, or opt out of advertising-based tracking across a +number of providers in one go using the +<a href="http://www.networkadvertising.org/choices/">Network +Advertising Initiative’s opt-out form</a>. + +<p>Rest assured, we only track usage data for one reason: to help us +understand how we can make the site work better for you, our +users. <h2>Credits</h2> diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 1bccf08d1..4ea87a5e1 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -20,7 +20,7 @@ [% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND not admin AND NOT c.req.header('User-Agent').match('Google Page Speed') %] <script src="//www.google-analytics.com/cx/api.js?experiment=ZwMlZkAhSbK_tP_QG64QrQ"></script> <script nonce="[% csp_nonce %]"> -var variation = cxApi.chooseVariation(), +var variation = typeof cxApi !== "undefined" ? cxApi.chooseVariation() : 0, docElement = document.documentElement, className = docElement.className; if (!/about\/council/.test(location.pathname)) { |