L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-19806 Upgraded calls to choose_from_menu

Browse Source
This commit is contained in:
nicolasconnault
2009-08-17 15:19:49 +00:00
parent 782c84e939
commit 601104f238
9 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/field.php
+1 -1
View File
@@ -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 '<input type="submit" value="'.get_string('save', 'data').'" />';
echo '</div>';
echo '</form>';
mod/data/field/checkbox/field.class.php
+2 -2
View File
@@ -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() {
mod/data/field/file/mod.html
+4 -1
View File
@@ -14,7 +14,10 @@
<?php
$course->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);
?>
</td>
</tr>
mod/data/field/latlong/field.class.php
+2 -2
View File
@@ -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() {
mod/data/field/menu/field.class.php
+9 -5
View File
@@ -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 .= '</div>';
@@ -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, '&nbsp;', '', 0, true);
return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $content, '&nbsp;'));
}
function parse_search_field() {
mod/data/field/picture/mod.html
+4 -1
View File
@@ -46,7 +46,10 @@
<?php
$course->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);
?>
</td>
</tr>
mod/data/field/radiobutton/field.class.php
+2 -2
View File
@@ -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() {
mod/data/field/textarea/field.class.php
+5 -6
View File
@@ -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 .= '<br />';
$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);
}
mod/data/lib.php
+8 -5
View File
@@ -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 '<label for="pref_perpage">'.get_string('pagesize','data').'</label> ';
$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 '<div id="reg_search" style="display: ';
if ($advanced) {
echo 'none';
@@ -1602,7 +1604,7 @@ function data_get_ratings_mean($recordid, $scale, $ratings=NULL) {
* @param array $scale
*/
function data_print_rating_menu($recordid, $userid, $scale) {
global $DB;
global $DB, $OUTPUT;
static $strrate;
@@ -1613,8 +1615,9 @@ function data_print_rating_menu($recordid, $userid, $scale) {
if (empty($strrate)) {
$strrate = get_string("rate", "data");
}
choose_from_menu($scale, $recordid, $rating->rating, "$strrate...", '', -999);
$select = html_select::make($scale, $recordid, $rating->rating, "$strrate...");
$select->nothingvalue = -999;
echo $OUTPUT->select($select);
}
/**