diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-07-31 12:01:27 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-07-31 12:21:33 +0100 |
| commit | 87543f78383eaab0d78d0fadc1655e39f9335517 (patch) | |
| tree | 3b652a2bbd1c08118cd0ae06ba93de252f490abc /templates | |
| parent | 939c6d6de069654fcbcb82722de5d71fd8cb1622 (diff) | |
Move Latin-char-specific name check to cobrand.
Also move some UK-specific code in the same function.
The specific code is still tested in report_new.t.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/barnet/header.html | 2 | ||||
| -rw-r--r-- | templates/web/bromley/header.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet-uk-councils/header_extra.html | 1 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/header_extra.html | 3 | ||||
| -rw-r--r-- | templates/web/harrogate/header.html | 2 | ||||
| -rw-r--r-- | templates/web/hart/header.html | 2 | ||||
| -rw-r--r-- | templates/web/oxfordshire/header.html | 1 | ||||
| -rw-r--r-- | templates/web/stevenage/header.html | 1 | ||||
| -rw-r--r-- | templates/web/warwickshire/header.html | 1 |
9 files changed, 13 insertions, 2 deletions
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 0227ceff8..101d444a7 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -33,6 +33,8 @@ [% 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> + [% PROCESS 'header_extra.html' %] + </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="barnet-wrapper"> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 4f885f513..9559592ff 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -40,6 +40,8 @@ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico"> + [% PROCESS 'header_extra.html' %] + </head> <body class="[% bodyclass | html IF bodyclass %]"> [%# ie_wrapper is to prevent a horizontal scrollbar in IE7, it appears (from Bromley site) %] diff --git a/templates/web/fixmystreet-uk-councils/header_extra.html b/templates/web/fixmystreet-uk-councils/header_extra.html new file mode 100644 index 000000000..9e614f177 --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/header_extra.html @@ -0,0 +1 @@ +<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 1cce668a5..6d3474c23 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,5 +1,6 @@ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/fixmystreet.com/favicon.ico"> -<script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script> +<script src="[% start %][% version('/js/jquery.cookie.min.js') %]"></script> +<script src="[% start %][% version('/cobrands/fixmystreet.com/js.js') %]"></script> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index a1c0ba38a..e40a38d94 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -31,7 +31,7 @@ <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> [% END %] - [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + [% PROCESS 'header_extra.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index dcc202b5a..c2d363010 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -42,6 +42,8 @@ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico"> + [% PROCESS 'header_extra.html' %] + </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 0bbdaf353..bc52a0720 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -26,6 +26,7 @@ [% extra_js %] [% INCLUDE 'tracking_code.html' %] + [% PROCESS 'header_extra.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 0b3171808..155b35b64 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -24,6 +24,7 @@ [% extra_js %] [% INCLUDE 'tracking_code.html' %] + [% PROCESS 'header_extra.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 1d52b5546..274a78ce7 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -32,6 +32,7 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] + [% PROCESS 'header_extra.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] |