diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-13 06:10:41 -0700 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-13 06:10:41 -0700 |
| commit | 210bec0d31dfdc51021780f304e2bf4a1ed2f180 (patch) | |
| tree | ce4f1bb1823c0f1441640888c525f7e5d7727eb4 | |
| parent | 8efd71099fb9b824a24fe7f061a7d286733d817a (diff) | |
| parent | 59be6a910c781506674aa47057f6ca55dd3df41e (diff) | |
| download | nextcloud-server-210bec0d31dfdc51021780f304e2bf4a1ed2f180.tar.gz nextcloud-server-210bec0d31dfdc51021780f304e2bf4a1ed2f180.zip | |
Merge pull request #2910 from owncloud/password-toggle-db-2
Implements Toggle for Database Password.
| -rw-r--r-- | core/css/styles.css | 10 | ||||
| -rw-r--r-- | core/js/js.js | 1 | ||||
| -rw-r--r-- | core/templates/installation.php | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 47973a5f2a2..043ca161c75 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -222,11 +222,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } /* Show password toggle */ -#show { position:absolute; right:1em; top:.8em; float:right; } -#show, #personal-show { display:none; } -#show + label { right:1em; top:1.25em!important; } -#show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } -#show + label, #personal-show + label { +#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; } +#show, #dbpassword, #personal-show { display:none; } +#show + label, #dbpassword + label { right:1em; top:1.25em!important; } +#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } +#show + label, #dbpassword + label, #personal-show + label { position:absolute!important; height:14px; width:24px; background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; diff --git a/core/js/js.js b/core/js/js.js index 1bb546f7081..d85e6d88f8a 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -605,6 +605,7 @@ $(document).ready(function(){ setShowPassword($('#password'), $('label[for=show]')); setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); + setShowPassword($('#dbpass'), $('label[for=dbpassword]')); //use infield labels $("label.infield").inFieldLabels({ diff --git a/core/templates/installation.php b/core/templates/installation.php index c70903cba55..c034fe5b52f 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -138,9 +138,11 @@ value="<?php p(OC_Helper::init_var('dbuser')); ?>" autocomplete="off" /> </p> <p class="infield groupmiddle"> - <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> - <input type="password" name="dbpass" id="dbpass" placeholder="" + <input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" value="<?php p(OC_Helper::init_var('dbpass')); ?>" /> + <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> + <input type="checkbox" id="dbpassword" name="dbpassword" /> + <label for="dbpassword"></label> </p> <p class="infield groupmiddle"> <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> |