Skip to content

Commit b1ab858

Browse files
author
Kristan Kenney
committed
Remove placeholder text from entry fields
Display names were duplicated as labels are already specified above the fields. Correct animation effects when switching between login dialogs
1 parent f3150f3 commit b1ab858

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

‎web/templates/login.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</tr>
2424
<tr>
2525
<td>
26-
<input tabindex="1" type="text" size="20px" style="width:240px;" name="user" class="vst-input" placeholder="<?php print __('Username');?>">
26+
<input tabindex="1" type="text" size="20px" style="width:240px;" name="user" class="vst-input">
2727
</td>
2828
</tr>
2929
<tr>

‎web/templates/login_1.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<center>
2-
<table class="login animated zoomIn">
2+
<table class="login">
33
<tr>
44
<td>
55
<table>
66
<tr>
77
<td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
88
<a href="/"><img border=0 src="/images/logo.png" alt="<?=__('Hestia Control Panel');?>" style="margin: 20px; margin-top: 64px;" /></a>
99
</td>
10-
<td style="padding: 40px 60px 0 0;">
10+
<td style="padding: 40px 60px 0 0;" class="animated fadeIn">
1111
<form method="post" action="/login/" id="form_login">
1212
<input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
1313
<input type="hidden" name="user" value="<?php echo $_POST['user']; ?>">
1414

1515
<table class="login-box">
1616
<tr>
1717
<td style="padding: 12px 0 0 2px;" class="login-welcome">
18-
<?php print __('Welcome to Hestia Control Panel');?>
18+
<?php print __('Welcome');?> <?php echo $_POST['user']; ?>!
1919
</td>
2020
</tr>
2121
<tr>
@@ -30,7 +30,7 @@
3030
</tr>
3131
<tr>
3232
<td>
33-
<input tabindex="2" type="password" size="20px" style="width:240px;" name="password" class="vst-input" placeholder="<?php print __('Password');?>">
33+
<input tabindex="2" type="password" size="20px" style="width:240px;" name="password" class="vst-input">
3434
</td>
3535
</tr>
3636
<tr>
@@ -39,7 +39,8 @@
3939
</tr>
4040
<tr>
4141
<td style="padding: 0 0 5px 0;">
42-
<button tabindex="3" type="submit" class="button"><?php print __('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>
42+
<button tabindex="3" type="submit" class="button"><?php print __('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>&nbsp;&nbsp;
43+
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
4344
</td>
4445
</tr>
4546
</table>

‎web/templates/login_2.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<center>
2-
<table class="login animated zoomIn">
2+
<table class="login">
33
<tr>
44
<td>
55
<table>
66
<tr>
77
<td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
88
<a href="/"><img border=0 src="/images/logo.png" alt="<?=__('Hestia Control Panel');?>" style="margin: 20px; margin-top: 64px;" /></a>
99
</td>
10-
<td style="padding: 40px 60px 0 0;">
10+
<td style="padding: 40px 60px 0 0;" class="animated fadeIn">
1111
<form method="post" action="/login/" id="form_login">
1212
<input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
1313
<input type="hidden" name="user" value="<?php echo $_POST['user']; ?>">
1414
<input type="hidden" name="password" value="<?php echo $_POST['password']; ?>">
1515
<table class="login-box">
1616
<tr>
1717
<td style="padding: 12px 0 0 2px;" class="login-welcome">
18-
<?php print __('Welcome to Hestia Control Panel');?>
18+
<?php print __('2 Factor Authentication');?>
1919
</td>
2020
</tr>
2121
<tr class="twofa">
@@ -30,7 +30,7 @@
3030
</tr>
3131
<tr>
3232
<td>
33-
<input tabindex="2" type="" size="20px" style="width:240px;" name="twofa" class="vst-input" placeholder="<?php print __('2FA Token');?>">
33+
<input tabindex="2" type="" size="20px" style="width:240px;" name="twofa" class="vst-input">
3434
</td>
3535
</tr>
3636
<tr>

‎web/templates/reset2fa.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
</tr>
5757
<tr>
5858
<td style="padding: 20px 0 12px 0;">
59-
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">&nbsp;&nbsp;
60-
<input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
59+
<input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">&nbsp;&nbsp;
60+
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
6161
</td>
6262
</tr>
6363
</table>

‎web/templates/reset_1.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
</tr>
4343
<tr>
4444
<td style="padding: 20px 0 12px 0;">
45-
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">&nbsp;&nbsp;
46-
<input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
45+
<input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">&nbsp;&nbsp;
46+
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
4747
</td>
4848
</tr>
4949
</table>

‎web/templates/reset_2.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
</tr>
3333
<tr>
3434
<td style="padding: 20px 0 12px 0;">
35-
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/reset/'">&nbsp;&nbsp;
36-
<input tabindex="2" type="submit" value="<?php print __('Confirm');?>" class="button">
35+
<input tabindex="2" type="submit" value="<?php print __('Confirm');?>" class="button">&nbsp;&nbsp;
36+
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/reset/'">
3737
</td>
3838
</tr>
3939
</table>

‎web/templates/reset_3.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
</tr>
4141
<tr>
4242
<td style="padding: 20px 0 12px 0;">
43-
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">&nbsp;&nbsp;
44-
<input tabindex="3" type="submit" value="<?php print __('Reset');?>" class="button">
43+
<input tabindex="3" type="submit" value="<?php print __('Reset');?>" class="button">&nbsp;&nbsp;
44+
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
4545
</td>
4646
</tr>
4747
</table>

0 commit comments

Comments
 (0)