diff options
Diffstat (limited to 'templates')
56 files changed, 527 insertions, 272 deletions
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index ab4870bb1..de671a284 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -10,7 +10,10 @@ website: If your email program does not let you click on this link, copy and paste it into your web browser and press return. - +[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] +Please note that [% c.cobrand.council_name %] is not responsible for this type +of problem, so it will instead be sent to [% report.body %]. +[% END %] Your problem had the title: [% report.title %] diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html index 658b9ff9e..a47a5a6e3 100644 --- a/templates/web/angus/maps/fms.html +++ b/templates/web/angus/maps/fms.html @@ -1,6 +1,6 @@ [% map_js = BLOCK %] <!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> --> -<script type="text/javascript" src="[% version('/js/OpenLayers.angus.js') %]"></script> +<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.angus.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/map-fms.js') %]"></script> diff --git a/templates/web/base/admin/header.html b/templates/web/base/admin/header.html index ddaa4aa44..517b984e3 100644 --- a/templates/web/base/admin/header.html +++ b/templates/web/base/admin/header.html @@ -1,6 +1,7 @@ [% SET bodyclass = bodyclass || 'fullwidthpage'; - INCLUDE 'header.html' admin = 1, bodyclass = bodyclass _ ' admin'; + SET admin = 1; + INCLUDE 'header.html' bodyclass = bodyclass _ ' admin'; %] <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index 677c2a171..351cf86f1 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -1,5 +1,5 @@ [% - PROCESS "maps/${map.type}.html"; + PROCESS "maps/${map.type}.html" admin = 1; INCLUDE 'admin/header.html' title = tprintf(loc('Editing problem %d'), problem.id ), bodyclass = 'mappage with-notes'; diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html index 65bba2fed..f94ce84f8 100644 --- a/templates/web/base/alert/_list.html +++ b/templates/web/base/alert/_list.html @@ -20,7 +20,7 @@ <p id="rss_local"> <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <a href="[% rss_feed_uri %]"><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> <br /> [% loc('(a default distance which covers roughly 200,000 people)') %] </p> diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index d7608f7aa..ed4ce209c 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -57,16 +57,16 @@ <p id='sub_map_links'> [% map_sub_links %] [% IF c.req.params.no_pins %] - <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a> + <a id='hide_pins_link' rel='nofollow' href="[% c.uri_with( { no_pins => 0 } ) %]">[% loc('Show pins') %]</a> [% ELSE %] - <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a> + <a id='hide_pins_link' rel='nofollow' href="[% c.uri_with( { no_pins => 1 } ) %]">[% loc('Hide pins') %]</a> [% END %] [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] <span class="hidden">|</span> [% IF c.req.params.all_pins %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a> + <a id='all_pins_link' rel='nofollow' href="[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]">[% loc('Hide old') %]</a> [% ELSE %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a> + <a id='all_pins_link' rel='nofollow' href="[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]">[% loc('Show old') %]</a> [% END %] [% END %] </p> diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index ac7859d9e..cef93770f 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -1,30 +1,32 @@ [% USE date %][% USE Math %] +[% SET start = c.config.ADMIN_BASE_URL IF admin %] + <meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta name="cobrand" content="[% c.cobrand.moniker %]"> -<script type="text/javascript" src="[% start %]/js/validation_rules.js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="[% start %]/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> -<script type="text/javascript" src="[% start %]/jslib/jquery-1.7.2.min.js"></script> +<script type="text/javascript" src="[% version('/jslib/jquery-1.7.2.min.js') %]"></script> <!--[if lte IE 9]> - <script type="text/javascript" src="[% start %]/js/history.polyfill.min.js"></script> + <script type="text/javascript" src="[% version('/js/history.polyfill.min.js') %]"></script> <![endif]--> -<script src="[% start %][% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> -<script type="text/javascript" src="[% start %][% version('/js/dropzone.min.js') %]"></script> +<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="[% start %][% version('/js/geo.min.js') %]"></script> -<script type="text/javascript" src="[% start %][% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> +<script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> [% IF admin %] - <script src="[% start %]/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js"></script> - <link rel="stylesheet" href="[% start %]/js/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css" /> - <script type="text/javascript" src="[% start %][% version('/js/fixmystreet-admin.js') %]"></script> + <script src="[% version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js') %]"></script> + <link rel="stylesheet" href="[% version('/js/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css') %]"> + <script type="text/javascript" src="[% version('/js/fixmystreet-admin.js') %]"></script> [% END %] [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] [% IF moderating %] - <script type="text/javascript" src="[% start %][% version('/js/moderate.js') %]"></script> + <script type="text/javascript" src="[% version('/js/moderate.js') %]"></script> [% END %] [% map_js %] diff --git a/templates/web/base/front/javascript.html b/templates/web/base/front/javascript.html index 4dcd384d6..b24c7493f 100644 --- a/templates/web/base/front/javascript.html +++ b/templates/web/base/front/javascript.html @@ -6,7 +6,7 @@ yepnope.addPrefix( 'preload', function ( resource ) { }); Modernizr.load({ load: [ - "preload![% version('/js/OpenLayers.fixmystreet.js') %]", + "preload![% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]", "preload![% version('/js/map-OpenLayers.js') %]", "preload![% version('/js/map-OpenStreetMap.js') %]", ] diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 3117b819f..b57f5d50f 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -16,8 +16,7 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - [% SET start = c.config.ADMIN_BASE_URL IF admin; - + [% # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts # it stylesheets under fixmystreet.com IF c.cobrand.moniker == 'fixmystreet'; @@ -25,14 +24,14 @@ 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)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] diff --git a/templates/web/base/header_opengraph.html b/templates/web/base/header_opengraph.html index f728d083f..6b2c8ff46 100644 --- a/templates/web/base/header_opengraph.html +++ b/templates/web/base/header_opengraph.html @@ -1,5 +1,5 @@ <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]"> - <meta property="og:title" content="[% title || site_name %]"> + <meta property="og:title" content="[% title || site_name | html %]"> <meta property="og:site_name" content="[% site_name %]"> [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Report, view, and discuss local street-related problems.">[% END %] <meta property="og:type" content="website"> diff --git a/templates/web/base/js/validation_rules.html b/templates/web/base/js/validation_rules.html deleted file mode 100644 index 5295a53ca..000000000 --- a/templates/web/base/js/validation_rules.html +++ /dev/null @@ -1,5 +0,0 @@ - validation_rules = { - title: { required: true }, - detail: { required: true }, - update: { required: true } - }; diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html index 6c32b05f3..6af4c3562 100644 --- a/templates/web/base/maps/bing.html +++ b/templates/web/base/maps/bing.html @@ -1,6 +1,6 @@ [% map_js = BLOCK %] <!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> --> -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<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> [% END %] diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index 21046332b..03eb843da 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -1,6 +1,6 @@ [% map_js = BLOCK %] <!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> --> -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<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/map-fms.js') %]"></script> diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index f7d79b11f..cccea5b24 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -1,6 +1,6 @@ [% map_js = BLOCK %] <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3"></script> -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.google.js') %]"></script> +<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> [% END %] diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html index c49cb41e0..ab4424cdd 100644 --- a/templates/web/base/maps/mapquest-attribution.html +++ b/templates/web/base/maps/mapquest-attribution.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<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> [% END %] diff --git a/templates/web/base/maps/noscript_map.html b/templates/web/base/maps/noscript_map.html index aaaa217c9..f35f152e8 100644 --- a/templates/web/base/maps/noscript_map.html +++ b/templates/web/base/maps/noscript_map.html @@ -1,3 +1,4 @@ +[% SET start = c.config.ADMIN_BASE_URL IF admin -%] <div class="noscript"> <div id="[% nsm_prefix %]drag"> <[% map.img_type %] @@ -39,13 +40,13 @@ SET zoom_out = '#' IF map.zoom <= 0; %] <div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on"> - <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div> - <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div> - <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/north-mini.png" border="0"></a></div> + <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/west-mini.png" border="0"></a></div> + <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/east-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/south-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/zoom-plus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/zoom-world-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers/img/zoom-minus-mini.png" border="0"></a></div> </div> [% END %] @@ -53,9 +54,9 @@ [% BLOCK pin %] [% IF pin.id %] -<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> +<a title="[% pin.title | html %]" href="[% c.cobrand.base_url_for_report( pin.problem ) %][% pin.problem.url %]"> [%- END -%] -<img border="0" class="pin" src="[% c.uri_for( c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png') %]" +<img border="0" class="pin" src="[% start %][% c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png' %]" alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;"> [%- IF pin.id -%] </a> diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index c00e28586..37059910e 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -19,7 +19,7 @@ $.extend(fixmystreet, { [% IF map.zoom -%] 'zoom': [% map.zoom %], [%- END %] - 'pin_prefix': '[% c.cobrand.path_to_pin_icons %]', + 'pin_prefix': '[% c.config.ADMIN_BASE_URL IF admin %][% c.cobrand.path_to_pin_icons %]', 'numZoomLevels': [% map.numZoomLevels %], 'zoomOffset': [% map.zoomOffset %], 'map_type': [% map.map_type %], diff --git a/templates/web/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html index 39b2379c9..2ff3b4723 100644 --- a/templates/web/base/maps/osm-streetview.html +++ b/templates/web/base/maps/osm-streetview.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<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> [% END %] diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html index efba70a7e..5e48f7569 100644 --- a/templates/web/base/maps/osm-toner-lite.html +++ b/templates/web/base/maps/osm-toner-lite.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script> <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> diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index c49cb41e0..ab4424cdd 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<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> [% END %] diff --git a/templates/web/base/maps/wmts_config.html b/templates/web/base/maps/wmts_config.html new file mode 100644 index 000000000..333455605 --- /dev/null +++ b/templates/web/base/maps/wmts_config.html @@ -0,0 +1,15 @@ +<script type="text/javascript"> + var fixmystreet = window.fixmystreet || {}; + fixmystreet.wmts_config = { + 'map_projection': '[% map.map_projection %]', + 'tile_dpi': [% map.tile_dpi %], + 'tile_urls': [% map.tile_urls %], + 'tile_suffix': '[% map.tile_suffix %]', + 'layer_names': [% map.layer_names %], + 'layer_style': '[% map.layer_style %]', + 'matrix_set': '[% map.matrix_set %]', + 'scales': [% map.scales %], + 'origin_x': [% map.origin_x %], + 'origin_y': [% map.origin_y %] + }; +</script> diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 704dfd29c..5894c5d81 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -1,5 +1,5 @@ <li class="item-list__item item-list--reports__item [% item_extra_class %]"> -<a href="[% c.uri_for('/report', problem.id ) %]"> +<a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]"> [% IF problem.photo %] <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] @@ -14,15 +14,18 @@ [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] [%- END %] - [% IF include_sentinfo %] - [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] - [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] + [% IF include_sentinfo %] + [% IF c.cobrand.is_council && !c.cobrand.owns_problem( problem ) %] + (sent to [% problem.body %]) + [% ELSIF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] + [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] + [% END %] [% END %] - [% END %] - [% IF NOT no_fixed AND problem.is_fixed %] - [% loc('(fixed)') %] - [% ELSIF NOT no_fixed AND problem.is_closed %] - [% loc('(closed)') %] - [% END %]</small> + [% IF NOT no_fixed AND problem.is_fixed %] + [% loc('(fixed)') %] + [% ELSIF NOT no_fixed AND problem.is_closed %] + [% loc('(closed)') %] + [% END %] + </small> </a> </li> diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index a07aab214..1d958c30b 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -35,8 +35,7 @@ </label> </div> <p class="report_meta_info"> - [% problem.meta_line(c) | html %] - [%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] + [% INCLUDE 'report/_report_meta_info.html' %] </p> [% INCLUDE 'report/_main_sent_info.html' %] diff --git a/templates/web/base/report/_report_meta_info.html b/templates/web/base/report/_report_meta_info.html new file mode 100644 index 000000000..da7339c81 --- /dev/null +++ b/templates/web/base/report/_report_meta_info.html @@ -0,0 +1,2 @@ +[% problem.meta_line(c) | html %] +[%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index 5892d0f9e..a4573b5e6 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -5,8 +5,21 @@ <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1> [% IF c.cobrand.is_council %] - <h2>Your issue is on its way to the council.</h2> - <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p> + [% IF c.cobrand.owns_problem( report ) %] + <h2>Your issue is on its way to the council.</h2> + <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p> + [% ELSE %] + <h2>Thank you for your report.</h2> + <p> + We don’t handle this type of problem, so have passed it on to: + </p> + <p> + <b>[% report.body %]</b> + </p> + <p> + You can follow this problem on <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">FixMyStreet.com</a>. + </p> + [% END %] [% ELSE %] <h2>[% loc('Thank you for reporting this issue!') %]</h2> diff --git a/templates/web/bristol/header_extra.html b/templates/web/bristol/header_extra.html index d03e34e1f..fd20823ae 100644 --- a/templates/web/bristol/header_extra.html +++ b/templates/web/bristol/header_extra.html @@ -1,2 +1,2 @@ -<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> +<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/bristol/maps/fms.html b/templates/web/bristol/maps/bristol.html index 367fe4f59..42cb86bf2 100644 --- a/templates/web/bristol/maps/fms.html +++ b/templates/web/bristol/maps/bristol.html @@ -1,12 +1,12 @@ [% map_js = BLOCK %] -<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> --> <script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script> <script type="text/javascript" src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script> <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> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] -[% map_html = INCLUDE maps/openlayers.html %] +[% map_html = BLOCK %] +[% INCLUDE maps/openlayers.html %] +[% INCLUDE maps/wmts_config.html %] +[% END %] diff --git a/templates/web/bristol/maps/noscript_map.html b/templates/web/bristol/maps/noscript_map.html index 5c2a2c064..1941cdd4c 100644 --- a/templates/web/bristol/maps/noscript_map.html +++ b/templates/web/bristol/maps/noscript_map.html @@ -33,13 +33,13 @@ SET zoom_out = '#' IF map.zoom <= 0; %] <div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on"> - <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div> - <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div> - <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/north-mini.png" border="0"></a></div> + <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/west-mini.png" border="0"></a></div> + <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/east-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/south-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/zoom-plus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/zoom-world-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/zoom-minus-mini.png" border="0"></a></div> </div> [% END %] diff --git a/templates/web/bristol/maps/openlayers.html b/templates/web/bristol/maps/openlayers.html deleted file mode 100644 index 70e06f99f..000000000 --- a/templates/web/bristol/maps/openlayers.html +++ /dev/null @@ -1,50 +0,0 @@ -[% IF map.clickable %] - [% map.img_type = 'input type="image"' %] -[% ELSE %] - [% map.img_type = 'img' %] -[% END %] - -<input type="hidden" name="zoom" value="[% map.zoom %]"> -<script type="text/javascript"> -var fixmystreet = fixmystreet || {}; -$.extend(fixmystreet, { - 'page': '[% page %]', - 'area': [ [% map.area.join(',') %] ], - 'all_pins': '[% all_pins %]', - 'latitude': [% map.latitude %], - 'longitude': [% map.longitude %], -[% IF map.any_zoom -%] - 'zoomToBounds': 1, -[%- END %] -[% IF map.zoom -%] - 'zoom': [% map.zoom %], -[%- END %] - 'pin_prefix': '[% c.cobrand.path_to_pin_icons %]', - 'numZoomLevels': [% map.numZoomLevels %], - 'zoomOffset': [% map.zoomOffset %], - 'map_type': [% map.map_type %], - 'pins': [% INCLUDE maps/pins_js.html %], - - 'wmts_config': { - 'map_projection': '[% map.map_projection %]', - 'tile_dpi': [% map.tile_dpi %], - 'tile_url': '[% map.tile_url %]', - 'tile_suffix': '[% map.tile_suffix %]', - 'layer_name': '[% map.layer_name %]', - 'layer_style': '[% map.layer_style %]', - 'matrix_set': '[% map.matrix_set %]', - 'scales': [% map.scales %], - 'origin_x': [% map.origin_x %], - 'origin_y': [% map.origin_y %] - } -}); -</script> -<div id="map_box" aria-hidden="true"> - [% pre_map %] - <div id="map"> - [% INCLUDE 'maps/noscript_map.html' %] - </div> - [% IF map.copyright %] - <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div> - [% END %] - diff --git a/templates/web/bromley/header_extra.html b/templates/web/bromley/header_extra.html index c7fe5f3e3..57066dbe8 100644 --- a/templates/web/bromley/header_extra.html +++ b/templates/web/bromley/header_extra.html @@ -1 +1 @@ -<script src="[% start %][% version('/cobrands/bromley/a-z-nav.js') %]" charset="utf-8"></script>
\ No newline at end of file +<script src="[% version('/cobrands/bromley/a-z-nav.js') %]" charset="utf-8"></script> diff --git a/templates/web/eastherts/about/faq-en-gb.html b/templates/web/eastherts/about/faq-en-gb.html new file mode 100644 index 000000000..697536df8 --- /dev/null +++ b/templates/web/eastherts/about/faq-en-gb.html @@ -0,0 +1,139 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</div> + +<h1> Frequently Asked Questions </h1> + +<p>These pages are for reporting things which are broken, dirty, damaged or +dumped, and need fixing, cleaning or clearing such as the following: </p> +<ul> + <li>Abandoned vehicles</li> + <li>Dog Bin overflow</li> + <li>Dog fouling</li> + <li>Drugs Paraphernalia</li> + <li>Litter </li> + <li>Litter Bin overflow</li> + <li>Flyposting</li> + <li>Flytipping</li> + <li>Graffiti</li> + <li>Grass Cutting</li> + <li>Public toilets</li> + <li>Street cleaning</li> + </ul> + <p> + Note that though most of these services are provided by East Hertfordshire District Council, + FixMyStreet will forward some categories of issue to Stevenage Council. + </p> + +<dl> + <dt><a name="emergencies"></a>Reporting emergencies (Out of Hours)</dt> + <dd> + <p> Please do not report problems which present an immediate risk to life, + for example fallen trees, broken glass. </p> + <p> Issues reported via the website are only actioned during office hours. + If you require an Out of Hours service please ring our main number + 01279 655261 and a message will direct you to the relevant Out of Hours + service. </p> + + </dd> + + <dt>How do I report a problem here?</dt> + <dd>After entering a postcode or location, you are shown +a map of that area. You can view problems already reported in that area, +or report ones of your own by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.</dd> + + <dt>Do you remove silly or illegal content?</dt> + <dd>East Hertfordshire District Council and FixMyStreet are not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd> + <p>The FixMyStreet website will already work on your mobile phone, adapting to + the size of your screen automatically. Using an app has some advantages, though + — for example, you can create a report even when you have no network + connection. + <ul> + <li> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a> + <li> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a> + </ul> + </dd> + + <dt>Can I use these pages to report problems outside of the East Hertfordshire district?</dd> + <dd>Yes, if you enter a postcode or address outside the district you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd> + + <dt>The site is powered by FixMyStreet, who are they?</dt> + <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. +The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd> + + <dt>Why does the site use kilometres for measurements?</dt> + <dd>The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep reports locally focused, so we restrict the ability to + move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all + the reports you’ve made, wherever they are.</dd> + + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The mySociety software behind this site is open source, and available +under the GNU Affero GPL software license. You can <a +href="http://github.com/mysociety/fixmystreet">download the +source code</a> and help mySociety develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> + +</dl> + + <h2><a name="privacy"></a>Privacy Questions</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd> +<p>If you submit a problem, your details, and details of the problem, will be +submitted to East Hertfordshire District Council, or Stevenage Council, as +appropriate. Other than the council, only people we authorise to view the +FixMyStreet administration interface will be able to see your email address and +they will never use it for anything other than to help administer +FixMyStreet.</p> +<p>We will never give or sell your email address to anyone else, unless we are +obliged to by law. Your name will not be published anywhere unless you let us.</p> +</dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.</dd> + + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html new file mode 100644 index 000000000..b0e5e0ae0 --- /dev/null +++ b/templates/web/eastherts/footer.html @@ -0,0 +1,56 @@ + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] + <ul class="nav-menu nav-menu--main"> + <li><[% IF c.req.uri.path == '/' + %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' + %]span[% ELSE %]a href="[% base %]/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' + %]span[% ELSE %]a href="[% base %]/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' + %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' + %]span[% ELSE %]a href="[% base %]/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' + %]span[% ELSE %]a href="[% base %]/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + + [% IF pagefooter %] + <footer role="contentinfo"> + <ul> + <li><a href="http://www.eastherts.gov.uk/article/10/A-to-Z">A to Z</a></li> + <li><a href="http://www.eastherts.gov.uk/article/3347/Accessibility" accesskey="0">Accessibility</a></li> + <li><a href="http://www.eastherts.gov.uk/article/3351/Disclaimer">Disclaimer</a></li> + <li><a href="http://www.eastherts.gov.uk/article/3352/Copyright-2016">Copyright 2016</a></li> + <li><a href="http://www.eastherts.gov.uk/privacy">Privacy, Data Protection and Fraud Prevention</a></li> + <li class="last"><a href="http://www.eastherts.gov.uk/article/6653/Neighbouring-Councils">Neighbouring Councils</a></li> + </ul> + <p>© 2016 East Herts Council , <strong>Telephone:</strong> +44 (0)1279 655261 <strong>Bishop's Stortford Office:</strong>- Charringtons House, Bishop's Stortford, Herts, CM23 2EN. <strong>Hertford Office:</strong>- Wallfields, Pegs Lane, Hertford, SG13 8EQ.</p> + </footer> + [% END %] + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + +</body> +</html> diff --git a/templates/web/eastherts/header_logo.html b/templates/web/eastherts/header_logo.html new file mode 100644 index 000000000..868edc6cd --- /dev/null +++ b/templates/web/eastherts/header_logo.html @@ -0,0 +1,25 @@ +<a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a> +<a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> + +<div class="header__eh_top_nav"> + <ul id="toputilnav" class="internal"> + <li><a href="http://www.eastherts.gov.uk/">Home</a> + </li> + <li><a href="http://www.eastherts.gov.uk/cookies">Cookies on our site</a></li> + [%# <li><a href="http://www.eastherts.gov.uk/article/5/Log-in">Log in</a></li> %] + <li><a href="http://www.eastherts.gov.uk/search" accesskey="4">Search the site</a></li> + <li><a href="http://www.eastherts.gov.uk/article/42/Site-Map" accesskey="3">Site Map</a></li> + <li class="last"><a href="http://www.eastherts.gov.uk/article/6715/Translation-Services">Translation Services</a></li> + </ul> + <ul id="bannerimages"> + <li><a href="http://www.eastherts.gov.uk/payments"><img src="[% version('/cobrands/eastherts/img/paymentsd1.gif') %]" width="110" height="50" alt="Payments"></a> + </li> + <li><a href="http://www.eastherts.gov.uk/report"><img src="[% version('/cobrands/eastherts/img/reportd1.gif') %]" width="110" height="50" alt="Report"></a> + </li> + <li><a href="http://www.eastherts.gov.uk/contactus"><img src="[% version('/cobrands/eastherts/img/contactusd1.gif') %]" width="110" height="50" alt="Contact Us"></a> + </li> + <li> + <img src="[% version('/cobrands/eastherts/img/consultationd1.gif') %]" width="110" height="50" alt="Consultations"> + </li> + </ul> +</div>
\ No newline at end of file diff --git a/templates/web/eastherts/header_site.html b/templates/web/eastherts/header_site.html new file mode 100644 index 000000000..30f692573 --- /dev/null +++ b/templates/web/eastherts/header_site.html @@ -0,0 +1,87 @@ +<header id="site-header" role="banner"> + <div class="container"> + [% INCLUDE 'header_logo.html' %] + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + <div class="header__eh_nav"> + <div class="container"> + <ul> + <li> + <a href="http://www.eastherts.gov.uk/article/11/A">A - Z Index - A</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/12/B">B</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/13/C">C</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/14/D">D</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/15/E">E</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/16/F">F</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/17/G">G</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/18/H">H</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/29071/I">I</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/20/J">J</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/21/K">K</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/22/L">L</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/23/M">M</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/24/N">N</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/25/O">O</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/26/P">P</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/28/R">R</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/29/S">S</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/30/T">T</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/31/U">U</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/32/V">V</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/33/W">W</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/34/X">X</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/35/Y">Y</a> + </li> + <li> + <a href="http://www.eastherts.gov.uk/article/36/Z">Z</a> + </li> + </ul> + </div> + </div> +</header> diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template index 325d1b6e6..2963dc642 100644 --- a/templates/web/eastsussex/header.html.template +++ b/templates/web/eastsussex/header.html.template @@ -3,16 +3,16 @@ <head> {MetadataDesktop} - <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)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/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="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] - <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script> + <script src="[% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script> [% IF c.req.uri.host == 'osm.fixmystreet.com' %] <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index f22e97fef..0459ed5d7 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -12,16 +12,14 @@ [% INCLUDE 'header_opengraph.html' %] -[% 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)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/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="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] diff --git a/templates/web/fixmystreet-uk-councils/header_extra.html b/templates/web/fixmystreet-uk-councils/header_extra.html index 9e614f177..cf8fa7301 100644 --- a/templates/web/fixmystreet-uk-councils/header_extra.html +++ b/templates/web/fixmystreet-uk-councils/header_extra.html @@ -1 +1 @@ -<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> +<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html index 32a86ef25..45871305c 100644 --- a/templates/web/fixmystreet.com/about/council.html +++ b/templates/web/fixmystreet.com/about/council.html @@ -25,7 +25,7 @@ <p>And it worked. Residents loved the easy interface; councils welcomed the shift to digital. Now we’ve developed FixMyStreet for Councils, allowing you to bring the award-winning FixMyStreet experience directly to your own council website’s users.</p> <p>FixMyStreet for Councils creates a council-branded, seamless fault-reporting interface for your site, integrating directly with your back-office systems, and available via web or mobile.</p> </div> - <img class="flush-image flush-image--bottom" src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/responsive.png') %]" alt="" /> + <img class="flush-image flush-image--bottom" src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/responsive.png') %]" alt="" /> </div> </div> <div class="councils-section"> @@ -51,7 +51,7 @@ <p>Patchy coverage in some parts of your borough? That’s fine: the FixMyStreet for Councils apps will store any report as it’s made, then send it off once there is access to a connection.</p> <p>We know that not everyone’s on an iPhone or Android device. No problem - your reporting interface can also be accessed via any smartphone browser, as a mobile-optimised website</p> </div> - <img class="flush-image flush-image--bottom" src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/iphone.png') %]" alt="" /> + <img class="flush-image flush-image--bottom" src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/iphone.png') %]" alt="" /> </div> </div> @@ -83,7 +83,7 @@ <p>You can tell us which types of reports are not your responsibility, and where we should route them instead.</p> <p>And you can tailor the text that we use at every step (or use ours - we’ve worked hard on it!).</p> </div> - <img class="flush-image flush-image--bottom-right" src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart.png') %]" alt="" /> + <img class="flush-image flush-image--bottom-right" src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart.png') %]" alt="" /> </div> </div> @@ -101,7 +101,7 @@ <div class="fixed-container"> <div class="section-content"> <h2>Who's using FixMyStreet for councils?</h2> - <p>Our UK client councils include <a href="https://fix.angus.gov.uk/">Angus</a>, <a href="https://fixmystreet.bristol.gov.uk/">Bristol</a>, <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://harrogate.fixmystreet.com/">Harrogate</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, <a href="http://fix.royalgreenwich.gov.uk/">Greenwich</a>, and <a href="http://warwickshire.fixmystreet.com/">Warwickshire County Council</a>.</p> + <p>Our UK client councils include <a href="https://fix.angus.gov.uk/">Angus</a>, <a href="https://fixmystreet.bristol.gov.uk/">Bristol</a>, <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://harrogate.fixmystreet.com/">Harrogate</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="https://fixmystreet.eastherts.gov.uk/">East Herts Council</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, <a href="http://fix.royalgreenwich.gov.uk/">Greenwich</a>, and <a href="http://warwickshire.fixmystreet.com/">Warwickshire County Council</a>.</p> <p>FixMyStreet for Councils is also in use outside the UK, in the city of <a href="https://www.zueriwieneu.ch/">Zurich</a>, Switzerland.</p> <h3>Case studies</h3> <p>For the insider view, and to understand the integration process, read these councils’ stories.</p> @@ -116,14 +116,14 @@ </div> <div class="client-logos"> - <a href="http://fix.bromley.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/bromley-logo.png') %]" alt="" /></a><!-- - --><a href="http://warwickshire.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/warwickshire-logo.png') %]" alt="" /></a><!-- - --><a href="http://fixmystreet.stevenage.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/stevenage-logo.png') %]" alt="" /></a><!-- - --><a href="http://hart.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart-logo.png') %]" alt="" /></a><!-- - --><a href="http://fixmystreet.oxfordshire.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/oxfordshire-logo.png') %]" alt="" /></a><!-- - --><a href="https://www.zueriwieneu.ch/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/zurich-logo.png') %]" alt="" /></a><!-- - --><a href="http://eastsussex.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a><!-- - --><a href="https://fix.angus.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png') %]" alt="" /></a> + <a href="http://fix.bromley.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/bromley-logo.png') %]" alt="" /></a><!-- + --><a href="http://warwickshire.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/warwickshire-logo.png') %]" alt="" /></a><!-- + --><a href="http://fixmystreet.stevenage.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/stevenage-logo.png') %]" alt="" /></a><!-- + --><a href="http://hart.fixmystreet.com/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart-logo.png') %]" alt="" /></a><!-- + --><a href="http://fixmystreet.oxfordshire.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/oxfordshire-logo.png') %]" alt="" /></a><!-- + --><a href="https://www.zueriwieneu.ch/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/zurich-logo.png') %]" alt="" /></a><!-- + --><a href="http://eastsussex.fixmystreet.com/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a><!-- + --><a href="https://fix.angus.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png') %]" alt="" /></a> </div> </div> diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html index f3020c016..d4e7b38a3 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -47,7 +47,7 @@ <div class="col-sm-3"> <div class="mysoc-footer__donate"> <p>Your donations keep this site and others like it running</p> - <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.com&utm_content=donate+now&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a> + <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.com&utm_content=footer+donate+now&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a> </div> </div> @@ -59,7 +59,7 @@ <div class="mysoc-footer__orgs"> <p class="mysoc-footer__org"> Built by - <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a> + <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a> </p> <p class="mysoc-footer__org"> Powered by @@ -70,7 +70,7 @@ <div class="col-sm-4"> <div class="mysoc-footer__legal"> - <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p> + <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p> </div> </div> diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html index d1c48a432..389b7ad93 100644 --- a/templates/web/fixmystreet.com/front/javascript.html +++ b/templates/web/fixmystreet.com/front/javascript.html @@ -5,7 +5,7 @@ yepnope.addPrefix( 'preload', function ( resource ) { }); Modernizr.load({ load: [ - "preload![% version('/js/OpenLayers.fixmystreet.js') %]", + "preload![% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]", "preload![% version('/js/map-OpenLayers.js') %]", "preload![% version('/js/map-bing-ol.js') %]", "preload![% version('/js/map-fms.js') %]", diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index d37c141f2..08f1251aa 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,11 +1,11 @@ <meta name='theme-color' content='#ffd000'> <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/fixmystreet.com/favicon.ico"> -<script src="[% start %][% version('/js/jquery.cookie.min.js') %]"></script> -<script src="[% start %][% version('/cobrands/fixmystreet.com/js.js') %]"></script> +<script src="[% version('/js/jquery.cookie.min.js') %]"></script> +<script src="[% version('/cobrands/fixmystreet.com/js.js') %]"></script> [%# We are conducting an A/B experiment %] -[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND not admin %] <script src="//www.google-analytics.com/cx/api.js?experiment=ZwMlZkAhSbK_tP_QG64QrQ"></script> <script> var variation = cxApi.chooseVariation(), diff --git a/templates/web/fixmystreet.com/report/_report_meta_info.html b/templates/web/fixmystreet.com/report/_report_meta_info.html new file mode 100644 index 000000000..da0912a3f --- /dev/null +++ b/templates/web/fixmystreet.com/report/_report_meta_info.html @@ -0,0 +1,5 @@ +[% problem.meta_line(c) | html %] +[% IF c.cobrand.moniker != problem.get_cobrand_logged.moniker AND problem.get_cobrand_logged.is_council %] + using <a href="https://www.fixmystreet.com/about/council">FixMyStreet for Councils</a> +[% END %] +[%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 260a87621..d5aee674c 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -3,6 +3,7 @@ 'Angus Council' = 'fix.angus.gov.uk' 'Bromley Council' = 'fix.bromley.gov.uk' 'Bristol City Council' = 'fixmystreet.bristol.gov.uk' + 'East Hertfordshire District Council' = 'fixmystreet.eastherts.gov.uk' 'East Sussex County Council' = 'eastsussex.fixmystreet.com' 'Harrogate Borough Council' = 'harrogate.fixmystreet.com' 'Hart District Council' = 'hart.fixmystreet.com' @@ -15,6 +16,7 @@ 'fixmystreet.bristol.gov.uk' = 's' 'fix.bromley.gov.uk' = 's' 'fix.angus.gov.uk' = 's' + 'fixmystreet.eastherts.gov.uk' = 's' } site = fms_councils.${body.name} %] diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index 23264066c..a1472105d 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -12,17 +12,15 @@ [% INCLUDE 'header_opengraph.html' %] -[% 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)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> <link rel="stylesheet" href="[% version('/cobrands/hart/hart.css') %]"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] diff --git a/templates/web/hart/tokens/confirm_problem.html b/templates/web/hart/tokens/confirm_problem.html deleted file mode 100644 index 68223e92b..000000000 --- a/templates/web/hart/tokens/confirm_problem.html +++ /dev/null @@ -1,19 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Confirmation') %] - -<h1>[% loc('Confirmation') %]</h1> - -<p class="confirmed"> -Thank you. You have successfully confirmed your report -[% IF c.cobrand.owns_problem( report ) %] -and this will now be investigated by the council. -You can <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">view the report on this site</a>. -[% ELSE %] -and this has now been passed on to [%# TODO make this generic %] <b>Hampshire County Council</b> to investigate. -Note that Hart District Council is not responsible for this type of problem. However you can continue to view your report on the <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]"><i>fixmystreet.com</i> website</a>. -[% END %] -</p> - -<p>Your reference for this report is [% report.id %], please quote it in any enquiries. -</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 0e4281df4..f9761aa96 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -10,16 +10,14 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> -[% 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)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/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="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html index 43d3d6265..76b135665 100644 --- a/templates/web/oxfordshire/reports/_list-entry.html +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -1,4 +1,5 @@ [% INCLUDE 'report/_item.html' no_fixed = 1 + include_sentinfo = 1 item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem) %] diff --git a/templates/web/oxfordshire/tracking_code.html b/templates/web/oxfordshire/tracking_code.html index f2a79aeb8..7a100f8ad 100644 --- a/templates/web/oxfordshire/tracking_code.html +++ b/templates/web/oxfordshire/tracking_code.html @@ -8,12 +8,6 @@ _gaq.push(['_setCustomVar',1,'level1','Roads and transport',3]); _gaq.push(['_setCustomVar',2,'level2','FixMyStreet',3]); _gaq.push(['_trackPageview']); - jQuery(document).ready( function () { - jQuery.occ.gaico({ - messageIcon: '/cms/sites/all/themes/publicsite/images/gaico_exclamation.png', - permanentMessageIcon: '/cms/sites/all/themes/publicsite/images/gaico_question.png' - }); - }); </script> diff --git a/templates/web/seesomething/header_extra.html b/templates/web/seesomething/header_extra.html new file mode 100644 index 000000000..839e03dbe --- /dev/null +++ b/templates/web/seesomething/header_extra.html @@ -0,0 +1 @@ +<script src="[% version('/cobrands/seesomething/validation_rules.js') %]"></script> diff --git a/templates/web/seesomething/js/validation_rules.html b/templates/web/seesomething/js/validation_rules.html deleted file mode 100644 index cef5fce7e..000000000 --- a/templates/web/seesomething/js/validation_rules.html +++ /dev/null @@ -1,13 +0,0 @@ - validation_rules = { - detail: { required: true }, - category: { required: true }, - subcategory: { required: true } - }; - - $(function(){ - $('#submit_noname').click( function(e) { - $('#form_category').addClass('required validCategory').removeClass('valid'); - $('#form_subcategory').addClass('required validCategory').removeClass('valid'); - }); - }); - diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 4877e9a7c..14d1db37a 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -10,22 +10,22 @@ <link rel="shortcut icon" href="/cobrands/warwickshire/gamma/images/favicon.ico" /> <!-- Style --> - <link rel="stylesheet" type="text/css" href="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/style.css') %]" /> - <link rel="stylesheet" type="text/css" href="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap-responsive.css') %]"> + <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/style.css') %]" /> + <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap-responsive.css') %]"> <!-- Scripts --> - <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/modernizr-2.6.2-respond-1.1.0.min.js') %]" type="text/javascript"></script> - <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/jquery-1.9.0.min.js') %]" type="text/javascript"></script> - <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap.min.js') %]" type="text/javascript"></script> - <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/main.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/modernizr-2.6.2-respond-1.1.0.min.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/jquery-1.9.0.min.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap.min.js') %]" type="text/javascript"></script> + <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/main.js') %]" type="text/javascript"></script> - <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)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/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="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] diff --git a/templates/web/zurich/about/faq-de-ch.html b/templates/web/zurich/about/faq-de-ch.html index deda32a1c..121a9b6af 100644 --- a/templates/web/zurich/about/faq-de-ch.html +++ b/templates/web/zurich/about/faq-de-ch.html @@ -2,55 +2,62 @@ <h1><a name="faq"></a>Hilfe</h1> -<h3 id="was_ist_zri_wie_neu">Was ist «Züri wie neu»</h3> + <h3>Was ist «Züri wie neu»</h3> -<p>«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und Einwohner die Stadt Zürich auf Schäden an der städtischen Infrastruktur hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und transparent geführt. Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt.</p> + <p>«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und Einwohner die Stadt Zürich auf Schäden an der städtischen Infrastruktur hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und transparent geführt. Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt.</p> -<h3 id="welche_probleme_kann_ich_ber_zri_wie_neu_melden">Welche Probleme kann ich über «Züri wie neu» melden?</h3> + <h3>Welche Schäden kann ich über «Züri wie neu» melden?</h3> -<p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich in folgenden Kategorien:</p> + <p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich in folgenden Kategorien:</p> -<ul> -<li>Abfall / Sammelstellen</li> -<li>Beleuchtung / Uhren</li> -<li>Brunnen / Hydranten</li> -<li>Graffiti</li> -<li>Grünflächen / Spielplätze</li> -<li>Strasse / Trottoir / Platz</li> -<li>VBZ / ÖV</li> -</ul> + <ul> + <li>Abfall / Sammelstellen</li> + <li>Beleuchtung / Uhren</li> + <li>Brunnen / Hydranten</li> + <li>Graffiti</li> + <li>Grünflächen / Spielplätze</li> + <li>Strasse / Trottoir / Platz</li> + <li>VBZ / ÖV</li> + </ul> -<h3 id="was_kann_ich_nicht_ber_zri_wie_neu_melden">Was kann ich nicht über «Züri wie neu» melden?</h3> -<ul> -<li>Schäden die nicht auf Stadtgebiet liegen</li> -<li>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: <br /> -Sanität – 144, Polizei – 117, Feuerwehr – 118, Allgemein - 112</li> -<li>Allgemeine Verschönerungs- und Verbesserungsvorschläge</li> -</ul> + <p>Ratten können in der Kategorie «Grünflächen / Spielplätze» gemeldet werden.</p> -<h3 id="wie_melde_ich_einen_schaden">Wie melde ich einen Schaden?</h3> + <h3>Was kann ich nicht über «Züri wie neu» melden?</h3> -<p>Geben Sie zuerst eine Adresse an oder lassen Sie Ihren Standort automatisch über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten Schritt füllen Sie die Felder des Formulars aus, machen mindestens ein Foto des Schadens und schicken die Meldung ab.</p> + <ul> + <li>Schäden die nicht auf Stadtgebiet liegen</li> + <li>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: Sanität – 144, Polizei – 117, Feuerwehr – 118, Allgemein - 112</li> + <li>Allgemeine Verschönerungs- und Verbesserungsvorschläge</li> + </ul> -<h3 id="wie_werden_die_schden_behoben">Wie werden die Schäden behoben?</h3> -<p>Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen zugewiesen und innert fünf Arbeitstagen von den dafür zuständigen Fachstellen bearbeitet sowie mit einer entsprechenden Rückmeldung versehen.</p> + <h3>Wie melde ich einen Schaden?</h3> -<h3 id="kann_ich_zri_wie_neu_auf_meinem_smartphone_nutzen">Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</h3> + <p>Geben Sie zuerst eine Adresse an oder lassen Sie Ihren Standort automatisch über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten Schritt füllen Sie die Felder des Formulars aus, machen mindestens ein Foto des Schadens und schicken die Meldung ab.</p> -<p>Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die <a href="https://itunes.apple.com/ch/app/zuri-wie-neu/id631302236">iOS-</a> und <a href="https://play.google.com/store/apps/details?id=ch.zueriwieneu.zueriwieneu">Android-App</a>.</p> + <h3>Wie werden die Schäden behoben?</h3> -<h3 id="kann_ich_auch_schden_ausserhalb_von_zrich_melden">Kann ich auch Schäden ausserhalb von Zürich melden?</h3> + <p>Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen zugewiesen und innert fünf Arbeitstagen von den dafür zuständigen Fachstellen bearbeitet sowie mit einer entsprechenden Rückmeldung versehen.</p> -<p>Nein, auf «Züri wie neu» können nur Schäden auf Stadtgebiet gemeldet werden.</p> + <h3>Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</h3> -<h3 id="werden_meine_e_mail_adresse_mein_name_und_meine_telefonnummer_vertraulich_behandelt">Werden meine E-Mail-Adresse, mein Name und meine Telefonnummer vertraulich behandelt?</h3> + <p>Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die <a href="https://itunes.apple.com/ch/app/zuri-wie-neu/id631302236">iOS-</a> und <a href="https://play.google.com/store/apps/details?id=ch.zueriwieneu.zueriwieneu">Android-App</a>.</p> -<p>Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie werden weder im Internet publiziert noch an Dritte weitergegeben.</p> + <h3>Kann ich auch Schäden ausserhalb von Zürich melden?</h3> -<h3 id="wer_hat_zri_wie_neu_programmiert">Wer hat «Züri wie neu» programmiert?</h3> + <p>Nein, auf «Züri wie neu» können nur Schäden auf Stadtgebiet gemeldet werden.</p> -<p>«Züri wie neu» wurde von <a href="https://www.mysociety.org/">mySociety</a> programmiert.</p> + <h3>Werden meine E-Mail-Adresse, mein Name und meine Telefonnummer vertraulich behandelt?</h3> + + <p>Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie werden weder im Internet publiziert noch an Dritte weitergegeben.</p> + + <h3>Wo kann ich mich bei Fragen zu «Züri wie neu» melden?</h3> + + <p><a href="mailto:christian.gees@zuerich.ch">Christian Gees</a> beantwortet gerne Ihre Fragen zu «Züri wie neu».</p> + + <h3>Wer hat «Züri wie neu» programmiert?</h3> + + <p>«Züri wie neu» wurde von <a href="https://www.mysociety.org/">mySociety</a> programmiert.</p> [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index 071e4fad8..bf4d7e478 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -10,19 +10,18 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> -[% 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="screen and (min-width:48em)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (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="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css"> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] + <script src="[% version('/cobrands/zurich/validation_rules.js') %]"></script> [% extra_js %] <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script> diff --git a/templates/web/zurich/js/validation_rules.html b/templates/web/zurich/js/validation_rules.html deleted file mode 100644 index d98bc1118..000000000 --- a/templates/web/zurich/js/validation_rules.html +++ /dev/null @@ -1,8 +0,0 @@ - validation_rules = { - title: { required: true }, - detail: { required: true }, - email: { required: true }, - update: { required: true }, - phone: { required: true }, - rznvy: { required: true } - }; diff --git a/templates/web/zurich/maps/noscript_map.html b/templates/web/zurich/maps/noscript_map.html index 5c2a2c064..1941cdd4c 100644 --- a/templates/web/zurich/maps/noscript_map.html +++ b/templates/web/zurich/maps/noscript_map.html @@ -33,13 +33,13 @@ SET zoom_out = '#' IF map.zoom <= 0; %] <div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on"> - <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div> - <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div> - <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/north-mini.png" border="0"></a></div> + <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/west-mini.png" border="0"></a></div> + <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/east-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/south-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/zoom-plus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/zoom-world-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers/img/zoom-minus-mini.png" border="0"></a></div> </div> [% END %] diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html index 873afd11a..2f21c91a6 100644 --- a/templates/web/zurich/maps/zurich.html +++ b/templates/web/zurich/maps/zurich.html @@ -1,7 +1,8 @@ [% map_js = BLOCK %] <script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script> -<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.CH1903.js') %]"></script> +<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.CH1903Plus.js') %]"></script> <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> [% END %] @@ -11,6 +12,7 @@ [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] +[% INCLUDE maps/wmts_config.html %] [% UNLESS around_page %] <p id="sub_map_links"> [% map_sub_links %] |