aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm2
-rw-r--r--perllib/FixMyStreet/Cobrand/Default.pm36
-rw-r--r--perllib/FixMyStreet/Cobrand/EmptyHomes.pm22
-rw-r--r--perllib/FixMyStreet/Cobrand/FixMyStreet.pm26
-rw-r--r--templates/web/bromley/report/display.html7
-rw-r--r--templates/web/default/report/banner.html22
-rw-r--r--templates/web/default/report/display.html7
-rw-r--r--templates/web/emptyhomes/report/display.html6
-rw-r--r--templates/web/fixmystreet/report/banner.html21
-rw-r--r--templates/web/fixmystreet/report/display.html8
10 files changed, 49 insertions, 108 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 6f249b2fe..24abc5ba4 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -115,8 +115,6 @@ sub format_problem_for_display : Private {
my $problem = $c->stash->{problem};
- $c->stash->{banner} = $c->cobrand->generate_problem_banner($problem);
-
( $c->stash->{short_latitude}, $c->stash->{short_longitude} ) =
map { Utils::truncate_coordinate($_) }
( $problem->latitude, $problem->longitude );
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index fc195432d..a73487ca4 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -855,42 +855,6 @@ sub council_rss_alert_options {
return ( \@options, @reported_to_options ? \@reported_to_options : undef );
}
-=head2 generate_problem_banner
-
- my $banner = $c->cobrand->generate_problem_banner;
-
- <p id="[% banner.id %]:>[% banner.text %]</p>
-
-Generate id and text for banner that appears at top of problem page.
-
-=cut
-
-sub generate_problem_banner {
- my ( $self, $problem ) = @_;
-
- my $banner = {};
- if ( $problem->is_open && time() - $problem->lastupdate_local->epoch > 8 * 7 * 24 * 60 * 60 )
- {
- $banner->{id} = 'unknown';
- $banner->{text} = _('This problem is old and of unknown status.');
- }
- if ($problem->is_fixed) {
- $banner->{id} = 'fixed';
- $banner->{text} = _('This problem has been fixed') . '.';
- }
- if ($problem->is_closed) {
- $banner->{id} = 'closed';
- $banner->{text} = _('This problem has been closed') . '.';
- }
-
- if ( grep { $problem->state eq $_ } ( 'investigating', 'in progress', 'planned' ) ) {
- $banner->{id} = 'progress';
- $banner->{text} = _('This problem is in progress') . '.';
- }
-
- return $banner;
-}
-
sub reports_council_check {
my ( $self, $c, $code ) = @_;
diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
index ecb3358bb..a7634e565 100644
--- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
+++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
@@ -93,28 +93,6 @@ sub shorten_recency_if_new_greater_than_fixed {
return 0;
}
-=head2 generate_problem_banner
-
- my $banner = $c->cobrand->generate_problem_banner;
-
- <p id="[% banner.id %]:>[% banner.text %]</p>
-
-Generate id and text for banner that appears at top of problem page.
-
-=cut
-
-sub generate_problem_banner {
- my ( $self, $problem ) = @_;
-
- my $banner = {};
- if ($problem->is_fixed ) {
- $banner->{id} = 'fixed';
- $banner->{text} = _('This problem has been fixed') . '.';
- }
-
- return $banner;
-}
-
=head2 default_photo_resize
Size that photos are to be resized to for display. If photos aren't
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index d44c58f37..33e071b66 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -12,32 +12,6 @@ sub admin_base_url {
sub all_reports_style { return 'detailed'; }
-sub generate_problem_banner {
- my ( $self, $problem ) = @_;
-
- my $banner = {};
- if ( $problem->is_open && time() - $problem->lastupdate_local->epoch > 8 * 7 * 24 * 60 * 60 )
- {
- $banner->{id} = 'unknown';
- $banner->{text} = _('Unknown');
- }
- if ($problem->is_fixed) {
- $banner->{id} = 'fixed';
- $banner->{text} = _('Fixed');
- }
- if ($problem->is_closed) {
- $banner->{id} = 'closed';
- $banner->{text} = _('Closed');
- }
-
- if ( grep { $problem->state eq $_ } ( 'investigating', 'in progress', 'planned' ) ) {
- $banner->{id} = 'progress';
- $banner->{text} = _('In progress');
- }
-
- return $banner;
-}
-
sub allow_crosssell_adverts { return 1; }
1;
diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html
index 89b74277f..13bc5f960 100644
--- a/templates/web/bromley/report/display.html
+++ b/templates/web/bromley/report/display.html
@@ -15,12 +15,7 @@
</div>
-[% IF banner.id %]
- <div class="banner">
- <p id="[% banner.id %]">[% banner.text %]</p>
- </div>
-[% END %]
-
+[% INCLUDE 'report/banner.html' %]
[% INCLUDE 'report/_main.html' %]
<div class="shadow-wrap">
diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html
new file mode 100644
index 000000000..85aaed82d
--- /dev/null
+++ b/templates/web/default/report/banner.html
@@ -0,0 +1,22 @@
+[% USE date %]
+[% BLOCK banner %]
+<p class="banner" id="[% id %]">
+ [% text %]
+</p>
+[% END %]
+
+[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %]
+ [% INCLUDE banner, id = 'unknown', text = loc('This problem is old and of unknown status.') %]
+[% END %]
+[% IF problem.is_fixed %]
+ [% INCLUDE banner, id = 'fixed', text = loc('This problem has been fixed') %]
+[% END %]
+[% IF problem.is_closed %]
+ [% INCLUDE banner, id = 'closed', text = loc('This problem has been closed') %]
+[% END %]
+[% states = [ 'investigating', 'in progress', 'planned' ];
+ IF states.grep(problem.state).size %]
+ [% INCLUDE banner, id = 'progress', text = loc('This problem is in progress') %]
+[% END %]
+
+
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index fac3ef0b2..6b93539f2 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -13,12 +13,7 @@
</div>
<div id="side">
-[% IF banner.id %]
-<p class="banner" id="[% banner.id %]">
- [% banner.text %]
-</p>
-[% END %]
-
+[% INCLUDE 'report/banner.html' %]
[% INCLUDE 'report/_main.html' %]
<p align="right">
diff --git a/templates/web/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html
index bcce6789d..e9a101e3e 100644
--- a/templates/web/emptyhomes/report/display.html
+++ b/templates/web/emptyhomes/report/display.html
@@ -7,9 +7,9 @@
<div id="side">
-[% IF banner.id %]
-<p class="banner" id="[% banner.id %]">
- [% banner.text %]
+[% IF problem.is_fixed %]
+<p class="banner" id="fixed">
+ [% loc('This problem has been fixed') . '.' %];
</p>
[% END %]
diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html
new file mode 100644
index 000000000..58712604e
--- /dev/null
+++ b/templates/web/fixmystreet/report/banner.html
@@ -0,0 +1,21 @@
+[% USE date %]
+[% BLOCK banner %]
+ <div class="banner">
+ <p id="[% id %]">[% text %]</p>
+ </div>
+[% END %]
+
+[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %]
+ [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %]
+[% END %]
+[% IF problem.is_fixed %]
+ [% INCLUDE banner, id = 'fixed', text = loc('Fixed') %]
+[% END %]
+[% IF problem.is_closed %]
+ [% INCLUDE banner, id = 'closed', text = loc('Closed') %]
+[% END %]
+[% states = [ 'investigating', 'in progress', 'planned' ];
+ IF states.grep(problem.state).size %]
+ [% INCLUDE banner, id = 'progress', text = loc('In progress') %]
+[% END %]
+
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index c5cfc8915..a22de373d 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -14,13 +14,7 @@
</div>
-
-[% IF banner.id %]
- <div class="banner">
- <p id="[% banner.id %]">[% banner.text %]</p>
- </div>
-[% END %]
-
+[% INCLUDE 'report/banner.html' %]
[% INCLUDE 'report/_main.html' %]
<div class="shadow-wrap">
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 18:43:22 +0000