diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/web/oxfordshire/around/postcode_form.html | 32 | ||||
-rw-r--r-- | templates/web/oxfordshire/footer.html | 33 | ||||
-rw-r--r-- | templates/web/oxfordshire/front/recent.html | 25 | ||||
-rw-r--r-- | templates/web/oxfordshire/header.html | 29 | ||||
-rw-r--r-- | templates/web/oxfordshire/index-steps.html | 13 | ||||
-rw-r--r-- | templates/web/oxfordshire/main_nav.html | 22 | ||||
-rw-r--r-- | templates/web/oxfordshire/main_nav_items.html | 48 |
7 files changed, 156 insertions, 46 deletions
diff --git a/templates/web/oxfordshire/around/postcode_form.html b/templates/web/oxfordshire/around/postcode_form.html new file mode 100644 index 000000000..f598f1f98 --- /dev/null +++ b/templates/web/oxfordshire/around/postcode_form.html @@ -0,0 +1,32 @@ +<div id="front-main"> + <div id="front-main-container"> + [% UNLESS possible_location_matches %] + [% INCLUDE 'around/intro.html' %] + [% END %] + + [% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); + %] + + <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm" class="js-geolocate"> + <label for="pc">[% question %]:</label> + <div> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ā%sā or ā%sā'), c.cobrand.example_places) %]" required> + <input type="submit" value="[% loc('Find') %]" id="sub"> + </div> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + [% IF c.user_exists AND c.user.categories.size %] + <input type="hidden" name="filter_category" value="[% c.user.categories.join(",") | html %]"> + [% END %] + </form> + <a href="[% c.uri_for('/around') %]" id="geolocate_link">[% loc('Or locate me automatically') %]</a> + + [% UNLESS possible_location_matches %] + [% INCLUDE 'around/_postcode_form_post.html' %] + [% END %] + </div> +</div> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index 7dd6b6254..c9c02bb5d 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -1,8 +1,3 @@ - [% IF pagefooter %] - <footer role="contentinfo"> - <p><a href="/privacy">Privacy and cookies</a></p> - </footer> - [% END %] </div><!-- .content role=main --> </div><!-- .container --> </div><!-- .table-cell --> @@ -11,25 +6,23 @@ <div class="container"> <div id="main-nav" role="navigation"> [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %] - <ul class="nav-menu"> - <li><a id="mysoc-logo" href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> - </ul> </div> </div> </div> </div> <!-- .wrapper --> - <div id="oxford-footer" class="desk-only"> - <address> - <strong>Oxfordshire County Council</strong><br> - <a href="http://www.oxfordshire.gov.uk/cms/public-site/contact-oxfordshire-county-council" title="Contact the council">Contact the council</a><br> - <a href="/privacy">View our terms and conditions</a> - </address> - <ul><!-- use | between items --> - <li class="powered-by-fms"> - <a href="https://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-inverse.png" alt="FixMyStreet"></a> - </li> - </ul> - </div> + + <footer class="occlss-page-footer" id="occlss-footer"> + <div class="occlss-wrapper occlss-page-footer__wraper"> + <div class="occlss-layout occlss-layout--gutter-s"> + <div class="occlss-layout__col s-cms-content-footer"> + <h4>Oxfordshire County Council</h4> + <p>County Hall, New Road, Oxford, OX1 1ND</p> + <p><a href="/privacy">Privacy and cookies</a></p> + </div> + </div> + </div> + </footer> + </div> <!-- oxford-wrapper --> [% INCLUDE 'common_footer_tags.html' %] diff --git a/templates/web/oxfordshire/front/recent.html b/templates/web/oxfordshire/front/recent.html new file mode 100644 index 000000000..fbd9b8eb7 --- /dev/null +++ b/templates/web/oxfordshire/front/recent.html @@ -0,0 +1,25 @@ +[% recent_photos = c.cobrand.recent_photos('front', 5); %] + +[% IF recent_photos.size %] +<div id="front-recently"> + <h2> + [%- IF c.cobrand.moniker == 'hart' %] + Recently reported + [% ELSE %] + [% loc('Recently reported problems') %] + [% END -%] + </h2> + + <section class="full-width"> + [% INCLUDE "front/stats.html" %] + </section> + + <section class="full-width"> + <ul id="js-reports-list" class="item-list item-list--reports item-list--front-page"> + [% FOREACH problem IN recent_photos %] + [% INCLUDE 'front/_list-entry.html' %] + [% END %] + </ul> + </section> +</div> +[% END %] diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6bb6436bc..eaf601b1b 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -12,6 +12,7 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> + <link href="https://fonts.googleapis.com/css?family=Fira+Sans:300,400,500,600,700,900|Open+Sans:300,400,600,700" rel="stylesheet"> [% INCLUDE 'header/css.html' %] [% INCLUDE 'common_header_tags.html' %] @@ -25,41 +26,17 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) --> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only"> - <a href="https://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council</a> - <span id="oxford-links"> - <a href="https://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> - </span> - <div style="clear:both"></div> - <span class="header"><a href="/">Report a road or street problem</a></span> - - <div id="navigation"> - <div class="menubar"> - <div class="menu-inner"> - [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %] - </div> - </div> - </div> - - </div> <!-- end of oxford header --> - <div class="wrapper"> <div class="table-cell"> <header id="site-header" role="banner"> <div class="container"> - <a href="/" id="site-logo">Oxfordshire FixMyStreet</a> + <a href="https://www.oxfordshire.gov.uk/" id="site-logo">Oxfordshire County Council</a> <a href="#main-nav" id="nav-link">Main Navigation</a> </div> </header> - [% IF c.req.uri.path == '/' %] - <p class="oxfordshire-preamble"> - This weekend Fix My Street, and the Oxfordshire County Council systems that it connects to, are being upgraded. If there - is a pause in our response, that may be why. But your report will be looked into by one of Oxfordshire's Highways Inspectors - as soon as possible. Thanks for using Fix My Street - </p> - [% END %] + <div class="nav-spacer"></div> [% pre_container_extra %] diff --git a/templates/web/oxfordshire/index-steps.html b/templates/web/oxfordshire/index-steps.html new file mode 100644 index 000000000..9d6a99c0b --- /dev/null +++ b/templates/web/oxfordshire/index-steps.html @@ -0,0 +1,13 @@ +<h2>[% loc('How to report a problem') %]</h2> + +<ol class="big-numbers"> + <li>[% question %]</li> + <li>[% loc('Locate the problem on a map of the area') %]</li> + <li>[% loc('Enter details of the problem') %]</li> + [% IF c.cobrand.is_council %] + <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> + [% ELSIF c.cobrand.moniker == 'zurich' %] + [% ELSE %] + <li>[% loc('We send it to the council on your behalf') %]</li> + [% END %] +</ol> diff --git a/templates/web/oxfordshire/main_nav.html b/templates/web/oxfordshire/main_nav.html new file mode 100644 index 000000000..f7bc619e2 --- /dev/null +++ b/templates/web/oxfordshire/main_nav.html @@ -0,0 +1,22 @@ +[% + # DEFAULT would make sense here, except it treats the empty string as falsy + # and some cobrands want to set ul_class to an empty string. + SET ul_class="nav-menu nav-menu--main" UNLESS ul_class.defined; +%] +[% BLOCK navitem ~%] + <li [% liattrs %]> + <a href="[% uri %][% suffix IF suffix %]" [% attrs %]>[% label %]</a> + </li> +[%~ END %] + +[% UNLESS omit_wrapper %] + <div id="main-nav" role="navigation"> +[% END %] + + <ul class="[% ul_class %]"[% " id='" _ ul_id _ "'" IF ul_id %]> + [% INCLUDE 'main_nav_items.html' %] + </ul> + +[% UNLESS omit_wrapper %] + </div> +[% END %] diff --git a/templates/web/oxfordshire/main_nav_items.html b/templates/web/oxfordshire/main_nav_items.html new file mode 100644 index 000000000..6c45bd785 --- /dev/null +++ b/templates/web/oxfordshire/main_nav_items.html @@ -0,0 +1,48 @@ +[%~ INCLUDE navitem uri=(homepage_template ? '/report' : '/') label=loc('Report a problem') ~%] + +[%~ IF c.user_exists ~%] + [%~ INCLUDE navitem uri='/my' label=loc('Your reports') ~%] +[%~ ELSE ~%] + [%~ INCLUDE navitem uri='/auth' label=loc('Your reports') ~%] +[%~ END ~%] + +[%~ IF c.user_exists AND c.user.has_body_permission_to('planned_reports') ~%] + [%~ INCLUDE navitem always_url=1 uri='/my/planned' label=loc('Shortlist') ~%] +[%~ END ~%] + + +[%~ UNLESS hide_all_reports_link ~%] + [%~ + IF c.user_exists AND c.user.categories.size; + categories = c.user.categories.join(",") | uri; + cat_suffix = "?filter_category=" _ categories; + END; + + reports_uri = '/reports'; + IF body_name; + body_name = body_name | uri; + reports_uri = "${reports_uri}/${body_name}"; + END; + + INCLUDE navitem uri=reports_uri label=loc('All reports') suffix=cat_suffix; + ~%] +[%~ END ~%] + +[%~ + IF pc; + pc_uri = pc | uri; + pc_suffix = "/list?pc=" _ pc_uri; + END; + + INCLUDE navitem uri='/alert' label=loc('Local alerts') suffix=pc_suffix; +~%] + +[%~ INCLUDE navitem uri='/faq' label=loc('Help') ~%] + +[%~ UNLESS hide_privacy_link ~%] + [%~ INCLUDE navitem uri='/privacy' label=loc('Privacy') liattrs='class="nav-menu__item--privacy"' ~%] +[%~ END ~%] + +[%~ IF c.user_exists AND c.cobrand.admin_allow_user(c.user) ~%] + [%~ INCLUDE navitem uri='/admin' label=loc('Admin') ~%] +[%~ END ~%] |