diff options
Diffstat (limited to 'templates')
23 files changed, 33 insertions, 49 deletions
diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html index 53e2d8195..a47a5a6e3 100644 --- a/templates/web/angus/maps/fms.html +++ b/templates/web/angus/maps/fms.html @@ -4,7 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> <script src="[% version('/cobrands/angus/position_map.js') %]" charset="utf-8"></script> [% END %] diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index 737a44c34..ed4ce209c 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -27,6 +27,7 @@ } ); + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html" around_page = 1; sidebar_html = PROCESS 'report/new/sidebar.html' js = 1 report.used_map = 1; diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index 184e2c297..cef93770f 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -8,12 +8,14 @@ <script type="text/javascript" src="[% start %]/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="[% version('/jslib/jquery-1.7.2.min.js') %]"></script> +<!--[if lte IE 9]> + <script type="text/javascript" src="[% version('/js/history.polyfill.min.js') %]"></script> +<![endif]--> <script type="text/javascript" src="[% version('/js/validation_rules.js') %]"></script> <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/dropzone.min.js') %]"></script> <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> -<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> [% IF admin %] diff --git a/templates/web/base/front/javascript.html b/templates/web/base/front/javascript.html index 869e5f676..b24c7493f 100644 --- a/templates/web/base/front/javascript.html +++ b/templates/web/base/front/javascript.html @@ -9,7 +9,6 @@ Modernizr.load({ "preload![% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]", "preload![% version('/js/map-OpenLayers.js') %]", "preload![% version('/js/map-OpenStreetMap.js') %]", - "preload![% version('/js/jquery.ba-hashchange.min.js') %]" ] }); </script> diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html index 95ec233e8..6af4c3562 100644 --- a/templates/web/base/maps/bing.html +++ b/templates/web/base/maps/bing.html @@ -3,7 +3,6 @@ <script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index aeb8343d0..03eb843da 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -4,7 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index ec3383d5e..cccea5b24 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -3,7 +3,6 @@ <script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.google.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_sub_links = BLOCK %] diff --git a/templates/web/base/maps/google.html b/templates/web/base/maps/google.html index 741edec40..86ca51fab 100644 --- a/templates/web/base/maps/google.html +++ b/templates/web/base/maps/google.html @@ -9,12 +9,12 @@ </style> <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script> <script type="text/javascript" src="[% version('/js/map-google.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = BLOCK %] <script type="text/javascript"> -var fixmystreet = { +var fixmystreet = fixmystreet || {}; +$.extend(fixmystreet, { 'page': '[% page %]', 'area': [ [% map.area.join(',') %] ], 'all_pins': '[% all_pins %]', @@ -27,7 +27,7 @@ var fixmystreet = { 'zoom': [% map.zoom %], [%- END %] 'pins': [% INCLUDE maps/pins_js.html %] -} +}); </script> <div id="map_box"> [% pre_map %] diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html index 698fa186d..ab4424cdd 100644 --- a/templates/web/base/maps/mapquest-attribution.html +++ b/templates/web/base/maps/mapquest-attribution.html @@ -2,7 +2,6 @@ <script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index 698ae2dab..37059910e 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -6,7 +6,8 @@ <input type="hidden" name="zoom" value="[% map.zoom %]"> <script type="text/javascript"> -var fixmystreet = { +var fixmystreet = fixmystreet || {}; +$.extend(fixmystreet, { 'page': '[% page %]', 'area': [ [% map.area.join(',') %] ], 'all_pins': '[% all_pins %]', @@ -26,7 +27,7 @@ var fixmystreet = { 'key': '[% c.config.BING_MAPS_API_KEY %]', [%- END %] 'pins': [% INCLUDE maps/pins_js.html %] -} +}); </script> <div id="map_box" aria-hidden="true"> [% pre_map %] diff --git a/templates/web/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html index e7811ba40..2ff3b4723 100644 --- a/templates/web/base/maps/osm-streetview.html +++ b/templates/web/base/maps/osm-streetview.html @@ -2,7 +2,6 @@ <script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-streetview.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html index 27397141d..5e48f7569 100644 --- a/templates/web/base/maps/osm-toner-lite.html +++ b/templates/web/base/maps/osm-toner-lite.html @@ -3,7 +3,6 @@ <script type="text/javascript" src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-toner-lite.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index 698fa186d..ab4424cdd 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -2,7 +2,6 @@ <script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 1eb6f809e..1d958c30b 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -1,5 +1,8 @@ [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] +<a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]" + class="problem-back js-back-to-report-list">[% loc('Back to all reports') %]</a> + <div class="problem-header clearfix" problem-id="[% problem.id %]"> [% IF moderating %] diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index e9f0b2914..50c649f9a 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -14,6 +14,7 @@ </div> <div id="map_sidebar"> + <div id="side-report"> [% IF login_success %] <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> @@ -43,6 +44,7 @@ [% INCLUDE 'report/update-form.html' %] [% END %] + </div> </div> [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html index 435bfcbc1..590f81593 100644 --- a/templates/web/base/report/display_tools.html +++ b/templates/web/base/report/display_tools.html @@ -23,19 +23,14 @@ [% IF c.cobrand.moniker == 'fixmystreet' %] <div id="report-share" class="hidden-js" align="center"> - <div id="fb-root"></div> - <a href="https://twitter.com/share" class="twitter-share-button" data-text="I just reported ‘[% problem.title_safe | html %]’" data-via="fixmystreet" data-related="mysociety" data-count="none" data-dnt="true">Tweet</a> - <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> - - <script>(function(d, s, id) { - var js, fjs = d.getElementsByTagName(s)[0]; - if (d.getElementById(id)) return; - js = d.createElement(s); js.id = id; - js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.6"; - fjs.parentNode.insertBefore(js, fjs); - }(document, 'script', 'facebook-jssdk'));</script> - <div style="line-height:1" class="fb-share-button" data-layout="button" data-mobile-iframe="true"><a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?src=sdkpreparse">Share</a></div> - + <a class="btn btn--social btn--twitter" href="https://twitter.com/intent/tweet?text=I%20just%20viewed%20this%20report:%20‘[% problem.title_safe | uri %]’&via=fixmystreet&related=mySociety"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Tweet + </a> + <a class="btn btn--social btn--facebook" href="https://www.facebook.com/sharer/sharer.php?u=[% c.cobrand.base_url %][% c.req.uri.path %]"> + <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> + Share + </a> </div> [% END %] diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html index e980c6065..debc2af2d 100644 --- a/templates/web/base/report/new/fill_in_details.html +++ b/templates/web/base/report/new/fill_in_details.html @@ -31,7 +31,7 @@ [% map_html %] </div> <div id="map_sidebar"> - <div id="side"> + <div id="side-form"> [% ELSE %] <div id="map_sidebar"> <div id="skipped-map"> diff --git a/templates/web/base/report/photo-js.html b/templates/web/base/report/photo-js.html index 9075ce005..05588d085 100644 --- a/templates/web/base/report/photo-js.html +++ b/templates/web/base/report/photo-js.html @@ -1,8 +1,6 @@ -[% IF c.cobrand.allow_photo_display(problem) %] - [% extra_css = BLOCK %] - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> - [% END %] - [% extra_js = BLOCK %] - <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> - [% END %] +[% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> +[% END %] +[% extra_js = BLOCK %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> [% END %] diff --git a/templates/web/bristol/maps/bristol.html b/templates/web/bristol/maps/bristol.html index c6e74022b..42cb86bf2 100644 --- a/templates/web/bristol/maps/bristol.html +++ b/templates/web/bristol/maps/bristol.html @@ -4,10 +4,9 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-bristol.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] [% INCLUDE maps/wmts_config.html %] -[% END %]
\ No newline at end of file +[% END %] diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html index bd59e1c6d..389b7ad93 100644 --- a/templates/web/fixmystreet.com/front/javascript.html +++ b/templates/web/fixmystreet.com/front/javascript.html @@ -9,7 +9,6 @@ Modernizr.load({ "preload![% version('/js/map-OpenLayers.js') %]", "preload![% version('/js/map-bing-ol.js') %]", "preload![% version('/js/map-fms.js') %]", - "preload![% version('/js/jquery.ba-hashchange.min.js') %]" ] }); </script> diff --git a/templates/web/seesomething/index.html b/templates/web/seesomething/index.html index cccd15709..dfd982e85 100644 --- a/templates/web/seesomething/index.html +++ b/templates/web/seesomething/index.html @@ -5,7 +5,8 @@ <form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> <script type="text/javascript"> -var fixmystreet = { +var fixmystreet = fixmystreet || {}; +$.extend(fixmystreet, { 'page': '', 'latitude': 52.505241, 'longitude': -1.815285, @@ -13,8 +14,7 @@ var fixmystreet = { 'numZoomLevels': 5, 'zoomOffset': 13, 'map_type': "" - -} +}); </script> <div id="map_box"> <div id="map"></div> diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html index e0a3979ed..2f21c91a6 100644 --- a/templates/web/zurich/maps/zurich.html +++ b/templates/web/zurich/maps/zurich.html @@ -4,7 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-zurich.js') %]"></script> -<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> [% END %] [% map_sub_links = BLOCK %] diff --git a/templates/web/zurich/report/photo-js.html b/templates/web/zurich/report/photo-js.html deleted file mode 100644 index 05588d085..000000000 --- a/templates/web/zurich/report/photo-js.html +++ /dev/null @@ -1,6 +0,0 @@ -[% extra_css = BLOCK %] - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> -[% END %] -[% extra_js = BLOCK %] - <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> -[% END %] |