Permalink
Browse files

Merge branch 'wip-mdl-29079-m20' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_20_STABLE
  • Loading branch information...
2 parents 439de8c + facb211 commit 2bc77f9cc9a16adde417b6adb168e99c9339f4ca @stronk7 stronk7 committed Sep 19, 2011
Showing with 2 additions and 1 deletion.
  1. +1 −1 lib/adminlib.php
  2. +1 −0 theme/base/style/admin.css
View
@@ -4109,7 +4109,7 @@ public function output_html($data, $query='') {
$checkboxparams['checked'] = 'checked';
}
- $lockcheckboxparams = array('type'=>'checkbox', 'id'=>$id.'_locked','name'=>$fullname.'[locked]', 'value'=>1, 'class'=>'form-checkbox');
+ $lockcheckboxparams = array('type'=>'checkbox', 'id'=>$id.'_locked','name'=>$fullname.'[locked]', 'value'=>1, 'class'=>'form-checkbox locked-checkbox');
if (!empty($data['locked'])) { // convert to strings before comparison
$lockcheckboxparams['checked'] = 'checked';
}
@@ -151,6 +151,7 @@
#adminsettings .form-item .form-setting .form-multicheckbox li {list-style: none;}
#adminsettings .form-item .form-setting .form-multicheckbox ul {padding:0;margin:0;}
#adminsettings .form-item .form-setting .defaultsnext {margin-right: 0.5em;display: inline;}
+#adminsettings .form-item .form-setting .locked-checkbox {margin-left: 0.5em;display: inline;}
#adminsettings .form-item .form-setting .form-password .unmask,
#adminsettings .form-item .form-setting .form-defaultinfo {display: inline;}
#adminsettings .form-item .form-description {display: block;margin: 0.5em 0 0em 14.25em;text-align: left;}

0 comments on commit 2bc77f9

Please sign in to comment.