Improved Login and Reset Password Fields (#12448)

* Improved Login and Reset Password Fields

* Update index.twig

* Update userSettings.twig

4 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Login/FormLogin.php b/plugins/Login/FormLogin.php
index d7be8a900e..16213ab56b 100644
--- a/plugins/Login/FormLogin.php
+++ b/plugins/Login/FormLogin.php
@@ -25,7 +25,7 @@ class FormLogin extends QuickForm2
     function init()
     {
         $this->addElement('text', 'form_login')
-            ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Username')));
+            ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Login_LoginOrEmail')));
 
         $this->addElement('password', 'form_password')
             ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Password')));
diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php
index 66723d3c35..30eabcb963 100644
--- a/plugins/Login/FormResetPassword.php
+++ b/plugins/Login/FormResetPassword.php
@@ -24,7 +24,7 @@ class FormResetPassword extends QuickForm2
     function init()
     {
         $this->addElement('text', 'form_login')
-            ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Username')));
+            ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Login_LoginOrEmail')));
 
         $password = $this->addElement('password', 'form_password');
         $password->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Password')));
diff --git a/plugins/Login/lang/en.json b/plugins/Login/lang/en.json
index 3508bcf89f..cfa860cee3 100644
--- a/plugins/Login/lang/en.json
+++ b/plugins/Login/lang/en.json
@@ -9,7 +9,7 @@
         "InvalidOrExpiredToken": "Token is invalid or has expired.",
         "InvalidUsernameEmail": "Invalid username or e-mail address.",
         "LogIn": "Sign in",
-        "LoginOrEmail": "Username or E-mail",
+        "LoginOrEmail": "Username or Email",
         "LoginPasswordNotCorrect": "Wrong Username and password combination.",
         "LostYourPassword": "Lost your password?",
         "ChangeYourPassword": "Change your password",
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index 45fd7073bc..133d311452 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -80,7 +80,7 @@
                                 <input type="text" name="form_login" placeholder="" id="login_form_login" class="input" value="" size="20"
                                        autocorrect="off" autocapitalize="none"
                                        tabindex="10" autofocus="autofocus"/>
-                                <label for="login_form_login"><i class="icon-user icon"></i> {{ 'General_Username'|translate }}</label>
+                                <label for="login_form_login"><i class="icon-user icon"></i> {{ 'Login_LoginOrEmail'|translate }}</label>
                             </div>
                         </div>
 
@@ -135,7 +135,7 @@
                                 <input type="text" placeholder="" name="form_login" id="reset_form_login" class="input" value="" size="20"
                                        autocorrect="off" autocapitalize="none"
                                        tabindex="10"/>
-                                <label for="reset_form_login">{{ 'Login_LoginOrEmail'|translate }}</label>
+                                <label for="reset_form_login"><i class="icon-user icon"></i> {{ 'Login_LoginOrEmail'|translate }}</label>
                             </div>
                         </div>
                         <div class="row">
@@ -143,7 +143,7 @@
                                 <input type="password" placeholder="" name="form_password" id="reset_form_password" class="input" value="" size="20"
                                        autocorrect="off" autocapitalize="none"
                                        tabindex="20" autocomplete="off"/>
-                                <label for="reset_form_password">{{ 'Login_NewPassword'|translate }}</label>
+                                <label for="reset_form_password"><i class="icon-locked icon"></i> {{ 'Login_NewPassword'|translate }}</label>
                             </div>
                         </div>
                         <div class="row">
@@ -151,7 +151,7 @@
                                 <input type="password" placeholder="" name="form_password_bis" id="reset_form_password_bis" class="input" value=""
                                        autocorrect="off" autocapitalize="none"
                                        size="20" tabindex="30" autocomplete="off"/>
-                                <label for="reset_form_password_bis">{{ 'Login_NewPasswordRepeat'|translate }}</label>
+                                <label for="reset_form_password_bis"><i class="icon-locked icon"></i> {{ 'Login_NewPasswordRepeat'|translate }}</label>
                             </div>
                         </div>