Merge branch 'ui-bugfix-0628-1'

web/templates/login.html

@@ -5,7 +5,7 @@
                         <table>
                             <tr>
                                 <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: 40px;" /></a>
+                                    <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;">
                                     <form method="post" action="/login/" id="form_login">

web/templates/reset_1.html

@@ -5,21 +5,16 @@
                         <table>
                             <tr>
                                 <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: 40px;" /></a>
+                                    <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;" class="animated fadeIn">
                                     <form method="post" action="/reset/">
                                         <table class="login-box">
                                             <tr>
-                                                <td syle="padding: 12px 0 0 2px;" class="login-welcome">
+                                                <td style="padding: 12px 0 0 2px;" class="login-welcome">
                                                     <?php print __('Forgot Password');?>
                                                 </td>
                                             </tr>
-                                            <tr>
-                                            <td style="padding: 12px 0 0 2px;">
-                                                <?php print __('RESET_NOTICE');?>
-                                            </td>
-                                            </tr>
                                             <tr>
                                                 <td style="padding: 12px 0 0 2px;">
                                                     <?php print __('Username');?>
@@ -40,6 +35,11 @@
                                                     <input tabindex="1" type="text" size="20px" style="width:240px" name="email" class="vst-input">
                                                 </td>
                                             </tr>
+                                            <tr>
+                                                <td style="padding: 12px 0 0 2px;">
+                                                    <?php print __('RESET_NOTICE');?>
+                                                </td>
+                                            </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;

web/templates/reset_2.html

@@ -5,13 +5,13 @@
                         <table>
                             <tr>
                                 <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: 40px;" /></a>
+                                    <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;" class="animated fadeIn">
                                     <form method="get" action="/reset/" >
                                         <table class="login-box">
                                             <tr>
-                                                <td syle="padding: 12px 0 0 2px;" class="login-welcome">
+                                                <td style="padding: 12px 0 0 2px;" class="login-welcome">
                                                     <?php print __('Forgot Password');?>
                                                 </td>
                                             </tr>

web/templates/reset_3.html

@@ -5,13 +5,13 @@
                         <table>
                             <tr>
                                 <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: 40px;" /></a>
+                                    <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;" class="animated fadeIn">
                                     <form method="post">
                                         <table class="login-box">
                                             <tr>
-                                                <td syle="padding: 12px 0 0 2px;" class="login-welcome">
+                                                <td style="padding: 12px 0 0 2px;" class="login-welcome">
                                                     <?php print __('Forgot Password');?>
                                                 </td>
                                             </tr>