From: nicolasconnault Date: Mon, 10 Aug 2009 08:38:45 +0000 (+0000) Subject: MDL-19756 Renamed moodle_select to html_select for better API consistency X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7b1f2c829ff9c1193c99c3516fefca5fba88f0af;p=moodle.git MDL-19756 Renamed moodle_select to html_select for better API consistency --- diff --git a/admin/environment.php b/admin/environment.php index 93c8bf043b..d1b84f1854 100644 --- a/admin/environment.php +++ b/admin/environment.php @@ -121,7 +121,7 @@ /// Print form and popup menu echo '
'.$strmoodleversion.' '; - $select = moodle_select::make_popup_form("$CFG->wwwroot/$CFG->admin/environment.php", 'version', $versions, 'selectversion', $version); + $select = html_select::make_popup_form("$CFG->wwwroot/$CFG->admin/environment.php", 'version', $versions, 'selectversion', $version); $select->nothinglabel = false; echo $OUTPUT->select($select); echo '
'; diff --git a/admin/filters.php b/admin/filters.php index 440d3d73ad..d71b2f4736 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -248,7 +248,7 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) } // Disable/off/on - $select = moodle_select::make_popup_form(action_url($filter, 'setstate'), 'newstate', $activechoices, 'active' . basename($filter), $filterinfo->active); + $select = html_select::make_popup_form(action_url($filter, 'setstate'), 'newstate', $activechoices, 'active' . basename($filter), $filterinfo->active); $select->nothinglabel = false; $select->form->button->text = get_string('save', 'admin'); $row[] = $OUTPUT->select($select); @@ -271,7 +271,7 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) $row[] = $updown; // Apply to strings. - $select = moodle_select::make_popup_form(action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, 'applyto' . basename($filter), $applytostrings); + $select = html_select::make_popup_form(action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, 'applyto' . basename($filter), $applytostrings); $select->nothinglabel = false; $select->disabled = $filterinfo->active == TEXTFILTER_DISABLED; $select->form->button->text = get_string('save', 'admin'); diff --git a/admin/lang.php b/admin/lang.php index a0ec39f37c..15e7cea962 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -140,7 +140,7 @@ echo $OUTPUT->box_start(); $currlang = current_language(); $langs = get_list_of_languages(false, true); - $select = moodle_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php", 'lang', $langs, "chooselang", $currlang); + $select = html_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php", 'lang', $langs, "chooselang", $currlang); $select->nothinglabel = false; $select->set_label($strcurrentlanguage.':'); echo $OUTPUT->select($select); @@ -494,7 +494,7 @@ //$selectionlabel .= $strfilestoredin; $selectionlabel .= $uselocal ? "{$currentlang}_local" : $currentlang; $selectionlabel .= '/'; - $select = moodle_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php?mode=compare", 'currentfile', $menufiles, "choosefile", $currentfile); + $select = html_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php?mode=compare", 'currentfile', $menufiles, "choosefile", $currentfile); $select->nothinglabel = $strchoosefiletoedit; $select->set_label($selectionlabel); echo $OUTPUT->select($select); @@ -761,7 +761,7 @@ //$selectionlabel .= $strfilestoredin; $selectionlabel .= $uselocal ? "{$currentlang}_local" : $currentlang; $selectionlabel .= '/help/'; - $select = moodle_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php?mode=helpfiles", 'currentfile', $menufiles, "choosefile", $currentfile); + $select = html_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php?mode=helpfiles", 'currentfile', $menufiles, "choosefile", $currentfile); $select->nothinglabel = $strchoosefiletoedit; $select->set_label($selectionlabel); echo $OUTPUT->select($select); diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 07ba75bef8..c22c8f176b 100755 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -373,7 +373,7 @@ /// Print a form to swap roles, and a link back to the all roles list. echo '
'; - $select = moodle_select::make_popup_form($baseurl, 'roleid', $nameswithcounts, 'switchrole', $roleid); + $select = html_select::make_popup_form($baseurl, 'roleid', $nameswithcounts, 'switchrole', $roleid); $select->set_label(get_string('assignanotherrole', 'role')); $select->nothinglabel = false; echo $OUTPUT->select($select); diff --git a/admin/roles/override.php b/admin/roles/override.php index b9f8412c80..977a1e2d9d 100755 --- a/admin/roles/override.php +++ b/admin/roles/override.php @@ -231,7 +231,7 @@ /// Print a form to swap roles, and a link back to the all roles list. echo '
'; - $select = moodle_select::make_popup_form($baseurl, 'roleid', $nameswithcounts, 'switchrole', $roleid); + $select = html_select::make_popup_form($baseurl, 'roleid', $nameswithcounts, 'switchrole', $roleid); $select->set_label(get_string('overrideanotherrole', 'role')); $select->nothinglabel = false; echo $OUTPUT->select($select); diff --git a/auth/shibboleth/login.php b/auth/shibboleth/login.php index 258561c4b8..92cb2aa27b 100644 --- a/auth/shibboleth/login.php +++ b/auth/shibboleth/login.php @@ -28,7 +28,7 @@ httpsrequired(); } else { $currlang = current_language(); $langs = get_list_of_languages(); - $select = moodle_select::make_popup_form("$CFG->httpswwwroot/login/index.php", 'lang', $langs, 'chooselang', $currlang); + $select = html_select::make_popup_form("$CFG->httpswwwroot/login/index.php", 'lang', $langs, 'chooselang', $currlang); $select->nothinglabel = false; $select->set_label(get_accesshide(get_string('language'))); $langmenu = $OUTPUT->select($select); diff --git a/backup/restore_form.html b/backup/restore_form.html index fcad656e67..0f82f4d471 100644 --- a/backup/restore_form.html +++ b/backup/restore_form.html @@ -284,9 +284,9 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { /// (some formats like main page, social..., haven't it and rolling dates /// from 0 produces crazy dates. MDL-10125 if ($form1->startdate) { - $dayselector = moodle_select::make_time_selector('days', "startday", $form1->startdate); - $monthselector = moodle_select::make_time_selector('months', "startmonth", $form1->startdate); - $yearselector = moodle_select::make_time_selector('years', "startyear", $form1->startdate); + $dayselector = html_select::make_time_selector('days', "startday", $form1->startdate); + $monthselector = html_select::make_time_selector('months', "startmonth", $form1->startdate); + $yearselector = html_select::make_time_selector('years', "startyear", $form1->startdate); echo $OUTPUT->select($dayselector) . $OUTPUT->select($monthselector) . $OUTPUT->select($yearselector); helpbutton("coursestartdate", get_string("startdate")); diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php index 5790d53afb..cca4e96d4b 100644 --- a/blocks/rss_client/managefeeds.php +++ b/blocks/rss_client/managefeeds.php @@ -133,7 +133,7 @@ foreach($feeds as $feed) { $deleteaction->link->title = get_string('delete'); $deleteaction->image->src = $OUTPUT->old_icon_url('t/delete'); $deleteaction->image->alt = get_string('delete'); - $deleteaction->link->add_action('click', 'confirm_dialog', array('message' => get_string('deletefeedconfirm', 'block_rss_client'))); + $deleteaction->link->add_confirm_action(get_string('deletefeedconfirm', 'block_rss_client')); $feedicons = $OUTPUT->action_icon($editaction) . ' ' . $OUTPUT->action_icon($deleteaction); diff --git a/calendar/event_edit.html b/calendar/event_edit.html index 0208cb19cb..bc5da929d9 100644 --- a/calendar/event_edit.html +++ b/calendar/event_edit.html @@ -1,12 +1,12 @@ 'startday', 'months' => 'startmon', 'years' => 'startyr', 'hours' => 'starthr', 'minutes' => 'startmin'), $form->timestart); -$endselectors = moodle_select::make_time_selectors(array( +$endselectors = html_select::make_time_selectors(array( 'days' => 'endday', 'months' => 'endmon', 'years' => 'endyr', diff --git a/calendar/event_new.html b/calendar/event_new.html index ff2ce47897..b6c6ad9943 100644 --- a/calendar/event_new.html +++ b/calendar/event_new.html @@ -1,14 +1,14 @@ get_record('course', array('id'=>($form->courseid ? $form->courseid : $site->id))); - $startselectors = moodle_select::make_time_selectors(array( + $startselectors = html_select::make_time_selectors(array( 'days' => 'startday', 'months' => 'startmon', 'years' => 'startyr', 'hours' => 'starthr', 'minutes' => 'startmin'), (int) $form->timestart); - $endselectors = moodle_select::make_time_selectors(array( + $endselectors = html_select::make_time_selectors(array( 'days' => 'endday', 'months' => 'endmon', 'years' => 'endyr', diff --git a/calendar/view.php b/calendar/view.php index 6056d1ced5..eb826597e7 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -625,7 +625,7 @@ function calendar_course_filter_selector($getvars = '') { } else { $selected = ''; } - $select = moodle_select::make_popup_form(CALENDAR_URL.'set.php?var=setcourse&'.$getvars, 'id', $courseoptions, 'cal_courses_flt', $selected); + $select = html_select::make_popup_form(CALENDAR_URL.'set.php?var=setcourse&'.$getvars, 'id', $courseoptions, 'cal_courses_flt', $selected); $select->nothinglabel = false; return $OUTPUT->select($select); } diff --git a/course/category.php b/course/category.php index 60e934f16c..5d0df06568 100644 --- a/course/category.php +++ b/course/category.php @@ -171,7 +171,7 @@ make_categories_list($displaylist, $notused); echo '
'; - $select = moodle_select::make_popup_form('category.php', 'id', $displaylist, 'switchcategory', $category->id); + $select = html_select::make_popup_form('category.php', 'id', $displaylist, 'switchcategory', $category->id); $select->set_label($strcategories.':'); $select->nothinglabel = false; echo $OUTPUT->select($select); @@ -410,7 +410,7 @@ make_categories_list($movetocategories, $notused, 'moodle/category:manage'); $movetocategories[$category->id] = get_string('moveselectedcoursesto'); echo ''; - $select = new moodle_select(); + $select = new html_select(); $select->options = $movetocategories; $select->name = 'moveto'; $select->selectedvalue = $category->id; diff --git a/course/format/topics/format.php b/course/format/topics/format.php index 496fde2e03..6a8771d862 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -253,7 +253,7 @@ if (!empty($sectionmenu)) { echo '
'; $popupurl = $CFG->wwwroot.'/course/view.php?id='.$course->id; - $select = moodle_select::make_popup_form($popupurl, 'topic', $sectionmenu, 'sectionmenu'); + $select = html_select::make_popup_form($popupurl, 'topic', $sectionmenu, 'sectionmenu'); $select->set_label(get_string('jumpto')); echo $OUTPUT->select($select); echo '
'; diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index 23b5a1893f..8e56aaa55f 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -245,7 +245,7 @@ if (!empty($sectionmenu)) { echo '
'; $popupurl = $CFG->wwwroot.'/course/view.php?id='.$course->id; - $select = moodle_select::make_popup_form($popupurl, 'week', $sectionmenu, 'sectionmenu'); + $select = html_select::make_popup_form($popupurl, 'week', $sectionmenu, 'sectionmenu'); $select->set_label(get_string('jumpto')); echo $OUTPUT->select($select); echo '
'; diff --git a/course/index.php b/course/index.php index a382017cb5..48fcba3160 100644 --- a/course/index.php +++ b/course/index.php @@ -337,7 +337,7 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $ } } $popupurl = "index.php?move=$category->id&sesskey=".sesskey(); - $select = moodle_select::make_popup_form($popupurl, 'moveto', $tempdisplaylist, "moveform$category->id", $category->parent); + $select = html_select::make_popup_form($popupurl, 'moveto', $tempdisplaylist, "moveform$category->id", $category->parent); $select->nothinglabel = false; echo $OUTPUT->select($select); } diff --git a/course/lib.php b/course/lib.php index 40280a4bb8..144ac281fb 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1605,14 +1605,14 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false, $popupurl = "$CFG->wwwroot/course/mod.php?id=$course->id§ion=$section&sesskey=".sesskey(); if (!empty($resources)) { - $select = moodle_select::make_popup_form($popupurl, 'add', $resources, "ressection$section", null); + $select = html_select::make_popup_form($popupurl, 'add', $resources, "ressection$section", null); $select->nothinglabel = $straddresource; $select->set_help_icon('resource/types', $straddresource); $output .= $OUTPUT->select($select); } if (!empty($activities)) { - $select = moodle_select::make_popup_form($popupurl, 'add', $activities, "section$section", null); + $select = html_select::make_popup_form($popupurl, 'add', $activities, "section$section", null); $select->nothinglabel = $straddactivity; $select->set_help_icon('mods', $straddactivity); $output .= $OUTPUT->select($select); diff --git a/course/report/log/lib.php b/course/report/log/lib.php index 45571572b3..a73f44820e 100644 --- a/course/report/log/lib.php +++ b/course/report/log/lib.php @@ -221,7 +221,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select echo "\n"; if (has_capability('coursereport/log:view', $sitecontext) && $showcourses) { $cid = empty($course->id)? '1' : $course->id; - $select = moodle_select::make($dropdown, "host_course", $hostid.'/'.$cid); + $select = html_select::make($dropdown, "host_course", $hostid.'/'.$cid); $select->nested = true; echo $OUTPUT->select($select); } else { diff --git a/course/report/participation/index.php b/course/report/participation/index.php index ad1f0b76a1..4d8ece267f 100644 --- a/course/report/participation/index.php +++ b/course/report/participation/index.php @@ -117,7 +117,7 @@ echo '
'."\n". ''."\n"; echo ''."\n"; - $select = moodle_select::make($instanceoptions, 'instanceid', $instanceid); + $select = html_select::make($instanceoptions, 'instanceid', $instanceid); $select->nested = true; echo $OUTPUT->select($select); echo ''."\n"; @@ -275,7 +275,7 @@ echo ''."\n"; } $displaylist['messageselect.php'] = get_string('messageselectadd'); - $select = new moodle_select(); + $select = new html_select(); $select->options = $displaylist; $select->name = "formaction"; $select->label = get_string("withselectedusers"); diff --git a/course/report/stats/lib.php b/course/report/stats/lib.php index 28fc7b53be..57acc8ae27 100644 --- a/course/report/stats/lib.php +++ b/course/report/stats/lib.php @@ -24,7 +24,7 @@ $options[STATS_MODE_RANKED] = get_string('reports'); } $popupurl = $url."?course=$course->id&time=$time"; - $select = moodle_select::make_popup_form($popupurl, 'mode', $options, 'switchmode', $mode); + $select = html_select::make_popup_form($popupurl, 'mode', $options, 'switchmode', $mode); $select->nothinglabel = false; return $OUTPUT->select($select); } diff --git a/course/search.php b/course/search.php index d3b84de0a5..780cc96175 100644 --- a/course/search.php +++ b/course/search.php @@ -334,7 +334,7 @@ echo "
"; echo "\n"; echo "\n"; - $select = new moodle_select(); + $select = new html_select(); $select->options = $displaylist; $select->name = "moveto"; $select->label = get_string("moveselectedcoursesto"); diff --git a/enrol/authorize/config_form.php b/enrol/authorize/config_form.php index b6dbab78fb..1cb44801d8 100755 --- a/enrol/authorize/config_form.php +++ b/enrol/authorize/config_form.php @@ -110,8 +110,8 @@ if (!isset($frm->acceptechecktypes)) { an_cutoff: an_cutoff_hour,$frm->an_cutoff_min); - $hourselector = moodle_select::make_time_selector('hours', 'an_cutoff_hour', $curtime); - $minselector = moodle_select::make_time_selector('minutes', 'an_cutoff_min', $curtime); + $hourselector = html_select::make_time_selector('hours', 'an_cutoff_hour', $curtime); + $minselector = html_select::make_time_selector('minutes', 'an_cutoff_min', $curtime); echo $OUTPUT->select($hourselector) . $OUTPUT->select($minselector); ?>
diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index d00f9b9551..a3d02816b6 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -50,7 +50,7 @@ function authorize_print_orders($courseid, $userid) { if (($popupcrs = $DB->get_records_sql_menu($sql, $params))) { $popupcrs = array($SITE->id => $SITE->fullname) + $popupcrs; } - $popupmenu = empty($popupcrs) ? '' : $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&status='.$status, 'course', $popupcrs, 'coursesmenu', $courseid)); + $popupmenu = empty($popupcrs) ? '' : $OUTPUT->select(html_select::make_popup_form($baseurl.'&status='.$status, 'course', $popupcrs, 'coursesmenu', $courseid)); $popupmenu .= '
'; $statusmenu = array( AN_STATUS_NONE => $strs->all, @@ -66,7 +66,7 @@ function authorize_print_orders($courseid, $userid) { AN_STATUS_TEST => $authstrs->tested ); - $popupmenu .= $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&course='.$courseid, 'status', $statusmenu, 'statusmenu', $status)); + $popupmenu .= $OUTPUT->select(html_select::make_popup_form($baseurl.'&course='.$courseid, 'status', $statusmenu, 'statusmenu', $status)); if ($canmanagepayments) { $popupmenu .= '
'; $checkbox = html_select_option::make_checkbox(1, $userid == $USER->id, get_string('mypaymentsonly', 'enrol_authorize')); @@ -92,7 +92,7 @@ function authorize_print_orders($courseid, $userid) { if ($perpage > 100) { $perpage = 100; } $perpagemenus = array(5 => 5, 10 => 10, 20 => 20, 50 => 50, 100 => 100); - $perpagemenu = $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&status='.$status.'&course='.$courseid, 'perpage',$perpagemenus,'perpagemenu',$perpage)); + $perpagemenu = $OUTPUT->select(html_select::make_popup_form($baseurl.'&status='.$status.'&course='.$courseid, 'perpage',$perpagemenus,'perpagemenu',$perpage)); $table->define_columns(array('id', 'userid', 'timecreated', 'status', 'action')); $table->define_headers(array($authstrs->orderid, $authstrs->shopper, $strs->time, $strs->status, $perpagemenu)); $table->define_baseurl($baseurl."&status=$status&course=$courseid&perpage=$perpage"); diff --git a/enrol/mnet/config.html b/enrol/mnet/config.html index f9f0b9fa3c..5c48e9d91f 100644 --- a/enrol/mnet/config.html +++ b/enrol/mnet/config.html @@ -8,7 +8,7 @@ $servercount = 0; if (is_array($mnethosts)) { $servercount = count(array_keys($mnethosts)); } -$select = moodle_select::make_yes_no('enrol_mnet_allow_allcourses', $frm->enrol_mnet_allow_allcourses); +$select = html_select::make_yes_no('enrol_mnet_allow_allcourses', $frm->enrol_mnet_allow_allcourses); ?> diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php index 93b45029d3..284b36b1c2 100644 --- a/grade/edit/tree/index.php +++ b/grade/edit/tree/index.php @@ -309,7 +309,7 @@ if (!$moving && count($categories) > 1) { echo '

'; echo ''; echo get_string('moveselectedto', 'grades') . ' '; - $select = new moodle_select(); + $select = new html_select(); $select->options = $categories; $select->name = 'moveafter'; $select->disabled = true; diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php index 551b9d7034..564a1cd177 100755 --- a/grade/edit/tree/lib.php +++ b/grade/edit/tree/lib.php @@ -564,7 +564,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category } } - $select = new moodle_select(); + $select = new html_select(); $select->options = $options; $select->name = 'aggregation_'.$category->id; $select->selectedvalue = $category->aggregation; diff --git a/grade/lib.php b/grade/lib.php index d2087624bf..49222a49cc 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -320,7 +320,7 @@ function print_graded_users_selector($course, $actionpage, $userid=0, $groupid=0 if ($includeall) { $menu[0] .= " (" . (count($menu) - 1) . ")"; } - $select = moodle_select::make_popup_form($CFG->wwwroot.'/grade/' . $actionpage, 'userid', $menu, 'choosegradeuser', $userid); + $select = html_select::make_popup_form($CFG->wwwroot.'/grade/' . $actionpage, 'userid', $menu, 'choosegradeuser', $userid); $select->set_label($label); return $OUTPUT->select($select); } @@ -359,7 +359,7 @@ function print_grade_plugin_selector($plugin_info, $return=false) { // finally print/return the popup form if ($count > 1) { - $select = moodle_select::make_popup_form('', '', $menu, 'choosepluginreport', ''); + $select = html_select::make_popup_form('', '', $menu, 'choosepluginreport', ''); $select->override_option_values($menu); if ($return) { diff --git a/group/overview.php b/group/overview.php index 4821f572da..66ea5f8484 100644 --- a/group/overview.php +++ b/group/overview.php @@ -130,7 +130,7 @@ if (!empty($CFG->enablegroupings)) { $options[$grouping->id] = strip_tags(format_string($grouping->name)); } $popupurl = $rooturl.'&group='.$groupid; - $select = moodle_select::make_popup_form($popupurl, 'grouping', $options, 'selectgrouping', $groupingid); + $select = html_select::make_popup_form($popupurl, 'grouping', $options, 'selectgrouping', $groupingid); $select->set_label($strgrouping); echo $OUTPUT->select($select); } @@ -141,7 +141,7 @@ foreach ($groups as $group) { $options[$group->id] = strip_tags(format_string($group->name)); } $popupurl = $rooturl.'&grouping='.$groupingid; -$select = moodle_select::make_popup_form($popupurl, 'group', $options, 'selectgroup', $groupid); +$select = html_select::make_popup_form($popupurl, 'group', $options, 'selectgroup', $groupid); $select->set_label($strgroup); echo $OUTPUT->select($select); diff --git a/index.php b/index.php index 6009984fed..7db0b94fba 100644 --- a/index.php +++ b/index.php @@ -75,7 +75,7 @@ $currlang = current_language(); $langs = get_list_of_languages(); - $select = moodle_select::make_popup_form($CFG->wwwroot .'/index.php', 'lang', $langs, 'chooselang', $currlang); + $select = html_select::make_popup_form($CFG->wwwroot .'/index.php', 'lang', $langs, 'chooselang', $currlang); $select->nothinglabel = false; $select->set_label(get_accesshide(get_string('language'))); $langmenu = $OUTPUT->select($select); diff --git a/lib/blocklib.php b/lib/blocklib.php index 4c1201c3fe..06ac5dce6c 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -1362,7 +1362,7 @@ function block_add_block_ui($page, $output) { asort($menu, SORT_LOCALE_STRING); $actionurl = $page->url->out_action(); - $select = moodle_select::make_popup_form($actionurl, 'bui_addblock', $menu, 'add_block'); + $select = html_select::make_popup_form($actionurl, 'bui_addblock', $menu, 'add_block'); $select->nothinglabel = get_string('adddots'); $bc->content = $OUTPUT->select($select); diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 1ae249389a..7505a661b0 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -3025,7 +3025,7 @@ function choose_from_menu ($options, $name, $selected='', $nothing='choose', $sc if ($script) { debugging('The $script parameter has been deprecated. You must use component_actions instead', DEBUG_DEVELOPER); } - $select = moodle_select::make($options, $name, $selected); + $select = html_select::make($options, $name, $selected); $select->nothinglabel = $nothing; $select->nothingvalue = $nothingvalue; $select->disabled = $disabled; @@ -3073,7 +3073,7 @@ function choose_from_menu_yesno($name, $selected, $script = '', $return = false, debugging('The $script parameter has been deprecated. You must use component_actions instead', DEBUG_DEVELOPER); } - $select = moodle_select::make_yes_no($name, $selected); + $select = html_select::make_yes_no($name, $selected); $select->disabled = $disabled; $select->tabindex = $tabindex; $output = $OUTPUT->select($select); @@ -3119,7 +3119,7 @@ function choose_from_menu_nested($options,$name,$selected='',$nothing='choose',$ if ($script) { debugging('The $script parameter has been deprecated. You must use component_actions instead', DEBUG_DEVELOPER); } - $select = moodle_select::make($options, $name, $selected); + $select = html_select::make($options, $name, $selected); $select->tabindex = $tabindex; $select->disabled = $disabled; $select->nothingvalue = $nothingvalue; @@ -3197,8 +3197,8 @@ function print_timer_selector($timelimit = 0, $unit = '', $name = 'timelimit', $ function print_time_selector($hour, $minute, $currenttime=0, $step=5, $return=false) { // debugging('print_time_selector() has been deprecated. Please change your code to use $OUTPUT->select($timeselector).'); global $OUTPUT; - $hourselector = moodle_select::make_time_selector('hours', $hour, $currenttime); - $minuteselector = moodle_select::make_time_selector('minutes', $minute, $currenttime, $step); + $hourselector = html_select::make_time_selector('hours', $hour, $currenttime); + $minuteselector = html_select::make_time_selector('minutes', $minute, $currenttime, $step); $output = $OUTPUT->select($hourselector) . $OUTPUT->select($minuteselector); @@ -3226,9 +3226,9 @@ function print_date_selector($day, $month, $year, $currenttime=0, $return=false) // debugging('print_date_selector() has been deprecated. Please change your code to use $OUTPUT->select($dateselector).'); global $OUTPUT; - $dayselector = moodle_select::make_time_selector('days', $day, $currenttime); - $monthselector = moodle_select::make_time_selector('months', $month, $currenttime); - $yearselector = moodle_select::make_time_selector('years', $year, $currenttime); + $dayselector = html_select::make_time_selector('days', $day, $currenttime); + $monthselector = html_select::make_time_selector('months', $month, $currenttime); + $yearselector = html_select::make_time_selector('years', $year, $currenttime); $output = $OUTPUT->select($dayselector) . $OUTPUT->select($monthselector) . $OUTPUT->select($yearselector); @@ -3284,7 +3284,7 @@ function popup_form($baseurl, $options, $formid, $selected='', $nothing='choose' } $baseurl = new moodle_url($baseurl); - $select = moodle_select::make_popup_form($baseurl, $name, $options, $formid, $selected); + $select = html_select::make_popup_form($baseurl, $name, $options, $formid, $selected); $select->disabled = $disabled; if (!empty($submitvalue)) { @@ -3356,7 +3356,7 @@ function choose_from_radio ($options, $name, $checked='', $return=false) { // debugging('choose_from_radio() has been deprecated. Please change your code to use $OUTPUT->select($select).'); global $OUTPUT; - $select = moodle_select::make($options, $name, $checked); + $select = html_select::make($options, $name, $checked); $select->rendertype = 'radio'; $output = $OUTPUT->select($select); diff --git a/lib/grouplib.php b/lib/grouplib.php index 6eca7586ac..5db4d8c831 100644 --- a/lib/grouplib.php +++ b/lib/grouplib.php @@ -480,7 +480,7 @@ function groups_print_course_menu($course, $urlroot, $return=false) { $groupname = reset($groupsmenu); $output = $grouplabel.': '.$groupname; } else { - $select = moodle_select::make_popup_form($urlroot, 'group', $groupsmenu, 'selectgroup', $activegroup); + $select = html_select::make_popup_form($urlroot, 'group', $groupsmenu, 'selectgroup', $activegroup); $select->nothinglabel = false; $select->set_label($grouplabel); $output = $OUTPUT->select($select); @@ -588,7 +588,7 @@ function groups_print_activity_menu($cm, $urlroot, $return=false, $hideallpartic $groupname = reset($groupsmenu); $output = $grouplabel.': '.$groupname; } else { - $select = moodle_select::make_popup_form($urlroot, 'group', $groupsmenu, 'selectgroup', $activegroup); + $select = html_select::make_popup_form($urlroot, 'group', $groupsmenu, 'selectgroup', $activegroup); $select->nothinglabel = false; $select->set_label($grouplabel); $output = $OUTPUT->select($select); diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 44221394f7..c8581d6539 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -210,9 +210,9 @@ function lockoptionsallsetup(formid) { * submits the form designated by args.id. If args.selectid is also * given, it only submits the form if the selected
by - * {@see moodle_core_renderer::table()} or by an overridden version of that - * method in a subclass. - * - * Example of usage: - * $t = new html_table(); - * ... // set various properties of the object $t as described below - * echo $OUTPUT->table($t); - * - * @copyright 2009 David Mudrak - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class html_table extends moodle_html_component { /** - * @var array of headings. The n-th array item is used as a heading of the n-th column. - * - * Example of usage: - * $t->head = array('Student', 'Grade'); + * This is a shortcut for making a yes/no select menu. + * @param string $name used to initialise {@link $name}. + * @param string $selected used to initialise {@link $selected}. + * @return html_select A menu initialised with yes/no options. */ - public $head; + public static function make_yes_no($name, $selected) { + return self::make(array(0 => get_string('no'), 1 => get_string('yes')), $name, $selected); + } + /** - * @var array can be used to make a heading span multiple columns - * - * Example of usage: - * $t->headspan = array(2,1); - * - * In this example, {@see html_table:$data} is supposed to have three columns. For the first two columns, - * the same heading is used. Therefore, {@see html_table::$head} should consist of two items. + * This is a shortcut for making an hour selector menu. + * @param string $type The type of selector (years, months, days, hours, minutes) + * @param string $name fieldname + * @param int $currenttime A default timestamp in GMT + * @param int $step minute spacing + * @return html_select A menu initialised with hour options. */ - public $headspan; - /** - * @var array of column alignments. The value is used as CSS 'text-align' property. Therefore, possible - * values are 'left', 'right', 'center' and 'justify'. Specify 'right' or 'left' from the perspective - * of a left-to-right (LTR) language. For RTL, the values are flipped automatically. - * + public static function make_time_selector($type, $name, $currenttime=0, $step=5) { + + if (!$currenttime) { + $currenttime = time(); + } + $currentdate = usergetdate($currenttime); + $userdatetype = $type; + + switch ($type) { + case 'years': + for ($i=1970; $i<=2020; $i++) { + $timeunits[$i] = $i; + } + $userdatetype = 'year'; + break; + case 'months': + for ($i=1; $i<=12; $i++) { + $timeunits[$i] = userdate(gmmktime(12,0,0,$i,15,2000), "%B"); + } + $userdatetype = 'month'; + break; + case 'days': + for ($i=1; $i<=31; $i++) { + $timeunits[$i] = $i; + } + $userdatetype = 'mday'; + break; + case 'hours': + for ($i=0; $i<=23; $i++) { + $timeunits[$i] = sprintf("%02d",$i); + } + break; + case 'minutes': + if ($step != 1) { + $currentdate['minutes'] = ceil($currentdate['minutes']/$step)*$step; + } + + for ($i=0; $i<=59; $i+=$step) { + $timeunits[$i] = sprintf("%02d",$i); + } + break; + default: + throw new coding_exception("Time type $type is not supported by html_select::make_time_selector()."); + } + + $timerselector = self::make($timeunits, $name, $currentdate[$userdatetype]); + $timerselector->label = new html_label(); + $timerselector->label->text = get_string(substr($type, -1), 'form'); + $timerselector->label->for = "menu$timerselector->name"; + $timerselector->label->add_class('accesshide'); + $timerselector->nothinglabel = ''; + + return $timerselector; + } + + /** + * Given an associative array of type => fieldname and an optional timestamp, + * returns an array of html_select components representing date/time selectors. + * @param array $selectors Arrays of type => fieldname. Selectors will be returned in the order of the types given + * @param int $currenttime A UNIX timestamp + * @param int $step minute spacing + * @return array Instantiated date/time selectors + */ + public function make_time_selectors($selectors, $currenttime=0, $step=5) { + $selects = array(); + foreach ($selectors as $type => $name) { + $selects[] = html_select::make_time_selector($type, $name, $currenttime, $step); + } + return $selects; + } + + /** + * This is a shortcut for making a select popup form. + * @param mixed $baseurl The target URL, string or moodle_url + * @param string $name The variable which this select's options are changing in the URL + * @param array $options A list of value-label pairs for the popup list + * @param string $formid id for the control. Must be unique on the page. Used in the HTML. + * @param string $selected The option that is initially selected + * @return html_select A menu initialised as a popup form. + */ + public function make_popup_form($baseurl, $name, $options, $formid, $selected=null) { + global $CFG; + + $selectedurl = null; + + if (!($baseurl instanceof moodle_url)) { + $baseurl = new moodle_url($baseurl); + } + + if (!empty($selected)) { + $selectedurl = $baseurl->out(false, array($name => $selected), false); + } + + if (!($baseurl instanceof moodle_url)) { + $baseurl = new moodle_url($baseurl); + } + + // Replace real value by formatted URLs + foreach ($options as $value => $label) { + $options[$baseurl->out(false, array($name => $value), false)] = $label; + unset($options[$value]); + } + + $select = self::make($options, 'jump', $selectedurl); + + $select->form = new html_form(); + $select->form->id = $formid; + $select->form->method = 'get'; + $select->form->add_class('popupform'); + $select->form->url = new moodle_url($CFG->wwwroot . '/course/jumpto.php', array('sesskey' => sesskey())); + $select->form->button->text = get_string('go'); + + $select->id = $formid . '_jump'; + + $select->add_action('change', 'submit_form_by_id', array('id' => $formid, 'selectid' => $select->id)); + + return $select; + } + + /** + * Override the URLs of the default popup_form, which only supports one base URL + * @param array $options value=>label pairs representing select options + * @return void + */ + public function override_option_values($options) { + global $PAGE; + + $this->initialise_options(); + + reset($options); + + foreach ($this->options as $optkey => $optgroup) { + if ($optgroup instanceof html_select_optgroup) { + foreach ($optgroup->options as $key => $option) { + next($options); + $this->options[$optkey]->options[$key]->value = key($options); + + $optionurl = new moodle_url(key($options)); + + if ($optionurl->compare($PAGE->url, URL_MATCH_PARAMS)) { + $this->options[$optkey]->options[$key]->selected = 'selected'; + } + } + next($options); + } else if ($optgroup instanceof html_select_option) { + next($options); + $this->options[$optkey]->value = key($options); + $optionurl = new moodle_url(key($options)); + + if ($optionurl->compare($PAGE->url, URL_MATCH_PARAMS)) { + $this->options[$optkey]->selected = 'selected'; + } + } + } + } + + /** + * Adds a help icon next to the select menu. + * + * This can be used in two ways: + * + * 
+     * $select->set_help_icon($page, $text, $linktext);
+     * // OR
+     * $helpicon = new moodle_help_icon();
+     * $helpicon->page = $page;
+     * $helpicon->text = $text;
+     * $helpicon->linktext = $linktext;
+     * $select->set_help_icon($helpicon);
+     *
+ * + * Use the second form when you need to add additional HTML attributes + * to the label and/or JS actions. + * + * @param mixed $page Either the keyword that defines a help page or a moodle_help_icon object + * @param text $text The text of the help icon + * @param boolean $linktext Whether or not to show text next to the icon + * @return void + */ + public function set_help_icon($page, $text, $linktext=false) { + if ($page instanceof moodle_help_icon) { + $this->helpicon = $page; + } else if (!empty($page)) { + $this->helpicon = new moodle_help_icon(); + $this->helpicon->page = $page; + $this->helpicon->text = $text; + $this->helpicon->linktext = $linktext; + } + } + + /** + * Parses the $options array and instantiates html_select_option objects in + * the place of the original value => label pairs. This is useful for when you + * need to setup extra html attributes and actions on individual options before + * the component is sent to the renderer + * @return void; + */ + public function initialise_options() { + // If options are already instantiated objects, stop here + $firstoption = reset($this->options); + if ($firstoption instanceof html_select_option || $firstoption instanceof html_select_optgroup) { + return; + } + + if ($this->rendertype == 'radio' && $this->multiple) { + $this->rendertype = 'checkbox'; + } + + // If nested is on, or if radio/checkbox rendertype is set, remove the default Choose option + if ($this->nested || $this->rendertype == 'radio' || $this->rendertype == 'checkbox') { + $this->nothinglabel = ''; + } + + $options = $this->options; + + $this->options = array(); + + if ($this->nested && $this->rendertype != 'menu') { + throw new coding_exception('html_select cannot render nested options as radio buttons or checkboxes.'); + } else if ($this->nested) { + foreach ($options as $section => $values) { + $optgroup = new html_select_optgroup(); + $optgroup->text = $section; + + foreach ($values as $value => $display) { + $option = new html_select_option(); + $option->value = s($value); + $option->text = $display; + if ($display === '') { + $option->text = $value; + } + + if ((string) $value == (string) $this->selectedvalue || + (is_array($this->selectedvalue) && in_array($value, $this->selectedvalue))) { + $option->selected = 'selected'; + } + + $optgroup->options[] = $option; + } + + $this->options[] = $optgroup; + } + } else { + $inoptgroup = false; + $optgroup = false; + + foreach ($options as $value => $display) { + if ($display == '--') { /// we are ending previous optgroup + // $this->options[] = $optgroup; + $inoptgroup = false; + continue; + } else if (substr($display,0,2) == '--') { /// we are starting a new optgroup + if (!empty($optgroup->options)) { + $this->options[] = $optgroup; + } + + $optgroup = new html_select_optgroup(); + $optgroup->text = substr($display,2); // stripping the -- + + $inoptgroup = true; /// everything following will be in an optgroup + continue; + + } else { + // Add $nothing option if there are not optgroups + if ($this->nothinglabel && empty($this->options[0]) && !$inoptgroup) { + $nothingoption = new html_select_option(); + $nothingoption->value = 0; + if (!empty($this->nothingvalue)) { + $nothingoption->value = $this->nothingvalue; + } + $nothingoption->text = $this->nothinglabel; + $this->options = array($nothingoption) + $this->options; + } + + $option = new html_select_option(); + $option->text = $display; + + if ($display === '') { + $option->text = $value; + } + + if ((string) $value == (string) $this->selectedvalue || + (is_array($this->selectedvalue) && in_array($value, $this->selectedvalue))) { + $option->selected = 'selected'; + } + + $option->value = s($value); + + if ($inoptgroup) { + $optgroup->options[] = $option; + } else { + $this->options[] = $option; + } + } + } + + if ($optgroup) { + $this->options[] = $optgroup; + } + } + } +} + +/** + * This class represents a select option element + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_select_option extends moodle_html_component { + /** + * @var string $value The value of this option (will be sent with form) + */ + public $value; + /** + * @var string $text The display value of the option + */ + public $text; + /** + * @var boolean $selected Whether or not this option is selected + */ + public $selected = false; + /** + * @var mixed $label The label for that component. String or html_label object + */ + public $label; + + public function __construct() { + $this->label = new html_label(); + } + + /** + * @see moodle_html_component::prepare() + * @return void + */ + public function prepare() { + if (empty($this->text)) { + throw new coding_exception('html_select_option requires a $text value.'); + } + + if (empty($this->label->text)) { + $this->set_label($this->text); + } else if (!($this->label instanceof html_label)) { + $this->set_label($this->label); + } + if (empty($this->id)) { + $this->generate_id(); + } + + parent::prepare(); + } + + /** + * Shortcut for making a checkbox-ready option + * @param string $value The value of the checkbox + * @param boolean $checked + * @param string $label + * @param string $alt + * @return html_select_option A component ready for $OUTPUT->checkbox() + */ + public function make_checkbox($value, $checked, $label='', $alt='') { + $checkbox = new html_select_option(); + $checkbox->value = $value; + $checkbox->selected = $checked; + $checkbox->text = $label; + $checkbox->label->text = $label; + $checkbox->alt = $alt; + return $checkbox; + } +} + +/** + * This class represents a select optgroup element + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_select_optgroup extends moodle_html_component { + /** + * @var string $text The display value of the optgroup + */ + public $text; + /** + * @var array $options An array of html_select_option objects + */ + public $options = array(); + + public function prepare() { + if (empty($this->text)) { + throw new coding_exception('html_select_optgroup requires a $text value.'); + } + if (empty($this->options)) { + throw new coding_exception('html_select_optgroup requires at least one html_select_option object'); + } + parent::prepare(); + } +} + +/** + * This class represents an input field + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_field extends moodle_html_component { + /** + * @var string $name The name attribute of the field + */ + public $name; + /** + * @var string $value The value attribute of the field + */ + public $value; + /** + * @var string $type The type attribute of the field (text, submit, checkbox etc) + */ + public $type; + /** + * @var string $maxlength The maxlength attribute of the field (only applies to text type) + */ + public $maxlength; + /** + * @var mixed $label The label for that component. String or html_label object + */ + public $label; + + public function __construct() { + $this->label = new html_label(); + } + + /** + * @see moodle_html_component::prepare() + * @return void + */ + public function prepare() { + if (empty($this->style)) { + $this->style = 'width: 4em;'; + } + if (empty($this->id)) { + $this->generate_id(); + } + parent::prepare(); + } + + /** + * Shortcut for creating a text input component. + * @param string $name The name of the text field + * @param string $value The value of the text field + * @param string $alt The info to be inserted in the alt tag + * @param int $maxlength Sets the maxlength attribute of the field. Not set by default + * @return html_field The field component + */ + public static function make_text($name='unnamed', $value, $alt, $maxlength=0) { + $field = new html_field(); + if (empty($alt)) { + $alt = get_string('textfield'); + } + $field->type = 'text'; + $field->name = $name; + $field->value = $value; + $field->alt = $alt; + $field->maxlength = $maxlength; + return $field; + } +} + +/** + * Holds all the information required to render a
by + * {@see moodle_core_renderer::table()} or by an overridden version of that + * method in a subclass. + * + * Example of usage: + * $t = new html_table(); + * ... // set various properties of the object $t as described below + * echo $OUTPUT->table($t); + * + * @copyright 2009 David Mudrak + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_table extends moodle_html_component { + /** + * @var array of headings. The n-th array item is used as a heading of the n-th column. + * + * Example of usage: + * $t->head = array('Student', 'Grade'); + */ + public $head; + /** + * @var array can be used to make a heading span multiple columns + * + * Example of usage: + * $t->headspan = array(2,1); + * + * In this example, {@see html_table:$data} is supposed to have three columns. For the first two columns, + * the same heading is used. Therefore, {@see html_table::$head} should consist of two items. + */ + public $headspan; + /** + * @var array of column alignments. The value is used as CSS 'text-align' property. Therefore, possible + * values are 'left', 'right', 'center' and 'justify'. Specify 'right' or 'left' from the perspective + * of a left-to-right (LTR) language. For RTL, the values are flipped automatically. + * * Examples of usage: * $t->align = array(null, 'right'); * or @@ -632,866 +1094,404 @@ class html_table extends moodle_html_component { public function __set($name, $value) { if ($name == 'rowclass') { debugging('rowclass[] has been deprecated for html_table ' . - 'and should be replaced with rowclasses[]. please fix the code.'); - $this->rowclasses = $value; - } else { - parent::__set($name, $value); - } - } -} - -/** - * Component representing a table row. - * - * @copyright 2009 Nicolas Connault - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class html_table_row extends moodle_html_component { - /** - * @var array $cells Array of html_table_cell objects - */ - public $cells = array(); - - /** - * @see lib/moodle_html_component#prepare() - * @return void - */ - public function prepare() { - parent::prepare(); - } -} - -/** - * Component representing a table cell. - * - * @copyright 2009 Nicolas Connault - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class html_table_cell extends moodle_html_component { - /** - * @var string $text The contents of the cell - */ - public $text; - /** - * @var string $abbr Abbreviated version of the contents of the cell - */ - public $abbr = ''; - /** - * @var int $colspan Number of columns this cell should span - */ - public $colspan = ''; - /** - * @var int $rowspan Number of rows this cell should span - */ - public $rowspan = ''; - /** - * @var string $scope Defines a way to associate header cells and data cells in a table - */ - public $scope = ''; - - /** - * @see lib/moodle_html_component#prepare() - * @return void - */ - public function prepare() { - parent::prepare(); - } -} - -/** - * Component representing a XHTML link. - * - * @copyright 2009 Nicolas Connault - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class html_link extends moodle_html_component { - /** - * URL can be simple text or a moodle_url object - * @var mixed $url - */ - public $url; - - /** - * @var string $text The text that will appear between the link tags - */ - public $text; - - /** - * @see lib/moodle_html_component#prepare() - * @return void - */ - public function prepare() { - // We can't accept an empty text value - if (empty($this->text)) { - throw new coding_exception('A html_link must have a descriptive text value!'); - } - - parent::prepare(); - } - - /** - * Shortcut for creating a link component. - * @param mixed $url String or moodle_url - * @param string $text The text of the link - * @return html_link The link component - */ - public function make($url, $text) { - $link = new html_link(); - $link->url = $url; - $link->text = $text; - return $link; - } -} - -/** - * Component representing a XHTML button (input of type 'button'). - * The renderer will either output it as a button with an onclick event, - * or as a form with hidden inputs. - * - * @copyright 2009 Nicolas Connault - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class html_button extends moodle_html_component { - /** - * @var string $text - */ - public $text; - - /** - * @var boolean $disabled Whether or not this button is disabled - */ - public $disabled = false; - - /** - * @see lib/moodle_html_component#prepare() - * @return void - */ - public function prepare() { - $this->add_class('singlebutton'); - - if (empty($this->text)) { - throw new coding_exception('A html_button must have a text value!'); - } - - if ($this->disabled) { - $this->disabled = 'disabled'; + 'and should be replaced with rowclasses[]. please fix the code.'); + $this->rowclasses = $value; + } else { + parent::__set($name, $value); } - - parent::prepare(); } } /** - * Component representing an image. + * Component representing a table row. * * @copyright 2009 Nicolas Connault * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.0 */ -class html_image extends moodle_html_component { - /** - * @var string $alt A descriptive text - */ - public $alt = HTML_ATTR_EMPTY; +class html_table_row extends moodle_html_component { /** - * @var string $src The path to the image being used + * @var array $cells Array of html_table_cell objects */ - public $src; + public $cells = array(); /** * @see lib/moodle_html_component#prepare() * @return void */ public function prepare() { - $this->add_class('image'); parent::prepare(); } } /** - * Component representing a textarea. + * Component representing a table cell. * * @copyright 2009 Nicolas Connault * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.0 */ -class html_textarea extends moodle_html_component { +class html_table_cell extends moodle_html_component { /** - * @param string $name Name to use for the textarea element. + * @var string $text The contents of the cell */ - public $name; + public $text; /** - * @param string $value Initial content to display in the textarea. + * @var string $abbr Abbreviated version of the contents of the cell */ - public $value; + public $abbr = ''; /** - * @param int $rows Number of rows to display (minimum of 10 when $height is non-null) + * @var int $colspan Number of columns this cell should span */ - public $rows; + public $colspan = ''; /** - * @param int $cols Number of columns to display (minimum of 65 when $width is non-null) + * @var int $rowspan Number of rows this cell should span */ - public $cols; + public $rowspan = ''; /** - * @param bool $usehtmleditor Enables the use of the htmleditor for this field. + * @var string $scope Defines a way to associate header cells and data cells in a table */ - public $usehtmleditor; + public $scope = ''; /** * @see lib/moodle_html_component#prepare() * @return void */ public function prepare() { - $this->add_class('form-textarea'); - - if (empty($this->id)) { - $this->id = "edit-$this->name"; - } - - if ($this->usehtmleditor) { - editors_head_setup(); - $editor = get_preferred_texteditor(FORMAT_HTML); - $editor->use_editor($this->id, array('legacy'=>true)); - $this->value = htmlspecialchars($value); - } - parent::prepare(); } } /** - * Component representing a simple form wrapper. Its purpose is mainly to enclose - * a submit input with the appropriate action and hidden inputs. + * Component representing a XHTML link. * * @copyright 2009 Nicolas Connault * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.0 */ -class html_form extends moodle_html_component { - /** - * @var string $method post or get - */ - public $method = 'post'; +class html_link extends moodle_html_component { /** - * If a string is given, it will be converted to a moodle_url during prepare() - * @var mixed $url A moodle_url including params or a string + * URL can be simple text or a moodle_url object + * @var mixed $url */ public $url; - /** - * @var array $params Optional array of parameters. Ignored if $url instanceof moodle_url - */ - public $params = array(); - /** - * @var boolean $showbutton If true, the submit button will always be shown even if JavaScript is available - */ - public $showbutton = false; - /** - * @var string $targetwindow The name of the target page to open the linked page in. - */ - public $targetwindow = 'self'; - /** - * @var html_button $button A submit button - */ - public $button; /** - * Constructor: sets up the other components in case they are needed - * @return void + * @var string $text The text that will appear between the link tags */ - public function __construct() { - static $yes; - $this->button = new html_button(); - if (!isset($yes)) { - $yes = get_string('yes'); - $this->button->text = $yes; - } - } + public $text; /** * @see lib/moodle_html_component#prepare() * @return void */ public function prepare() { - - if (empty($this->url)) { - throw new coding_exception('A html_form must have a $url value (string or moodle_url).'); - } - - if (!($this->url instanceof moodle_url)) { - $this->url = new moodle_url($this->url, $this->params); - } - - if ($this->method == 'post') { - $this->url->param('sesskey', sesskey()); + // We can't accept an empty text value + if (empty($this->text)) { + throw new coding_exception('A html_link must have a descriptive text value!'); } parent::prepare(); } -} - -/** - * Component representing a list. - * - * The advantage of using this object instead of a flat array is that you can load it - * with metadata (CSS classes, event handlers etc.) which can be used by the renderers. - * - * @copyright 2009 Nicolas Connault - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class html_list extends moodle_html_component { - - /** - * @var array $items An array of html_list_item or html_list objects - */ - public $items = array(); - - /** - * @var string $type The type of list (ordered|unordered), definition type not yet supported - */ - public $type = 'unordered'; - - /** - * @see lib/moodle_html_component#prepare() - * @return void - */ - public function prepare() { - parent::prepare(); - } - - /** - * This function takes a nested array of data and maps it into this list's $items array - * as proper html_list_item and html_list objects, with appropriate metadata. - * - * @param array $tree A nested array (array keys are ignored); - * @param int $row Used in identifying the iteration level and in ul classes - * @return void - */ - public function load_data($tree, $level=0) { - - $this->add_class("list-$level"); - - foreach ($tree as $key => $element) { - if (is_array($element)) { - $newhtmllist = new html_list(); - $newhtmllist->load_data($element, $level + 1); - $this->items[] = $newhtmllist; - } else { - $listitem = new html_list_item(); - $listitem->value = $element; - $listitem->add_class("list-item-$level-$key"); - $this->items[] = $listitem; - } - } - } /** - * Adds a html_list_item or html_list to this list. - * If the param is a string, a html_list_item will be added. - * @param mixed $item String, html_list or html_list_item object - * @return void + * Shortcut for creating a link component. + * @param mixed $url String or moodle_url + * @param string $text The text of the link + * @return html_link The link component */ - public function add_item($item) { - if ($item instanceof html_list_item || $item instanceof html_list) { - $this->items[] = $item; - } else { - $listitem = new html_list_item(); - $listitem->value = $item; - $this->items[] = $item; - } + public function make($url, $text) { + $link = new html_link(); + $link->url = $url; + $link->text = $text; + return $link; } } /** - * Component representing a list item. + * Component representing a XHTML button (input of type 'button'). + * The renderer will either output it as a button with an onclick event, + * or as a form with hidden inputs. * * @copyright 2009 Nicolas Connault * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.0 */ -class html_list_item extends moodle_html_component { - /** - * @var string $value The value of the list item - */ - public $value; - +class html_button extends moodle_html_component { /** - * @see lib/moodle_html_component#prepare() - * @return void + * @var string $text */ - public function prepare() { - parent::prepare(); - } -} - -/// Complex components aggregating simpler components + public $text; -/** - * This class hold all the information required to describe a element. Default 0. + * @see lib/moodle_html_component#prepare() + * @return void */ - public $tabindex = 0; + public function prepare() { + $this->add_class('singlebutton'); + + if (empty($this->text)) { + throw new coding_exception('A html_button must have a text value!'); + } + + if ($this->disabled) { + $this->disabled = 'disabled'; + } + + parent::prepare(); + } +} + +/** + * Component representing an image. + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_image extends moodle_html_component { /** - * @var mixed Defaults to false, which means display the select as a dropdown menu. - * If true, display this select as a list box whose size is chosen automatically. - * If an integer, display as list box of that size. + * @var string $alt A descriptive text */ - public $listbox = false; + public $alt = HTML_ATTR_EMPTY; /** - * @var integer if you are using $listbox === true to get an automatically - * sized list box, the size of the list box will be the number of options, - * or this number, whichever is smaller. + * @var string $src The path to the image being used */ - public $maxautosize = 10; + public $src; + /** - * @var boolean if true, allow multiple selection. Only used if $listbox is true, or if - * the select is to be output as checkboxes. + * @see lib/moodle_html_component#prepare() + * @return void */ - public $multiple = false; + public function prepare() { + $this->add_class('image'); + parent::prepare(); + } +} + +/** + * Component representing a textarea. + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_textarea extends moodle_html_component { /** - * Another way to use nested menu is to prefix optgroup labels with -- and end the optgroup with -- - * Leave this setting to false if you are using the latter method. - * @var boolean $nested if true, uses $options' keys as option headings (optgroup) + * @param string $name Name to use for the textarea element. */ - public $nested = false; + public $name; /** - * @var html_form $form An optional html_form component + * @param string $value Initial content to display in the textarea. */ - public $form; + public $value; /** - * @var moodle_help_icon $form An optional moodle_help_icon component + * @param int $rows Number of rows to display (minimum of 10 when $height is non-null) */ - public $helpicon; + public $rows; /** - * @var boolean $rendertype How the select element should be rendered: menu or radio (checkbox is just radio + multiple) + * @param int $cols Number of columns to display (minimum of 65 when $width is non-null) */ - public $rendertype = 'menu'; + public $cols; + /** + * @param bool $usehtmleditor Enables the use of the htmleditor for this field. + */ + public $usehtmleditor; /** - * @see moodle_html_component::prepare() + * @see lib/moodle_html_component#prepare() * @return void */ public function prepare() { - global $CFG; + $this->add_class('form-textarea'); - // name may contain [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading if (empty($this->id)) { - $this->id = 'menu' . str_replace(array('[', ']'), '', $this->name); - } - - if (empty($this->classes)) { - $this->set_classes(array('menu' . str_replace(array('[', ']'), '', $this->name))); - } - - if (is_null($this->nothinglabel)) { - $this->nothinglabel = get_string('choosedots'); + $this->id = "edit-$this->name"; } - if (!empty($this->label) && !($this->label instanceof html_label)) { - $label = new html_label(); - $label->text = $this->label; - $label->for = $this->name; - $this->label = $label; + if ($this->usehtmleditor) { + editors_head_setup(); + $editor = get_preferred_texteditor(FORMAT_HTML); + $editor->use_editor($this->id, array('legacy'=>true)); + $this->value = htmlspecialchars($value); } - $this->add_class('select'); - - $this->initialise_options(); parent::prepare(); } +} +/** + * Component representing a simple form wrapper. Its purpose is mainly to enclose + * a submit input with the appropriate action and hidden inputs. + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_form extends moodle_html_component { /** - * This is a shortcut for making a simple select menu. It lets you specify - * the options, name and selected option in one line of code. - * @param array $options used to initialise {@link $options}. - * @param string $name used to initialise {@link $name}. - * @param string $selected used to initialise {@link $selected}. - * @return moodle_select A moodle_select object with the three common fields initialised. + * @var string $method post or get */ - public static function make($options, $name, $selected = '') { - $menu = new moodle_select(); - $menu->options = $options; - $menu->name = $name; - $menu->selectedvalue = $selected; - return $menu; - } - + public $method = 'post'; /** - * This is a shortcut for making a yes/no select menu. - * @param string $name used to initialise {@link $name}. - * @param string $selected used to initialise {@link $selected}. - * @return moodle_select A menu initialised with yes/no options. + * If a string is given, it will be converted to a moodle_url during prepare() + * @var mixed $url A moodle_url including params or a string */ - public static function make_yes_no($name, $selected) { - return self::make(array(0 => get_string('no'), 1 => get_string('yes')), $name, $selected); - } - + public $url; /** - * This is a shortcut for making an hour selector menu. - * @param string $type The type of selector (years, months, days, hours, minutes) - * @param string $name fieldname - * @param int $currenttime A default timestamp in GMT - * @param int $step minute spacing - * @return moodle_select A menu initialised with hour options. + * @var array $params Optional array of parameters. Ignored if $url instanceof moodle_url */ - public static function make_time_selector($type, $name, $currenttime=0, $step=5) { - - if (!$currenttime) { - $currenttime = time(); - } - $currentdate = usergetdate($currenttime); - $userdatetype = $type; - - switch ($type) { - case 'years': - for ($i=1970; $i<=2020; $i++) { - $timeunits[$i] = $i; - } - $userdatetype = 'year'; - break; - case 'months': - for ($i=1; $i<=12; $i++) { - $timeunits[$i] = userdate(gmmktime(12,0,0,$i,15,2000), "%B"); - } - $userdatetype = 'month'; - break; - case 'days': - for ($i=1; $i<=31; $i++) { - $timeunits[$i] = $i; - } - $userdatetype = 'mday'; - break; - case 'hours': - for ($i=0; $i<=23; $i++) { - $timeunits[$i] = sprintf("%02d",$i); - } - break; - case 'minutes': - if ($step != 1) { - $currentdate['minutes'] = ceil($currentdate['minutes']/$step)*$step; - } - - for ($i=0; $i<=59; $i+=$step) { - $timeunits[$i] = sprintf("%02d",$i); - } - break; - default: - throw new coding_exception("Time type $type is not supported by moodle_select::make_time_selector()."); - } - - $timerselector = self::make($timeunits, $name, $currentdate[$userdatetype]); - $timerselector->label = new html_label(); - $timerselector->label->text = get_string(substr($type, -1), 'form'); - $timerselector->label->for = "menu$timerselector->name"; - $timerselector->label->add_class('accesshide'); - $timerselector->nothinglabel = ''; - - return $timerselector; - } + public $params = array(); + /** + * @var boolean $showbutton If true, the submit button will always be shown even if JavaScript is available + */ + public $showbutton = false; + /** + * @var string $targetwindow The name of the target page to open the linked page in. + */ + public $targetwindow = 'self'; + /** + * @var html_button $button A submit button + */ + public $button; /** - * Given an associative array of type => fieldname and an optional timestamp, - * returns an array of moodle_select components representing date/time selectors. - * @param array $selectors Arrays of type => fieldname. Selectors will be returned in the order of the types given - * @param int $currenttime A UNIX timestamp - * @param int $step minute spacing - * @return array Instantiated date/time selectors + * Constructor: sets up the other components in case they are needed + * @return void */ - public function make_time_selectors($selectors, $currenttime=0, $step=5) { - $selects = array(); - foreach ($selectors as $type => $name) { - $selects[] = moodle_select::make_time_selector($type, $name, $currenttime, $step); + public function __construct() { + static $yes; + $this->button = new html_button(); + if (!isset($yes)) { + $yes = get_string('yes'); + $this->button->text = $yes; } - return $selects; } /** - * This is a shortcut for making a select popup form. - * @param mixed $baseurl The target URL, string or moodle_url - * @param string $name The variable which this select's options are changing in the URL - * @param array $options A list of value-label pairs for the popup list - * @param string $formid id for the control. Must be unique on the page. Used in the HTML. - * @param string $selected The option that is initially selected - * @return moodle_select A menu initialised as a popup form. + * @see lib/moodle_html_component#prepare() + * @return void */ - public function make_popup_form($baseurl, $name, $options, $formid, $selected=null) { - global $CFG; - - $selectedurl = null; - - if (!($baseurl instanceof moodle_url)) { - $baseurl = new moodle_url($baseurl); - } + public function prepare() { - if (!empty($selected)) { - $selectedurl = $baseurl->out(false, array($name => $selected), false); + if (empty($this->url)) { + throw new coding_exception('A html_form must have a $url value (string or moodle_url).'); } - if (!($baseurl instanceof moodle_url)) { - $baseurl = new moodle_url($baseurl); + if (!($this->url instanceof moodle_url)) { + $this->url = new moodle_url($this->url, $this->params); } - // Replace real value by formatted URLs - foreach ($options as $value => $label) { - $options[$baseurl->out(false, array($name => $value), false)] = $label; - unset($options[$value]); + if ($this->method == 'post') { + $this->url->param('sesskey', sesskey()); } - $select = self::make($options, 'jump', $selectedurl); + parent::prepare(); + } +} - $select->form = new html_form(); - $select->form->id = $formid; - $select->form->method = 'get'; - $select->form->add_class('popupform'); - $select->form->url = new moodle_url($CFG->wwwroot . '/course/jumpto.php', array('sesskey' => sesskey())); - $select->form->button->text = get_string('go'); +/** + * Component representing a list. + * + * The advantage of using this object instead of a flat array is that you can load it + * with metadata (CSS classes, event handlers etc.) which can be used by the renderers. + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_list extends moodle_html_component { - $select->id = $formid . '_jump'; + /** + * @var array $items An array of html_list_item or html_list objects + */ + public $items = array(); - $select->add_action('change', 'submit_form_by_id', array('id' => $formid, 'selectid' => $select->id)); + /** + * @var string $type The type of list (ordered|unordered), definition type not yet supported + */ + public $type = 'unordered'; - return $select; + /** + * @see lib/moodle_html_component#prepare() + * @return void + */ + public function prepare() { + parent::prepare(); } /** - * Override the URLs of the default popup_form, which only supports one base URL - * @param array $options value=>label pairs representing select options + * This function takes a nested array of data and maps it into this list's $items array + * as proper html_list_item and html_list objects, with appropriate metadata. + * + * @param array $tree A nested array (array keys are ignored); + * @param int $row Used in identifying the iteration level and in ul classes * @return void */ - public function override_option_values($options) { - global $PAGE; - - $this->initialise_options(); - - reset($options); - - foreach ($this->options as $optkey => $optgroup) { - if ($optgroup instanceof html_select_optgroup) { - foreach ($optgroup->options as $key => $option) { - next($options); - $this->options[$optkey]->options[$key]->value = key($options); - - $optionurl = new moodle_url(key($options)); + public function load_data($tree, $level=0) { - if ($optionurl->compare($PAGE->url, URL_MATCH_PARAMS)) { - $this->options[$optkey]->options[$key]->selected = 'selected'; - } - } - next($options); - } else if ($optgroup instanceof html_select_option) { - next($options); - $this->options[$optkey]->value = key($options); - $optionurl = new moodle_url(key($options)); + $this->add_class("list-$level"); - if ($optionurl->compare($PAGE->url, URL_MATCH_PARAMS)) { - $this->options[$optkey]->selected = 'selected'; - } + foreach ($tree as $key => $element) { + if (is_array($element)) { + $newhtmllist = new html_list(); + $newhtmllist->load_data($element, $level + 1); + $this->items[] = $newhtmllist; + } else { + $listitem = new html_list_item(); + $listitem->value = $element; + $listitem->add_class("list-item-$level-$key"); + $this->items[] = $listitem; } } } /** - * Adds a help icon next to the select menu. - * - * This can be used in two ways: - * - * 
-     * $select->set_help_icon($page, $text, $linktext);
-     * // OR
-     * $helpicon = new moodle_help_icon();
-     * $helpicon->page = $page;
-     * $helpicon->text = $text;
-     * $helpicon->linktext = $linktext;
-     * $select->set_help_icon($helpicon);
-     *
- * - * Use the second form when you need to add additional HTML attributes - * to the label and/or JS actions. - * - * @param mixed $page Either the keyword that defines a help page or a moodle_help_icon object - * @param text $text The text of the help icon - * @param boolean $linktext Whether or not to show text next to the icon + * Adds a html_list_item or html_list to this list. + * If the param is a string, a html_list_item will be added. + * @param mixed $item String, html_list or html_list_item object * @return void */ - public function set_help_icon($page, $text, $linktext=false) { - if ($page instanceof moodle_help_icon) { - $this->helpicon = $page; - } else if (!empty($page)) { - $this->helpicon = new moodle_help_icon(); - $this->helpicon->page = $page; - $this->helpicon->text = $text; - $this->helpicon->linktext = $linktext; + public function add_item($item) { + if ($item instanceof html_list_item || $item instanceof html_list) { + $this->items[] = $item; + } else { + $listitem = new html_list_item(); + $listitem->value = $item; + $this->items[] = $item; } } +} +/** + * Component representing a list item. + * + * @copyright 2009 Nicolas Connault + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class html_list_item extends moodle_html_component { /** - * Parses the $options array and instantiates html_select_option objects in - * the place of the original value => label pairs. This is useful for when you - * need to setup extra html attributes and actions on individual options before - * the component is sent to the renderer - * @return void; + * @var string $value The value of the list item */ - public function initialise_options() { - // If options are already instantiated objects, stop here - $firstoption = reset($this->options); - if ($firstoption instanceof html_select_option || $firstoption instanceof html_select_optgroup) { - return; - } - - if ($this->rendertype == 'radio' && $this->multiple) { - $this->rendertype = 'checkbox'; - } - - // If nested is on, or if radio/checkbox rendertype is set, remove the default Choose option - if ($this->nested || $this->rendertype == 'radio' || $this->rendertype == 'checkbox') { - $this->nothinglabel = ''; - } - - $options = $this->options; - - $this->options = array(); - - if ($this->nested && $this->rendertype != 'menu') { - throw new coding_exception('moodle_select cannot render nested options as radio buttons or checkboxes.'); - } else if ($this->nested) { - foreach ($options as $section => $values) { - $optgroup = new html_select_optgroup(); - $optgroup->text = $section; - - foreach ($values as $value => $display) { - $option = new html_select_option(); - $option->value = s($value); - $option->text = $display; - if ($display === '') { - $option->text = $value; - } - - if ((string) $value == (string) $this->selectedvalue || - (is_array($this->selectedvalue) && in_array($value, $this->selectedvalue))) { - $option->selected = 'selected'; - } - - $optgroup->options[] = $option; - } - - $this->options[] = $optgroup; - } - } else { - $inoptgroup = false; - $optgroup = false; - - foreach ($options as $value => $display) { - if ($display == '--') { /// we are ending previous optgroup - // $this->options[] = $optgroup; - $inoptgroup = false; - continue; - } else if (substr($display,0,2) == '--') { /// we are starting a new optgroup - if (!empty($optgroup->options)) { - $this->options[] = $optgroup; - } - - $optgroup = new html_select_optgroup(); - $optgroup->text = substr($display,2); // stripping the -- - - $inoptgroup = true; /// everything following will be in an optgroup - continue; - - } else { - // Add $nothing option if there are not optgroups - if ($this->nothinglabel && empty($this->options[0]) && !$inoptgroup) { - $nothingoption = new html_select_option(); - $nothingoption->value = 0; - if (!empty($this->nothingvalue)) { - $nothingoption->value = $this->nothingvalue; - } - $nothingoption->text = $this->nothinglabel; - $this->options = array($nothingoption) + $this->options; - } - - $option = new html_select_option(); - $option->text = $display; - - if ($display === '') { - $option->text = $value; - } - - if ((string) $value == (string) $this->selectedvalue || - (is_array($this->selectedvalue) && in_array($value, $this->selectedvalue))) { - $option->selected = 'selected'; - } - - $option->value = s($value); - - if ($inoptgroup) { - $optgroup->options[] = $option; - } else { - $this->options[] = $option; - } - } - } + public $value; - if ($optgroup) { - $this->options[] = $optgroup; - } - } + /** + * @see lib/moodle_html_component#prepare() + * @return void + */ + public function prepare() { + parent::prepare(); } } +/// Complex components aggregating simpler components + /** * Component representing a paging bar. * diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index f16adeec72..6213bd9e3f 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1565,26 +1565,26 @@ class moodle_core_renderer extends moodle_renderer_base { * descriptive labels and help icons. By default it just outputs a select * menu. * - * To add a descriptive label, use moodle_select::set_label($text, $for) or - * moodle_select::set_label($label) passing a html_label object + * To add a descriptive label, use html_select::set_label($text, $for) or + * html_select::set_label($label) passing a html_label object * - * To add a help icon, use moodle_select::set_help($page, $text, $linktext) or - * moodle_select::set_help($helpicon) passing a moodle_help_icon object + * To add a help icon, use html_select::set_help($page, $text, $linktext) or + * html_select::set_help($helpicon) passing a moodle_help_icon object * - * If you moodle_select::$rendertype to "radio", it will render radio buttons + * If you html_select::$rendertype to "radio", it will render radio buttons * instead of a */ @@ -1745,7 +1745,7 @@ class moodle_core_renderer extends moodle_renderer_base { * Output an element. If an optgroup element is detected, * this will recursively output its options as well. * - * @param mixed $option a html_select_option or moodle_select_optgroup + * @param mixed $option a html_select_option or html_select_optgroup * @return string the HTML for the */ public function select_option($option) { diff --git a/lib/questionlib.php b/lib/questionlib.php index 862bb137bc..78fcbe5a16 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -2355,7 +2355,7 @@ function question_category_select_menu($contexts, $top = false, $currentcat = 0, } else { $nothing = 'choosedots'; } - $select = moodle_select::make($categoriesarray, 'category', $selected); + $select = html_select::make($categoriesarray, 'category', $selected); $select->nothingvalue = $nothing; $select->nested = true; echo $OUTPUT->select($select); diff --git a/lib/simpletest/testoutputlib.php b/lib/simpletest/testoutputlib.php index 851dd5bf3d..88da5790fe 100644 --- a/lib/simpletest/testoutputlib.php +++ b/lib/simpletest/testoutputlib.php @@ -884,7 +884,7 @@ class moodle_core_renderer_test extends UnitTestCase { } public function test_select_simple() { - $select = moodle_select::make(array(10 => 'ten', 'c2' => 'two'), 'mymenu'); + $select = html_select::make(array(10 => 'ten', 'c2' => 'two'), 'mymenu'); $html = $this->renderer->select($select); $this->assert(new ContainsTagWithAttributes('select', array('class' => 'menumymenu select', 'name' => 'mymenu', 'id' => 'menumymenu')), $html); $this->assert(new ContainsTagWithContents('option', 'ten'), $html); @@ -1160,9 +1160,9 @@ class moodle_core_renderer_test extends UnitTestCase { $html = $this->renderer->htmllist($htmllist); } - public function test_moodle_select() { + public function test_html_select() { $options = array('var1' => 'value1', 'var2' => 'value2', 'var3' => 'value3'); - $select = moodle_select::make($options, 'mymenu', 'var2'); + $select = html_select::make($options, 'mymenu', 'var2'); $html = $this->renderer->select($select); $this->assert(new ContainsTagWithAttributes('select', array('name' => 'mymenu')), $html); $this->assert(new ContainsTagWithAttributes('option', array('value' => 'var1'), array('selected' => 'selected')), $html); @@ -1173,7 +1173,7 @@ class moodle_core_renderer_test extends UnitTestCase { $this->assert(new ContainsTagWithContents('option', 'value3'), $html); $options = array('group1' => '--group1', 'var1' => 'value1', 'var2' => 'value2', 'group2' => '--', 'group2' => '--group2', 'var3' => 'value3', 'var4' => 'value4'); - $select = moodle_select::make($options, 'mymenu', 'var2'); + $select = html_select::make($options, 'mymenu', 'var2'); $html = $this->renderer->select($select); $this->assert(new ContainsTagWithAttributes('select', array('name' => 'mymenu')), $html); $this->assert(new ContainsTagWithAttributes('optgroup', array('label' => 'group1')), $html); diff --git a/lib/weblib.php b/lib/weblib.php index 80f9789acf..15881359e6 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2666,7 +2666,7 @@ function switchroles_form($courseid) { // unset default user role - it would not work unset($roles[$CFG->guestroleid]); $popupurl = $CFG->wwwroot.'/course/view.php?id='.$courseid.'&sesskey='.sesskey(); - $select = moodle_select::make_popup_form($popupurl, 'switchrole', $roles, 'switchrole', ''); + $select = html_select::make_popup_form($popupurl, 'switchrole', $roles, 'switchrole', ''); $select->nothinglabel = get_string('switchroleto'); $select->set_help_icon('switchrole', get_string('switchroleto')); return $OUTPUT->select($select); diff --git a/login/index.php b/login/index.php index ca9e834ab3..50ad0985ef 100644 --- a/login/index.php +++ b/login/index.php @@ -46,7 +46,7 @@ } else { $currlang = current_language(); $langs = get_list_of_languages(); - $select = moodle_select::make_popup_form("$CFG->httpswwwroot/login/index.php", 'lang', $langs, 'chooselang', $currlang); + $select = html_select::make_popup_form("$CFG->httpswwwroot/login/index.php", 'lang', $langs, 'chooselang', $currlang); $select->nothinglabel = false; $select->set_label(get_accesshide(get_string('language'))); $langmenu = $OUTPUT->select($select); diff --git a/login/signup.php b/login/signup.php index 1d2e456401..82b2c737e2 100644 --- a/login/signup.php +++ b/login/signup.php @@ -51,7 +51,7 @@ } else { $currlang = current_language(); $langs = get_list_of_languages(); - $select = moodle_select::make_popup_form("$CFG->wwwroot/login/signup.php", 'lang', $langs, 'chooselang', $currlang); + $select = html_select::make_popup_form("$CFG->wwwroot/login/signup.php", 'lang', $langs, 'chooselang', $currlang); $select->nothinglabel = false; $langmenu = $OUTPUT->select($select); } diff --git a/mod/choice/lib.php b/mod/choice/lib.php index 0b633c407b..105455b8cc 100644 --- a/mod/choice/lib.php +++ b/mod/choice/lib.php @@ -544,7 +544,7 @@ function choice_show_results($choice, $course, $cm, $allresponses, $forcepublish echo ''.get_string('selectall', 'quiz').' / '; echo ''.get_string('selectnone', 'quiz').' '; echo '  '; - $select = new moodle_select(); + $select = new html_select(); $select->options = array('delete' => get_string('delete')); $select->name = 'action'; $select->button->label = get_string('withselected', 'quiz'); diff --git a/mod/data/field.php b/mod/data/field.php index 197d3dc6bc..6f3e84e72f 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -280,7 +280,7 @@ echo '
'; echo ''; $popupurl = $CFG->wwwroot.'/mod/data/field.php?d='.$data->id.'&mode=new&sesskey='. sesskey(); - echo $OUTPUT->select(moodle_select::make_popup_form($popupurl, 'newtype', $menufield, "fieldform")); + echo $OUTPUT->select(html_select::make_popup_form($popupurl, 'newtype', $menufield, "fieldform")); helpbutton('fields', get_string('addafield','data'), 'data'); echo '
'; diff --git a/mod/data/field/date/field.class.php b/mod/data/field/date/field.class.php index aee7a7297f..4b5a85a2e7 100755 --- a/mod/data/field/date/field.class.php +++ b/mod/data/field/date/field.class.php @@ -44,9 +44,9 @@ class data_field_date extends data_field_base { } $str = '
'; - $dayselector = moodle_select::make_time_selector('days', 'field_'.$this->field->id.'_day', $content); - $monthselector = moodle_select::make_time_selector('months', 'field_'.$this->field->id.'_month', $content); - $yearselector = moodle_select::make_time_selector('years', 'field_'.$this->field->id.'_year', $content); + $dayselector = html_select::make_time_selector('days', 'field_'.$this->field->id.'_day', $content); + $monthselector = html_select::make_time_selector('months', 'field_'.$this->field->id.'_month', $content); + $yearselector = html_select::make_time_selector('years', 'field_'.$this->field->id.'_year', $content); $str .= $OUTPUT->select($dayselector) . $OUTPUT->select($monthselector) . $OUTPUT->select($yearselector); $str .= '
'; diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php index 664a42c5f1..2dc0187b44 100644 --- a/mod/feedback/analysis_course.php +++ b/mod/feedback/analysis_course.php @@ -146,7 +146,7 @@ if ($courses = $DB->get_records_sql_menu($sql, $params)) { echo ' ' . get_string('filter_by_course', 'feedback') . ': '; - $select = new moodle_select(); + $select = new html_select(); $select->options = $courses; $select->name = 'coursefilter'; $select->selectedvalue = $coursefilter; diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index 562929a12e..8c3fb7c853 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -212,7 +212,7 @@ } if (!empty($forummenu)) { echo "
"; - $select = moodle_select::make_popup_form('', '', $forummenu, 'forummenu'); + $select = html_select::make_popup_form('', '', $forummenu, 'forummenu'); $select->nothinglabel = get_string("movethisdiscussionto", "forum"); $select->form->button->text = get_string('move'); diff --git a/mod/forum/lib.php b/mod/forum/lib.php index f6d94a869b..d8d6348c1f 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -4135,7 +4135,7 @@ function forum_print_rating_menu($postid, $userid, $scale, $myrating=NULL) { */ function forum_print_mode_form($id, $mode, $forumtype='') { global $OUTPUT; - $select = moodle_select::make_popup_form("view.php?f=$id", 'mode', forum_get_layout_modes(), "mode", $mode); + $select = html_select::make_popup_form("view.php?f=$id", 'mode', forum_get_layout_modes(), "mode", $mode); $select->nothinglabel = false; if ($forumtype == 'single') { diff --git a/mod/forum/search.php b/mod/forum/search.php index 57cc06fa37..381aa5c33f 100644 --- a/mod/forum/search.php +++ b/mod/forum/search.php @@ -292,7 +292,7 @@ function forum_print_big_search_form($course) { } echo ' '; - $selectors = moodle_select::make_time_selectors(array('days' => 'fromday','months' => 'frommonth', 'years' => 'fromyear', 'hours' => 'fromhour', 'minutes' => 'fromminute'), $datefrom); + $selectors = html_select::make_time_selectors(array('days' => 'fromday','months' => 'frommonth', 'years' => 'fromyear', 'hours' => 'fromhour', 'minutes' => 'fromminute'), $datefrom); foreach ($selectors as $select) { echo $OUTPUT->select($select); } @@ -316,7 +316,7 @@ function forum_print_big_search_form($course) { } echo ' '; - $selectors = moodle_select::make_time_selectors(array('days' => 'today','months' => 'tomonth', 'years' => 'toyear', 'hours' => 'tohour', 'minutes' => 'tominute'), $dateto); + $selectors = html_select::make_time_selectors(array('days' => 'today','months' => 'tomonth', 'years' => 'toyear', 'hours' => 'tohour', 'minutes' => 'tominute'), $dateto); foreach ($selectors as $select) { echo $OUTPUT->select($select); } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 3c2591a388..84466143e9 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1523,7 +1523,7 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) { echo ''; echo '
'; @@ -285,7 +285,7 @@ if (count($timeoptions) > 1) { echo ''; @@ -315,7 +315,7 @@ if ($allowenroldetails) { $formatmenu['2']= get_string('enroldetails'); } - $select = moodle_select::make_popup_form($baseurl, 'mode', $formatmenu, 'formatmenu', $mode); + $select = html_select::make_popup_form($baseurl, 'mode', $formatmenu, 'formatmenu', $mode); $select->nothinglabel = false; $select->set_label(get_string('userlist')); echo $OUTPUT->select($select); @@ -589,7 +589,7 @@ $rolenames = array('0' => get_string('userswithrole', 'role')) + $rolenames; } } - $select = moodle_select::make_popup_form($rolenamesurl, 'roleid', $rolenames, 'rolesform', $roleid); + $select = html_select::make_popup_form($rolenamesurl, 'roleid', $rolenames, 'rolesform', $roleid); $select->nothinglabel = false; echo $OUTPUT->select($select); echo ''; @@ -970,7 +970,7 @@ } helpbutton("participantswithselectedusers", get_string("withselectedusers")); - $select = new moodle_select(); + $select = new html_select(); $select->options = $displaylist; $select->name = "formaction"; $select->label = get_string("withselectedusers"); diff --git a/user/profile/index.php b/user/profile/index.php index 2eb6283243..0a6f6df4f0 100644 --- a/user/profile/index.php +++ b/user/profile/index.php @@ -140,7 +140,7 @@ echo '
'; /// Create a new field link $options = profile_list_datatypes(); $popupurl = $CFG->wwwroot.'/user/profile/index.php?id=0&action=editfield'; -echo $OUTPUT->select(moodle_select::make_popup_form($popupurl, 'datatype', $options, 'newfieldform', $strcreatefield)); +echo $OUTPUT->select(html_select::make_popup_form($popupurl, 'datatype', $options, 'newfieldform', $strcreatefield)); /// Create a new category link $options = array('action'=>'editcategory');
'; - $select = moodle_select::make_popup_form("$CFG->wwwroot/mod/glossary/view.php?id=$cm->id&mode=cat", 'hook', $menu, "catmenu", $selected); + $select = html_select::make_popup_form("$CFG->wwwroot/mod/glossary/view.php?id=$cm->id&mode=cat", 'hook', $menu, "catmenu", $selected); $select->nothinglabel = false; echo $OUTPUT->select($select); diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 64734b4834..af8b353718 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -481,7 +481,7 @@ function lesson_print_page_actions($cmid, $page, $printmove, $printaddpage = fal $options['addpage'] = get_string('question', 'lesson'); // Base url $common = "$CFG->wwwroot/mod/lesson/lesson.php?id=$cmid&pageid=$page->id"; - $select = moodle_select::make_popup_form($common, 'action', $options, "addpage_$page->id"); + $select = html_select::make_popup_form($common, 'action', $options, "addpage_$page->id"); $select->nothinglabel = get_string('addpage', 'lesson').'...'; $actions[] = $OUTPUT->select($select); diff --git a/mod/lesson/report.php b/mod/lesson/report.php index d60bfd749b..56b1315450 100644 --- a/mod/lesson/report.php +++ b/mod/lesson/report.php @@ -275,7 +275,7 @@ ''.get_string('selectall').' / '. ''.get_string('deselectall').' '; - $select = new moodle_select(); + $select = new html_select(); $select->options = array('delete' => get_string('deleteselected')); $select->name = 'attemptaction'; $select->selectedvalue = 0; diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php index 670755d8f4..d7c34255c1 100644 --- a/mod/quiz/report/grading/report.php +++ b/mod/quiz/report/grading/report.php @@ -185,7 +185,7 @@ class quiz_grading_report extends quiz_default_report { if (count($gradeableqs)!=1){ $qurl = fullclone($this->viewurl); $qurl->remove_params('questionid', 'attemptid', 'gradeall', 'gradeungraded', 'gradenextungraded'); - $menu = $OUTPUT->select(moodle_select::make_popup_form($qurl->out(), 'questionid', $qmenu, 'questionid', $questionid)); + $menu = $OUTPUT->select(html_select::make_popup_form($qurl->out(), 'questionid', $qmenu, 'questionid', $questionid)); echo '
'.$menu.'
'; } if (!$questionid){ diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index 728abd9bcc..fd8e0f8f78 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -540,7 +540,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n } $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'¤torg='.$currentorg.$modestr; - $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); + $select = html_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); $select->nothinglabel = false; $result->tocmenu = $OUTPUT->select($select); diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php index 116a2b6b12..c07b547d69 100644 --- a/mod/scorm/datamodels/scorm_12lib.php +++ b/mod/scorm/datamodels/scorm_12lib.php @@ -324,7 +324,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n } $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'¤torg='.$currentorg.$modestr; - $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); + $select = html_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); $select->nothinglabel = false; $result->tocmenu = $OUTPUT->select($select); diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php index f7fa4d50a7..f1821a7fb9 100644 --- a/mod/scorm/datamodels/scorm_13lib.php +++ b/mod/scorm/datamodels/scorm_13lib.php @@ -215,7 +215,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n } $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'¤torg='.$currentorg.$modestr; - $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); + $select = html_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); $select->nothinglabel = false; $result->tocmenu = $OUTPUT->select($select); diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php index e4aacf556b..d4ebf3f374 100755 --- a/mod/scorm/locallib.php +++ b/mod/scorm/locallib.php @@ -740,7 +740,7 @@ function scorm_view_display ($user, $scorm, $action, $cm, $boxwidth='') { options = $orgs; $select->name = 'organization'; $select->selectedvalue = $organization; diff --git a/mod/scorm/report.php b/mod/scorm/report.php index c1ca80dc24..c259e80f4c 100755 --- a/mod/scorm/report.php +++ b/mod/scorm/report.php @@ -198,7 +198,7 @@ echo ''.get_string('selectall', 'quiz').' / '; echo ''.get_string('selectnone', 'quiz').' '; echo '  '; - $select = new moodle_select(); + $select = new html_select(); $select->options = array('delete' => get_string('delete')); $select->name = 'action'; $select->button->label = get_string('withselected', 'quiz'); diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php index 7b9a2aa533..6aaf3c8d29 100644 --- a/mod/wiki/admin.php +++ b/mod/wiki/admin.php @@ -285,7 +285,7 @@ while(list($key,$val)=each($wiki_list)) { $wiki_admin_list[$key."&action=$action"]=$val; } - $select = new moodle_select(); + $select = new html_select(); $select->options = $wiki_admin_list; $select->name = 'wikiselect'; $select->selectedvalue = $selected; diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php index c5a53a1d57..21583497fc 100644 --- a/mod/wiki/lib.php +++ b/mod/wiki/lib.php @@ -1476,7 +1476,7 @@ function wiki_print_wikilinks_block($cmid, $binary=false, $return=false) { $name = $matches[1]; } - $select = moodle_select::make_popup_form(EWIKI_SCRIPT, $name, $links, 'wikilinks'); + $select = html_select::make_popup_form(EWIKI_SCRIPT, $name, $links, 'wikilinks'); $select->nothinglabel = get_string("choosewikilinks", "wiki"); echo $OUTPUT->select($select); } @@ -1516,7 +1516,7 @@ function wiki_print_page_actions($cmid, $specialpages, $page, $action, $binary=f $name = $matches[1]; } - $select = moodle_select::make_popup_form(EWIKI_SCRIPT, $name, $page, 'wikiactions'); + $select = html_select::make_popup_form(EWIKI_SCRIPT, $name, $page, 'wikiactions'); $select->nothinglabel = get_string("action", "wiki"); echo $OUTPUT->select($select); } @@ -1561,7 +1561,7 @@ function wiki_print_administration_actions($wiki, $cmid, $userid, $groupid, $pag if($noeditor) { $action["checklinks"]=get_string("checklinks", "wiki"); } - $select = moodle_select::make_popup_form($ewscript, 'action', $action, 'wikiadministration'); + $select = html_select::make_popup_form($ewscript, 'action', $action, 'wikiadministration'); $select->nothinglabel = get_string("chooseadministration", "wiki"); echo $OUTPUT->select($select); } diff --git a/mod/wiki/view.php b/mod/wiki/view.php index 47cd5284d3..6eda2131ca 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -300,7 +300,7 @@ echo '		' .get_string('otherwikis', 'wiki').':  '; - $select = new moodle_select(); + $select = new html_select(); $select->options = $wiki_list; $select->name = 'wikiselect'; $select->selectedvalue = $selected; diff --git a/my/index.php b/my/index.php index 628f9b99f9..21d92a3da7 100644 --- a/my/index.php +++ b/my/index.php @@ -50,7 +50,7 @@ } else { $currlang = current_language(); $langs = get_list_of_languages(); - $select = moodle_select::make_popup_form($CFG->wwwroot .'/my/index.php', 'lang', $langs, 'chooselang', $currlang); + $select = html_select::make_popup_form($CFG->wwwroot .'/my/index.php', 'lang', $langs, 'chooselang', $currlang); $select->nothinglabel = false; $select->set_label(get_accesshide(get_string('language'))); $langmenu = $OUTPUT->select($select); diff --git a/question/editlib.php b/question/editlib.php index f833bc72bf..52388bca57 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -1165,7 +1165,7 @@ class question_bank_view { /// Get all the existing categories now echo '
'; $catmenu = question_category_options($contexts, false, 0, true); - $select = moodle_select::make_popup_form('edit.php?'.$pageurl->get_query_string(), 'category', $catmenu, 'catmenu', $current); + $select = html_select::make_popup_form('edit.php?'.$pageurl->get_query_string(), 'category', $catmenu, 'catmenu', $current); $select->nothinglabel = false; $select->set_label(get_string('selectacategory', 'question')); echo $OUTPUT->select($select); diff --git a/user/index.php b/user/index.php index 6bed589d32..03b5593f89 100644 --- a/user/index.php +++ b/user/index.php @@ -223,7 +223,7 @@ unset($courselist[SITEID]); $courselist = array(SITEID => format_string($SITE->shortname)) + $courselist; } - $select = moodle_select::make_popup_form($popupurl, 'id', $courselist, 'courseform', $course->id); + $select = html_select::make_popup_form($popupurl, 'id', $courselist, 'courseform', $course->id); $select->set_label(get_string('mycourses')); echo $OUTPUT->select($select); echo '
'; - $select = moodle_select::make_popup_form($baseurl, 'accesssince', $timeoptions, 'timeoptions', $accesssince); + $select = html_select::make_popup_form($baseurl, 'accesssince', $timeoptions, 'timeoptions', $accesssince); $select->set_label(get_string('usersnoaccesssince')); echo $OUTPUT->select($select); echo '