Merge branch 'feature/2020-07_new_login_screen_fix' into feature/2020-07_new_login_screen

web/templates/login.html

@@ -23,7 +23,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="1" type="text" size="20px" style="width:240px;" name="user" class="vst-input" placeholder="<?php print __('Username');?>">
+                                                <input tabindex="1" type="text" size="20px" style="width:240px;" name="user" class="vst-input">
                                             </td>
                                         </tr>
                                         <tr>

web/templates/login_1.html

@@ -1,5 +1,5 @@
         <center>
-            <table class="login animated zoomIn">
+            <table class="login">
                 <tr>
                     <td>
                         <table>
@@ -7,7 +7,7 @@
                                 <td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
                                     <a href="/"><img border=0 src="/images/logo.png" alt="<?=__('Hestia Control Panel');?>" style="margin: 20px; margin-top: 64px;" /></a>
                                 </td>
-                                <td style="padding: 40px 60px 0 0;">
+                                <td style="padding: 40px 60px 0 0;" class="animated fadeIn">
                                     <form method="post" action="/login/" id="form_login">
                                     <input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
                                     <input type="hidden" name="user" value="<?php echo $_POST['user']; ?>">
@@ -15,7 +15,7 @@
                                     <table class="login-box">
                                         <tr>
                                             <td style="padding: 12px 0 0 2px;" class="login-welcome">
-                                                <?php print __('Welcome to Hestia Control Panel');?>
+                                                <?php print __('Welcome');?> <?php echo $_POST['user']; ?>!
                                             </td>
                                         </tr>
                                         <tr>
@@ -30,7 +30,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="2" type="password" size="20px"  style="width:240px;" name="password" class="vst-input" placeholder="<?php print __('Password');?>">
+                                                <input tabindex="2" type="password" size="20px"  style="width:240px;" name="password" class="vst-input">
                                             </td>
                                         </tr>
                                         <tr>
@@ -39,7 +39,8 @@
                                         </tr>
                                         <tr>
                                             <td style="padding: 0 0 5px 0;">
-                                                <button tabindex="3" type="submit" class="button"><?php print __('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>
+                                                <button tabindex="3" type="submit" class="button"><?php print __('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>&nbsp;&nbsp;
+                                                <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
                                             </td>
                                         </tr>
                                     </table>

web/templates/login_2.html

@@ -1,5 +1,5 @@
         <center>
-            <table class="login animated zoomIn">
+            <table class="login">
                 <tr>
                     <td>
                         <table>
@@ -7,7 +7,7 @@
                                 <td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
                                     <a href="/"><img border=0 src="/images/logo.png" alt="<?=__('Hestia Control Panel');?>" style="margin: 20px; margin-top: 64px;" /></a>
                                 </td>
-                                <td style="padding: 40px 60px 0 0;">
+                                <td style="padding: 40px 60px 0 0;" class="animated fadeIn">
                                     <form method="post" action="/login/" id="form_login">
                                     <input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
                                     <input type="hidden" name="user" value="<?php echo $_POST['user']; ?>">
@@ -15,7 +15,7 @@
                                     <table class="login-box">
                                         <tr>
                                             <td style="padding: 12px 0 0 2px;" class="login-welcome">
-                                                <?php print __('Welcome to Hestia Control Panel');?>
+                                                <?php print __('2 Factor Authentication');?>
                                             </td>
                                         </tr>
                                         <tr class="twofa">
@@ -30,7 +30,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="2" type="" size="20px"  style="width:240px;" name="twofa" class="vst-input" placeholder="<?php print __('2FA Token');?>">
+                                                <input tabindex="2" type="" size="20px"  style="width:240px;" name="twofa" class="vst-input">
                                             </td>
                                         </tr>
                                         <tr>

web/templates/reset2fa.html

@@ -56,8 +56,8 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
-                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">&nbsp;&nbsp;
-                                                    <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
+                                                    <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">&nbsp;&nbsp;
+                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_1.html

@@ -42,8 +42,8 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
-                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">&nbsp;&nbsp;
-                                                    <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
+                                                    <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">&nbsp;&nbsp;
+                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_2.html

@@ -32,8 +32,8 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
-                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/reset/'">&nbsp;&nbsp;
-                                                    <input tabindex="2" type="submit" value="<?php print __('Confirm');?>" class="button">
+                                                    <input tabindex="2" type="submit" value="<?php print __('Confirm');?>" class="button">&nbsp;&nbsp;
+                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/reset/'">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_3.html

@@ -40,8 +40,8 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
-                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">&nbsp;&nbsp;
-                                                    <input tabindex="3" type="submit" value="<?php print __('Reset');?>" class="button">
+                                                    <input tabindex="3" type="submit" value="<?php print __('Reset');?>" class="button">&nbsp;&nbsp;
+                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
                                                 </td>
                                             </tr>
                                         </table>