Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen

Improve the password reset screen.
This commit is contained in:
Bart Visscher 2013-04-26 05:33:09 -07:00
commit 67b6ee661d
2 changed files with 21 additions and 12 deletions

View File

@ -220,6 +220,8 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
} }
#login #databaseField .infield { padding-left:0; } #login #databaseField .infield { padding-left:0; }
#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
/* Show password toggle */ /* Show password toggle */
#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; } #show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }

View File

@ -1,17 +1,24 @@
<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post"> <?php if ($_['requested']): ?>
<fieldset> <div class="success"><p>
<?php echo $l->t('You will receive a link to reset your password via Email.'); ?> <?php
<?php if ($_['requested']): ?> print_unescaped($l->t('The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .'));
<?php echo $l->t('Reset email send.'); ?> ?>
<?php else: ?> </p></div>
<?php else: ?>
<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
<fieldset>
<?php if ($_['error']): ?> <?php if ($_['error']): ?>
<?php echo $l->t('Request failed!'); ?> <div class="errors"><p>
<?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
</p></div>
<?php endif; ?> <?php endif; ?>
<?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?>
<p class="infield"> <p class="infield">
<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus /> <input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
</p> </p>
<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" /> <input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
<?php endif; ?> </fieldset>
</fieldset> </form>
</form> <?php endif; ?>