summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-02-10 02:38:43 -0800
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-02-10 02:38:43 -0800
commit1ba44a33250774f38c9118b9e29bf43ccad1bb17 (patch)
treeed684b59461f5307458d8482d81742d3ed846ebb /core
parent01fabd6c65805c1812c508bc1dfeef4feef4c384 (diff)
parenteea4864c70fe5d0cc20e5bdcaed36232741a3520 (diff)
downloadnextcloud-server-1ba44a33250774f38c9118b9e29bf43ccad1bb17.tar.gz
nextcloud-server-1ba44a33250774f38c9118b9e29bf43ccad1bb17.zip
Merge pull request #1538 from raghunayyar/admin-password-toggle
Password Toggle Works on Installation
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css1
-rw-r--r--core/js/js.js3
-rw-r--r--core/templates/installation.php2
3 files changed, 4 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index e6a4bf61995..3667740223b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -155,6 +155,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
}
#adminpass-icon, #password-icon { top:1.1em; }
input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
+input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
/* Nicely grouping input field sets */
.grouptop input {
diff --git a/core/js/js.js b/core/js/js.js
index 5f1870eb6ce..ae23c955c38 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -628,7 +628,8 @@ $(document).ready(function(){
});
// 'show password' checkbox
- $('#password').showPassword();
+ $('#password').showPassword();
+ $('#adminpass').showPassword();
$('#pass2').showPassword();
//use infield labels
diff --git a/core/templates/installation.php b/core/templates/installation.php
index ad0d9cfbada..cef979c2ab6 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -40,7 +40,7 @@
<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
</p>
<p class="infield groupbottom">
- <input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required data-typetoggle="#show" />
+ <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
<input type="checkbox" id="show" name="show" />