summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-08-28 13:58:49 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-29 09:39:23 +0200
commit09563634108da9fb865b6da91231f1273d6698b6 (patch)
treecd30976d51dbe63ac898fc03b245216da7a056eb /core
parentda504295fe7d6f360cbf6156f4c2edf5b3b521a8 (diff)
downloadnextcloud-server-09563634108da9fb865b6da91231f1273d6698b6.tar.gz
nextcloud-server-09563634108da9fb865b6da91231f1273d6698b6.zip
remove show password toggle from log in page, ref #4577 #4580
Conflicts: core/js/js.js
Diffstat (limited to 'core')
-rw-r--r--core/js/js.js3
-rw-r--r--core/templates/login.php4
2 files changed, 2 insertions, 5 deletions
diff --git a/core/js/js.js b/core/js/js.js
index d878ac5c18e..586d698f3a2 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -683,8 +683,7 @@ $(document).ready(function(){
});
// 'show password' checkbox
- $('#password').showPassword();
- $('#adminpass').showPassword();
+ $('#adminpass').showPassword();
$('#pass2').showPassword();
//use infield labels
diff --git a/core/templates/login.php b/core/templates/login.php
index c0aad47e920..882ce234cf4 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -30,12 +30,10 @@
</p>
<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'); ?> />
<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=""/>
- <input type="checkbox" id="show" name="show" />
- <label for="show"></label>
</p>
<input type="checkbox" name="remember_login" value="1" id="remember_login" checked /><label
for="remember_login"><?php p($l->t('remember')); ?></label>