MDL-20204 one more step away from html_select

This commit is contained in:
Petr Skoda 2010-02-09 18:54:03 +00:00
parent c86a91d508
commit 2f0e96e447
8 changed files with 29 additions and 80 deletions

View file

@ -80,16 +80,16 @@ class data_field_checkbox extends data_field_base {
$checkbox = trim($checkbox);
if (in_array(addslashes($checkbox), $content)) {
$str .= $OUTPUT->checkbox(html_select_option::make_checkbox(s($checkbox), true, $checkbox), 'f_'.$this->field->id.'[]');
$str .= html_writer::checkbox('f_'.$this->field->id.'[]', s($checkbox), true, $checkbox);
}
$str .= $OUTPUT->checkbox(html_select_option::make_checkbox(s($checkbox), false, $checkbox), 'f_'.$this->field->id.'[]');
$str .= html_writer::checkbox('f_'.$this->field->id.'[]', s($checkbox), false, $checkbox);
$found = true;
}
if (!$found) {
return '';
}
$str .= $OUTPUT->checkbox(html_select_option::make_checkbox(null, false, get_string('selectedrequired', 'data')), 'f_'.$this->field->id.'_allreq');
$str .= html_writer::checkbox('f_'.$this->field->id.'_allreq', null, false, get_string('selectedrequired', 'data'));
return $str;
}

View file

@ -506,9 +506,9 @@ function feedback_reset_course_form($course) {
foreach($feedbacks as $feedback) {
echo '<p>';
echo get_string('name','feedback').': '.$feedback->name.'<br />';
echo $OUTPUT->checkbox(html_select_option::make_checkbox(1, true, get_string('resetting_data','feedback')), FEEDBACK_RESETFORM_RESET.$feedback->id);
echo html_writer::checkbox(FEEDBACK_RESETFORM_RESET.$feedback->id, 1, true, get_string('resetting_data','feedback'));
echo '<br />';
echo $OUTPUT->checkbox(html_select_option::make_checkbox(1, false, get_string('drop_feedback','feedback')), FEEDBACK_RESETFORM_DROP.$feedback->id);
echo html_writer::checkbox(FEEDBACK_RESETFORM_DROP.$feedback->id, 1, false, get_string('drop_feedback','feedback'));
echo '</p>';
}
}