Set up default cobrand to use fixmystreet templates when inherited.

3 files changed, 19 insertions, 14 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Barnet.pm b/perllib/FixMyStreet/Cobrand/Barnet.pm
index 0d38d30f2..768ca9efb 100644
--- a/perllib/FixMyStreet/Cobrand/Barnet.pm
+++ b/perllib/FixMyStreet/Cobrand/Barnet.pm
@@ -31,5 +31,6 @@ sub disambiguate_location {
 sub example_places {
     return [ 'N11 1NP', 'Wood St' ];
 }
+
 1;
 
diff --git a/perllib/FixMyStreet/Cobrand/Base.pm b/perllib/FixMyStreet/Cobrand/Base.pm
index 4a95294d6..4941712b2 100644
--- a/perllib/FixMyStreet/Cobrand/Base.pm
+++ b/perllib/FixMyStreet/Cobrand/Base.pm
@@ -51,19 +51,5 @@ sub is_default {
     return $self->moniker eq 'default';
 }
 
-=head2 path_to_web_templates
-
-    $path = $cobrand->path_to_web_templates(  );
-
-Returns the path to the templates for this cobrand - by default
-"templates/web/$moniker"
-
-=cut
-
-sub path_to_web_templates {
-    my $self = shift;
-    return [ FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify ];
-}
-
 1;
 
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index ed00e03b5..569f25a74 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -11,6 +11,24 @@ use Carp;
 use mySociety::MaPit;
 use mySociety::PostcodeUtil;
 
+=head1 path_to_web_templates
+
+    $path = $cobrand->path_to_web_templates(  );
+
+Returns the path to the templates for this cobrand - by default
+"templates/web/$moniker" and "templates/web/fixmystreet"
+
+=cut
+
+sub path_to_web_templates {
+    my $self = shift;
+    my $paths = [];
+    push @$paths, FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify
+        unless $self->is_default;
+    push @$paths, FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify;
+    return $paths;
+}
+
 =head1 country
 
 Returns the country that this cobrand operates in, as an ISO3166-alpha2 code.