aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/bromley
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/bromley')
-rwxr-xr-xtemplates/web/bromley/about/faq-en-gb.html13
-rw-r--r--templates/web/bromley/admin/category-checkboxes.html22
-rw-r--r--templates/web/bromley/admin/templates/_external.html24
-rw-r--r--templates/web/bromley/footer.html7
-rw-r--r--templates/web/bromley/footer_extra_js.html2
-rw-r--r--templates/web/bromley/front/pre-steps.html2
-rw-r--r--templates/web/bromley/header_extra.html1
-rw-r--r--templates/web/bromley/header_logo.html68
-rw-r--r--templates/web/bromley/report/_updates_disallowed_message.html21
-rw-r--r--templates/web/bromley/report/form/user_loggedout_email.html11
-rw-r--r--templates/web/bromley/waste/enquiry-problem.html29
-rw-r--r--templates/web/bromley/waste/services.html39
-rw-r--r--templates/web/bromley/waste/services_extra.html15
13 files changed, 200 insertions, 54 deletions
diff --git a/templates/web/bromley/about/faq-en-gb.html b/templates/web/bromley/about/faq-en-gb.html
index 615069150..a4d60c75d 100755
--- a/templates/web/bromley/about/faq-en-gb.html
+++ b/templates/web/bromley/about/faq-en-gb.html
@@ -15,7 +15,7 @@
<dl>
<dt>What issues can&rsquo;t be reported here?</dt>
<dd><p>The following problems should be reported via
- <a href="http://www.bromley.gov.uk/report">http://www.bromley.gov.uk/report</a>:</p>
+ <a href="https://www.bromley.gov.uk/report">https://www.bromley.gov.uk/report</a>:</p>
<ul>
<li>missed rubbish or recycling collections
<li>anti-social behaviour
@@ -26,7 +26,9 @@
<li>complaining or commenting about the council
</ul>
- <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>.
+ <p>Note, the council does not maintain responsibility for problems on
+ private land or TfL roads (A21 and part of the A232, West Wickham to
+ Locksbottom). Reports on TfL roads will be automatically routed to TfL.</p>
</dd>
@@ -39,7 +41,7 @@
<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 missing manhole covers or a fallen lamp column.</p>
- <p>Please direct your enquiry to our <a href="http://www.bromley.gov.uk/info/200039/emergencies/460/emergency_contacts">Out of Hours service</a></p>
+ <p>Please direct your enquiry to our <a href="https://www.bromley.gov.uk/info/200039/emergencies/460/emergency_contacts">Out of Hours service</a></p>
</dd>
@@ -70,11 +72,10 @@ the problem.</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
+mySociety is a registered charity, number 1076346, which has grown out of the community of
volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>.
mySociety&rsquo;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
+benefits in the civic and community aspects of their lives. mySociety
can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
diff --git a/templates/web/bromley/admin/category-checkboxes.html b/templates/web/bromley/admin/category-checkboxes.html
index 756f2d1ff..68e8e0c26 100644
--- a/templates/web/bromley/admin/category-checkboxes.html
+++ b/templates/web/bromley/admin/category-checkboxes.html
@@ -1,12 +1,4 @@
-<fieldset>
- <legend>
- [% IF hint %]
- <div class="admin-hint">
- <p>[% hint %]</p>
- </div>
- [% END %]
- [% loc('Categories:') %]
- </legend>
+[% BLOCK checkboxes %]
<ul class="no-bullets no-margin">
<li>
[% loc('Select:') %]
@@ -22,4 +14,16 @@
</li>
[% END %]
</ul>
+[% END %]
+<fieldset>
+ <legend>
+ [% IF hint %]
+ <div class="admin-hint">
+ <p>[% hint %]</p>
+ </div>
+ [% END %]
+ [% loc('Categories:') %]
+ </legend>
+
+ [% INCLUDE checkboxes %]
</fieldset>
diff --git a/templates/web/bromley/admin/templates/_external.html b/templates/web/bromley/admin/templates/_external.html
new file mode 100644
index 000000000..6015950de
--- /dev/null
+++ b/templates/web/bromley/admin/templates/_external.html
@@ -0,0 +1,24 @@
+[% parts = rt.external_status_code.split(',') ~%]
+
+[% IF errors.external_status_code %]
+ <div class="form-error">[% errors.external_status_code %]</div>
+[% END %]
+<p>
+ <label for="resolution_code">External status code / Resolution Code ID</label>
+ <input type="text" id="resolution_code" name="resolution_code" class="form-control" size="30" value="[% parts.0 %]">
+</p>
+
+<p>
+ <label for="task_type">Task type ID</label>
+ <input type="text" id="task_type" name="task_type" class="form-control" size="30" value="[% parts.1 %]">
+</p>
+
+<p>
+ <label for="task_state">Task state</label>
+ <select class="form-control" name="task_state" id="task_state">
+ <option value="">---</option>
+ [% FOR opt IN ['Completed', 'Not Completed'] %]
+ <option value="[% opt %]"[% ' selected' IF parts.2 == opt %]>[% opt %]</option>
+ [% END %]
+ </select>
+</p>
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 914ba3ace..5aac635b3 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -2,6 +2,13 @@
<footer role="contentinfo">
[% INCLUDE 'front/footer-marketing.html' %]
</footer>
+ [% ELSIF bodyclass == 'waste' %]
+ <div class="bromley-waste-credits">
+ <p>Powered by</p>
+ <p>
+ <a href="https://www.societyworks.org/services/waste/">SocietyWorks</a>
+ </p>
+ </div>
[% END %]
</div><!-- .content role=main -->
</div><!-- .container -->
diff --git a/templates/web/bromley/footer_extra_js.html b/templates/web/bromley/footer_extra_js.html
index c3bad670c..3a58505ef 100644
--- a/templates/web/bromley/footer_extra_js.html
+++ b/templates/web/bromley/footer_extra_js.html
@@ -2,7 +2,7 @@
version('/jslib/jquery-1.7.2.min.js'),
version('/cobrands/bromley/a-z-nav.js'),
) %]
-[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 validation=1 tfl=1 %]
+[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 validation=1 tfl=1 roadworks=1 %]
[% IF bodyclass.match('mappage');
scripts.push(
version('/cobrands/bromley/map.js'),
diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-steps.html
index ebe7154c1..4ba703cb0 100644
--- a/templates/web/bromley/front/pre-steps.html
+++ b/templates/web/bromley/front/pre-steps.html
@@ -9,5 +9,5 @@ priority issues in the first instance.
<p>This is primarily for reporting physical problems that can be fixed
like graffiti, cleansing issues or road defects. To report other
kinds of problems like missed bins use our
-<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
+<a href="https://www.bromley.gov.uk/report">online report it forms</a>.
</p>
diff --git a/templates/web/bromley/header_extra.html b/templates/web/bromley/header_extra.html
new file mode 100644
index 000000000..709f06084
--- /dev/null
+++ b/templates/web/bromley/header_extra.html
@@ -0,0 +1 @@
+<link rel="stylesheet" href="/vendor/govuk-frontend/govuk-frontend-3.5.0.min.css">
diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html
index 8c49d9145..2159dc5d3 100644
--- a/templates/web/bromley/header_logo.html
+++ b/templates/web/bromley/header_logo.html
@@ -1,13 +1,19 @@
<div class="bromley-header clearfix">
- <a href="http://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a>
+[% IF bodyclass == 'waste' %]
+ <a href="https://www.bromley.gov.uk/" id="site-logo">
+ <img src="/cobrands/bromley/images/waste.png" alt="Bromley Council">
+ </a>
+[% ELSE %]
+ <a href="https://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a>
+[% END %]
<ul class="linear-links subtext float-right top-links">
- <li class="first-child"><i class="fa fa-home"></i><a href="http://www.bromley.gov.uk">Home</a></li>
- <li><i class="fa fa-sitemap"></i><a href="http://www.bromley.gov.uk/site_map">Sitemap</a></li>
+ <li class="first-child"><i class="fa fa-home"></i><a href="https://www.bromley.gov.uk">Home</a></li>
+ <li><i class="fa fa-sitemap"></i><a href="https://www.bromley.gov.uk/site_map">Sitemap</a></li>
<li><i class="fa fa-user"></i><a href="https://www.bromley.gov.uk/SiteLogin">Register/Sign in</a></li>
</ul>
- <form action="http://www.bromley.gov.uk/site/scripts/google_results.aspx" method="get" id="search" class="main-search" role="search">
+ <form action="https://www.bromley.gov.uk/site_search/results/" method="get" id="search" class="main-search" role="search">
<label for="SearchSite" class="hidden">Search this site</label>
<input type="text" size="18" class="main-search-input field" name="q" id="SearchSite" value="" placeholder="Search the website">
<input value="Search" type="submit" class="button__primary">
@@ -21,32 +27,32 @@
<li class="first-child">
<a href="#" class="main-nav-title">A-Z</a>
<ul class="nav-hover-item nav-hover-item-active a-z">
- <li class="first-child"><a href="http://www.bromley.gov.uk/a_to_z/A">a</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/B">b</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/C">c</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/D">d</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/E">e</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/F">f</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/G">g</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/H">h</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/I">i</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/J">j</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/K">k</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/L">l</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/M">m</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/N">n</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/O">o</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/P">p</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/Q">q</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/R">r</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/S">s</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/T">t</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/U">u</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/V">v</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/W">w</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/X">x</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/Y">y</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z/Z">z</a></li>
+ <li class="first-child"><a href="https://www.bromley.gov.uk/a_to_z/A">a</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/B">b</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/C">c</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/D">d</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/E">e</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/F">f</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/G">g</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/H">h</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/I">i</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/J">j</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/K">k</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/L">l</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/M">m</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/N">n</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/O">o</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/P">p</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/Q">q</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/R">r</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/S">s</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/T">t</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/U">u</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/V">v</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/W">w</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/X">x</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/Y">y</a></li>
+ <li><a href="https://www.bromley.gov.uk/a_to_z/Z">z</a></li>
</ul>
</li>
</ul>
@@ -55,7 +61,7 @@
<div class="breadcrumb">
<!-- Breadcrumb --><!-- googleoff:all -->
<ul>
- <li class="first-child"><a href="http://www.bromley.gov.uk">Home</a></li>
+ <li class="first-child"><a href="https://www.bromley.gov.uk">Home</a></li>
<li class="current"><span>FixMyStreet</span></li>
</ul>
<!-- END Breadcrumb --><!-- googleon:all -->
diff --git a/templates/web/bromley/report/_updates_disallowed_message.html b/templates/web/bromley/report/_updates_disallowed_message.html
new file mode 100644
index 000000000..25e3a57c4
--- /dev/null
+++ b/templates/web/bromley/report/_updates_disallowed_message.html
@@ -0,0 +1,21 @@
+[% IF c.cobrand.updates_disallowed(problem) == 'waste';
+ SET property_id = problem.get_extra_field_value('property_id');
+%]
+<p>
+ <a href="/waste[% IF property_id %]/[% property_id %][% END %]">See your bin collections</a>.
+</p>
+
+<div class="bromley-waste-credits">
+ <p>Powered by</p>
+ <p>
+ <a href="https://www.societyworks.org/services/waste/">SocietyWorks</a>
+ </p>
+</div>
+
+[% ELSE %]
+<p>[% loc('This report is now closed to updates.') %]
+ [% tprintf(loc('You can <a href="%s">make a new report in the same location</a>.'),
+ c.uri_for( '/report/new', { longitude = longitude, latitude = latitude } )
+ ) %]
+</p>
+[% END %]
diff --git a/templates/web/bromley/report/form/user_loggedout_email.html b/templates/web/bromley/report/form/user_loggedout_email.html
index 8aad16289..e7f08a4a8 100644
--- a/templates/web/bromley/report/form/user_loggedout_email.html
+++ b/templates/web/bromley/report/form/user_loggedout_email.html
@@ -1,21 +1,20 @@
[% IF c.config.SMS_AUTHENTICATION %]
[% SET username_label = loc('Your email or mobile') %]
[% SET username_type = 'text' %]
- [% SET username_value = object.user.username %]
[% ELSE %]
[% SET username_label = loc('Your email') %]
[% SET username_type = 'email' %]
- [% SET username_value = object.user.email %]
[% END %]
+[% SET username_field = (name == 'username_sign_in') ? 'username' : 'username_register' ~%]
<label for="form_[% name %]">[% loc('Email' ) %]
[% IF type == 'update' %]
<span class="muted">([% loc('We never show your email') %])</span>
[% END %]
</label>
-[% IF field_errors.username %]
- <p class='form-error'>[% field_errors.username %]</p>
+[% IF field_errors.$name %]
+ <p class='form-error'>[% field_errors.$name %]</p>
[% END %]
-<input type="[% username_type %]" name="username" id="form_[% name %]"
- value="[% username_value | html %]"
+<input type="[% username_type %]" name="[% username_field %]" id="form_[% name %]"
+ value="[% c.get_param(username_field) %]"
class="form-control required">
diff --git a/templates/web/bromley/waste/enquiry-problem.html b/templates/web/bromley/waste/enquiry-problem.html
new file mode 100644
index 000000000..db4cb1848
--- /dev/null
+++ b/templates/web/bromley/waste/enquiry-problem.html
@@ -0,0 +1,29 @@
+[%
+
+f = [];
+service_id = c.req.params.service_id;
+service = services.$service_id;
+IF service.report_allowed;
+ IF !service.enquiry_open_events.2118;
+ f.push( { value = 'Gate not closed', label = 'A gate or enclosure wasn’t closed after the collection' } );
+ END;
+ IF !service.enquiry_open_events.2119;
+ f.push( { value = 'Waste spillage', label = 'Bin contents were spilled during the collection' } );
+ END;
+ IF !service.enquiry_open_events.2120;
+ f.push( { value = 'Bin not returned', label = 'A bin wasn’t returned after the collection' } );
+ END;
+END;
+f.push(
+ { value = 'Crew behaviour', label = 'There was a problem with the crew’s behaviour' },
+ { value = 'Wrongful removal', label = 'Something was wrongly removed during the collection' },
+ { value = 'Damage to 3rd party', label = 'Someone else’s vehicle was damaged' },
+ { value = 'Damage to Property', label = 'My property was damaged' },
+ { value = 'Failure to deliver bin', label = 'My bin was not delivered' },
+);
+
+PROCESS waste/enquiry.html
+ title = 'Report a problem'
+ field_options = f;
+
+%]
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
new file mode 100644
index 000000000..6fc654f07
--- /dev/null
+++ b/templates/web/bromley/waste/services.html
@@ -0,0 +1,39 @@
+[% IF unit.service_id == 531 ~%]
+[% domestic_collection = 1 ~%]
+[% END ~%]
+[% IF unit.report_open %]
+ <span class="waste-service-descriptor">
+ A [% unit.service_name FILTER lower %] collection has been reported as missed
+ [% IF unit.report_open.report %] – <a href="[% unit.report_open.report.url %]" class="waste-service-link">check status</a>[% END %]
+ </span>
+[% ELSIF unit.report_allowed %]
+ [% any_report_allowed = 1 %]
+ <form method="post" action="[% c.uri_for_action('waste/report', [ property.id ]) %]">
+ <input type="hidden" name="token" value="[% csrf_token %]">
+ <input type="hidden" name="service-[% unit.service_id %]" value="1">
+ <input type="submit" value="Report a [% unit.service_name FILTER lower %] collection as missed" class="waste-service-descriptor waste-service-link">
+ </form>
+[% ELSIF unit.report_locked_out %]
+ <span class="waste-service-descriptor">A missed collection cannot be reported, please see the last collection status above.</span>
+[% ELSE %]
+ <span class="waste-service-descriptor">Please note that missed collections can only be reported within 2 working days of your scheduled collection day.</span>
+[% END %]
+ <a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?template=problem&amp;service_id=[% unit.service_id %]" class="waste-service-link waste-service-descriptor">Report a problem with a [% unit.service_name FILTER lower %] collection</a>
+[% IF unit.request_open %]
+ <span class="waste-service-descriptor">
+ A new [% unit.service_name FILTER lower %] container request has been made
+ [% IF unit.request_open.report %] – <a href="[% unit.request_open.report.url %]" class="waste-service-link">check status</a>[% END %]
+ </span>
+[% ELSIF unit.request_allowed %]
+ [% any_request_allowed = 1 %]
+ <form method="post" action="[% c.uri_for_action('waste/request', [ property.id ]) %]">
+ <input type="hidden" name="token" value="[% csrf_token %]">
+ <input type="hidden" name="container-[% unit.request_containers.0 %]" value="1">
+ <input type="submit" value="Request a new [% unit.service_name FILTER lower %] container" class="waste-service-descriptor waste-service-link">
+ </form>
+[% END %]
+ <form method="get" action="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]">
+ <input type="hidden" name="service_id" value="[% unit.service_id %]">
+ <input type="hidden" name="category" id="category" value="General Enquiry">
+ <input type="submit" value="Contact us about a [% unit.service_name FILTER lower %] collection" class="waste-service-descriptor waste-service-link">
+ </form>
diff --git a/templates/web/bromley/waste/services_extra.html b/templates/web/bromley/waste/services_extra.html
new file mode 100644
index 000000000..d635c843f
--- /dev/null
+++ b/templates/web/bromley/waste/services_extra.html
@@ -0,0 +1,15 @@
+[% IF domestic_collection %]
+<h3 class="govuk-heading-m waste-service-name">Batteries, small electrical items and textiles</h3>
+<div class="govuk-grid-row">
+ <div class="govuk-grid-column-one-quarter text-centered">
+ <img src="/cobrands/bromley/images/container-images/electricals-batteries-textiles.png"
+ srcset="/cobrands/bromley/images/container-images/electricals-batteries-textiles.png 1x, /cobrands/bromley/images/container-images/electricals-batteries-textiles@2x.png 2x"
+ alt="" class="waste-service-image">
+ </div>
+ <div class="govuk-grid-column-three-quarters">
+ <p>Please only present one small bag each week as we cannot handle high
+ volumes. If we do not collect your items, please bring them back inside and
+ present them for collection next week.</p>
+ </div>
+</div>
+[% END %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 10:37:02 +0000