Move site_name/site_title into templates where they belong.

25 files changed, 21 insertions, 63 deletions

diff --git a/notes/cobranding.txt b/notes/cobranding.txt
index 4092071a4..db71c87ce 100644
--- a/notes/cobranding.txt
+++ b/notes/cobranding.txt
@@ -10,7 +10,6 @@ NB: this is moderately specific to producing cobrands for UK councils
 1: copy an exiting perllib/FixMyStreet/Cobrand/ file to perllib/FixMyStreet/Cobrand/ExampleCom.pm
     * Change package name at top of file
     * Change following functions accordingly:
-        site_title
         site_restriction
         problems_clause
         enter_postcode_text
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 21c7d31d6..c33135673 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -22,14 +22,6 @@ sub path_to_web_templates {
     ];
 }
 
-sub site_title {
-    my ($self) = @_;
-    return "London Borough of Bromley - Report a problem in Bromley\x{2019}s streets or parks";
-}
-sub site_name {
-    return 'Bromley FixMyStreet';
-}
-
 sub disambiguate_location {
     my $self    = shift;
     my $string  = shift;
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index cbad9e965..9b22095f7 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -310,24 +310,6 @@ Return any params to be added to responses
 
 sub header_params { return {} }
 
-=head2 site_title
-
-Return the title to be used in page heads.
-
-=cut
-
-sub site_title { 'FixMyStreet' }
-
-=head2 site_name
-
-Return short name for use in emails.
-
-=cut
-sub site_name {
-    my $self = shift;
-    $self->site_title;
-}
-
 =head2 map_type
 
 Return an override type of map if necessary.
diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
index 36bc67835..d99dcb3de 100644
--- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
+++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
@@ -48,17 +48,6 @@ sub base_url_with_lang {
 sub languages { [ 'en-gb,English,en_GB', 'cy,Cymraeg,cy_GB' ] }
 sub language_domain { 'FixMyStreet-EmptyHomes' }
 
-=item site_title
-
-Return the title to be used in page heads
-
-=cut 
-
-sub site_title {
-    my ($self) = @_;
-    return _('Report Empty Homes');
-}
-
 =item feed_xsl
 
 Return the XSL file path to be used for feeds'
diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
index 8b2fb06ea..fc21baed7 100644
--- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
+++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
@@ -20,11 +20,6 @@ sub country {
 sub languages { [ 'en-gb,English,en_GB', 'nb,Norwegian,nb_NO' ] }
 sub language_override { 'nb' }
 
-sub site_title {
-    my ($self) = @_;
-    return 'FiksGataMi';
-}
-
 sub enter_postcode_text {
     my ( $self ) = @_;
     return _('Enter a nearby postcode, or street name and area');
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 23f84e76f..a9ebb1b3f 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -46,11 +46,6 @@ sub base_url {
     return $base_url;
 }
 
-sub site_title {
-    my ($self) = @_;
-    return $self->council_name . ' FixMyStreet';
-}
-
 sub enter_postcode_text {
     my ($self) = @_;
     return 'Enter a ' . $self->council_area . ' postcode, or street name and area';
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 5c6a4ef09..67466e959 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -43,7 +43,7 @@ for my $test (
         "try to create an account with email '$email'"
     );
     is $mech->uri->path, '/auth', "still on auth page";
-    is_deeply $mech->page_errors, [ $error_message ], 'no errors initially';
+    is_deeply $mech->page_errors, [ $error_message ], 'errors match';
 }
 
 # create a new account
diff --git a/templates/email/barnet/site-name.txt b/templates/email/barnet/site-name.txt
new file mode 100644
index 000000000..78563bdf3
--- /dev/null
+++ b/templates/email/barnet/site-name.txt
@@ -0,0 +1 @@
+Barnet Council FixMyStreet
diff --git a/templates/email/bromley/site-name.txt b/templates/email/bromley/site-name.txt
new file mode 100644
index 000000000..fc49c6865
--- /dev/null
+++ b/templates/email/bromley/site-name.txt
@@ -0,0 +1 @@
+Bromley FixMyStreet
diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt
index abf7801f5..0d23d7733 100644
--- a/templates/email/default/alert-confirm.txt
+++ b/templates/email/default/alert-confirm.txt
@@ -1,9 +1,9 @@
-Subject: Confirm your alert on [% c.cobrand.site_name %]
+Subject: Confirm your alert on [% INCLUDE 'site-name.txt' | trim %]
 
 Hi,
 
 Please click on the link below to confirm the alert you just
-asked to subscribe to on [% c.cobrand.site_name %]:
+asked to subscribe to on [% INCLUDE 'site-name.txt' | trim %]:
 
     [% token_url %]
 
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt
index 5f5bd511a..3a6bbe03a 100644
--- a/templates/email/default/problem-confirm.txt
+++ b/templates/email/default/problem-confirm.txt
@@ -1,9 +1,9 @@
-Subject: Confirm your problem on [% c.cobrand.site_name %]
+Subject: Confirm your problem on [% INCLUDE 'site-name.txt' | trim %]
 
 Hi [% report.name %],
 
 Please click on the link below to confirm the problem you just
-added to [% c.cobrand.site_name %]:
+added to [% INCLUDE 'site-name.txt' | trim %]:
 
 [% token_url %]
 
diff --git a/templates/email/default/site-name.txt b/templates/email/default/site-name.txt
new file mode 100644
index 000000000..4e9a24bb9
--- /dev/null
+++ b/templates/email/default/site-name.txt
@@ -0,0 +1 @@
+FixMyStreet
diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt
index fdcd68edb..beefac9c1 100644
--- a/templates/email/default/update-confirm.txt
+++ b/templates/email/default/update-confirm.txt
@@ -1,4 +1,4 @@
-Subject: Confirm your update on [% c.cobrand.site_name %]
+Subject: Confirm your update on [% INCLUDE 'site-name.txt' | trim %]
 
 Hi [% update.name %],
 
diff --git a/templates/email/lichfielddc/site-name.txt b/templates/email/lichfielddc/site-name.txt
new file mode 100644
index 000000000..97ebd69a3
--- /dev/null
+++ b/templates/email/lichfielddc/site-name.txt
@@ -0,0 +1 @@
+Lichfield District Council FixMyStreet
diff --git a/templates/email/reading/site-name.txt b/templates/email/reading/site-name.txt
new file mode 100644
index 000000000..a0cf6367c
--- /dev/null
+++ b/templates/email/reading/site-name.txt
@@ -0,0 +1 @@
+Reading City Council FixMyStreet
diff --git a/templates/email/southampton/site-name.txt b/templates/email/southampton/site-name.txt
new file mode 100644
index 000000000..48f5deeb3
--- /dev/null
+++ b/templates/email/southampton/site-name.txt
@@ -0,0 +1 @@
+Southampton City Council FixMyStreet
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html
index 5c6a19d89..d7cc01f4b 100644
--- a/templates/web/barnet/header.html
+++ b/templates/web/barnet/header.html
@@ -30,7 +30,7 @@
 
         <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% version('/cobrands/barnet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Barnet Council FixMyStreet' %]
         <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
 
     </head>
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index 6e1c67dea..55304a280 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -20,7 +20,7 @@
 
         <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% version('/cobrands/bromley/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = "London Borough of Bromley - Report a problem in Bromley&rsquo;s streets or parks" %]
         <script type="text/javascript">
 
           var _gaq = _gaq || [];
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index 582afd422..9d32164f7 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -30,5 +30,5 @@
 
 <title>
     [% "$title :: " | html IF title %]
-    [% c.cobrand.site_title %]
+    [% site_title || 'FixMyStreet' %]
 </title>
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index 063cbba18..96ad1040c 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -7,7 +7,7 @@
 
     <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
     <link rel="stylesheet" type="text/css" href="[% version('/cobrands/emptyhomes/css.css') %]">
-    [% INCLUDE 'common_header_tags.html' %]
+    [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %]
 
 </head>
 <body>
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index 5449eff81..e2ea1f684 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -8,7 +8,7 @@
         <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
         <link rel="stylesheet" type="text/css" href="[% version('/cobrands/fiksgatami/css.css') %]">
 
-    [% INCLUDE 'common_header_tags.html' %]
+    [% INCLUDE 'common_header_tags.html', site_title = 'FiksGataMi' %]
     </head>
     <body>
 
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index 44387ba8d..8d10d4c04 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -20,7 +20,7 @@
 
         <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %]
         [% extra_js %]
                 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
diff --git a/templates/web/lichfielddc/header.html b/templates/web/lichfielddc/header.html
index cff34e650..02e3c6a5b 100644
--- a/templates/web/lichfielddc/header.html
+++ b/templates/web/lichfielddc/header.html
@@ -71,7 +71,7 @@
 	<meta name="DC.subject" lang="en" scheme="eGMS.IPSV" content="Local government;Government, politics and public administration" />
 	<meta name="DC.subject" lang="en" content="Council, government and democracy" />
 	
-[% INCLUDE 'common_header_tags.html' %]
+[% INCLUDE 'common_header_tags.html', site_title = 'Lichfield District Council FixMyStreet' %]
 </head>
 <body>
 <!-- ########## MAIN STRUCTURE ######### -->
diff --git a/templates/web/reading/header.html b/templates/web/reading/header.html
index 39281ed01..85117b57e 100644
--- a/templates/web/reading/header.html
+++ b/templates/web/reading/header.html
@@ -14,7 +14,7 @@
     <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/print3rdParty.css') %]" media="print"/>
     <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/css.css') %]" />
 
-    [% INCLUDE 'common_header_tags.html' %]
+    [% INCLUDE 'common_header_tags.html', site_title = 'Reading City Council FixMyStreet' %]
 
 </head>
 <body>
diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html
index 7b0f77e88..43553468c 100644
--- a/templates/web/southampton/header.html
+++ b/templates/web/southampton/header.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" />
 	<link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css.css') %]" />
 
-    [% INCLUDE 'common_header_tags.html' %]
+    [% INCLUDE 'common_header_tags.html', site_title = 'Southampton City Council FixMyStreet' %]
     <script type="text/javascript" src="[% version('/js/southampton.js') %]"></script>
 
 </head>