diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2014-07-07 16:59:23 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2014-07-08 17:59:17 +0100 |
| commit | ba8d2c4ba6f6c0216d618e77d368b640a2b92d1e (patch) | |
| tree | 8b9e1a960f91c006606b5e0767a84a400dfc2fb0 /perllib | |
| parent | 8f2c5942e3aa5d3b85e76b7353ab7ada87f97fc6 (diff) | |
Rename 'default' web directory to 'base'.
This should reduce confusion with the Default cobrand and override order.
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/App/View/Web.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index e4aafe951..033ad583f 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -13,7 +13,7 @@ use Utils; __PACKAGE__->config( TEMPLATE_EXTENSION => '.html', INCLUDE_PATH => [ # - FixMyStreet->path_to( 'templates', 'web', 'default' ), + FixMyStreet->path_to( 'templates', 'web', 'base' ), ], ENCODING => 'utf8', render_die => 1, diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 34ad5790f..8eb637879 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -24,10 +24,10 @@ Returns the path to the templates for this cobrand - by default 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; + my $paths = [ + FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, + FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify, + ]; return $paths; } |