aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web')
-rwxr-xr-xtemplates/web/base/around/display_location.html16
-rw-r--r--templates/web/base/report/display.html2
-rw-r--r--templates/web/base/report/new/fill_in_details.html4
-rw-r--r--templates/web/bromley/report/display.html2
-rw-r--r--templates/web/fixmystreet.com/static/posters.html41
-rw-r--r--templates/web/fixmystreet/report/display.html4
-rw-r--r--templates/web/seesomething/around/display_location.html8
-rw-r--r--templates/web/trinidadtobago/header_logo.html1
-rw-r--r--templates/web/trinidadtobago/site-name.html1
-rw-r--r--templates/web/zerotb/report/display.html2
10 files changed, 52 insertions, 29 deletions
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
index 804be9603..3f4ec8881 100755
--- a/templates/web/base/around/display_location.html
+++ b/templates/web/base/around/display_location.html
@@ -6,14 +6,14 @@
rss_url
= pc
? c.uri_for( "/rss/pc", pc )
- : c.uri_for( "/rss/l/$short_latitude,$short_longitude" );
+ : c.uri_for( "/rss/l/$latitude,$longitude" );
email_url = c.uri_for(
'/alert/list',
{
- lat => short_latitude,
- lon => short_longitude,
- feed => "local:$short_latitude:$short_longitude",
+ lat => latitude,
+ lon => longitude,
+ feed => "local:$latitude:$longitude",
}
);
@@ -21,8 +21,8 @@
'/report/new',
{
pc => pc
- latitude => short_latitude,
- longitude => short_longitude,
+ latitude => latitude,
+ longitude => longitude,
skipped => 1,
}
);
@@ -45,8 +45,8 @@
[% END %]
<input type="hidden" name="pc" value="[% pc | html %]">
- <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">
- <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]">
+ <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]">
+ <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]">
[% END %]
[% map_html %]
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index a7181942f..0731d9f0e 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -31,7 +31,7 @@
[% IF c.cobrand.moniker != 'emptyhomes' %]
<p style="padding-bottom: 0.5em; border-bottom: dotted 1px #999999;" align="right">
- <a href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'More problems nearby' ) %]</a>
+ <a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'More problems nearby' ) %]</a>
</p>
<div id="alert_links">
diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html
index 1b8a866fc..9d3f52041 100644
--- a/templates/web/base/report/new/fill_in_details.html
+++ b/templates/web/base/report/new/fill_in_details.html
@@ -22,8 +22,8 @@
[% END %]
- <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">
- <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]">
+ <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]">
+ <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]">
[% IF report.used_map %]
[% map_html %]
diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html
index f30b4b86d..75b7700a5 100644
--- a/templates/web/bromley/report/display.html
+++ b/templates/web/bromley/report/display.html
@@ -25,7 +25,7 @@
<ul id="key-tools">
<li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse') %]</a></li>
<li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li>
- <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li>
+ <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li>
</ul>
<div id="report-updates-data" class="hidden-js">
diff --git a/templates/web/fixmystreet.com/static/posters.html b/templates/web/fixmystreet.com/static/posters.html
index 2e26ad40e..4bd613fd9 100644
--- a/templates/web/fixmystreet.com/static/posters.html
+++ b/templates/web/fixmystreet.com/static/posters.html
@@ -11,6 +11,27 @@
badge = '<a href="https://www.fixmystreet.com/"> <img src="https://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>'
%]
+<script>
+
+$("[data-goodielink]").on(click, function(e){
+ var url = $(this).attr('href')
+ var name = $(this).attr('data-goodielink')
+ var callback = function(){
+ window.location.href = url
+ }
+ if(e.metaKey || e.ctrlKey){
+ callback = function(){}
+ } else {
+ e.preventDefault()
+ }
+ ga('send', 'event', 'goodie', 'download', name, {
+ 'hitCallback': callback
+ })
+ setTimeout(callback, 2000);
+});
+
+</script>
+
<div class="sticky-sidebar">
<aside>
<ul class="plain-list">
@@ -45,7 +66,7 @@
<li>Ideas for letting more people know about FixMyStreet</li>
</ul>
-<a href="/cobrands/fixmystreet/posters/activist-pack.zip" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet/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>
@@ -59,7 +80,7 @@
<li>Ideas for activities</li>
</ul>
-<a href="/cobrands/fixmystreet/posters/schools-clubs-pack.zip" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet/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>
@@ -75,7 +96,7 @@
<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" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
<h2 id="web">Website Badge</h2>
@@ -88,19 +109,19 @@
<h2 id="print">Printed Materials</h2>
<ul class="downloads">
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
<img src="/cobrands/fixmystreet/images/a4-poster.png">
<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">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
<img src="/cobrands/fixmystreet/images/a5-flyers.png">
<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">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
<img src="/cobrands/fixmystreet/images/a6-flyers.png">
<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">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
<img src="/cobrands/fixmystreet/images/dog-poop-flags.png">
<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>
@@ -111,15 +132,15 @@
<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-advert-90x130.pdf">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
<img src="/cobrands/fixmystreet/images/advert-90x130.png">
<strong>Quarter page advert</strong> (9cm wide, 13cm high)
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x60.pdf">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
<img src="/cobrands/fixmystreet/images/advert-90x60.png">
<strong>One-eighth page advert</strong> (9cm wide, 6cm high)
</a></li>
- <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-40x60.pdf">
+ <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
<img src="/cobrands/fixmystreet/images/advert-40x60.png">
<strong>One-sixteenth page advert</strong> (4cm wide, 6cm high)
</a></li>
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 4f4e7a2a6..91762e022 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -38,9 +38,9 @@
<li><a rel="nofollow" id="key-tool-report-share" class="share" href="#report-share">[% loc('Share') %]</a></li>
[% END %]
[% IF c.cobrand.moniker == 'zurich' %]
- <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems on the map' ) %]</a></li>
+ <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems on the map' ) %]</a></li>
[% ELSE %]
- <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li>
+ <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li>
[% END %]
</ul>
diff --git a/templates/web/seesomething/around/display_location.html b/templates/web/seesomething/around/display_location.html
index ea0a499f7..b54311264 100644
--- a/templates/web/seesomething/around/display_location.html
+++ b/templates/web/seesomething/around/display_location.html
@@ -4,8 +4,8 @@
'/report/new',
{
pc => pc
- latitude => short_latitude,
- longitude => short_longitude,
+ latitude => latitude,
+ longitude => longitude,
skipped => 1,
}
);
@@ -25,8 +25,8 @@
[% END %]
<input type="hidden" name="pc" value="[% pc | html %]">
- <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">
- <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]">
+ <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]">
+ <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]">
[% map_html %]
diff --git a/templates/web/trinidadtobago/header_logo.html b/templates/web/trinidadtobago/header_logo.html
new file mode 100644
index 000000000..d5da7e6b2
--- /dev/null
+++ b/templates/web/trinidadtobago/header_logo.html
@@ -0,0 +1 @@
+ <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html' -%]</a>
diff --git a/templates/web/trinidadtobago/site-name.html b/templates/web/trinidadtobago/site-name.html
new file mode 100644
index 000000000..d9c3f19c7
--- /dev/null
+++ b/templates/web/trinidadtobago/site-name.html
@@ -0,0 +1 @@
+FixMyStreeTT
diff --git a/templates/web/zerotb/report/display.html b/templates/web/zerotb/report/display.html
index 9161fb586..697b5428c 100644
--- a/templates/web/zerotb/report/display.html
+++ b/templates/web/zerotb/report/display.html
@@ -25,7 +25,7 @@
<div class="shadow-wrap">
<ul id="key-tools">
- <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li>
+ <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li>
</ul>
</div>