diff options
Diffstat (limited to 'templates')
21 files changed, 202 insertions, 27 deletions
diff --git a/templates/web/angus/angus_search.html b/templates/web/angus/angus_search.html new file mode 100644 index 000000000..f519b8f4f --- /dev/null +++ b/templates/web/angus/angus_search.html @@ -0,0 +1,6 @@ +<form action="//www.angus.gov.uk/site/scripts/google_results.aspx" method="get" id="search" class="form form__search"> + <div> + <input size="18" maxlength="40" class="field" name="q" id="SearchSite" placeholder="Explore Angus Council" type="text"> + <input value="Search" class="button button__primary" type="submit"> + </div> +</form> diff --git a/templates/web/angus/around/intro.html b/templates/web/angus/around/intro.html new file mode 100644 index 000000000..45e94194a --- /dev/null +++ b/templates/web/angus/around/intro.html @@ -0,0 +1 @@ +<h1>Report, view, or discuss local issues</h1> diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html new file mode 100644 index 000000000..a09c7ce2f --- /dev/null +++ b/templates/web/angus/footer.html @@ -0,0 +1,27 @@ + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--main' %] + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + + [% IF pagefooter %] + <div class="angus_footer"> + <footer role="contentinfo"> + [% INCLUDE 'front/footer-marketing.html' %] + </footer> + </div> + [% END %] + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + +</body> +</html> diff --git a/templates/web/angus/front/footer-marketing.html b/templates/web/angus/front/footer-marketing.html new file mode 100644 index 000000000..59413121d --- /dev/null +++ b/templates/web/angus/front/footer-marketing.html @@ -0,0 +1,24 @@ +<div class="tablewrapper bordered"> + <p class="social"><a href="https://twitter.com/anguscouncil" class="icon-twitter" title="Follow Angus Council on Twitter">Twitter</a> <a href="https://www.facebook.com/AngusCouncil" class="icon-facebook" title="Join Angus Council on Facebook">Facebook</a> <a href="https://www.youtube.com/channel/UCtdcoPEFDA_CikJMiJjiDtA" class="icon-youtube" title="Watch Angus Council videos on YouTube">YouTube</a></p> + <ul> + <li> + <a href="http://www.angus.gov.uk/info/19999/council_and_democracy/172/contact_us "><strong>Contact the Council</strong></a> + </li> + <li> + <a href="http://www.angus.gov.uk/socialmedia">Social media</a> + </li> + <li> + <a href="http://www.angus.gov.uk/whats_new">Recently published</a> + </li> + <li> + <a href="http://www.angus.gov.uk/site_map">Site map</a> + </li> + <li> + <a href="http://www.angus.gov.uk/terms">Terms and disclaimer</a> + </li> + <li> + <a href="http://www.angus.gov.uk/cookies">Cookies</a> + </li> + </ul> + <p><span class="copyright">All content © Angus Council.</span></p> +</div>
\ No newline at end of file diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html new file mode 100644 index 000000000..d1a40574e --- /dev/null +++ b/templates/web/angus/header.html @@ -0,0 +1,68 @@ +[% + SET html_att = ' lang="' _ lang_code _ '"'; + # For a right-to-left language, use the following line in your own header: + # SET html_att = html_att _ ' dir="rtl"'; +-%] +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]--> +<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]--> + <head> + <meta name="viewport" content="initial-scale=1.0"> + + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> + <meta name="HandHeldFriendly" content="true"> + <meta name="mobileoptimized" content="0"> + + [% INCLUDE 'header_opengraph.html' %] + <link rel="stylesheet" href="[% version('/cobrands/angus/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]" media="(min-width:48em)"> + [% extra_css %] + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]"> + <![endif]--> + + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/cobrands/angus/position_map.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% extra_js %] + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] + + [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + + </head> + [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] + <body class="[% bodyclass | html IF bodyclass %]"> + + <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + [% INCLUDE 'header_logo.html' %] + <a href="#main-nav" id="nav-link">Main Navigation</a> + + [% INCLUDE 'angus_search.html' %] + </div> + </header> + + [% IF c.user_exists %] + <div id="user-meta"> + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + </div> + [% END %] + + [% INCLUDE 'post_header_extra.html' %] + [% pre_container_extra %] + + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/angus/main_menu.html b/templates/web/angus/main_menu.html new file mode 100644 index 000000000..3a07c61cd --- /dev/null +++ b/templates/web/angus/main_menu.html @@ -0,0 +1,24 @@ +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] +<ul class="nav-menu [% extra_class %]"> + <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/Angus' + %]span[% ELSE %]a href="[% base %]/reports/Angus"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Angus' ? '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> diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html new file mode 100644 index 000000000..d76d9329d --- /dev/null +++ b/templates/web/angus/maps/fms.html @@ -0,0 +1,13 @@ +[% 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/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> +<!--[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 include_key = 1 %] diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html new file mode 100644 index 000000000..16a82de3e --- /dev/null +++ b/templates/web/angus/post_header_extra.html @@ -0,0 +1,14 @@ +<div class="angus_nav"> + <div class="container"> + <ul> + <li><a href="http://www.angus.gov.uk/">Home</a></li> + <li><a href="/">FixMyStreet</a></li> + </ul> + </div> +</div> + +<div class="wrapper wrapper__main_menu"> + <div class="container"> + [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--breadcrumb' %] + </div> +</div> diff --git a/templates/web/base/front/international_banner.html b/templates/web/angus/report/new/after_category.html index e69de29bb..e69de29bb 100644 --- a/templates/web/base/front/international_banner.html +++ b/templates/web/angus/report/new/after_category.html diff --git a/templates/web/angus/report/new/category_at_top.html b/templates/web/angus/report/new/category_at_top.html new file mode 100644 index 000000000..8002eb37a --- /dev/null +++ b/templates/web/angus/report/new/category_at_top.html @@ -0,0 +1 @@ +[% PROCESS "report/new/category_wrapper.html" %]
\ No newline at end of file diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 84ea6840c..b46d411c2 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -162,7 +162,7 @@ </p> </div> <p> - <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> + <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed OR contact.confirmed == "" %]> <label for="confirmed" class="inline">[% loc('Confirmed') %]</label> </p> diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 6ae43f798..704dfd29c 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -3,7 +3,7 @@ [% IF problem.photo %] <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] - <h4>[% problem.title | html %]</h4> + <h3 class="item-list__heading">[% problem.title | html %]</h3> <small> [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] [%- prettify_dt( problem.confirmed, 1 ) %] diff --git a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html deleted file mode 100644 index b36dac3b6..000000000 --- a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html +++ /dev/null @@ -1,6 +0,0 @@ -<li class="item-list__item item-list__item--with-pin [% c.cobrand.pin_colour(problem) %]"> - <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]"> - <h3>[% problem.title | html %]</h3> - <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p> - </a> -</li> diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html index 9a411be5c..3fad765c5 100644 --- a/templates/web/fixmystreet.com/about/council.html +++ b/templates/web/fixmystreet.com/about/council.html @@ -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="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="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>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> @@ -122,7 +122,8 @@ --><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="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> </div> </div> diff --git a/templates/web/fixmystreet.com/front/international_banner.html b/templates/web/fixmystreet.com/front/international_banner.html deleted file mode 100644 index 303d52851..000000000 --- a/templates/web/fixmystreet.com/front/international_banner.html +++ /dev/null @@ -1,11 +0,0 @@ -[% country = c.cobrand.get_country_for_ip_address(c.req.address) -%] -[%- IF country AND country != 'GB' -%] -<div class="top_banner top_banner--country"> - <a href="#" class="top_banner__close">Close</a> - <p> - This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites - <a href="http://www.fixmystreet.org/sites/">all over the world</a>, or you - could set up your own using the <a href="http://www.fixmystreet.org/">FixMyStreet Platform</a>. - </p> -</div> -[%- END -%] diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 6768c675a..6435f56fa 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -1,5 +1,6 @@ [% fms_councils = { + 'Angus Council' = 'fix.angus.gov.uk' 'Bromley Council' = 'fix.bromley.gov.uk' 'East Sussex County Council' = 'eastsussex.fixmystreet.com' 'Harrogate Borough Council' = 'harrogate.fixmystreet.com' @@ -11,6 +12,7 @@ } secure = { 'fix.bromley.gov.uk' = 's' + 'fix.angus.gov.uk' = 's' } site = fms_councils.${body.name} %] diff --git a/templates/web/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html index b24ef2260..43d3d6265 100644 --- a/templates/web/greenwich/reports/_list-entry.html +++ b/templates/web/greenwich/reports/_list-entry.html @@ -1 +1,4 @@ -[% INCLUDE 'report/_item-with-pin.html' %] +[% INCLUDE 'report/_item.html' + no_fixed = 1 + item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem) +%] diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 499fd4637..52b20a0af 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -10,7 +10,12 @@ </h3> [% END %] - [% IF c.cobrand.problem_response_days(problem) > 0 %] + [% IF c.cobrand.problem_response_days(problem) == 'emergency' %] + <p> + Thank you for contacting Oxfordshire County Council [% problem.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> + Reported faults will continue to be registered on our management system and these will be tackled in coming months. + </p> + [% ELSIF c.cobrand.problem_response_days(problem) > 0 %] <p> Problems in the [% problem.category %] diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html index b24ef2260..43d3d6265 100644 --- a/templates/web/oxfordshire/reports/_list-entry.html +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -1 +1,4 @@ -[% INCLUDE 'report/_item-with-pin.html' %] +[% INCLUDE 'report/_item.html' + no_fixed = 1 + item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem) +%] diff --git a/templates/web/zerotb/report/_item.html b/templates/web/zerotb/report/_item.html index e12c9e1fa..8562fe607 100644 --- a/templates/web/zerotb/report/_item.html +++ b/templates/web/zerotb/report/_item.html @@ -1,5 +1,5 @@ <li class="item-list__item item-list--reports__item"> <a href="[% c.uri_for('/report', problem.id ) %]"> - <h4>[% problem.title | html %]</h4> + <h3 class="item-list__heading">[% problem.title | html %]</h3> </a> </li> diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index a4d274a8e..560cbac51 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -4,9 +4,9 @@ <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] [% IF problem.state != 'unconfirmed' %] - <h4>[% problem.title | html %]</h4> + <h3 class="item-list__heading">[% problem.title | html %]</h3> [% ELSE %] - <h4><em>[% loc('Awaiting moderation') %]</em></h4> + <h3 class="item-list__heading"><em>[% loc('Awaiting moderation') %]</em></h3> [% END %] <small>[% prettify_dt( problem.created, 'zurich' ) %] [%- IF dist %], [% dist %]km[% END %] |