wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4610 from owncloud/password-toggle-login

Browse source 
Password toggle login
This commit is contained in:
Morris Jobke 2013-08-28 06:04:15 -07:00
commit b9a95af12c
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/css/styles.css
View file

@ -255,9 +255,9 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
#body-login input[type="password"], #body-login input[type="password"],
#body-login input[type="email"] { #body-login input[type="email"] {
border: 1px solid #323233; border: 1px solid #323233;
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
} }
/* Nicely grouping input field sets */ /* Nicely grouping input field sets */

1
core/js/js.js
View file

@ -709,7 +709,6 @@ $(document).ready(function(){
}); });
label.hide(); label.hide();
}; };
setShowPassword($('#password'), $('label[for=show]'));
setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#adminpass'), $('label[for=show]'));
setShowPassword($('#pass2'), $('label[for=personal-show]')); setShowPassword($('#pass2'), $('label[for=personal-show]'));
setShowPassword($('#dbpass'), $('label[for=dbpassword]')); setShowPassword($('#dbpass'), $('label[for=dbpassword]'));

4
core/templates/login.php
View file

@ -21,12 +21,10 @@
</p> </p>
<p class="infield groupbottom"> <p class="infield groupbottom">
<input type="password" name="password" id="password" value="" data-typetoggle="#show" placeholder="" <input type="password" name="password" id="password" value="" placeholder=""
required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> /> required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> />
<label for="password" class="infield"><?php p($l->t('Password')); ?></label> <label for="password" class="infield"><?php p($l->t('Password')); ?></label>
<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
<input type="checkbox" id="show" name="show" />
<label for="show"></label>
</p> </p>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>