diff options
Diffstat (limited to 'templates')
19 files changed, 56 insertions, 83 deletions
diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt index b3853e1a5..7fa0a23da 100644 --- a/templates/email/default/submit-example.txt +++ b/templates/email/default/submit-example.txt @@ -27,9 +27,7 @@ you approach the junction along Bournville Lane from the east, which leads to vehicles rolling back as they fall in and out of it whilst waiting at the junction. -Easting: 404517 - -Northing: 280922 +Easting/Northing: 404517/280922 Latitude: 52.4262642791826 diff --git a/templates/email/fixamingata/submit-example.txt b/templates/email/fixamingata/submit-example.txt deleted file mode 100644 index c11d613ad..000000000 --- a/templates/email/fixamingata/submit-example.txt +++ /dev/null @@ -1,61 +0,0 @@ -Subject: Problem Report: Dangerous pothole - -Dear Birmingham City Council, - -A user of FixMyStreet has submitted the following report of a -local problem that they believe might require your attention. - -To view a map of the precise location of this issue, or to provide -an update on the problem, please visit the following link: - - http://www.fixmystreet.com/report/39092 - ----------- - -Name: Matthew Somerville - -Email: [...] - -Phone: [...] - -Category: Potholes - -Subject: Dangerous pothole - -Details: There is a large pothole almost on the give way line as -you approach the junction along Bournville Lane from the east, -which leads to vehicles rolling back as they fall in and out of it -whilst waiting at the junction. - -Easting: 404517 - -Northing: 280922 - -Latitude: 52.4262642791826 - -Longitude: -1.93500217285966 - -Nearest road to the pin placed on the map (automatically -generated by Bing Maps): Bournville Lane, Birmingham B30 1 - -Nearest postcode to the pin placed on the map (automatically -generated): B30 1LA (83m away) - ----------- - -Replies to this email will go to the user who submitted the problem. - -Yours, -The FixMyStreet team - -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 'Potholes', please let us know by -visiting <http://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/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/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index 217fb0a72..8c92c874a 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -31,6 +31,8 @@ [% END %] +[% TRY %][% INCLUDE 'tokens/_extras_confirm.html' %][% CATCH file %][% END %] + </div> [% display_crosssell_advert( problem.user.email, problem.name ) %] 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/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html new file mode 100644 index 000000000..ba32a5534 --- /dev/null +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -0,0 +1,3 @@ +<script type="text/javascript"> + (function(){var e=0.6;var t=null;var n=document.cookie.split(";");for(var r=0;r<n.length;r++){var i=n[r];while(i.charAt(0)==" "){i=i.substring(1,i.length)}if(i.indexOf("ms_srv_t=")==0){var t=i.substring("ms_srv_t=".length,i.length)}if(i.indexOf("ms_srv_r=")==0){var s=i.substring("ms_srv_r=".length,i.length)}}if(t==null){if(Math.random()<e){var o=Math.round((new Date).getTime()/1e3);document.cookie="ms_srv_t="+o+"; path=/";document.cookie="ms_srv_r="+document.referrer+"; path=/";t=o;s=document.referrer}else{document.cookie="ms_srv_t=X; path=/";t="X"}}if(t!="X"&&!!document.getElementById("ms_srv_wrapper")){var u=Math.round((new Date).getTime()/1e3)-t;var a=!!document.getElementById("user-meta");var f=document.getElementById("ms_srv_link");data={ms_time:u,ms_referrer:s||null,ms_registered:a,ms_transaction:f.getAttribute("data-transaction")};var l=[];for(var c in data){l.push(encodeURIComponent(c)+"="+encodeURIComponent(data[c]))}f.href=f.href+"?"+l.join("&");document.getElementById("ms_srv_wrapper").style.display=""}})() +</script> diff --git a/templates/web/fixmystreet.com/report/_extras_top.html b/templates/web/fixmystreet.com/report/_extras_top.html new file mode 100755 index 000000000..4938e8749 --- /dev/null +++ b/templates/web/fixmystreet.com/report/_extras_top.html @@ -0,0 +1,3 @@ +[% IF created_report %] + [% INCLUDE 'research/survey_link.html' %] +[% END %] diff --git a/templates/web/fixmystreet.com/research/survey_link.html b/templates/web/fixmystreet.com/research/survey_link.html new file mode 100644 index 000000000..7357249d8 --- /dev/null +++ b/templates/web/fixmystreet.com/research/survey_link.html @@ -0,0 +1,3 @@ +<div id="ms_srv_wrapper" style="display:none"> + <p><a href="https://www.surveygizmo.co.uk/s3/1907419/FMS-2014" id="ms_srv_link" data-transaction="report">We’re running a short survey to help us understand how well FixMyStreet works. If you’d like to take it, click here.</a></p> +</div> diff --git a/templates/web/fixmystreet.com/tokens/_extras_confirm.html b/templates/web/fixmystreet.com/tokens/_extras_confirm.html new file mode 100644 index 000000000..c27383f42 --- /dev/null +++ b/templates/web/fixmystreet.com/tokens/_extras_confirm.html @@ -0,0 +1 @@ +[% INCLUDE 'research/survey_link.html' %] diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 71e87ddfb..63b04de83 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -37,5 +37,8 @@ <!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + </body> </html> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 4f4e7a2a6..314b09b28 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -17,6 +17,8 @@ <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> [% END %] +[% TRY %][% INCLUDE 'report/_extras_top.html' %][% CATCH file %][% END %] + [% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] @@ -38,9 +40,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/stevenage/header.html b/templates/web/stevenage/header.html index dbcc37866..0b3171808 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -23,6 +23,7 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] + [% INCLUDE 'tracking_code.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/stevenage/tracking_code.html b/templates/web/stevenage/tracking_code.html new file mode 100644 index 000000000..e7c2bafd6 --- /dev/null +++ b/templates/web/stevenage/tracking_code.html @@ -0,0 +1,16 @@ +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] + +<script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-21613820-7', 'auto'); + ga('send', 'pageview'); + +</script> + +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> +[% END %] 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> |