Move banner generation logic out of cobrand code and into templates.

4 files changed, 0 insertions, 86 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;