aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/barnet/header.html2
-rw-r--r--templates/web/bromley/header.html2
-rw-r--r--templates/web/fixmystreet-uk-councils/header_extra.html1
-rw-r--r--templates/web/fixmystreet.com/around/postcode_form.html48
-rw-r--r--templates/web/fixmystreet.com/header_extra.html23
-rw-r--r--templates/web/fixmystreet.com/next_steps.html12
-rw-r--r--templates/web/fixmystreet.com/static/posters.html46
-rw-r--r--templates/web/fixmystreet/header.html16
-rw-r--r--templates/web/harrogate/header.html2
-rw-r--r--templates/web/hart/header.html2
-rw-r--r--templates/web/oxfordshire/header.html1
-rw-r--r--templates/web/stevenage/header.html1
-rw-r--r--templates/web/warwickshire/header.html1
13 files changed, 53 insertions, 104 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/around/postcode_form.html b/templates/web/fixmystreet.com/around/postcode_form.html
deleted file mode 100644
index afb3b66fb..000000000
--- a/templates/web/fixmystreet.com/around/postcode_form.html
+++ /dev/null
@@ -1,48 +0,0 @@
-[%# Identical to parent, but with an extra div and javascript for our homepage A/B test %]
-
-<div id="front-main">
- <div id="front-main-container">
- [% INCLUDE 'around/intro.html' %]
-
- <div id="homepage-ab-test">
- <p><a id="cta-report">Report a problem</a></p>
- <p><a id="cta-view">Or view problems in an area you know</a></p>
- </div>
-
- [%
- question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area');
- %]
- <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
- <label for="pc">[% question %]:</label>
- <div>
- <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]">
- <input type="submit" value="[% loc('Go') %]" id="sub">
- </div>
- [% IF partial_token %]
- <input type="hidden" name="partial" value="[% partial_token.token %]">
- [% END %]
- </form>
- </div>
-</div>
-
-<script type="text/javascript">
-$(function(){
- $('#homepage-ab-test a').on('click', function(e){
- e.preventDefault();
- $('#homepage-ab-test').fadeOut(250, function(){
-
- /* fadeIn() normal form, and focus input */
- $('#postcodeForm').fadeIn(250, function(){
- $('#pc').focus();
- });
-
- /* Can't just fadeIn() because #geolocate_link
- should have { display: inline-block } */
- $('#geolocate_link').css({
- opacity: 0,
- display: 'inline-block'
- }).animate({ opacity: 1 }, 250);
- });
- });
-});
-</script>
diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html
index 71c3bace5..6d3474c23 100644
--- a/templates/web/fixmystreet.com/header_extra.html
+++ b/templates/web/fixmystreet.com/header_extra.html
@@ -1,25 +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>
-
-[%# We are conducting an A/B experiment on the homepage %]
-[% IF c.req.uri.path == '/' %]
-<script src="//www.google-analytics.com/cx/api.js?experiment=cX9Tbz_VRl-cZDM5WVRgTQ"></script>
-<script>
-var variation = cxApi.chooseVariation(),
- docElement = document.documentElement,
- className = docElement.className;
-docElement.className = className + ' ' + 'variant' + variation;
-</script>
-<style>
-html.variant1 #homepage-ab-test {
- display: block;
-}
-html.variant1 #postcodeForm,
-html.variant1 #front-main a#geolocate_link {
- display: none;
-}
-</style>
-[% END %]
+<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/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html
index 1c286827d..5a26a67fe 100644
--- a/templates/web/fixmystreet.com/next_steps.html
+++ b/templates/web/fixmystreet.com/next_steps.html
@@ -12,8 +12,8 @@
[% END %]
<p>[% loc('Download it now, and it’ll be ready to use when you next pick up your phone.') %]</p>
<p class="next-steps__step__cta">
- <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
- <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
+ <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet.com/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
+ <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet.com/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
</p>
</div>
<div class="next-steps__step next-steps__step--social">
@@ -25,18 +25,18 @@
<p>[% loc('You know how to get things fixed - now make sure your friends do too.') %]</p>
[% END %]
<p class="next-steps__step__cta">
- <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
- <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
+ <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet.com/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
+ <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet.com/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
</p>
</div>
<div class="next-steps__step next-steps__step--goodies">
<h2>[% loc('Free FixMyStreet goodies for you!') %]</h2>
<a href="/posters">
- <img src="/cobrands/fixmystreet/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
+ <img src="/cobrands/fixmystreet.com/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
</a>
<p>[% loc('Perfect for civic groups, clubs, and schools.') %]</p>
<p class="next-steps__step__cta">
- <a href="/posters"><img src="/cobrands/fixmystreet/images/next-step-download.png" alt="Download" width="120" height="37"></a>
+ <a href="/posters"><img src="/cobrands/fixmystreet.com/images/next-step-download.png" alt="Download" width="120" height="37"></a>
</p>
</div>
</div>
diff --git a/templates/web/fixmystreet.com/static/posters.html b/templates/web/fixmystreet.com/static/posters.html
index 7d60a0e1d..bcf235fa4 100644
--- a/templates/web/fixmystreet.com/static/posters.html
+++ b/templates/web/fixmystreet.com/static/posters.html
@@ -1,5 +1,5 @@
[% extra_css = BLOCK %]
- <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/posters.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]">
[% END %]
[% INCLUDE header.html
@@ -54,7 +54,7 @@ $("[data-goodielink]").on(click, function(e){
<h2 id="activist-pack">The FMS Activist Pack</h2>
-<img src="/cobrands/fixmystreet/images/pack-general.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-general.jpg" class="pack-preview" alt="">
<p>Everything you need to help spread the word about FixMyStreet. Includes:</p>
@@ -66,11 +66,11 @@ $("[data-goodielink]").on(click, function(e){
<li>Ideas for letting more people know about FixMyStreet</li>
</ul>
-<a href="/cobrands/fixmystreet/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a>
<h2 id="school-pack">Activity Pack for Schools, Brownies, and Scouts</h2>
-<img src="/cobrands/fixmystreet/images/pack-schools.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-schools.jpg" class="pack-preview" alt="">
<p>A special pack with activities suitable for groups of children. Includes:</p>
@@ -80,11 +80,11 @@ $("[data-goodielink]").on(click, function(e){
<li>Ideas for activities</li>
</ul>
-<a href="/cobrands/fixmystreet/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a>
<h2 id="community-pack">Community Group Pack</h2>
-<img src="/cobrands/fixmystreet/images/pack-community.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-community.jpg" class="pack-preview" alt="">
<p>Materials for groups of adults who have a particular interest in their local community. Includes:</p>
@@ -96,7 +96,7 @@ $("[data-goodielink]").on(click, function(e){
<li>Instructions for including a feed of local FixMyStreet reports on your site or blog</li>
</ul>
-<a href="/cobrands/fixmystreet/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
<h2 id="web">Website Badge</h2>
@@ -109,24 +109,24 @@ $("[data-goodielink]").on(click, function(e){
<h2 id="print">Printed Materials</h2>
<ul class="downloads">
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
- <img src="/cobrands/fixmystreet/images/a4-poster.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
+ <img src="/cobrands/fixmystreet.com/images/a4-poster.png" alt="">
<strong>A4 poster</strong> Ideal for a noticeboard at work, in the library, corner shop… wherever your community will see it.
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
- <img src="/cobrands/fixmystreet/images/a5-flyers.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
+ <img src="/cobrands/fixmystreet.com/images/a5-flyers.png" alt="">
<strong>A5 flyers (2 to a sheet)</strong> Perfect for handing out to friends or posting to subscribers.
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
- <img src="/cobrands/fixmystreet/images/a6-flyers.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
+ <img src="/cobrands/fixmystreet.com/images/a6-flyers.png" alt="">
<strong>A6 flyers (4 to a sheet)</strong> Great for cafés, pubs, or meetings.
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
- <img src="/cobrands/fixmystreet/images/dog-poop-flags.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
+ <img src="/cobrands/fixmystreet.com/images/dog-poop-flags.png" alt="">
<strong>Doggy poop flags (4 to a sheet)</strong> Take a stand against dog-fouling with our home-made flags. Some assembly required!
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster">
- <img src="/cobrands/fixmystreet/images/dog-poop-poster.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster">
+ <img src="/cobrands/fixmystreet.com/images/dog-poop-poster.png" alt="">
<strong>A4 &ldquo;We love our street&rsquo; dog poop poster</strong>
</a></li>
</ul>
@@ -136,16 +136,16 @@ $("[data-goodielink]").on(click, function(e){
<p>Ideal for promoting FixMyStreet in your community newsletter or local magazine. Specially designed to stand out, and get your message across!</p>
<ul class="downloads">
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
- <img src="/cobrands/fixmystreet/images/promote-90x130.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
+ <img src="/cobrands/fixmystreet.com/images/promote-90x130.png" alt="">
<strong>Quarter page advert</strong> (9cm wide, 13cm high)
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
- <img src="/cobrands/fixmystreet/images/promote-90x60.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
+ <img src="/cobrands/fixmystreet.com/images/promote-90x60.png" alt="">
<strong>One-eighth page advert</strong> (9cm wide, 6cm high)
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
- <img src="/cobrands/fixmystreet/images/promote-40x60.png" alt="">
+ <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
+ <img src="/cobrands/fixmystreet.com/images/promote-40x60.png" alt="">
<strong>One-sixteenth page advert</strong> (4cm wide, 6cm high)
</a></li>
</ul>
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index a1c0ba38a..4fde56e94 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -12,14 +12,20 @@
<meta name="mobileoptimized" content="0">
[% INCLUDE 'header_opengraph.html' %]
+ [% SET start = c.config.ADMIN_BASE_URL IF admin;
-[% 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)">
+ # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
+ # it stylesheets under fixmystreet.com
+ IF c.cobrand.moniker == 'fixmystreet';
+ SET css_dir = 'fixmystreet.com';
+ ELSE;
+ SET css_dir = c.cobrand.moniker;
+ END %]
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/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') %]">
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
<![endif]-->
<script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
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 %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 13:42:32 +0000