diff options
Diffstat (limited to 'templates')
35 files changed, 51 insertions, 43 deletions
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 |