diff options
Diffstat (limited to 'templates/web/oxfordshire')
10 files changed, 40 insertions, 45 deletions
diff --git a/templates/web/oxfordshire/_email_sent_extra.html b/templates/web/oxfordshire/_email_sent_extra.html new file mode 100644 index 000000000..5fdcd3bfd --- /dev/null +++ b/templates/web/oxfordshire/_email_sent_extra.html @@ -0,0 +1 @@ +[% INCLUDE '_response_time.html' problem=report %] diff --git a/templates/web/oxfordshire/_response_time.html b/templates/web/oxfordshire/_response_time.html new file mode 100644 index 000000000..c3cb5fdfa --- /dev/null +++ b/templates/web/oxfordshire/_response_time.html @@ -0,0 +1,14 @@ +[% 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 %] + category are generally responded to within + [% c.cobrand.problem_response_days(problem) %] + working days. + </p> +[% END %] diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index dd90cab01..b7e3d9829 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -8,13 +8,12 @@ </div><!-- .table-cell --> <div class="nav-wrapper"> - <div class="nav-wrapper-2"> + <div class="container"> <div id="main-nav" role="navigation"> - <ul class="nav-menu nav-menu--mysoc"> - <li><a id="mysoc-logo" href="https://www.fixmystreet.com/about/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> + [% 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/about/professional">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> </ul> - - [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 omit_wrapper=1 hide_privacy_link=1 %] </div> </div> </div> diff --git a/templates/web/oxfordshire/footer_extra_js.html b/templates/web/oxfordshire/footer_extra_js.html new file mode 100644 index 000000000..abef0d40f --- /dev/null +++ b/templates/web/oxfordshire/footer_extra_js.html @@ -0,0 +1,3 @@ +[% scripts.push( + version('/cobrands/oxfordshire/js.js'), +) %] diff --git a/templates/web/oxfordshire/front/_list-entry.html b/templates/web/oxfordshire/front/_list-entry.html index 046c3b97f..43d3d6265 100755 --- a/templates/web/oxfordshire/front/_list-entry.html +++ b/templates/web/oxfordshire/front/_list-entry.html @@ -1 +1,4 @@ -[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %] +[% 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/header.html b/templates/web/oxfordshire/header.html index 452a71e88..3666eb4ff 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -26,10 +26,10 @@ </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only oxford-left"> - <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> + <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="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> + <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> @@ -37,7 +37,7 @@ <div id="navigation"> <div class="menubar"> <div class="menu-inner"> - [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %] + [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %] </div> </div> </div> diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 52b20a0af..5bc7949ff 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -10,20 +10,7 @@ </h3> [% END %] - [% 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 %] - category are generally responded to within - [% c.cobrand.problem_response_days(problem) %] - working days. - </p> - [% END %] + [% INCLUDE '_response_time.html' %] </div> [% END %] diff --git a/templates/web/oxfordshire/report/_inspect_extra_info.html b/templates/web/oxfordshire/report/_inspect_extra_info.html new file mode 100644 index 000000000..6151d79ae --- /dev/null +++ b/templates/web/oxfordshire/report/_inspect_extra_info.html @@ -0,0 +1,8 @@ +<p><small> +RDI sent: +[% IF problem.get_extra_metadata('rdi_processed') %] + [% problem.get_extra_metadata('rdi_processed') %] +[% ELSE %] + <strong>not yet sent</strong> +[% END %] +</small></p> diff --git a/templates/web/oxfordshire/report/inspect/state_groups_select.html b/templates/web/oxfordshire/report/inspect/state_groups_select.html deleted file mode 100644 index d9db3864a..000000000 --- a/templates/web/oxfordshire/report/inspect/state_groups_select.html +++ /dev/null @@ -1,21 +0,0 @@ -[% -SET state_pretty = { - 'confirmed' = loc('Open') - 'investigating' = loc('Investigating') - 'action scheduled' = loc('Action Scheduled') - 'fixed - council' = loc('Fixed') - 'not responsible' = loc('Not Responsible') - 'duplicate' = loc('Duplicate') - 'unable to fix' = loc('No further action') -}; - -SET state_groups = [ - [ loc('New'), [ 'confirmed', 'investigating' ] ], - [ loc('Scheduled'), [ 'action scheduled' ] ], - [ loc('Fixed'), [ 'fixed - council' ] ], - [ loc('Closed'), [ 'not responsible', 'duplicate', 'unable to fix' ] ] -]; - -%] -[% DEFAULT current_state = problem.state %] -[% INCLUDE 'report/_state_select_field.html' %] diff --git a/templates/web/oxfordshire/tokens/_extras_confirm.html b/templates/web/oxfordshire/tokens/_extras_confirm.html new file mode 100644 index 000000000..5fdcd3bfd --- /dev/null +++ b/templates/web/oxfordshire/tokens/_extras_confirm.html @@ -0,0 +1 @@ +[% INCLUDE '_response_time.html' problem=report %] |