Merge branch 'MDL-34564_accessibility_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

This commit is contained in:
Aparup Banerjee
2012-08-07 14:58:05 +08:00
5 changed files with 9 additions and 7 deletions
+3 -4
View File
@@ -165,8 +165,8 @@ if ($courseitemfilter > 0) {
}
} else {
echo get_string('search_course', 'feedback') . ': ';
echo '<input type="text" name="searchcourse" value="'.s($searchcourse).'"/> ';
echo html_writer::label(get_string('search_course', 'feedback') . ': ', 'searchcourse');
echo '<input id="searchcourse" type="text" name="searchcourse" value="'.s($searchcourse).'"/> ';
echo '<input type="submit" value="'.get_string('search').'"/>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<input type="hidden" name="id" value="'.$id.'" />';
@@ -185,8 +185,7 @@ if ($courseitemfilter > 0) {
if ($courses = $DB->get_records_sql_menu($sql, $params)) {
echo ' ' . get_string('filter_by_course', 'feedback') . ': ';
echo ' '. html_writer::label(get_string('filter_by_course', 'feedback'), 'coursefilterid'). ': ';
echo html_writer::select($courses, 'coursefilter', $coursefilter,
null, array('id'=>'coursefilterid'));
+2 -1
View File
@@ -763,7 +763,8 @@ class feedback_item_multichoice extends feedback_item_base {
?>
<li class="feedback_item_select_<?php echo $hv.'_'.$align;?>">
<select name="<?php echo $item->typ .'_' . $item->id;?>[]" size="1">
<label class="accesshide" for="<?php echo $item->typ .'_' . $item->id;?>"><?php echo $item->name; ?></label>
<select id="<?php echo $item->typ .'_' . $item->id;?>" name="<?php echo $item->typ .'_' . $item->id;?>[]" size="1">
<option value="0">&nbsp;</option>
<?php
$index = 1;
+2 -1
View File
@@ -575,7 +575,8 @@ class feedback_item_multichoicerated extends feedback_item_base {
echo '<ul>';
?>
<li class="feedback_item_select_<?php echo $hv.'_'.$align;?>">
<select name="<?php echo $item->typ.'_'.$item->id;?>">
<label class="accesshide" for="<?php echo $item->typ.'_'.$item->id;?>"><?php echo $item->name; ?></label>
<select id="<?php echo $item->typ.'_'.$item->id;?>" name="<?php echo $item->typ.'_'.$item->id;?>">
<option value="0">&nbsp;</option>
<?php
$index = 1;
+1 -1
View File
@@ -104,7 +104,7 @@ $sql = "select c.id, c.shortname
$params = array("%{$searchcourse}%", "%{$searchcourse}%");
if (($courses = $DB->get_records_sql_menu($sql, $params)) && !empty($searchcourse)) {
echo ' ' . get_string('courses') . ': ';
echo ' '. html_writer::label(get_string('courses'), 'menucoursefilter', false). ': ';
echo html_writer::select($courses, 'coursefilter', $coursefilter);
echo '<input type="submit" value="'.get_string('mapcourse', 'feedback').'"/>';
echo $OUTPUT->help_icon('mapcourses', 'feedback');
+1
View File
@@ -288,6 +288,7 @@ if (!$students) {
print_string('formathtml');
echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
} else {
echo '<label for="menuformat" class="accesshide">'. get_string('format') .'</label>';
choose_from_menu(format_text_menu(), "format", $format, "");
}
echo '<br /><div class="buttons">';