Bring static pages together in Static.pm, and add posters static page.

3 files changed, 22 insertions, 71 deletions

diff --git a/perllib/FixMyStreet/App/Controller/About.pm b/perllib/FixMyStreet/App/Controller/About.pm
deleted file mode 100644
index b444e02bb..000000000
--- a/perllib/FixMyStreet/App/Controller/About.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FixMyStreet::App::Controller::About;
-use Moose;
-use namespace::autoclean;
-
-BEGIN { extends 'Catalyst::Controller'; }
-
-=head1 NAME
-
-FixMyStreet::App::Controller::About - Catalyst Controller
-
-=head1 DESCRIPTION
-
-Catalyst Controller.
-
-=head1 METHODS
-
-=cut
-
-=head2 about
-
-Show the 'about us' page.
-
-=cut
-
-sub about : Path : Args(0) {
-    my ( $self, $c ) = @_;
-
-    # don't need to do anything here - should just pass through.
-}
-
-__PACKAGE__->meta->make_immutable;
-
-1;
diff --git a/perllib/FixMyStreet/App/Controller/Fun.pm b/perllib/FixMyStreet/App/Controller/Fun.pm
deleted file mode 100644
index e5d8f9652..000000000
--- a/perllib/FixMyStreet/App/Controller/Fun.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FixMyStreet::App::Controller::Fun;
-use Moose;
-use namespace::autoclean;
-
-BEGIN { extends 'Catalyst::Controller'; }
-
-=head1 NAME
-
-FixMyStreet::App::Controller::Fun - Catalyst Controller
-
-=head1 DESCRIPTION
-
-Catalyst Controller.
-
-=head1 METHODS
-
-=cut
-
-=head2 fun
-
-Show the 'fun' page.
-
-=cut
-
-sub index : Path : Args(0) {
-    my ( $self, $c ) = @_;
-    $c->stash->{template} = 'fun.html';
-}
-
-__PACKAGE__->meta->make_immutable;
-
-1;
-
diff --git a/perllib/FixMyStreet/App/Controller/FAQ.pm b/perllib/FixMyStreet/App/Controller/Static.pm
index 6b8fb1191..b58b55852 100644..100755
--- a/perllib/FixMyStreet/App/Controller/FAQ.pm
+++ b/perllib/FixMyStreet/App/Controller/Static.pm
@@ -1,4 +1,4 @@
-package FixMyStreet::App::Controller::FAQ;
+package FixMyStreet::App::Controller::Static;
 use Moose;
 use namespace::autoclean;
 
@@ -6,16 +6,23 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 =head1 NAME
 
-FixMyStreet::App::Controller::FAQ - Catalyst Controller
+FixMyStreet::App::Controller::Static - Catalyst Controller
 
 =head1 DESCRIPTION
 
-Show the FAQ page - does some smarts to choose the correct template depending on
-language.
+Static pages Catalyst Controller. FAQ does some smarts to choose the correct
+template depending on language, will need extending at some point.
+
+=head1 METHODS
 
 =cut
 
-sub faq : Path : Args(0) {
+sub about : Global : Args(0) {
+    my ( $self, $c ) = @_;
+    # don't need to do anything here - should just pass through.
+}
+
+sub faq : Global : Args(0) {
     my ( $self, $c ) = @_;
 
     # There should be a faq template for each language in a cobrand or default.
@@ -30,6 +37,16 @@ sub faq : Path : Args(0) {
     $c->stash->{template} = $template;
 }
 
+sub fun : Global : Args(0) {
+    my ( $self, $c ) = @_;
+    # don't need to do anything here - should just pass through.
+}
+
+sub posters : Global : Args(0) {
+    my ( $self, $c ) = @_;
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;
+