From 60293b276a493ef948fd1a8f0e7e1abf68efaf46 Mon Sep 17 00:00:00 2001
From: Michael Milette <michael.milette@tngconsulting.ca>
Date: Wed, 9 Oct 2013 11:32:57 -0400
Subject: [PATCH 1/2] MDL-42210-Feedback-Input-Labels

Adds labels to the input fields in the Feedback module including: multichoice, multichoicerated, numeric, textarea and textfield.
---
 mod/feedback/item/multichoice/lib.php      | 12 ++++++++++++
 mod/feedback/item/multichoicerated/lib.php | 12 ++++++++++++
 mod/feedback/item/numeric/lib.php          | 10 +++++++++-
 mod/feedback/item/textarea/lib.php         | 12 ++++++++++--
 mod/feedback/item/textfield/lib.php        | 12 ++++++++++--
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index c129b45fa05..ce579f82212 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -316,6 +316,9 @@ class feedback_item_multichoice extends feedback_item_base {
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
+        if ($info->subtype == 'd') {
+			echo '<label for="'. $item->typ . '_' . $item->id .'">';
+		}
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
         if ($item->dependitem) {
@@ -325,6 +328,9 @@ class feedback_item_multichoice extends feedback_item_base {
                 echo '</span>';
             }
         }
+        if ($info->subtype == 'd') {
+			echo '</label>';
+		}
         echo '</div>';
 
         //print the presentation
@@ -420,7 +426,13 @@ class feedback_item_multichoice extends feedback_item_base {
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        if ($info->subtype == 'd') {
+			echo '<label for="'. $item->typ . '_' . $item->id .'">';
             echo format_text($item->name.$requiredmark, true, false, false);
+			echo '</label>';
+		} else {
+            echo format_text($item->name.$requiredmark, true, false, false);
+		}
         echo '</div>';
 
         //print the presentation
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index 696afda58d5..35b29304705 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -301,6 +301,9 @@ class feedback_item_multichoicerated extends feedback_item_base {
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
+        if ($info->subtype == 'd') {
+            echo '<label for="'. $item->typ . '_' . $item->id .'">';
+        }
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
         if ($item->dependitem) {
@@ -310,6 +313,9 @@ class feedback_item_multichoicerated extends feedback_item_base {
                 echo '</span>';
             }
         }
+        if ($info->subtype == 'd') {
+            echo '</label>';
+        }
         echo '</div>';
 
         //print the presentation
@@ -350,7 +356,13 @@ class feedback_item_multichoicerated extends feedback_item_base {
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        if ($info->subtype == 'd') {
+            echo '<label for="'. $item->typ . '_' . $item->id .'">';
             echo format_text($item->name.$requiredmark, true, false, false);
+            echo '</label>';
+        } else {
+            echo format_text($item->name.$requiredmark, true, false, false);
+        }
         echo '</div>';
 
         //print the presentation
diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index 86d4be099af..7b88c5f5d19 100644
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -252,7 +252,9 @@ class feedback_item_numeric extends feedback_item_base {
 
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
+		$inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
+        echo '<label for="'. $inputname .'">';
         echo '('.$item->label.') ';
         echo format_text($item->name . $requiredmark, true, false, false);
         if ($item->dependitem) {
@@ -281,13 +283,15 @@ class feedback_item_numeric extends feedback_item_base {
                 break;
         }
         echo '</span>';
+		echo '</label>';
         echo '</div>';
 
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.'">';
         echo '<span class="feedback_item_textfield">';
         echo '<input type="text" '.
-                    'name="'.$item->typ.'_'.$item->id.'" '.
+                    'id="'.$inputname.'" '.
+                    'name="'.$inputname.'" '.
                     'size="10" '.
                     'maxlength="10" '.
                     'value="" />';
@@ -335,7 +339,9 @@ class feedback_item_numeric extends feedback_item_base {
         $requiredmark = ($item->required == 1) ? $str_required_mark : '';
 
         //print the question and label
+		$inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<label for="'. $inputname .'">';
         echo format_text($item->name . $requiredmark, true, false, false);
         echo '<span class="feedback_item_numinfo">';
         switch(true) {
@@ -355,12 +361,14 @@ class feedback_item_numeric extends feedback_item_base {
                 break;
         }
         echo '</span>';
+		echo '</label>';
         echo '</div>';
 
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
         echo '<span class="feedback_item_textfield">';
         echo '<input type="text" '.
+                     'id="'.$inputname.'" '.
                      'name="'.$item->typ.'_'.$item->id.'" '.
                      'size="10" '.
                      'maxlength="10" '.
diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index 74605bc87c8..135bd139f46 100644
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -206,7 +206,9 @@ class feedback_item_textarea extends feedback_item_base {
         $presentation = explode ("|", $item->presentation);
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
+		$inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
+        echo '<label for="'. $inputname .'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
         if ($item->dependitem) {
@@ -216,12 +218,14 @@ class feedback_item_textarea extends feedback_item_base {
                 echo '</span>';
             }
         }
+		echo '</label>';
         echo '</div>';
 
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.'">';
         echo '<span class="feedback_item_textarea">';
-        echo '<textarea name="'.$item->typ.'_'.$item->id.'" '.
+        echo '<textarea id="'.$inputname.'" '.
+                       'name="'.$inputname.'" '.
                        'cols="'.$presentation[0].'" '.
                        'rows="'.$presentation[1].'">';
         echo '</textarea>';
@@ -252,14 +256,18 @@ class feedback_item_textarea extends feedback_item_base {
         $requiredmark = ($item->required == 1) ? $str_required_mark :'';
 
         //print the question and label
+		$inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<label for="'. $inputname .'">';
             echo format_text($item->name . $requiredmark, true, false, false);
+        echo '</label>';
         echo '</div>';
 
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
         echo '<span class="feedback_item_textarea">';
-        echo '<textarea name="'.$item->typ.'_'.$item->id.'" '.
+        echo '<textarea id="'.$inputname.'" '.
+                       'name="'.$inputname.'" '.
                        'cols="'.$presentation[0].'" '.
                        'rows="'.$presentation[1].'">';
         echo $value;
diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index 0d151ae12a5..d2869dfc194 100644
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -194,7 +194,9 @@ class feedback_item_textfield extends feedback_item_base {
         $presentation = explode ("|", $item->presentation);
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
+		$inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
+        echo '<label for="'. $inputname .'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
         if ($item->dependitem) {
@@ -204,13 +206,15 @@ class feedback_item_textfield extends feedback_item_base {
                 echo '</span>';
             }
         }
+		echo '</label>';
         echo '</div>';
 
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.'">';
         echo '<span class="feedback_item_textfield">';
         echo '<input type="text" '.
-                    'name="'.$item->typ.'_'.$item->id.'" '.
+                    'id="'.$inputname.'" '.
+                    'name="'.$inputname.'" '.
                     'size="'.$presentation[0].'" '.
                     'maxlength="'.$presentation[1].'" '.
                     'value="" />';
@@ -241,15 +245,19 @@ class feedback_item_textfield extends feedback_item_base {
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
 
         //print the question and label
+		$inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<label for="'. $inputname .'">';
             echo format_text($item->name.$requiredmark, true, false, false);
+		echo '</label>';
         echo '</div>';
 
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
         echo '<span class="feedback_item_textfield">';
         echo '<input type="text" '.
-                    'name="'.$item->typ.'_'.$item->id.'" '.
+                    'id="'.$inputname.'" '.
+                    'name="'.$inputname.'" '.
                     'size="'.$presentation[0].'" '.
                     'maxlength="'.$presentation[1].'" '.
                     'value="'.$value.'" />';

From 4ae00d74bc1fd6e48629c9f5fdb8640b26ef3420 Mon Sep 17 00:00:00 2001
From: Andreas Grabs <moodle@grabs-edv.de>
Date: Wed, 16 Oct 2013 22:10:27 +0200
Subject: [PATCH 2/2] MDL-42210 mod_feedback - convert tabs to space

---
 mod/feedback/item/multichoice/lib.php | 16 ++++++++--------
 mod/feedback/item/numeric/lib.php     |  8 ++++----
 mod/feedback/item/textarea/lib.php    | 12 ++++++------
 mod/feedback/item/textfield/lib.php   | 14 +++++++-------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index ce579f82212..0991de5a266 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -317,8 +317,8 @@ class feedback_item_multichoice extends feedback_item_base {
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
         if ($info->subtype == 'd') {
-			echo '<label for="'. $item->typ . '_' . $item->id .'">';
-		}
+            echo '<label for="'. $item->typ . '_' . $item->id .'">';
+        }
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
         if ($item->dependitem) {
@@ -329,8 +329,8 @@ class feedback_item_multichoice extends feedback_item_base {
             }
         }
         if ($info->subtype == 'd') {
-			echo '</label>';
-		}
+            echo '</label>';
+        }
         echo '</div>';
 
         //print the presentation
@@ -427,12 +427,12 @@ class feedback_item_multichoice extends feedback_item_base {
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
         if ($info->subtype == 'd') {
-			echo '<label for="'. $item->typ . '_' . $item->id .'">';
+            echo '<label for="'. $item->typ . '_' . $item->id .'">';
             echo format_text($item->name.$requiredmark, true, false, false);
-			echo '</label>';
-		} else {
+            echo '</label>';
+        } else {
             echo format_text($item->name.$requiredmark, true, false, false);
-		}
+        }
         echo '</div>';
 
         //print the presentation
diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index 7b88c5f5d19..e774e349d34 100644
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -252,7 +252,7 @@ class feedback_item_numeric extends feedback_item_base {
 
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
-		$inputname = $item->typ . '_' . $item->id;
+        $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '<label for="'. $inputname .'">';
         echo '('.$item->label.') ';
@@ -283,7 +283,7 @@ class feedback_item_numeric extends feedback_item_base {
                 break;
         }
         echo '</span>';
-		echo '</label>';
+        echo '</label>';
         echo '</div>';
 
         //print the presentation
@@ -339,7 +339,7 @@ class feedback_item_numeric extends feedback_item_base {
         $requiredmark = ($item->required == 1) ? $str_required_mark : '';
 
         //print the question and label
-		$inputname = $item->typ . '_' . $item->id;
+        $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
         echo '<label for="'. $inputname .'">';
         echo format_text($item->name . $requiredmark, true, false, false);
@@ -361,7 +361,7 @@ class feedback_item_numeric extends feedback_item_base {
                 break;
         }
         echo '</span>';
-		echo '</label>';
+        echo '</label>';
         echo '</div>';
 
         //print the presentation
diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index 135bd139f46..5a09a6aada7 100644
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -190,7 +190,7 @@ class feedback_item_textarea extends feedback_item_base {
         return $row_offset;
     }
 
-    /**     
+    /**
      * print the item at the edit-page of feedback
      *
      * @global object
@@ -206,7 +206,7 @@ class feedback_item_textarea extends feedback_item_base {
         $presentation = explode ("|", $item->presentation);
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
-		$inputname = $item->typ . '_' . $item->id;
+        $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '<label for="'. $inputname .'">';
         echo '('.$item->label.') ';
@@ -218,7 +218,7 @@ class feedback_item_textarea extends feedback_item_base {
                 echo '</span>';
             }
         }
-		echo '</label>';
+        echo '</label>';
         echo '</div>';
 
         //print the presentation
@@ -233,7 +233,7 @@ class feedback_item_textarea extends feedback_item_base {
         echo '</div>';
     }
 
-    /**     
+    /**
      * print the item at the complete-page of feedback
      *
      * @global object
@@ -256,7 +256,7 @@ class feedback_item_textarea extends feedback_item_base {
         $requiredmark = ($item->required == 1) ? $str_required_mark :'';
 
         //print the question and label
-		$inputname = $item->typ . '_' . $item->id;
+        $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
         echo '<label for="'. $inputname .'">';
             echo format_text($item->name . $requiredmark, true, false, false);
@@ -276,7 +276,7 @@ class feedback_item_textarea extends feedback_item_base {
         echo '</div>';
     }
 
-    /**     
+    /**
      * print the item at the complete-page of feedback
      *
      * @global object
diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index d2869dfc194..505531d9b27 100644
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -179,7 +179,7 @@ class feedback_item_textfield extends feedback_item_base {
         return $row_offset;
     }
 
-    /**     
+    /**
      * print the item at the edit-page of feedback
      *
      * @global object
@@ -194,7 +194,7 @@ class feedback_item_textfield extends feedback_item_base {
         $presentation = explode ("|", $item->presentation);
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
         //print the question and label
-		$inputname = $item->typ . '_' . $item->id;
+        $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '<label for="'. $inputname .'">';
         echo '('.$item->label.') ';
@@ -206,7 +206,7 @@ class feedback_item_textfield extends feedback_item_base {
                 echo '</span>';
             }
         }
-		echo '</label>';
+        echo '</label>';
         echo '</div>';
 
         //print the presentation
@@ -222,7 +222,7 @@ class feedback_item_textfield extends feedback_item_base {
         echo '</div>';
     }
 
-    /**     
+    /**
      * print the item at the complete-page of feedback
      *
      * @global object
@@ -245,11 +245,11 @@ class feedback_item_textfield extends feedback_item_base {
         $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
 
         //print the question and label
-		$inputname = $item->typ . '_' . $item->id;
+        $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.$highlight.'">';
         echo '<label for="'. $inputname .'">';
             echo format_text($item->name.$requiredmark, true, false, false);
-		echo '</label>';
+        echo '</label>';
         echo '</div>';
 
         //print the presentation
@@ -265,7 +265,7 @@ class feedback_item_textfield extends feedback_item_base {
         echo '</div>';
     }
 
-    /**     
+    /**
      * print the item at the complete-page of feedback
      *
      * @global object