diff options
47 files changed, 104 insertions, 82 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index fd70ffda8..769a6bb8f 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -12,6 +12,7 @@ use Memcached; use mySociety::Email; use mySociety::Random qw(random_bytes); use FixMyStreet::Map; +use Utils; use Path::Class; use URI; @@ -388,10 +389,9 @@ sub send_email_cron { $sig = Encode::decode('utf8', $sig); $params->{_parameters_}->{signature} = $sig; - $tt->process( 'site_name.txt', $params, \$site_name ); - $site_name = Encode::decode('utf8', $site_name); - my $site_title = $cobrand ? $cobrand->site_title : ''; - $params->{_parameters_}->{site_name} = $site_name || $site_title; + $tt->process( 'site-name.txt', $params, \$site_name ); + $site_name = Utils::trim_text(Encode::decode('utf8', $site_name)); + $params->{_parameters_}->{site_name} = $site_name; $params->{_line_indent} = ''; my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) }; diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index c20a6754a..88a49f6c9 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -112,9 +112,10 @@ sub load_problem_or_display_error : Private { ); } elsif ( $problem->non_public ) { if ( !$c->user || $c->user->id != $problem->user->id ) { + my $site_name = Utils::trim_text($c->render_fragment('site-name.html')); $c->detach( '/page_error_403_access_denied', - [ sprintf(_('That report cannot be viewed on %s.'), $c->cobrand->site_title) ] # + [ sprintf(_('That report cannot be viewed on %s.'), $site_name) ] # ); } } diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index ec7a8a81d..7f1fba67a 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -146,14 +146,6 @@ Can be specified in template. sub enter_postcode_text { } -=head2 site_title - -The name of the site - -=cut - -sub site_title { return 'FixMyStreet'; } - =head2 set_lang_and_domain my $set_lang = $cobrand->set_lang_and_domain( $lang, $unicode, $dir ) diff --git a/perllib/FixMyStreet/Cobrand/FixMindelo.pm b/perllib/FixMyStreet/Cobrand/FixMindelo.pm index fd3a55c6c..59debf157 100644 --- a/perllib/FixMyStreet/Cobrand/FixMindelo.pm +++ b/perllib/FixMyStreet/Cobrand/FixMindelo.pm @@ -4,8 +4,6 @@ use base 'FixMyStreet::Cobrand::Default'; use strict; use warnings; -sub site_title { return 'FixMindelo'; } - sub country { return 'CV'; } diff --git a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm index 98c157aef..60f98dd47 100644 --- a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm +++ b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm @@ -9,11 +9,6 @@ use mySociety::MaPit; use FixMyStreet::Geocode::FixaMinGata; use DateTime; -sub site_title { - my ($self) = @_; - return 'FixaMinGata'; -} - sub country { return 'SE'; } diff --git a/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm b/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm index ebeb15fbb..f263df4cc 100644 --- a/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm +++ b/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm @@ -4,8 +4,6 @@ use base 'FixMyStreet::Cobrand::Default'; use strict; use warnings; -sub site_title { return 'MakeMyIsland'; } - sub country { return 'MV'; } diff --git a/perllib/FixMyStreet/Cobrand/SeeSomething.pm b/perllib/FixMyStreet/Cobrand/SeeSomething.pm index 5e6d3a8cd..775ba770b 100644 --- a/perllib/FixMyStreet/Cobrand/SeeSomething.pm +++ b/perllib/FixMyStreet/Cobrand/SeeSomething.pm @@ -9,8 +9,6 @@ sub council_area { return 'West Midlands'; } sub council_name { return 'See Something Say Something'; } sub council_url { return 'seesomething'; } sub area_types { [ 'MTD' ] } -sub site_title { return 'See Something, Say Something'; } - sub site_restriction { my $self = shift; diff --git a/perllib/FixMyStreet/Cobrand/ZeroTB.pm b/perllib/FixMyStreet/Cobrand/ZeroTB.pm index 087bf0912..cdf4e5ad4 100644 --- a/perllib/FixMyStreet/Cobrand/ZeroTB.pm +++ b/perllib/FixMyStreet/Cobrand/ZeroTB.pm @@ -4,8 +4,6 @@ use base 'FixMyStreet::Cobrand::Default'; use strict; use warnings; -sub site_title { return 'ZeroTB'; } - sub enter_postcode_text { return _ ('Enter a nearby street name and area, postal code or district in Delhi'); } sub country { diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm index 646967bfc..63a91697d 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm @@ -92,8 +92,6 @@ sub send_questionnaires_period { . $row->user->email . "\n" if $params->{verbose}; - $h{site_name} = $cobrand->site_title(); - my $result = FixMyStreet::App->send_email_cron( { _template_ => $template, 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-brent.txt index 37adde4df..37adde4df 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/fixmystreet/submit-brent.txt 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/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/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/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/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/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/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/harrogate/header.html b/templates/web/harrogate/header.html index 3d69fbac6..a1c0ba38a 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/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/harrogate/static/privacy.html b/templates/web/harrogate/static/privacy.html index 0107d0873..7f0f090e4 100755 --- a/templates/web/harrogate/static/privacy.html +++ b/templates/web/harrogate/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/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/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/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/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/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 |