aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/zurich/auth/general.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/zurich/auth/general.html')
-rw-r--r--templates/web/zurich/auth/general.html30
1 files changed, 15 insertions, 15 deletions
diff --git a/templates/web/zurich/auth/general.html b/templates/web/zurich/auth/general.html
index 000cf3349..899f0ca71 100644
--- a/templates/web/zurich/auth/general.html
+++ b/templates/web/zurich/auth/general.html
@@ -1,15 +1,15 @@
[% INCLUDE 'header.html', title = loc('Sign in or create an account') %]
-[% IF email_error;
+[% IF username_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')
+ missing_email = loc('Please enter your email'),
+ other_email = loc('Please check your email address is correct')
};
- loc_email_error = errors.$email_error || errors.other;
+ loc_username_error = errors.$username_error || errors.other_email;
END %]
<form action="/auth" method="post" name="general_auth_login" class="validate">
@@ -21,18 +21,18 @@ END %]
<div id="form_sign_in_yes" class="form-box">
- <label class="n" for="email">[% loc('Email') %]</label>
- [% IF loc_email_error %]
- <div class="form-error">[% loc_email_error %]</div>
+ <label class="n" for="username">[% loc('Email') %]</label>
+ [% IF loc_username_error %]
+ <div class="form-error">[% loc_username_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>
+ <div class="form-error">[% loc('There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&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') %]" autofocus>
+ <input type="email" class="required email" id="username" name="username" value="[% username | html %]" placeholder="[% loc('Your email address') %]" autofocus>
<label for="password_sign_in">[% loc('Password (optional)') %]</label>
<div class="form-txt-submit-box">
<input type="password" class="required" 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') %]">
+ <input class="green-btn" type="submit" name="sign_in_by_password" value="[% loc('Sign in') %]">
</div>
<div class="form-txt-submit-box">
@@ -51,11 +51,11 @@ END %]
<h1>[% loc('<strong>No</strong> let me sign in by email') %]</h1>
<div id="form_sign_in_no" class="form-box">
- <label class="n" for="email2">[% loc('Email') %]</label>
- [% IF loc_email_error %]
- <div class="form-error">[% loc_email_error %]</div>
+ <label class="n" for="username2">[% loc('Email') %]</label>
+ [% IF loc_username_error %]
+ <div class="form-error">[% loc_username_error %]</div>
[% END %]
- <input type="email" class="required email" id="email2" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
+ <input type="email" class="required email" id="username2" name="username" value="[% username | html %]" placeholder="[% loc('Your email address') %]">
<label for="name">[% loc('Name') %]</label>
<input type="text" class="required" name="name" value="" placeholder="[% loc('Your name') %]">
@@ -63,7 +63,7 @@ END %]
<label for="password_register">[% loc('Password (optional)') %]</label>
<div class="form-txt-submit-box">
<input type="password" class="required" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
- <input class="green-btn" type="submit" name="email_sign_in" value="Registrieren">
+ <input class="green-btn" type="submit" name="sign_in_by_code" value="Registrieren">
</div>
</div>