Merge branch 'wip-mdl-29079' of git://github.com/rajeshtaneja/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2011-09-20 00:17:20 +02:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -4172,7 +4172,7 @@ class admin_setting_configcheckbox_with_lock extends admin_setting_configcheckbo
$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';
}
+1
View File
@@ -160,6 +160,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;}