From 99a7e49f36a4e85e201f68637c342cf8b829dd5d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 6 Nov 2025 15:16:03 +0000 Subject: [PATCH 1/2] [Bromley] Tidy garden overdue message location. --- templates/web/base/waste/bin_days.html | 19 ++++++++ .../web/bromley/waste/_service_missed.html | 45 ------------------- .../waste/_service_missed_fallback.html | 1 + .../bromley/waste/_service_missed_open.html | 3 ++ 4 files changed, 23 insertions(+), 45 deletions(-) delete mode 100644 templates/web/bromley/waste/_service_missed.html create mode 100644 templates/web/bromley/waste/_service_missed_fallback.html create mode 100644 templates/web/bromley/waste/_service_missed_open.html diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html index ebaa47ba58..0a16a938e2 100644 --- a/templates/web/base/waste/bin_days.html +++ b/templates/web/base/waste/bin_days.html @@ -103,6 +103,25 @@

[% u [% END %] + [% IF c.cobrand.moniker == 'bromley' AND unit.garden_overdue AND unit.garden_waste AND NOT waste_features.garden_renew_disabled %] +
+
+ +
+
+ Warning +

Your subscription is now overdue.

+ Collections have been paused. They’ll start again when you renew. + [% WRAPPER 'waste/_garden_status_messages.html' %] +
+ + +
+ [% END %] +
+
+ [% END %] + [% IF !unit.garden_overdue %] [% IF unit.garden_due AND NOT pending_subscription AND NOT waste_features.garden_disabled AND NOT waste_features.garden_renew_disabled %] diff --git a/templates/web/bromley/waste/_service_missed.html b/templates/web/bromley/waste/_service_missed.html deleted file mode 100644 index 15f4628410..0000000000 --- a/templates/web/bromley/waste/_service_missed.html +++ /dev/null @@ -1,45 +0,0 @@ -[% IF unit.report_open %] - - A [% unit.service_name FILTER lower %] collection has been reported as missed - [% IF unit.report_open.report %] – check status[% END %] - -[% ELSIF unit.report_allowed %] - [% any_report_allowed = 1 %] -
- - - -
-[% ELSIF unit.report_locked_out %] - A missed collection cannot be reported; - [% IF unit.report_locked_out_reason %] - [% unit.report_locked_out_reason %] - [% ELSE %] - please see the last collection status above. - [% END %] - -[% ELSIF NOT no_default %] - [% IF unit.garden_overdue AND unit.garden_waste AND NOT waste_features.garden_renew_disabled %] -
-
- -
-
- Warning -

Your subscription is now overdue.

- Collections have been paused. They'll start again when you renew. - [% WRAPPER 'waste/_garden_status_messages.html' %] -
- - -
- [% END %] -
-
- [% END %] - [% IF unit.next AND unit.next.state == 'In progress' %] - A missed collection cannot be reported on the day of collection until the crew have finished their round. - [% ELSE %] - Please note that missed collections can only be reported within 2 working days of your scheduled collection day. - [% END %] -[% END %] diff --git a/templates/web/bromley/waste/_service_missed_fallback.html b/templates/web/bromley/waste/_service_missed_fallback.html new file mode 100644 index 0000000000..909a72e3e4 --- /dev/null +++ b/templates/web/bromley/waste/_service_missed_fallback.html @@ -0,0 +1 @@ +Please note that missed collections can only be reported within 2 working days of your scheduled collection day. diff --git a/templates/web/bromley/waste/_service_missed_open.html b/templates/web/bromley/waste/_service_missed_open.html new file mode 100644 index 0000000000..981f072f76 --- /dev/null +++ b/templates/web/bromley/waste/_service_missed_open.html @@ -0,0 +1,3 @@ +A [% unit.service_name FILTER lower %] collection has been reported as missed +[% IF unit.report_open.report %] – check status[% END %] + From 014d90bad0a3888a382873d48cb05fa9f57a44ae Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 6 Nov 2025 17:27:56 +0000 Subject: [PATCH 2/2] [Waste] Nicer mobile display of bin days. The image can always be put inline with the collection dates, and we can make the services full width until a wider point. [Bexley] Fixes issue with missing margins on garden waste entry. --- templates/web/base/waste/_service_missed.html | 4 ++-- templates/web/base/waste/bin_days.html | 18 +++++++++++------- templates/web/bexley/waste/services_extra.html | 10 ++++------ .../web/bromley/waste/services_extra.html | 4 ++-- .../web/merton/waste/_service_missed.html | 4 ++-- web/cobrands/sass/_waste.scss | 18 ++++++++++++++++++ 6 files changed, 39 insertions(+), 19 deletions(-) diff --git a/templates/web/base/waste/_service_missed.html b/templates/web/base/waste/_service_missed.html index 373b350d1e..3af65c402d 100644 --- a/templates/web/base/waste/_service_missed.html +++ b/templates/web/base/waste/_service_missed.html @@ -18,9 +18,9 @@ [% END %] [% ELSIF unit.next AND unit.next.state == 'In progress' %] - A missed collection cannot be reported on the day of collection until the crew have finished their round. + A missed collection cannot be reported on the day of collection until the crew have finished their round. [% ELSIF NOT no_default %] - + [% PROCESS 'waste/_service_missed_fallback.html' %] [% END %] diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html index 0a16a938e2..fa0bada035 100644 --- a/templates/web/base/waste/bin_days.html +++ b/templates/web/base/waste/bin_days.html @@ -67,7 +67,7 @@

[% SET image = c.cobrand.image_for_unit(unit) ~%] [% IF image %] -
+
[% IF c.cobrand.moniker == 'peterborough' %]

[% unit.service_name %]

[% END %] @@ -84,7 +84,7 @@

[% u [% END %]

-
+
[% ELSE %]
[% IF c.cobrand.moniker == 'peterborough' %] @@ -215,6 +215,10 @@

Your subscription is soo [% END %] [% IF c.cobrand.moniker == 'peterborough' %]
[% END %] +

+
+
+
[% PROCESS waste/services.html %]
@@ -241,15 +245,15 @@

[%

[% END %]
-
+
[% ELSE %]
-
+

Bulky Waste

[% END %]
-
+
[% IF c.cobrand.moniker == 'peterborough' %]
[% END %] [% IF property.commercial_property %] [% PROCESS waste/_bulky_waste_message.html %] @@ -271,10 +275,10 @@

Small items

[% END %]
-
+
-
+
[% PROCESS 'waste/bulky/_bin_days_list.html' type='small_items' %]
diff --git a/templates/web/bexley/waste/services_extra.html b/templates/web/bexley/waste/services_extra.html index 714866de3f..1cacab1137 100644 --- a/templates/web/bexley/waste/services_extra.html +++ b/templates/web/bexley/waste/services_extra.html @@ -1,13 +1,12 @@ -
[% IF property.garden_signup_eligible %]

Brown Wheelie Bin

-
+
-
+

Status: You do not have a Garden waste collection.

@@ -24,10 +23,10 @@

Brown Wheelie Bin

-
+
-
+

Status: We're currently unable to check your garden waste subscription status.

@@ -134,4 +133,3 @@

[% tag.reason %]

[% END %] [% END %] -
diff --git a/templates/web/bromley/waste/services_extra.html b/templates/web/bromley/waste/services_extra.html index 4c2c469555..fb765c9efd 100644 --- a/templates/web/bromley/waste/services_extra.html +++ b/templates/web/bromley/waste/services_extra.html @@ -1,12 +1,12 @@ [% IF domestic_collection %]

Batteries, small electrical items and textiles

-
+
-
+

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.

diff --git a/templates/web/merton/waste/_service_missed.html b/templates/web/merton/waste/_service_missed.html index 880f4566b2..aa92a0bed8 100644 --- a/templates/web/merton/waste/_service_missed.html +++ b/templates/web/merton/waste/_service_missed.html @@ -1,5 +1,5 @@ [% IF NOT unit.report_allowed AND NOT unit.report_locked_out AND NOT (unit.next AND unit.next.state == 'In progress') AND NOT no_default %] - + [% PROCESS 'waste/_service_missed_fallback.html' %] [% ELSIF unit.report_open %] @@ -22,5 +22,5 @@ [% END %] [% ELSIF unit.next AND unit.next.state == 'In progress' %] - A missed collection cannot be reported on the day of collection until the crew have finished their round. + A missed collection cannot be reported on the day of collection until the crew have finished their round. [% END %] diff --git a/web/cobrands/sass/_waste.scss b/web/cobrands/sass/_waste.scss index ec7726261e..d9bf767207 100644 --- a/web/cobrands/sass/_waste.scss +++ b/web/cobrands/sass/_waste.scss @@ -50,6 +50,24 @@ body.waste { } } +.govuk-grid-column { + box-sizing: border-box; + padding: 0 15px; +} +.govuk-grid-column-always-one-quarter { + width: 25%; + float: left; +} +.govuk-grid-column-always-three-quarters { + width: 75%; + float: left; +} +@media (min-width: $large-screen) { + .govuk-grid-column-wide-three-quarters { + margin-left: 25%; + } +} + .waste__collections, .waste__summary { .govuk-summary-list {