From 601104f238a9ea9d1482e8ea95e374191edd10f3 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Mon, 17 Aug 2009 15:19:49 +0000 Subject: [PATCH] MDL-19806 Upgraded calls to choose_from_menu --- mod/data/field.php | 2 +- mod/data/field/checkbox/field.class.php | 4 ++-- mod/data/field/file/mod.html | 5 ++++- mod/data/field/latlong/field.class.php | 4 ++-- mod/data/field/menu/field.class.php | 14 +++++++++----- mod/data/field/picture/mod.html | 5 ++++- mod/data/field/radiobutton/field.class.php | 4 ++-- mod/data/field/textarea/field.class.php | 11 +++++------ mod/data/lib.php | 13 ++++++++----- 9 files changed, 37 insertions(+), 25 deletions(-) diff --git a/mod/data/field.php b/mod/data/field.php index 6f3e84e72f..158be8dd3e 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -325,7 +325,7 @@ $options = array(0 => get_string('ascending', 'data'), 1 => get_string('descending', 'data')); - choose_from_menu($options, 'defaultsortdir', $data->defaultsortdir, ''); + echo $OUTPUT->select(html_select::make($options, 'defaultsortdir', $data->defaultsortdir, false)); echo ''; echo ''; echo ''; diff --git a/mod/data/field/checkbox/field.class.php b/mod/data/field/checkbox/field.class.php index a58fa80f2f..0d50f0c8e3 100755 --- a/mod/data/field/checkbox/field.class.php +++ b/mod/data/field/checkbox/field.class.php @@ -63,7 +63,7 @@ class data_field_checkbox extends data_field_base { } function display_search_field($value='') { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $temp = $DB->get_records_sql_menu('SELECT id, content FROM {data_content} WHERE fieldid=? GROUP BY content ORDER BY content', array($this->field->id)); $options = array(); if(!empty($temp)) { @@ -72,7 +72,7 @@ class data_field_checkbox extends data_field_base { $options[$key] = $key; //Build following indicies from the sql. } } - return choose_from_menu($options, 'f_'.$this->field->id, $value, 'choose', '', 0, true); + return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $value)); } function parse_search_field() { diff --git a/mod/data/field/file/mod.html b/mod/data/field/file/mod.html index 29227cd440..7b8dbe8097 100755 --- a/mod/data/field/file/mod.html +++ b/mod/data/field/file/mod.html @@ -14,7 +14,10 @@ maxbytes = $DB->get_field('course', 'maxbytes', array('id'=>$this->data->course)); $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes); - choose_from_menu($choices, 'param3', $this->field->param3, '', '', 0, false, false, 0, 'param3'); + $select = html_select::make($choices, 'param3', $this->field->param3, false); + $select->id = 'param3'; + + echo $OUTPUT->select($select); ?> diff --git a/mod/data/field/latlong/field.class.php b/mod/data/field/latlong/field.class.php index 87ed62a7d4..e74c68730e 100755 --- a/mod/data/field/latlong/field.class.php +++ b/mod/data/field/latlong/field.class.php @@ -66,7 +66,7 @@ class data_field_latlong extends data_field_base { } function display_search_field($value = '') { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $lats = $DB->get_records_sql_menu('SELECT id, content FROM {data_content} WHERE fieldid=? GROUP BY content ORDER BY content', array($this->field->id)); $longs = $DB->get_records_sql_menu('SELECT id, content1 FROM {data_content} WHERE fieldid=? GROUP BY content ORDER BY content', array($this->field->id)); $options = array(); @@ -77,7 +77,7 @@ class data_field_latlong extends data_field_base { $options[$temp.','.$longs[$key]] = $temp.','.$longs[$key]; } } - return choose_from_menu($options, 'f_'.$this->field->id, $value, 'choose', '', 0, true); + return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $value)); } function parse_search_field() { diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php index c855a90ce3..2c99ce1a94 100755 --- a/mod/data/field/menu/field.class.php +++ b/mod/data/field/menu/field.class.php @@ -27,7 +27,7 @@ class data_field_menu extends data_field_base { var $type = 'menu'; function display_add_field($recordid=0) { - global $DB; + global $DB, $OUTPUT; if ($recordid){ $content = $DB->get_field('data_content', 'content', array('fieldid'=>$this->field->id, 'recordid'=>$recordid)); @@ -45,9 +45,13 @@ class data_field_menu extends data_field_base { $options[$option] = $option; } } + - $str .= choose_from_menu($options, 'field_'.$this->field->id, $content, - get_string('menuchoose', 'data'), '', '', true, false, 0, 'field_'.$this->field->id); + $select = html_select::make($options, 'field_'.$this->field->id, $content, get_string('menuchoose', 'data')); + $select->nothingvalue = ''; + $select->id = 'field_'.$this->field->id; + + $str .= $OUTPUT->select($select); $str .= ''; @@ -55,7 +59,7 @@ class data_field_menu extends data_field_base { } function display_search_field($content = '') { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $usedoptions = array(); $sql = "SELECT DISTINCT content @@ -84,7 +88,7 @@ class data_field_menu extends data_field_base { return ''; } - return choose_from_menu($options, 'f_'.$this->field->id, $content, ' ', '', 0, true); + return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $content, ' ')); } function parse_search_field() { diff --git a/mod/data/field/picture/mod.html b/mod/data/field/picture/mod.html index a8d3a65e55..6086967fb2 100755 --- a/mod/data/field/picture/mod.html +++ b/mod/data/field/picture/mod.html @@ -46,7 +46,10 @@ maxbytes = $DB->get_field('course', 'maxbytes', array('id'=>$this->data->course)); $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes); - choose_from_menu($choices, 'param3', $this->field->param3, '', '', 0, false, false, 0, 'param3'); + $select = html_select::make($choices, 'param3', $this->field->param3, false); + $select->id = 'param3'; + + echo $OUTPUT->select($select); ?> diff --git a/mod/data/field/radiobutton/field.class.php b/mod/data/field/radiobutton/field.class.php index 6f024a38bc..e0dcd96fa0 100755 --- a/mod/data/field/radiobutton/field.class.php +++ b/mod/data/field/radiobutton/field.class.php @@ -63,7 +63,7 @@ class data_field_radiobutton extends data_field_base { } function display_search_field($value = '') { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $temp = $DB->get_records_sql_menu('SELECT id, content FROM {data_content} WHERE fieldid=? GROUP BY content ORDER BY content', array($this->field->id)); $options = array(); if(!empty($temp)) { @@ -72,7 +72,7 @@ class data_field_radiobutton extends data_field_base { $options[$key] = $key; //Build following indicies from the sql. } } - return choose_from_menu($options, 'f_'.$this->field->id, $value, 'choose', '', 0, true); + return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $value)); } function parse_search_field() { diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php index a2a11d6a73..573105ddb4 100755 --- a/mod/data/field/textarea/field.class.php +++ b/mod/data/field/textarea/field.class.php @@ -11,8 +11,7 @@ // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // +// (at your option) any later version. // // // // This program is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // @@ -27,7 +26,7 @@ class data_field_textarea extends data_field_base { var $type = 'textarea'; function display_add_field($recordid=0) { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $text = ''; $format = 0; @@ -54,9 +53,9 @@ class data_field_textarea extends data_field_base { // Get the available text formats for this field. $formatsForField = format_text_menu(); $str .= '
'; - - $str .= choose_from_menu($formatsForField, 'field_' . $this->field->id . - '_content1', $format, 'choose', '', '', true); + $select = html_select( $formatsForField, 'field_' . $this->field->id . '_content1', $format); + $select->nothingvalue = ''; + $str .= $OUTPUT->select($select); $str .= helpbutton('textformat', get_string('helpformatting'), 'moodle', true, false, '', true); } diff --git a/mod/data/lib.php b/mod/data/lib.php index ba3d01e3da..aece792ade 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1305,7 +1305,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r * @return void */ function data_print_preference_form($data, $perpage, $search, $sort='', $order='ASC', $search_array = '', $advanced = 0, $mode= ''){ - global $CFG, $DB, $PAGE; + global $CFG, $DB, $PAGE, $OUTPUT; $cm = get_coursemodule_from_instance('data', $data->id); $context = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -1320,7 +1320,9 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order=' echo ' '; $pagesizes = array(2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15, 20=>20,30=>30,40=>40,50=>50,100=>100,200=>200,300=>300,400=>400,500=>500,1000=>1000); - choose_from_menu($pagesizes, 'perpage', $perpage, '', '', '0', false, false, 0, 'pref_perpage'); + $select = html_select::make($pagesizes, 'perpage', $perpage, false); + $select->id = 'pref_perpage'; + echo $OUTPUT->select($select); echo '