diff options
Diffstat (limited to 'templates')
72 files changed, 680 insertions, 181 deletions
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 315411fb4..0ab29e412 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -3,7 +3,7 @@ Subject: Problem Report: <?=$values['title']?> Dear <?=$values['bodies_name']?>, <?=$values['missing']?><?=$values['multiple']?>A user of -FixMyStreet has submitted the following report +<?=$values['site_name']?> has submitted the following report of a local problem that they believe might require your attention. <?=$values['fuzzy']?>, or to provide an update on the problem, @@ -31,13 +31,6 @@ Replies to this email will go to the user who submitted the problem. <?=$values['signature']?> -This message was sent via FixMyStreet, a project of UKCOD, registered charity -number 1076346. If there is a more appropriate email address for messages about -<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>. -This will help improve the service for local people. We -also welcome any other feedback you may have. - -FixMyStreet is now available for full integration into council -websites, making life easier for both you and your residents. -Read more here: https://www.fixmystreet.com/council - +If there is a more appropriate email address for messages about +<?=$values['category_footer']?>, please let us know. This will help improve the +service for local people. We also welcome any other feedback you may have. diff --git a/templates/email/default/submit-brent.txt b/templates/email/fixmystreet/submit-oxfordshire.txt index 37adde4df..23a8504ee 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/fixmystreet/submit-oxfordshire.txt @@ -33,7 +33,7 @@ Replies to this email will go to the user who submitted the problem. This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about -<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>. +<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>. This will help improve the service for local people. We also welcome any other feedback you may have. diff --git a/templates/email/fixmystreet/submit.txt b/templates/email/fixmystreet/submit.txt new file mode 100644 index 000000000..315411fb4 --- /dev/null +++ b/templates/email/fixmystreet/submit.txt @@ -0,0 +1,43 @@ +Subject: Problem Report: <?=$values['title']?> + +Dear <?=$values['bodies_name']?>, + +<?=$values['missing']?><?=$values['multiple']?>A user of +FixMyStreet has submitted the following report +of a local problem that they believe might require your attention. + +<?=$values['fuzzy']?>, or to provide an update on the problem, +please visit the following link: + + <?=$values['url']?> + +<?=$values['has_photo']?>---------- + +Name: <?=$values['name']?> + +Email: <?=$values['email']?> + +<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?> + +Details: <?=$values['detail']?> + +<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?> + +Longitude: <?=$values['longitude']?> + +<?=$values['closest_address']?>---------- + +Replies to this email will go to the user who submitted the problem. + +<?=$values['signature']?> + +This message was sent via FixMyStreet, a project of UKCOD, registered charity +number 1076346. If there is a more appropriate email address for messages about +<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>. +This will help improve the service for local people. We +also welcome any other feedback you may have. + +FixMyStreet is now available for full integration into council +websites, making life easier for both you and your residents. +Read more here: https://www.fixmystreet.com/council + diff --git a/templates/email/harrogate/submit.txt b/templates/email/harrogate/submit.txt new file mode 100644 index 000000000..87df45c0c --- /dev/null +++ b/templates/email/harrogate/submit.txt @@ -0,0 +1,43 @@ +Subject: Problem Report: <?=$values['title']?> + +Dear <?=$values['bodies_name']?>, + +<?=$values['missing']?><?=$values['multiple']?>A user of +FixMyStreet has submitted the following report +of a local problem that they believe might require your attention. + +<?=$values['fuzzy']?>, or to provide an update on the problem, +please visit the following link: + + <?=$values['url']?> + +<?=$values['has_photo']?>---------- + +Name: <?=$values['name']?> + +Email: <?=$values['email']?> + +<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?> + +<?=$values['detail']?> <?=$values['additional_information']?> + +<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?> + +Longitude: <?=$values['longitude']?> + +<?=$values['closest_address']?>---------- + +Replies to this email will go to the user who submitted the problem. + +<?=$values['signature']?> + +This message was sent via FixMyStreet, a project of UKCOD, registered charity +number 1076346. If there is a more appropriate email address for messages about +<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>. +This will help improve the service for local people. We +also welcome any other feedback you may have. + +FixMyStreet is now available for full integration into council +websites, making life easier for both you and your residents. +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ + diff --git a/templates/email/fixamingata/submit-brent.txt b/templates/email/oxfordshire/submit.txt index 37adde4df..23a8504ee 100644 --- a/templates/email/fixamingata/submit-brent.txt +++ b/templates/email/oxfordshire/submit.txt @@ -33,7 +33,7 @@ Replies to this email will go to the user who submitted the problem. This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about -<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>. +<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>. This will help improve the service for local people. We also welcome any other feedback you may have. diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 7b296c208..0e9bbfa42 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -30,7 +30,7 @@ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/barnet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Barnet Council FixMyStreet' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> </head> diff --git a/templates/web/barnet/report/new/councils_text_all.html b/templates/web/barnet/report/new/councils_text_all.html index 20152928b..ae02f7647 100644 --- a/templates/web/barnet/report/new/councils_text_all.html +++ b/templates/web/barnet/report/new/councils_text_all.html @@ -1,4 +1,4 @@ <p> All the information you provide here will be sent to the <strong>relevant department</strong>. -[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] +[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] </p> diff --git a/templates/web/barnet/site-name.html b/templates/web/barnet/site-name.html new file mode 100644 index 000000000..78563bdf3 --- /dev/null +++ b/templates/web/barnet/site-name.html @@ -0,0 +1 @@ +Barnet Council FixMyStreet diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html index ad0594146..a039f8208 100644 --- a/templates/web/base/admin/bodies.html +++ b/templates/web/base/admin/bodies.html @@ -9,6 +9,13 @@ contacts (such as an email address) to which reports are sent.') %] </p> [% ELSE %] + + [% IF c.config.STAGING_SITE and !c.config.SEND_REPORTS_ON_STAGING %] + <p class="fms-admin-warning"> + [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>SEND_REPORTS_ON_STAGING</code></a>") %] + </p> + [% END %] + <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('Name') %]</th> diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index e67cb2b07..cd87a5af8 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -47,6 +47,10 @@ <br> [% loc("Add a contact using the form below.") %] </p> +[% ELSIF c.config.STAGING_SITE and !c.config.SEND_REPORTS_ON_STAGING %] + <p class="fms-admin-warning"> + [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>SEND_REPORTS_ON_STAGING</code></a>") %] + </p> [% END %] <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> @@ -61,7 +65,7 @@ </tr> [% WHILE ( cat = contacts.next ) %] <tr [% IF cat.deleted %]class="is-deleted"[% END %]> - <td class="contact-category"><a href="[% c.uri_for( 'body_edit', body_id, cat.category ) %]">[% cat.category %]</a> + <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a> <br>[% cat.email | html %]</td> <td> [% loc('Confirmed') %]: diff --git a/templates/web/base/admin/body_edit.html b/templates/web/base/admin/category_edit.html index ef7a0a11c..ef7a0a11c 100644 --- a/templates/web/base/admin/body_edit.html +++ b/templates/web/base/admin/category_edit.html diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html index 0b29590e4..211d41f31 100644 --- a/templates/web/base/admin/config_page.html +++ b/templates/web/base/admin/config_page.html @@ -39,7 +39,10 @@ running version <strong>[% git_version || 'unknown' %]</strong>. [% INCLUDE with_cobrand value="ADMIN_BASE_URL" cob=c.cobrand.admin_base_url %] [% INCLUDE subsection heading="Display" %] -[% INCLUDE just_value value="Site title" conf = c.cobrand.site_title %] +<tr> + <td>Site title</td> + <td colspan=2>[% PROCESS 'site-name.html' -%]</td> +</tr> [% allowed_conf = FOR k IN c.config.ALLOWED_COBRANDS %] [% IF k.keys %][% k.items.join(':') %][% ELSE %][% k %][% END %] [%- ',' IF NOT loop.last %] diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index 17f7bd22a..c9d2b8deb 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -1,7 +1,7 @@ [% INCLUDE 'admin/header.html' title=loc('Summary') -%] <div class="fms-admin-info fms-admin-floated"> -This is the administration interface for [% c.cobrand.site_title %]. If you +This is the administration interface for [% PROCESS 'site-name.html' -%]. If you need any help or guidance, there is <a href="http://fixmystreet.org/">plenty of online documentation</a>. The FixMyStreet Platform is <a href="https://github.com/mysociety/fixmystreet">actively supported</a> by diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index dbe7d9ffd..804be9603 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -27,7 +27,7 @@ } ); - PROCESS "maps/${map.type}.html"; + PROCESS "maps/${map.type}.html" around_page = 1; SET bodyclass = 'mappage'; SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; @@ -53,9 +53,7 @@ [% IF c.cobrand.moniker != 'emptyhomes' %] <p id='sub_map_links'> - [% IF c.cobrand.moniker == 'zurich' %] - <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> - [% END %] + [% map_sub_links %] [% IF c.req.params.no_pins %] <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a> [% ELSE %] diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html index 5f2861aa3..b4170c23e 100644 --- a/templates/web/base/auth/change_password.html +++ b/templates/web/base/auth/change_password.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title = loc('Change password') %] +[% INCLUDE 'header.html', title = loc('Change password'), bodyclass = 'authpage' %] <h1>[% loc('Change password') %]</h1> diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index 49b649eca..16098b7f5 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -42,5 +42,5 @@ <title> [% "$title :: " | html IF title %] - [% site_title || 'FixMyStreet' %] + [% PROCESS 'site-name.html' -%] </title> diff --git a/templates/web/base/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html index 55046ce4a..e1e07a8d7 100755 --- a/templates/web/base/faq/faq-en-gb.html +++ b/templates/web/base/faq/faq-en-gb.html @@ -5,7 +5,7 @@ <ul class="plain-list"> <li><strong>Frequently Asked Questions</strong></li> <li><a href="/privacy">Privacy and cookies</a></li> - <li><a href="/contact">Contact [% c.cobrand.site_title %]</a></li> + <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li> </ul> </aside> </div> @@ -15,15 +15,15 @@ <dl> <dt>What is this site?</dt> - <dd>[% c.cobrand.site_title %] is a site to help people report to their + <dd>[% PROCESS 'site-name.html' -%] is a site to help people report to their local authority, view, or discuss local issues they’ve found, by simply locating them on a map.</dd> - <dt>How do I get in touch with [% c.cobrand.site_title %]?</dt> + <dt>How do I get in touch with [% PROCESS 'site-name.html' -%]?</dt> <dd>Here’s our <a href="/contact">contact page</a>.</dd> - <dt>What sort of problems should I report with [% c.cobrand.site_title %]?</dt> - <dd>This depends upon the precise purpose of [% c.cobrand.site_title %]; + <dt>What sort of problems should I report with [% PROCESS 'site-name.html' -%]?</dt> + <dd>This depends upon the precise purpose of [% PROCESS 'site-name.html' -%]; in the UK, FixMyStreet is primarily for reporting things which are <strong>broken or dirty or damaged or dumped, and need fixing, cleaning or clearing</strong>, such as: @@ -38,8 +38,8 @@ </ul> </dd> - <dt>What isn’t [% c.cobrand.site_title %] for?</dt> - <dd>[% c.cobrand.site_title %] is not a way of getting in touch with your + <dt>What isn’t [% PROCESS 'site-name.html' -%] for?</dt> + <dd>[% PROCESS 'site-name.html' -%] is not a way of getting in touch with your authority for all issues – please use this site only for problems such as the above. We often route problem reports via cleansing services or highways and so using this site for other matters may result in a delay in @@ -75,9 +75,9 @@ a registered charity, so if you want to make a contribution, <a href="https://www.mysociety.org/donate/">please do</a>.</dd> - <dt>Can I use [% c.cobrand.site_title %] on my mobile?</dt> + <dt>Can I use [% PROCESS 'site-name.html' -%] on my mobile?</dt> <dd> - <p>The [% c.cobrand.site_title %] website will already work on your mobile + <p>The [% PROCESS 'site-name.html' -%] website will already work on your mobile phone, adapting to the size of your screen automatically.</p> </dd> </dl> @@ -90,18 +90,18 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> - <dt>I’m from an authority, can we have [% c.cobrand.site_title %] + <dt>I’m from an authority, can we have [% PROCESS 'site-name.html' -%] on our website?</dt> <dd>Quite possibly – contact the people who run this site.</dd> <dt>Do you remove silly or illegal content?</dt> - <dd>[% c.cobrand.site_title %] is not responsible for the content and + <dd>[% PROCESS 'site-name.html' -%] is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any problems or updates which we consider to be inappropriate upon being informed by a user of the site.</dd> <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep [% c.cobrand.site_title %] locally focused, so restrict + <dd>We want to keep [% PROCESS 'site-name.html' -%] locally focused, so restrict the ability to move radically between areas. The map on Your Reports will let you see all the reports you’ve made, wherever they are. If you’re from the authority then the emailed version of the problem @@ -111,7 +111,7 @@ to update the address or addresses we use.</dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> - <dt>Who built [% c.cobrand.site_title %]?</dt> + <dt>Who built [% PROCESS 'site-name.html' -%]?</dt> <dd>This will depend upon the installation of the FixMyStreet Platform, who should create their own <code>faq/</code> template in their cobrand directory to replace this default one. The FixMyStreet Platform was diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index a14443b71..669055a1b 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -42,6 +42,9 @@ ok: '[% loc('OK') | replace("'", "\\'") %]', map: '[% loc('MAP') | replace("'", "\\'") %]', + map_map: '[% loc('Map') | replace("'", "\\'") %]', + map_satellite: '[% loc('Satellite') | replace("'", "\\'") %]', + permalink: '[% loc('Permalink') | replace("'", "\\'") %]', report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 35c046b55..919ae073f 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -9,7 +9,15 @@ <![endif]--> [% END %] +[% map_sub_links = BLOCK %] +<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a> +[% END %] + [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] +[% UNLESS around_page %] +<p id="sub_map_links"> + [% map_sub_links %] +</p> +[% END %] [% END %] - diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index 928b61041..6b15cbef9 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -11,14 +11,16 @@ <div class="form-field"> <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + [% IF meta.variable != 'false' %] + [% IF meta.exists('values') + <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values.value.value %] + <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + [% END %] + </select> + [% ELSE %] + <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] </div> [%- END %] diff --git a/templates/web/base/report/new/councils_extra_text.html b/templates/web/base/report/new/councils_extra_text.html index 1088b9f8b..b77758b01 100644 --- a/templates/web/base/report/new/councils_extra_text.html +++ b/templates/web/base/report/new/councils_extra_text.html @@ -1 +1 @@ -[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] +[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] diff --git a/templates/web/base/report/new/councils_text_some.html b/templates/web/base/report/new/councils_text_some.html index 8d4768612..70cb97617 100644 --- a/templates/web/base/report/new/councils_text_some.html +++ b/templates/web/base/report/new/councils_text_some.html @@ -7,9 +7,8 @@ [%- '.' IF loop.last %] [% END %] -[% - loc('The subject and details of the problem will be public, plus your name if you give us permission.'); -%] +[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] + [% nget( "We do <strong>not</strong> yet have details for the other council that covers this location.", diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index ec05e127e..cee0244c7 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -15,7 +15,7 @@ loc('the local council') ); %] - [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] + [% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] </p> [% ELSE %] [% PROCESS 'report/new/councils_text.html' %] diff --git a/templates/web/base/site-name.html b/templates/web/base/site-name.html new file mode 100644 index 000000000..4e9a24bb9 --- /dev/null +++ b/templates/web/base/site-name.html @@ -0,0 +1 @@ +FixMyStreet diff --git a/templates/web/base/static/privacy.html b/templates/web/base/static/privacy.html index 55d8531f4..36720207b 100755 --- a/templates/web/base/static/privacy.html +++ b/templates/web/base/static/privacy.html @@ -7,7 +7,7 @@ <ul class="plain-list"> <li><a href="/faq">Frequently Asked Questions</a></li> <li><strong>Privacy and cookies</strong></li> - <li><a href="/contact">Contact [% c.cobrand.site_title %]</a></li> + <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li> </ul> </aside> </div> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 7d7e21a39..4f885f513 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -20,7 +20,7 @@ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/bromley/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = "London Borough of Bromley - Report a problem in Bromley’s streets or parks" %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] <script type="text/javascript"> var _gaq = _gaq || []; diff --git a/templates/web/bromley/site-name.html b/templates/web/bromley/site-name.html new file mode 100644 index 000000000..2ae8d10d4 --- /dev/null +++ b/templates/web/bromley/site-name.html @@ -0,0 +1 @@ +London Borough of Bromley - Report a problem in Bromley’s streets or park diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template index 04aedc188..1ca60f4b7 100644 --- a/templates/web/eastsussex/header.html.template +++ b/templates/web/eastsussex/header.html.template @@ -11,7 +11,7 @@ <![endif]--> <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = c.cobrand.site_title %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index fea973468..de1ecec7b 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -9,7 +9,7 @@ <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css/css.css') %]"> - [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] + [% INCLUDE 'common_header_tags.html' %] </head> <body> diff --git a/templates/web/emptyhomes/site-name.html b/templates/web/emptyhomes/site-name.html new file mode 100644 index 000000000..7fd286328 --- /dev/null +++ b/templates/web/emptyhomes/site-name.html @@ -0,0 +1 @@ +[% loc('Report Empty Homes') %] diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index db3ba546e..3cdc093cb 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -24,7 +24,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FiksGataMi' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] diff --git a/templates/web/fiksgatami/site-name.html b/templates/web/fiksgatami/site-name.html new file mode 100644 index 000000000..c6f8b5562 --- /dev/null +++ b/templates/web/fiksgatami/site-name.html @@ -0,0 +1 @@ +FiksGataMi diff --git a/templates/web/fixamingata/site-name.html b/templates/web/fixamingata/site-name.html new file mode 100644 index 000000000..022606e78 --- /dev/null +++ b/templates/web/fixamingata/site-name.html @@ -0,0 +1 @@ +FixaMinGata diff --git a/templates/web/fixmindelo/site-name.html b/templates/web/fixmindelo/site-name.html new file mode 100644 index 000000000..da8217a7b --- /dev/null +++ b/templates/web/fixmindelo/site-name.html @@ -0,0 +1 @@ +FixMindelo diff --git a/templates/web/fixmybarangay/header.html b/templates/web/fixmybarangay/header.html index 06a8b71a1..18388649b 100644 --- a/templates/web/fixmybarangay/header.html +++ b/templates/web/fixmybarangay/header.html @@ -22,7 +22,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmybarangay/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', site_title = 'FixMyBarangay', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] [% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_body); %] diff --git a/templates/web/fixmybarangay/site-name.html b/templates/web/fixmybarangay/site-name.html new file mode 100644 index 000000000..075d881b5 --- /dev/null +++ b/templates/web/fixmybarangay/site-name.html @@ -0,0 +1 @@ +FixMyBarangay diff --git a/templates/web/fixmystreet-uk-councils/static/privacy.html b/templates/web/fixmystreet-uk-councils/static/privacy.html new file mode 100644 index 000000000..addce1e2d --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/static/privacy.html @@ -0,0 +1,131 @@ +[% INCLUDE 'header.html', + title = loc('Privacy and cookies'), + bodyclass = 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="/faq">Frequently Asked Questions</a></li> + <li><strong>Privacy and cookies</strong></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</div> + +<h1>Privacy, cookies, and third party services</h1> + +<p><strong>Our use of your data, cookies, and external services: what you +should know, and how to opt out if you want to.</strong></p> + +<p>Summary: We care a lot about our users’ privacy. We provide details below, +and we try our hardest to look after the private data that we hold. Like many +other websites, we sometimes use cookies and Google Analytics to help us make +our websites better. These tools are very common and used by many other sites, +but they do have privacy implications, and as a charity concerned with socially +positive uses of the internet, we think it’s important to explain them in full. +If you don’t want to share your browsing activities on mySociety’s sites with +other companies, you can adjust your usage or install opt-out browser plugins. + +<h2>Privacy</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd>If you submit a problem, we pass on your details, and details of +the problem, to the council contact or contacts responsible for the area where +you located the problem, or other relevant body (for example, in most of London +we send reports via the central London Report-It service, who may also publish +the public details of your report). Other than the council, who obviously get +your email address, only people we authorise to view the FixMyStreet +administration interface will be able to see your email address and they will +never use it for anything other than to help administer FixMyStreet. Similarly +with email addresses from updates. We will never give or sell your email +address to anyone else, unless we are obliged to by law. Your name, given in +the name field, will not be published anywhere unless you let us (if you give +your name elsewhere, e.g. in the public details section, it will be publicly +available).</dd> + <dt>Will you send nasty, brutish spam to my email address?</dt> + <dd>Never. We will email you if someone leaves an update on a +problem you’ve reported, and send you a questionnaire email four weeks +after you submit a problem, asking for a status update; we’ll only ever +send you emails in relation to your problem.</dd> + </dl> + +<h2>Cookies</h2> + +<p>To make our service easier or more useful, we sometimes place small data +files on your computer or mobile phone, known as cookies; many websites do +this. We use this information to, for example, remember you have logged in so +you don't need to do that on every page, or to measure how people use the +website so we can improve it and make sure it works properly. Below, we list +the cookies and services that this site can use. + +<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>fixmystreet_app_session</td> + <td nowrap>A random unique identifier</td> + <td>When browser is closed, or four weeks if “Keep me signed in” is ticked</td> +</tr> + +</table> + +<h3>Measuring website usage (Google Analytics)</h3> + +<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 +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 +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>__utma</td><td>Unique anonymous visitor ID</td><td>2 years</td></tr> +<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30 minutes</td></tr> +<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6 months</td></tr> +<tr><td>__utmx</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> + +<h4>Google’s Official Statement about Analytics Data</h4> + +<p>“This website uses Google Analytics, a web analytics service provided by +Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files +placed on your computer, to help the website analyze how users use the site. +The information generated by the cookie about your use of the website +(including your IP address) will be transmitted to and stored by Google on +servers in the United States . Google will use this information for the purpose +of evaluating your use of the website, compiling reports on website activity +for website operators and providing other services relating to website activity +and internet usage. Google may also transfer this information to third parties +where required to do so by law, or where such third parties process the +information on Google’s behalf. Google will not associate your IP address with +any other data held by Google. You may refuse the use of cookies by selecting +the appropriate settings on your browser, however please note that if you do +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> + +<h2>Credits</h2> + +<p>Bits of wording taken from the <a +href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open +Government Licence). + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet.com/around/_report_banner.html b/templates/web/fixmystreet.com/around/_report_banner.html deleted file mode 100755 index 9d0d9bdfe..000000000 --- a/templates/web/fixmystreet.com/around/_report_banner.html +++ /dev/null @@ -1,11 +0,0 @@ -[%# Identical to parent, just with variant0s %] - -<h1 class="big-green-banner variant0"> - [% loc( 'Click map to report a problem' ) %] - [% IF c.cobrand.moniker == 'bromley' %] - <span>Yellow pins show existing reports</span> - [% END %] -</h1> -<a id="skip-this-step" class="variant0" href="[% url_skip %]" rel="nofollow"> - [% loc("Can't see the map? <em>Skip this step</em>") %] -</a> diff --git a/templates/web/fixmystreet.com/around/tabbed_lists.html b/templates/web/fixmystreet.com/around/tabbed_lists.html deleted file mode 100644 index 6a3cdf8a9..000000000 --- a/templates/web/fixmystreet.com/around/tabbed_lists.html +++ /dev/null @@ -1,46 +0,0 @@ -<menu id="problems-nav" class="tab-nav"> - <ul class="variant0"> - <li><a href="#current_tab">[% loc('Problems on the map') %]</a></li> - <li><a href="#current_near_tab">[% loc( 'Problems nearby' ) %]</a></li> - </ul> - <ul class="variant1"> - <li><a href="#reporting">[% loc('Report a problem') %]</a></li> - <li><a href="#current_near_tab">[% loc( 'Problems near here' ) %]</a></li> - </ul> -</menu> - -<div class="variant1"> -<div id="reporting" class="tab"> - <h1>[% loc( 'Click the map to<br/>report a problem' ) %]</h1> - - <a id="skip-this-step" href="[% url_skip %]" rel="nofollow"> - [% loc("Can't see the map? <em>Skip this step</em>") %] - </a> - - <p>Don’t worry if it’s not in precisely the right place,<br/> - you can move the pin afterwards.</p> -</div> -</div> - -<div class="variant0"> -<div id="current_tab" class="tab"> - <ul id="current" class="issue-list-a"> - [% INCLUDE "around/on_map_list_items.html" %] - </ul> -</div> -</div> - -<div id="current_near_tab" class="tab"> - <ul id="current_near" class="issue-list-a"> - [% INCLUDE "around/around_map_list_items.html" %] - </ul> -</div> - -<script> -if (typeof variation !== 'undefined' && variation == 1) { - fixmystreet.initial_hide_pins = true; - $(function(){ - $('#current').insertBefore('#current_near'); - }); -} -</script> diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 65f88be14..27ffc12a1 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,24 +1,3 @@ <script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script> -[%# We are conducting an A/B experiment on the first step of reporting process %] -[% IF page == 'around' %] -<script src="//www.google-analytics.com/cx/api.js?experiment=1gdSSsSMQgy99AsCPeBalg"></script> -<script> -if (window.matchMedia) { - var desktop = window.matchMedia("(min-width: 48em)").matches; - if (desktop) { - var variation = cxApi.chooseVariation(), - docElement = document.documentElement, - className = docElement.className; - docElement.className = className + ' ' + 'variant' + variation; - } -} -</script> -<style> -html .variant1 { display: none !important; } -html.variant1 .variant0 { display: none !important; } -html.variant1 .variant1 { display: block !important; } -</style> -[% END %] - [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/fixmystreet.com/static/privacy.html b/templates/web/fixmystreet.com/static/privacy.html index e7c78384f..addce1e2d 100755 --- a/templates/web/fixmystreet.com/static/privacy.html +++ b/templates/web/fixmystreet.com/static/privacy.html @@ -1,5 +1,5 @@ [% INCLUDE 'header.html', - title = loc('Frequently Asked Questions'), + title = loc('Privacy and cookies'), bodyclass = 'twothirdswidthpage' %] <div class="sticky-sidebar"> diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index 3f3fe5b99..45239073d 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -1,4 +1,5 @@ -[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] +[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %] +[%# should bodyclass='twothirdspage' instead? Need override for Harrogate %] <h1>[% loc('Sign in') %]</h1> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 3d69fbac6..a1c0ba38a 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -24,7 +24,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = c.cobrand.site_title %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html index e5e4aae60..6e4ad9e21 100644 --- a/templates/web/fixmystreet/header_logo.html +++ b/templates/web/fixmystreet/header_logo.html @@ -1 +1 @@ - <a href="/" id="site-logo">[% c.cobrand.site_title | html %]</a> + <a href="/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> diff --git a/templates/web/fixmystreet/header_opengraph.html b/templates/web/fixmystreet/header_opengraph.html index 45e7c246c..d0cd31261 100644 --- a/templates/web/fixmystreet/header_opengraph.html +++ b/templates/web/fixmystreet/header_opengraph.html @@ -1,6 +1,6 @@ <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]"> <meta property="og:title" content="[% title || 'FixMyStreet' %]"> - <meta property="og:site_name" content="[% c.cobrand.site_title %]"> + <meta property="og:site_name" content="[%- PROCESS 'site-name.html' -%]"> [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Report, view, and discuss local street-related problems.">[% END %] <meta property="og:type" content="website"> <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/fms-og_image.png"> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 3534572c6..4f4e7a2a6 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -11,13 +11,6 @@ %] [% map_html %] - - [% IF c.cobrand.moniker == 'zurich' %] - <p id='sub_map_links'> - <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> - </p> - [% END %] - </div> [% IF login_success %] diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html index ae1214c35..48a38435d 100644 --- a/templates/web/fixmystreet/report/new/category_extras.html +++ b/templates/web/fixmystreet/report/new/category_extras.html @@ -9,14 +9,16 @@ [% IF field_errors.$meta_name %] <p class='form-error'>[% field_errors.$meta_name %]</p> [% END -%] - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> - [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% IF meta.variable != 'false' %] + [% IF meta.exists('values') %] + <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values.value %] + <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + [% END %] + </select> + [% ELSE %] + <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% END %] [% END %] [%- END %] diff --git a/templates/web/harrogate/around/intro.html b/templates/web/harrogate/around/intro.html new file mode 100644 index 000000000..53476965d --- /dev/null +++ b/templates/web/harrogate/around/intro.html @@ -0,0 +1,4 @@ + <div id="postcode-intro"> + <h1> Report something in Harrogate district that needs to be fixed, cleaned, or cleared. </h1> + <h2> (like graffiti, fly tipping, broken playground equipment, or street lighting) </h2> + </div> diff --git a/templates/web/harrogate/faq/faq-en-gb.html b/templates/web/harrogate/faq/faq-en-gb.html new file mode 100755 index 000000000..e5c9e5480 --- /dev/null +++ b/templates/web/harrogate/faq/faq-en-gb.html @@ -0,0 +1,134 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</div> + +<h1> Frequently Asked Questions </h1> + +<p>These pages are for reporting things which are broken, dirty, damaged or +dumped, and need fixing, cleaning or clearing: </p> +<ul> + <li>graffiti + <li>flytipping + <li>broken playground equipment + <li>street lighting + <li>potholes + </ul> + <p> + Note that though most of these services are provided by Harrogate Borough Council, + FixMyStreet will forward some categories of issue to North Yorkshire County Council. + </p> + +<dl> + <dt><a name="emergencies"></a>Reporting emergencies (Out of Hours)</dt> + <dd> + <p> Please do not report problems which present an immediate risk to life, + for example missing manhole covers or a fallen lamp column. </p> + <p> Issues reported via the website are only actioned during office hours. + If you require an Out of Hours service please ring our main number + 01423 500600 and a message will direct you to the relevant Council Out of Hours + service. </p> + + </dd> + + <dt>How do I report a problem here?</dt> + <dd>After entering a postcode or location, you are shown +a map of that area. You can view problems already reported in that area, +or report ones of your own by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.</dd> + + <dt>Do you remove silly or illegal content?</dt> + <dd>Harrogate Borough Council and FixMyStreet are not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd> + <p>The FixMyStreet website will already work on your mobile phone, adapting to + the size of your screen automatically. Using an app has some advantages, though + — for example, you can create a report even when you have no network + connection. + <ul> + <li> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a> + <li> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a> + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> + </dd> + + <dt>Can I use these pages to report problems outside of the Harrogate district?</dd> + <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd> + + <dt>The site is powered by FixMyStreet, who are they?</dt> + <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. +The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd> + + <dt>Why does the site use kilometres for measurements?</dt> + <dd>The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep reports locally focused, so we restrict the ability to + move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all + the reports you’ve made, wherever they are.</dd> + + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The mySociety software behind this site is open source, and available +under the GNU Affero GPL software license. You can <a +href="http://github.com/mysociety/fixmystreet">download the +source code</a> and help mySociety develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> + +</dl> + + <h2><a name="privacy"></a>Privacy Questions</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd> +<p>If you submit a problem, your details, and details of the problem, will be +submitted to Harrogate Borough Council, or North Yorkshire County Council, as +appropriate. Other than the council, only people we authorise to view the +FixMyStreet administration interface will be able to see your email address and +they will never use it for anything other than to help administer +FixMyStreet.</p> +<p>We will never give or sell your email address to anyone else, unless we are +obliged to by law. Your name will not be published anywhere unless you let us.</p> +</dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.</dd> + + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html new file mode 100644 index 000000000..116b318a3 --- /dev/null +++ b/templates/web/harrogate/footer.html @@ -0,0 +1,55 @@ + [% IF pagefooter %] + <footer role="content-info"> + [% INCLUDE 'front/footer-marketing.html' %] + </footer> + [% END %] + </div><!-- .content role=main --> + </div><!-- .container --> + [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + + <ul id="main-menu"> + [% selected = c.req.uri.path == '/' %] + <li [% selected ? 'class="menu-item-selected"' : '' %]> + <[% IF selected %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"> + [% loc("Report a problem") %]</[% selected == '/' ? 'span' : 'a' %]></li> + + [% selected = c.req.uri.path == '/my' %] + <li [% selected ? 'class="menu-item-selected"' : '' %]> + <[% IF selected %]span[% ELSE %]a href="/my"[% END %]> + [% loc("Your reports") %]</[% selected ? 'span' : 'a' %]></li> + + [% selected = c.req.uri.path == '/reports/Harrogate' %] + <li [% selected ? 'class="menu-item-selected"' : '' %]> + <[% IF selected %]span[% ELSE %]a href="/reports"[% END %]> + [% loc("All reports") %]</[% selected ? 'span' : 'a' %]></li> + + [% selected = c.req.uri.path == '/alert' %] + <li [% selected ? 'class="menu-item-selected"' : '' %]> + <[% IF selected %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]> + [% loc("Local alerts") %]</[% selected ? 'span' : 'a' %]></li> + + [% selected = c.req.uri.path == '/faq' %] + <li [% selected ? 'class="menu-item-selected"' : '' %]> + <[% IF selected %]span[% ELSE %]a href="/faq"[% END %]> + [% loc("Help") %]</[% selected ? 'span' : 'a' %]></li> + + [% selected = c.req.uri.path == '/privacy' %] + <li id="top-nav-privacy" [% selected ? 'class="menu-item-selected"' : '' %]> + <[% IF selected %]span[% ELSE %]a href="/privacy"[% END %]> + [% loc("Privacy") %]</[% selected ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> +</body> +</html> diff --git a/templates/web/harrogate/front/footer-marketing.html b/templates/web/harrogate/front/footer-marketing.html new file mode 100644 index 000000000..495a17fc5 --- /dev/null +++ b/templates/web/harrogate/front/footer-marketing.html @@ -0,0 +1,19 @@ + <div class="tablewrapper bordered"> + <div id="footer-mobileapps"> + <h4>The FixMyStreet App</h4> + <p> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> + <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" /> + </a> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> + <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" /> + </a> + </p> + </div> + + <div id="footer-help"> + <p> + Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a> + </p> + </div> + </div> diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html new file mode 100644 index 000000000..a1c0ba38a --- /dev/null +++ b/templates/web/harrogate/header.html @@ -0,0 +1,63 @@ +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> + <head> + <meta name="viewport" content="initial-scale=1.0"> + + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> + <meta name="HandHeldFriendly" content="true"> + <meta name="mobileoptimized" content="0"> + + [% INCLUDE 'header_opengraph.html' %] + +[% SET start = c.config.ADMIN_BASE_URL IF admin %] + + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> + [% extra_css %] + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> + <![endif]--> + + <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% extra_js %] + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] + + [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + + </head> + [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] + <body class="[% bodyclass | html IF bodyclass %]"> + + <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + [% INCLUDE 'header_logo.html' %] + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> + + [% IF c.user_exists %] + <div id="user-meta"> + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + </div> + [% END %] + + [% pre_container_extra %] + + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/harrogate/report/new/councils_extra_text.html b/templates/web/harrogate/report/new/councils_extra_text.html new file mode 100644 index 000000000..92dc93452 --- /dev/null +++ b/templates/web/harrogate/report/new/councils_extra_text.html @@ -0,0 +1,10 @@ +<div id="council_responsibilities_note"> +<p> +<b>NB:</b> though we will forward your request as appropriate, +reports for problems managed by North Yorkshire County Council are not shown on this map. +View all problems in that area on +<a href="https://www.fixmystreet.com/reports/North+Yorkshire">FixMyStreet.com</a>. +</p> +</div> + +Do not use this to <a href="/faq#emergencies">report emergencies outside of working hours</a>. diff --git a/templates/web/harrogate/static/privacy.html b/templates/web/harrogate/static/privacy.html new file mode 100755 index 000000000..7f0f090e4 --- /dev/null +++ b/templates/web/harrogate/static/privacy.html @@ -0,0 +1,56 @@ +[% INCLUDE 'header.html', + title = loc('Frequently Asked Questions'), + bodyclass = 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="/faq">Frequently Asked Questions</a></li> + <li><strong>Privacy and cookies</strong></li> + <li><a href="/contact">Contact [%- PROCESS 'site-name.html' -%]</a></li> + </ul> + </aside> +</div> + +<h1>Privacy, cookies, and third party services</h1> + +<p><strong>Our use of your data, cookies, and external services: what you +should know, and how to opt out if you want to.</strong></p> + +<h2>Privacy</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd> + <p>If you submit a problem, your details, and details of the problem, will be + submitted to Harrogate Borough Council, or North Yorkshire County Council, as + appropriate. Other than the council, only people we authorise to view the + FixMyStreet administration interface will be able to see your email address and + they will never use it for anything other than to help administer + FixMyStreet.</p> + <p>We will never give or sell your email address to anyone else, unless we are + obliged to by law. Your name will not be published anywhere unless you let us.</p> + </dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.</dd> + + </dl> + <dl> + +<h2>Cookies</h2> + +<p>To make our service easier or more useful, we sometimes place small data +files on your computer or mobile phone, known as cookies; many websites do +this. We use this information to, for example, remember you have logged in so +you don't need to do that on every page. Below, we list the cookies and +services that this site can use. + +<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>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if “Keep me signed in” is ticked</td></tr> +</table> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index 882d382dd..dcc202b5a 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -11,15 +11,7 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]"> - <meta property="og:title" content="[% title || 'FixMyStreet' %]"> - <meta property="og:site_name" content="[% c.cobrand.site_title %]"> - [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Report, view, and discuss local street-related problems.">[% END %] - <meta property="og:type" content="website"> - <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/fms-og_image.png"> - <meta property="og:image:type" content="image/png"> - <meta property="og:image:width" content="500"> - <meta property="og:image:height" content="500"> + [% INCLUDE 'header_opengraph.html' %] [% SET start = c.config.ADMIN_BASE_URL IF admin %] @@ -33,7 +25,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = c.cobrand.site_title %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] <script type="text/javascript"> $(function(){ diff --git a/templates/web/makemyisland/header_logo.html b/templates/web/makemyisland/header_logo.html index cbe5c13fc..5d8b285dc 100644 --- a/templates/web/makemyisland/header_logo.html +++ b/templates/web/makemyisland/header_logo.html @@ -1,2 +1,2 @@ <a href="http://www.undp.org/" id="united-nations-dp-logo">UNDP</a> - <a href="[% c.config.BASE_URL %]/" id="site-logo">[% c.cobrand.site_title | html %]</a> + <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html -%]</a> diff --git a/templates/web/makemyisland/site-name.html b/templates/web/makemyisland/site-name.html new file mode 100644 index 000000000..3eb903cd1 --- /dev/null +++ b/templates/web/makemyisland/site-name.html @@ -0,0 +1 @@ +MakeMyIsland diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index e287b0ec8..19bb23374 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -22,7 +22,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/oxfordshire/report/new/councils_text_all.html b/templates/web/oxfordshire/report/new/councils_text_all.html index f205418d7..a8c81f39e 100644 --- a/templates/web/oxfordshire/report/new/councils_text_all.html +++ b/templates/web/oxfordshire/report/new/councils_text_all.html @@ -1,5 +1,5 @@ <p> All the information you provide here will be sent to the - <strong>relevant department</strong>. The subject and details of the - problem will be public, plus your name if you give us permission. + <strong>relevant department</strong>. The summary and description + will also be made public, plus your name if you give us permission. </p> diff --git a/templates/web/seesomething/site-name.html b/templates/web/seesomething/site-name.html new file mode 100644 index 000000000..7a3ceec89 --- /dev/null +++ b/templates/web/seesomething/site-name.html @@ -0,0 +1 @@ +See Something, Say Something diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index f53e12c6c..dbcc37866 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -20,7 +20,7 @@ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Stevenage: FixMyStreet' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] </head> diff --git a/templates/web/stevenage/site-name.html b/templates/web/stevenage/site-name.html new file mode 100644 index 000000000..49b12501a --- /dev/null +++ b/templates/web/stevenage/site-name.html @@ -0,0 +1 @@ +Stevenage: FixMyStreet diff --git a/templates/web/warwickshire/front/stats.html b/templates/web/warwickshire/front/stats.html new file mode 100644 index 000000000..57eb4789c --- /dev/null +++ b/templates/web/warwickshire/front/stats.html @@ -0,0 +1 @@ +<!-- stats suppressed at WCC request. Remove this file to reenable --> diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 00cb76799..1d52b5546 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -29,7 +29,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = c.cobrand.site_title %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] </head> diff --git a/templates/web/zerotb/site-name.html b/templates/web/zerotb/site-name.html new file mode 100644 index 000000000..b2c01ff85 --- /dev/null +++ b/templates/web/zerotb/site-name.html @@ -0,0 +1 @@ +ZeroTB diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html index 4cedc9838..771f1e537 100644 --- a/templates/web/zurich/admin/body.html +++ b/templates/web/zurich/admin/body.html @@ -19,7 +19,7 @@ </tr> [% WHILE ( cat = contacts.next ) %] <tr[% IF cat.deleted %] class="is-deleted"[% END %]> - <td><a href="[% c.uri_for( 'body_edit', body_id, cat.category ) %]">[% cat.category %]</a></td> + <td><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a></td> <td>[% cat.email | html %]</td> <td>[% cat.editor %]</td> <td>[% cat.note | html %]</td> diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 5ff031ce2..82bbeba23 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -7,9 +7,6 @@ -%] [% map_html %] - <p id='sub_map_links'> - <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> - </p> </div> [% status_message %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 66a51f162..5376d77f4 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -8,9 +8,6 @@ -%] [% map_html %] - <p id='sub_map_links'> - <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> - </p> </div> [% status_message %] diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index 891c6f1d3..ae1b47712 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -24,7 +24,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Züri wie neu' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script> diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html index 492ccc556..46b003530 100644 --- a/templates/web/zurich/maps/zurich.html +++ b/templates/web/zurich/maps/zurich.html @@ -9,6 +9,15 @@ <![endif]--> [% END %] +[% map_sub_links = BLOCK %] + <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> +[% END %] + [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] +[% UNLESS around_page %] +<p id="sub_map_links"> + [% map_sub_links %] +</p> +[% END %] [% END %] diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html index 670746753..0ece1ca2c 100755 --- a/templates/web/zurich/reports/index.html +++ b/templates/web/zurich/reports/index.html @@ -5,9 +5,6 @@ bodyclass = 'mappage'; %] [% map_html %] - <p id='sub_map_links'> - <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> - </p> </div> <div id="side"> diff --git a/templates/web/zurich/site-name.html b/templates/web/zurich/site-name.html new file mode 100644 index 000000000..d8932b521 --- /dev/null +++ b/templates/web/zurich/site-name.html @@ -0,0 +1 @@ +Züri wie neu |