summaryrefslogtreecommitdiffstats
path: root/core/templates
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-28 16:44:11 +0200
committerkondou <kondou@ts.unde.re>2013-08-28 16:44:11 +0200
commit67c5be9f199c08ac4c9307901e8e6cc678943f05 (patch)
tree061575d844745b3ad43b9aac518b386228966ad3 /core/templates
parent8d8a57de7fb41030ffb69f098419616f4003119a (diff)
parent0c02e1efef76430eea8986697cd9736814fb604a (diff)
downloadnextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.tar.gz
nextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.zip
Merge branch 'master' into oc_avatars
Conflicts: 3rdparty
Diffstat (limited to 'core/templates')
-rw-r--r--core/templates/login.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/templates/login.php b/core/templates/login.php
index 9143510f757..ee761f0aa52 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -21,12 +21,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>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>