MDL-39368 url: Remove advanced parameters from settings form

This commit is contained in:
Frederic Massart 2013-04-26 14:19:01 +08:00
parent 9cf26d0890
commit b0b79f8ab2
2 changed files with 10 additions and 20 deletions

View File

@ -70,7 +70,6 @@ class mod_url_mod_form extends moodleform_mod {
} else {
$mform->addElement('select', 'display', get_string('displayselect', 'url'), $options);
$mform->setDefault('display', $config->display);
$mform->setAdvanced('display', $config->display_adv);
$mform->addHelpButton('display', 'displayselect', 'url');
}
@ -81,7 +80,6 @@ class mod_url_mod_form extends moodleform_mod {
}
$mform->setType('popupwidth', PARAM_INT);
$mform->setDefault('popupwidth', $config->popupwidth);
$mform->setAdvanced('popupwidth', $config->popupwidth_adv);
$mform->addElement('text', 'popupheight', get_string('popupheight', 'url'), array('size'=>3));
if (count($options) > 1) {
@ -89,7 +87,6 @@ class mod_url_mod_form extends moodleform_mod {
}
$mform->setType('popupheight', PARAM_INT);
$mform->setDefault('popupheight', $config->popupheight);
$mform->setAdvanced('popupheight', $config->popupheight_adv);
}
if (array_key_exists(RESOURCELIB_DISPLAY_AUTO, $options) or
@ -100,14 +97,12 @@ class mod_url_mod_form extends moodleform_mod {
$mform->disabledIf('printheading', 'display', 'eq', RESOURCELIB_DISPLAY_OPEN);
$mform->disabledIf('printheading', 'display', 'eq', RESOURCELIB_DISPLAY_NEW);
$mform->setDefault('printheading', $config->printheading);
$mform->setAdvanced('printheading', $config->printheading_adv);
$mform->addElement('checkbox', 'printintro', get_string('printintro', 'url'));
$mform->disabledIf('printintro', 'display', 'eq', RESOURCELIB_DISPLAY_POPUP);
$mform->disabledIf('printintro', 'display', 'eq', RESOURCELIB_DISPLAY_OPEN);
$mform->disabledIf('printintro', 'display', 'eq', RESOURCELIB_DISPLAY_NEW);
$mform->setDefault('printintro', $config->printintro);
$mform->setAdvanced('printintro', $config->printintro_adv);
}
//-------------------------------------------------------

View File

@ -58,19 +58,14 @@ if ($ADMIN->fulltree) {
//--- modedit defaults -----------------------------------------------------------------------------------
$settings->add(new admin_setting_heading('urlmodeditdefaults', get_string('modeditdefaults', 'admin'), get_string('condifmodeditdefaults', 'admin')));
$settings->add(new admin_setting_configcheckbox_with_advanced('url/printheading',
get_string('printheading', 'url'), get_string('printheadingexplain', 'url'),
array('value'=>0, 'adv'=>false)));
$settings->add(new admin_setting_configcheckbox_with_advanced('url/printintro',
get_string('printintro', 'url'), get_string('printintroexplain', 'url'),
array('value'=>1, 'adv'=>false)));
$settings->add(new admin_setting_configselect_with_advanced('url/display',
get_string('displayselect', 'url'), get_string('displayselectexplain', 'url'),
array('value'=>RESOURCELIB_DISPLAY_AUTO, 'adv'=>false), $displayoptions));
$settings->add(new admin_setting_configtext_with_advanced('url/popupwidth',
get_string('popupwidth', 'url'), get_string('popupwidthexplain', 'url'),
array('value'=>620, 'adv'=>true), PARAM_INT, 7));
$settings->add(new admin_setting_configtext_with_advanced('url/popupheight',
get_string('popupheight', 'url'), get_string('popupheightexplain', 'url'),
array('value'=>450, 'adv'=>true), PARAM_INT, 7));
$settings->add(new admin_setting_configcheckbox('url/printheading',
get_string('printheading', 'url'), get_string('printheadingexplain', 'url'), 0));
$settings->add(new admin_setting_configcheckbox('url/printintro',
get_string('printintro', 'url'), get_string('printintroexplain', 'url'), 1));
$settings->add(new admin_setting_configselect('url/display',
get_string('displayselect', 'url'), get_string('displayselectexplain', 'url'), RESOURCELIB_DISPLAY_AUTO, $displayoptions));
$settings->add(new admin_setting_configtext('url/popupwidth',
get_string('popupwidth', 'url'), get_string('popupwidthexplain', 'url'), 620, PARAM_INT, 7));
$settings->add(new admin_setting_configtext('url/popupheight',
get_string('popupheight', 'url'), get_string('popupheightexplain', 'url'), 450, PARAM_INT, 7));
}