Remove `fixmystreet` cobrand version of login page

The `base` and `fixmystreet` login templates were basically
the same, so this commit combines them and puts the result
in the `base` cobrand. Since most cobrands inherit from
`fixmystreet` anyway, this shouldn’t cause any major issues.

2 files changed, 59 insertions, 140 deletions

diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html
index f5e2e423f..4c9a59350 100644
--- a/templates/web/base/auth/general.html
+++ b/templates/web/base/auth/general.html
@@ -1,83 +1,74 @@
-[% INCLUDE 'header.html', title = loc('Sign in or create an account') %]
+[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %]
 
 <h1>[% loc('Sign in') %]</h1>
 
 <form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate">
-<input type="hidden" name="r" value="[% c.req.params.r | html %]">
-    
-    [% IF email_error;
-
-        # other keys include fqdn, mxcheck if you'd like to write a custom error message
-
-        errors = {
-            missing => loc('Please enter your email'),
-            other   => loc('Please check your email address is correct')
-        };
-        
-        loc_email_error = errors.$email_error || errors.other;
-    END %]
-    
-    [% IF loc_email_error  %]
+    <fieldset>
+
+        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
+
+            [% IF email_error;
+
+                # other keys include fqdn, mxcheck if you'd like to write a custom error message
+
+                errors = {
+                    missing => loc('Please enter your email'),
+                    other   => loc('Please check your email address is correct')
+                };
+
+                loc_email_error = errors.$email_error || errors.other;
+            END %]
+
+        <label class="n" for="email">[% loc('Email') %]</label>
+      [% IF loc_email_error  %]
         <div class="form-error">[% loc_email_error %]</div>
-    [% ELSIF sign_in_error %]
+      [% ELSIF sign_in_error %]
         <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form.') %]</div>
-    [% END %]
-
-    <div class="form-field">
-        <label class="n" for="email">[% loc('Your email address:') %]</label>
-        <input type="email" class="required email" size="30" id="email" name="email" value="[% email | html %]">
-    </div>
-
-<div id="form_sign_in">
-    <h3>[% loc("Do you have a FixMyStreet password?") %]</h3>
-
-    <div id="form_sign_in_yes">
-
-        <p>
-        <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label>
-        <input type="password" name="password_sign_in" id="password_sign_in" value="">
-        </p>
-
-        <p>
-        <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-        <label class="n" for="remember_me">
-        [% loc('Keep me signed in on this computer') %]
-        </label>
-        </p>
-        
-        <p>
-        <input type="submit" name="sign_in" value="[% loc('Sign in') %]">
-        </p>
-
-    </div>
-    <div id="form_sign_in_no">
-
-        <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p>
-
-        <div class="fieldset">
-            <div class="form-field">
-                <label for="name">[% loc('Your name:') %]</label>
-                <input type="text" name="name" value="">
-            </div>
+      [% END %]
+        <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
+
+        <div id="form_sign_in">
+          [% IF c.cobrand.moniker == 'fixmybarangay' %]
+            <h3>[% loc("Do you have a FixMyBarangay password?") %]</h3>
+          [% ELSE %]
+            <h3>[% loc("Do you have a FixMyStreet password?") %]</h3>
+          [% END %]
+
+            <div id="form_sign_in_yes" class="form-box">
+                <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
+
+                <label class="hidden-js n" for="password_sign_in">[% loc('Password:') %]</label>
+
+                <div class="form-txt-submit-box">
+                    <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
+                    <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]">
+                </div>
+
+                <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
+                <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
 
-            <div class="form-field">
-                <label for="password_register">[% loc('Enter a new password:') %]</label>
-                <input type="password" name="password_register" id="password_register" value="">
             </div>
-        </div>
+            <div id="form_sign_in_no" class="form-box">
+                <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5>
 
-        <p><small>Providing a name and password is optional, but doing so
-        will allow you to more easily report problems, leave updates and
-        manage your reports.</small></p>
+                <label for="name">[% loc('Name') %]</label>
+                <input type="text" name="name" value="" placeholder="[% loc('Your name') %]">
 
-        <p>
-        <input type="submit" name="email_sign_in" value="[% loc('Sign in by email') %]">
-        </p>
+                <label for="password_register">[% loc('Password (optional)') %]</label>
 
-    </div>
+                <div class="general-notes">
+                    <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
+                </div>
+
+                <div class="form-txt-submit-box">
+                    <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
+                    <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]">
+                </div>
+            </div>
+
+        </div>
 
-</div>
-    
+    </fieldset>
 </form>
 
 
diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
deleted file mode 100644
index 3d0ee4f31..000000000
--- a/templates/web/fixmystreet/auth/general.html
+++ /dev/null
@@ -1,72 +0,0 @@
-[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %]
-
-<h1>[% loc('Sign in') %]</h1>
-
-<form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate">
-    <fieldset>
-        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
-            
-            [% IF email_error;
-
-                # other keys include fqdn, mxcheck if you'd like to write a custom error message
-
-                errors = {
-                    missing => loc('Please enter your email'),
-                    other   => loc('Please check your email address is correct')
-                };
-                
-                loc_email_error = errors.$email_error || errors.other;
-            END %]
-        <label class="n" for="email">[% loc('Email') %]</label>
-        [% IF loc_email_error  %]
-            <div class="form-error">[% loc_email_error %]</div>
-        [% ELSIF sign_in_error %]
-            <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form.') %]</div>
-        [% END %]
-        <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
-
-        <div id="form_sign_in">
-            [% IF c.cobrand.moniker == 'fixmybarangay' %]
-            <h3>[% loc("Do you have a FixMyBarangay password?") %]</h3>
-            [% ELSE %]
-            <h3>[% loc("Do you have a FixMyStreet password?") %]</h3>
-            [% END %]
-
-            <div id="form_sign_in_yes" class="form-box">
-                <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
-                
-                <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label>
-
-                <div class="form-txt-submit-box">
-                    <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
-                    <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]">
-                </div>
-                
-                <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-                <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
-
-            </div>
-            <div id="form_sign_in_no" class="form-box">
-                <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5>
-
-                <label for="name">[% loc('Name') %]</label>
-                <input type="text" name="name" value="" placeholder="[% loc('Your name') %]">
-
-                <label for="password_register">[% loc('Password (optional)') %]</label>
-
-                <div class="general-notes">
-                    <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
-                </div>
-
-                <div class="form-txt-submit-box">
-                    <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
-                    <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]">
-                </div>
-            </div>
-
-        </div>
-    </fieldset>    
-</form>
-
-
-[% INCLUDE 'footer.html' %]