From 5ec0afb99a3643439e6f6e11e2ff790efd619e97 Mon Sep 17 00:00:00 2001
From: Rossiani Wijaya <rwijaya@moodle.com>
Date: Fri, 27 Jul 2012 19:28:26 +0800
Subject: [PATCH] MDL-34564 accessibility compliance for feedback module: Add
 forform input text and select tag

---
 mod/feedback/analysis_course.php           | 7 +++----
 mod/feedback/item/multichoice/lib.php      | 3 ++-
 mod/feedback/item/multichoicerated/lib.php | 3 ++-
 mod/feedback/mapcourse.php                 | 2 +-
 mod/feedback/show_nonrespondents.php       | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index 9378c720224..ebe52f38561 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -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'));
 
diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 84582694202..96a0eebb43a 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -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;
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index e859f47d738..f6ecc56618d 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -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;
diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 3708b1a567d..2403f53e3da 100644
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -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');
diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php
index 63b780211e1..ea14832d1e7 100644
--- a/mod/feedback/show_nonrespondents.php
+++ b/mod/feedback/show_nonrespondents.php
@@ -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">';