Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2013-04-04 01:15:34 +02:00
commit 0c7ad0ab13

View File

@ -52,6 +52,8 @@ class mod_url_mod_form extends moodleform_mod {
$mform->addElement('url', 'externalurl', get_string('externalurl', 'url'), array('size'=>'60'), array('usefilepicker'=>true));
$mform->setType('externalurl', PARAM_URL);
$mform->addRule('externalurl', null, 'required', null, 'client');
$mform->setExpanded('content');
//-------------------------------------------------------
$mform->addElement('header', 'optionssection', get_string('optionsheader', 'url'));
@ -111,7 +113,6 @@ class mod_url_mod_form extends moodleform_mod {
//-------------------------------------------------------
$mform->addElement('header', 'parameterssection', get_string('parametersheader', 'url'));
$mform->addElement('static', 'parametersinfo', '', get_string('parametersheader_help', 'url'));
$mform->setAdvanced('parametersinfo');
if (empty($this->current->parameters)) {
$parcount = 5;
@ -130,7 +131,6 @@ class mod_url_mod_form extends moodleform_mod {
$mform->createElement('selectgroups', $variable, '', $options),
);
$mform->addGroup($group, $pargroup, get_string('parameterinfo', 'url'), ' ', false);
$mform->setAdvanced($pargroup);
}
//-------------------------------------------------------