From cba011942c8cb85447344124eed4b47bf43f72c9 Mon Sep 17 00:00:00 2001
From: Michael Milette <michael.milette@instruxmedia.com>
Date: Sun, 16 Feb 2014 16:54:30 -0500
Subject: [PATCH] MDL-42462 - Feedback - Fix for WCAG 2.0 issue with
 Informational and Error Content Displayed in red

1) The same code used in other Moodle forms is now used in Feedback to display the "There are required fields in this form marked (*/Required field)" message at the top of the screen and each of the asterisks next to required fields.

2) Feedback specific styles (missingrequire, feeback_required_mark), which were used to highlight required and error fields, have been eliminated. These colours are now controlled by the common Moodle styles (mform1, mform, fdescription, required, req and error) that are used throughout the rest of Moodle for a more uniform appearance.

3) Field level error reporting now displays a message instead of just highlighting the field in a similar way that other Moodle forms do.

Affected files:

- /mod/feedback/styles.css
- /mod/feedback/complete.php
- /mod/feedback/complete_guest.php
- /mod/feedback/edit.php
- /mod/feedback/print.php
- /mod/feedback/item/captcha/lib.php
- /mod/feedback/item/info/lib.php
- /mod/feedback/item/multichoice/lib.php
- /mod/feedback/item/multichoicerated/lib.php
- /mod/feedback/item/numeric/lib.php
- /mod/feedback/item/textarea/lib.php
- /mod/feedback/item/textfield/lib.php
- /mod/feedback/lang/en/feedback.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
---
 mod/feedback/complete.php                  | 15 +++---
 mod/feedback/complete_guest.php            | 18 +++----
 mod/feedback/edit.php                      |  7 +--
 mod/feedback/item/captcha/lib.php          | 17 ++++---
 mod/feedback/item/info/lib.php             | 15 ++++--
 mod/feedback/item/multichoice/lib.php      | 55 ++++++++++------------
 mod/feedback/item/multichoicerated/lib.php | 35 ++++++++------
 mod/feedback/item/numeric/lib.php          | 28 ++++++-----
 mod/feedback/item/textarea/lib.php         | 28 ++++++-----
 mod/feedback/item/textfield/lib.php        | 28 ++++++-----
 mod/feedback/lang/en/feedback.php          |  1 -
 mod/feedback/print.php                     |  7 +--
 mod/feedback/styles.css                    |  8 ----
 13 files changed, 139 insertions(+), 123 deletions(-)

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 189410e2278..6ee053efd03 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -403,21 +403,21 @@ if ($feedback_can_submit) {
         echo $OUTPUT->continue_button($url);
     } else {
         if (isset($savereturn) && $savereturn == 'failed') {
-            echo $OUTPUT->box_start('mform error');
-            echo get_string('saving_failed', 'feedback');
+            echo $OUTPUT->box_start('mform');
+            echo '<span class="error">'.get_string('saving_failed', 'feedback').'</span>';
             echo $OUTPUT->box_end();
         }
 
         if (isset($savereturn) && $savereturn == 'missing') {
-            echo $OUTPUT->box_start('mform error');
-            echo get_string('saving_failed_because_missing_or_false_values', 'feedback');
+            echo $OUTPUT->box_start('mform');
+            echo '<span class="error">'.get_string('saving_failed_because_missing_or_false_values', 'feedback').'</span>';
             echo $OUTPUT->box_end();
         }
 
         //print the items
         if (is_array($feedbackitems)) {
             echo $OUTPUT->box_start('feedback_form');
-            echo '<form action="complete.php" method="post" onsubmit=" ">';
+            echo '<form action="complete.php" class="mform" method="post" onsubmit=" ">';
             echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
             echo $OUTPUT->box_start('feedback_anonymousinfo');
             switch ($feedback->anonymous) {
@@ -440,8 +440,9 @@ if ($feedback_can_submit) {
             $params = array('feedback' => $feedback->id, 'required' => 1);
             $countreq = $DB->count_records('feedback_item', $params);
             if ($countreq > 0) {
-                echo '<span class="feedback_required_mark">(*)';
-                echo get_string('items_are_required', 'feedback');
+                echo '<span class="fdescription required">';
+                echo get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').
+                    '" src="'.$OUTPUT->pix_url('req') .'" class="req" />');
                 echo '</span>';
             }
             echo $OUTPUT->box_start('feedback_items');
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 407d63eb184..cf2d5a44edb 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -363,21 +363,22 @@ if ($feedback_can_submit) {
         echo $OUTPUT->continue_button($url);
     } else {
         if (isset($savereturn) && $savereturn == 'failed') {
-            echo $OUTPUT->box_start('mform error');
-            echo get_string('saving_failed', 'feedback');
+            echo $OUTPUT->box_start('mform');
+            echo '<span class="error">'.get_string('saving_failed', 'feedback').'</span>';
             echo $OUTPUT->box_end();
         }
 
         if (isset($savereturn) && $savereturn == 'missing') {
-            echo $OUTPUT->box_start('mform error');
-            echo get_string('saving_failed_because_missing_or_false_values', 'feedback');
+            echo $OUTPUT->box_start('mform');
+            echo '<span class="error">'.get_string('saving_failed_because_missing_or_false_values', 'feedback').'</span>';
             echo $OUTPUT->box_end();
         }
 
         //print the items
         if (is_array($feedbackitems)) {
             echo $OUTPUT->box_start('feedback_form');
-            echo '<form action="complete_guest.php" method="post" onsubmit=" ">';
+            echo '<form action="complete_guest.php" class="mform" method="post" onsubmit=" ">';
+            echo '<fieldset>';
             echo '<input type="hidden" name="anonymous" value="0" />';
             $inputvalue = 'value="'.FEEDBACK_ANONYMOUS_YES.'"';
             echo '<input type="hidden" name="anonymous_response" '.$inputvalue.' />';
@@ -386,9 +387,10 @@ if ($feedback_can_submit) {
             $params = array('feedback'=>$feedback->id, 'required'=>1);
             $countreq = $DB->count_records('feedback_item', $params);
             if ($countreq > 0) {
-                echo '<span class="feedback_required_mark">(*)';
-                echo get_string('items_are_required', 'feedback');
-                echo '</span>';
+                echo '<div class="fdescription required">';
+                echo get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').
+                    '" src="'.$OUTPUT->pix_url('req') .'" class="req" />');
+                echo '</div>';
             }
             echo $OUTPUT->box_start('feedback_items');
 
diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 97c94283d79..b0627443578 100644
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -258,9 +258,10 @@ if ($do_show == 'edit') {
         $params = array('feedback' => $feedback->id, 'required' => 1);
         $countreq = $DB->count_records('feedback_item', $params);
         if ($countreq > 0) {
-            echo '<span class="feedback_required_mark">(*)';
-            echo get_string('items_are_required', 'feedback');
-            echo '</span>';
+            echo '<div class="fdescription required">';
+            echo get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').
+                '" src="'.$OUTPUT->pix_url('req') .'" class="req" />');
+            echo '</div>';
         }
 
         //Use list instead a table
diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php
index b676f6b675b..a7f1442b24c 100644
--- a/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@ -134,7 +134,8 @@ class feedback_item_captcha extends feedback_item_base {
             }
         }
 
-        $requiredmark = '<span class="feedback_required_mark">*</span>';
+        $requiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
@@ -154,7 +155,7 @@ class feedback_item_captcha extends feedback_item_base {
      * @return void
      */
     public function print_item_complete($item, $value = '', $highlightrequire = false) {
-        global $SESSION, $CFG, $DB, $USER;
+        global $SESSION, $CFG, $DB, $USER, $OUTPUT;
         require_once($CFG->libdir.'/recaptchalib.php');
 
         $align = right_to_left() ? 'right' : 'left';
@@ -177,11 +178,13 @@ class feedback_item_captcha extends feedback_item_base {
         }
 
         if ($falsevalue) {
-            $highlight = 'missingrequire';
+            $highlight = '<br class="error"><span id="id_error_recaptcha_response_field" class="error"> '.
+                get_string('err_required', 'form').'</span><br id="id_error_break_recaptcha_response_field" class="error" >';
         } else {
             $highlight = '';
         }
-        $requiredmark = '<span class="feedback_required_mark">*</span>';
+        $requiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         if (isset($SESSION->feedback->captchacheck) AND
                 $SESSION->feedback->captchacheck == $USER->sesskey AND
@@ -208,7 +211,7 @@ class feedback_item_captcha extends feedback_item_base {
         $html = html_writer::script(js_writer::set_variable('RecaptchaOptions', $recaptureoptions));
         $html .= '
 
-        <div  class="'.$highlight.'" id="recaptcha_widget" style="display:none">
+        <div id="recaptcha_widget" style="display:none">
 
         <div id="recaptcha_image"></div>
         <div class="recaptcha_only_if_incorrect_sol" style="color:red">'.
@@ -220,6 +223,7 @@ class feedback_item_captcha extends feedback_item_base {
         <span class="recaptcha_only_if_audio">
         <label for="recaptcha_response_field">'.$strenterthenumbersyouhear.'</label>
         </span>
+        <label for="recaptcha_response_field">'.$highlight.'</label>
 
         <input type="text" id="recaptcha_response_field" name="'.$item->typ.'_'.$item->id.'" />
 
@@ -268,7 +272,8 @@ class feedback_item_captcha extends feedback_item_base {
             }
         }
 
-        $requiredmark = '<span class="feedback_required_mark">*</span>';
+        $requiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php
index 4fddadf322a..de56497abd1 100644
--- a/mod/feedback/item/info/lib.php
+++ b/mod/feedback/item/info/lib.php
@@ -194,7 +194,8 @@ class feedback_item_info extends feedback_item_base {
 
         $align = right_to_left() ? 'right' : 'left';
         $presentation = $item->presentation;
-        $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
+        $requiredmark = ($item->required == 1)?'<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />':'';
 
         if ($item->feedback) {
             $courseid = $DB->get_field('feedback', 'course', array('id'=>$item->feedback));
@@ -272,11 +273,12 @@ class feedback_item_info extends feedback_item_base {
 
         $presentation = $item->presentation;
         if ($highlightrequire AND $item->required AND strval($value) == '') {
-            $highlight = ' missingrequire';
+            $highlight = 'error';
         } else {
             $highlight = '';
         }
-        $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
+        $requiredmark = ($item->required == 1)?'<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />':'';
 
         $feedback = $DB->get_record('feedback', array('id'=>$item->feedback));
 
@@ -326,8 +328,10 @@ class feedback_item_info extends feedback_item_base {
         }
 
         //print the question and label
-        echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_label_'.$align.'">';
+        echo '<span class="'.$highlight.'">';
             echo format_text($item->name.$requiredmark, true, false, false);
+        echo '</span>';
         echo '</div>';
 
         //print the presentation
@@ -350,7 +354,8 @@ class feedback_item_info extends feedback_item_base {
         $align = right_to_left() ? 'right' : 'left';
 
         $presentation = $item->presentation;
-        $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
+        $requiredmark = ($item->required == 1)?'<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />':'';
 
         if ($presentation == 1) {
             $value = $value ? userdate($value) : '&nbsp;';
diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 423a98f5fe1..6332f6e10fe 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -308,11 +308,12 @@ class feedback_item_multichoice extends feedback_item_base {
         $align = right_to_left() ? 'right' : 'left';
 
         $presentation = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation);
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //test if required and no value is set so we have to mark this item
         //we have to differ check and the other subtypes
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
@@ -407,45 +408,40 @@ class feedback_item_multichoice extends feedback_item_base {
             $value = array();
         }
         $presentation = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation);
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //test if required and no value is set so we have to mark this item
         //we have to differ check and the other subtypes
-        // if ($info->subtype == 'c') {
-            if (is_array($value)) {
-                $values = $value;
-            } else {
-                $values = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value);
-            }
-            $highlight = '';
-            if ($highlightrequire AND $item->required) {
-                if (count($values) == 0 OR $values[0] == '' OR $values[0] == 0) {
-                    $highlight = ' missingrequire';
-                }
-            }
-            $requiredmark = ($item->required == 1) ? $str_required_mark : '';
-        // } else {
-            // if ($highlightrequire AND $item->required AND intval($value) <= 0) {
-                // $highlight = ' missingrequire';
-            // } else {
-                // $highlight = '';
-            // }
-            // $requiredmark = ($item->required == 1) ? $str_required_mark : '';
-        // }
+        if (is_array($value)) {
+            $values = $value;
+        } else {
+            $values = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value);
+        }
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
-        echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        $inputname = $item->typ . '_' . $item->id;
+        echo '<div class="feedback_item_label_'.$align.'">';
         if ($info->subtype == 'd') {
-            echo '<label for="'. $item->typ . '_' . $item->id .'">';
-            echo format_text($item->name . $requiredmark, FORMAT_HTML, array('noclean' => true, 'para' => false));
+            echo '<label for="'. $inputname .'">';
+            echo format_text($item->name.$requiredmark, true, false, false);
+            if ($highlightrequire AND $item->required AND (count($values) == 0 OR $values[0] == '' OR $values[0] == 0)) {
+                echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                    '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+            }
             echo '</label>';
         } else {
             echo format_text($item->name . $requiredmark, FORMAT_HTML, array('noclean' => true, 'para' => false));
+            if ($highlightrequire AND $item->required AND (count($values) == 0 OR $values[0] == '' OR $values[0] == 0)) {
+                echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                    '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+            }
         }
         echo '</div>';
 
         //print the presentation
-        echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_presentation_'.$align.'">';
 
         if ($info->subtype == 'r' || $info->subtype == 'c') {
             // if (r)adio buttons or (c)heckboxes
@@ -534,7 +530,8 @@ class feedback_item_multichoice extends feedback_item_base {
         }
         $requiredmark = '';
         if ($item->required == 1) {
-            $requiredmark = '<span class="feedback_required_mark">*</span>';
+            $requiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+                get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
         }
 
         //print the question and label
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index 0863f07ab69..09b8fdf9e9e 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -295,10 +295,11 @@ class feedback_item_multichoicerated extends feedback_item_base {
 
         $align = right_to_left() ? 'right' : 'left';
         $info = $this->get_info($item);
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
         if ($info->subtype == 'd') {
@@ -344,29 +345,34 @@ class feedback_item_multichoicerated extends feedback_item_base {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
         $info = $this->get_info($item);
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
-        if ($highlightrequire AND $item->required AND intval($value) <= 0) {
-            $highlight = ' missingrequire';
-        } else {
-            $highlight = '';
-        }
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
-        echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        $inputname = $item->typ . '_' . $item->id;
+        echo '<div class="feedback_item_label_'.$align.'">';
         if ($info->subtype == 'd') {
-            echo '<label for="'. $item->typ . '_' . $item->id .'">';
-            echo format_text($item->name . $requiredmark, FORMAT_HTML, array('noclean' => true, 'para' => false));
+            echo '<label for="'. $inputname .'">';
+            echo format_text($item->name.$requiredmark, true, false, false);
+            if ($highlightrequire AND $item->required AND intval($value) <= 0) {
+                echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                    '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+            }
             echo '</label>';
         } else {
             echo format_text($item->name . $requiredmark, FORMAT_HTML, array('noclean' => true, 'para' => false));
+            if ($highlightrequire AND $item->required AND intval($value) <= 0) {
+                echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                    '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+            }
         }
         echo '</div>';
 
         //print the presentation
-        echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_presentation_'.$align.'">';
         switch($info->subtype) {
             case 'r':
                 $this->print_item_radio($item, $value, $info, $align, false, $lines);
@@ -392,7 +398,8 @@ class feedback_item_multichoicerated extends feedback_item_base {
         $info = $this->get_info($item);
 
         $lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
-        $requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
+        $requiredmark = ($item->required == 1)?'<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />':'';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index e774e349d34..fadd2468d4f 100644
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -231,7 +231,8 @@ class feedback_item_numeric extends feedback_item_base {
         global $OUTPUT, $DB;
 
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //get the range
         $range_from_to = explode('|', $item->presentation);
@@ -250,7 +251,7 @@ class feedback_item_numeric extends feedback_item_base {
             $range_to = 0;
         }
 
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
         //print the question and label
         $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
@@ -312,7 +313,8 @@ class feedback_item_numeric extends feedback_item_base {
     public function print_item_complete($item, $value = '', $highlightrequire = false) {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //get the range
         $range_from_to = explode('|', $item->presentation);
@@ -331,16 +333,11 @@ class feedback_item_numeric extends feedback_item_base {
             $range_to = 0;
         }
 
-        if ($highlightrequire AND (!$this->check_value($value, $item))) {
-            $highlight = ' missingrequire';
-        } else {
-            $highlight = '';
-        }
-        $requiredmark = ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
         $inputname = $item->typ . '_' . $item->id;
-        echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_label_'.$align.'">';
         echo '<label for="'. $inputname .'">';
         echo format_text($item->name . $requiredmark, true, false, false);
         echo '<span class="feedback_item_numinfo">';
@@ -361,11 +358,15 @@ class feedback_item_numeric extends feedback_item_base {
                 break;
         }
         echo '</span>';
+        if ($highlightrequire AND (!$this->check_value($value, $item))) {
+            echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+        }
         echo '</label>';
         echo '</div>';
 
         //print the presentation
-        echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_presentation_'.$align.'">';
         echo '<span class="feedback_item_textfield">';
         echo '<input type="text" '.
                      'id="'.$inputname.'" '.
@@ -389,7 +390,8 @@ class feedback_item_numeric extends feedback_item_base {
     public function print_item_show_value($item, $value = '') {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         //get the range
         $range_from_to = explode('|', $item->presentation);
@@ -405,7 +407,7 @@ class feedback_item_numeric extends feedback_item_base {
         } else {
             $range_to = 0;
         }
-        $requiredmark = ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index 5a09a6aada7..304e5d7cfb3 100644
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -201,10 +201,11 @@ class feedback_item_textarea extends feedback_item_base {
         global $OUTPUT, $DB;
 
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $presentation = explode ("|", $item->presentation);
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
         //print the question and label
         $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
@@ -245,26 +246,26 @@ class feedback_item_textarea extends feedback_item_base {
     public function print_item_complete($item, $value = '', $highlightrequire = false) {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $presentation = explode ("|", $item->presentation);
-        if ($highlightrequire AND $item->required AND strval($value) == '') {
-            $highlight = ' missingrequire';
-        } else {
-            $highlight = '';
-        }
-        $requiredmark = ($item->required == 1) ? $str_required_mark :'';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark :'';
 
         //print the question and label
         $inputname = $item->typ . '_' . $item->id;
-        echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_label_'.$align.'">';
         echo '<label for="'. $inputname .'">';
             echo format_text($item->name . $requiredmark, true, false, false);
+        if ($highlightrequire AND $item->required AND strval($value) == '') {
+            echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+        }
         echo '</label>';
         echo '</div>';
 
         //print the presentation
-        echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_presentation_'.$align.'">';
         echo '<span class="feedback_item_textarea">';
         echo '<textarea id="'.$inputname.'" '.
                        'name="'.$inputname.'" '.
@@ -287,10 +288,11 @@ class feedback_item_textarea extends feedback_item_base {
     public function print_item_show_value($item, $value = '') {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $presentation = explode ("|", $item->presentation);
-        $requiredmark = ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index 505531d9b27..ccbf806379d 100644
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -189,10 +189,11 @@ class feedback_item_textfield extends feedback_item_base {
     public function print_item_preview($item) {
         global $OUTPUT, $DB;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $presentation = explode ("|", $item->presentation);
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
         //print the question and label
         $inputname = $item->typ . '_' . $item->id;
         echo '<div class="feedback_item_label_'.$align.'">';
@@ -234,26 +235,26 @@ class feedback_item_textfield extends feedback_item_base {
     public function print_item_complete($item, $value = '', $highlightrequire = false) {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $presentation = explode ("|", $item->presentation);
-        if ($highlightrequire AND $item->required AND strval($value) == '') {
-            $highlight = ' missingrequire';
-        } else {
-            $highlight = '';
-        }
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
         $inputname = $item->typ . '_' . $item->id;
-        echo '<div class="feedback_item_label_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_label_'.$align.'">';
         echo '<label for="'. $inputname .'">';
             echo format_text($item->name.$requiredmark, true, false, false);
+        if ($highlightrequire AND $item->required AND strval($value) == '') {
+            echo '<br class="error"><span id="id_error_'.$inputname.'" class="error"> '.get_string('err_required', 'form').
+                '</span><br id="id_error_break_'.$inputname.'" class="error" >';
+        }
         echo '</label>';
         echo '</div>';
 
         //print the presentation
-        echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
+        echo '<div class="feedback_item_presentation_'.$align.'">';
         echo '<span class="feedback_item_textfield">';
         echo '<input type="text" '.
                     'id="'.$inputname.'" '.
@@ -276,10 +277,11 @@ class feedback_item_textfield extends feedback_item_base {
     public function print_item_show_value($item, $value = '') {
         global $OUTPUT;
         $align = right_to_left() ? 'right' : 'left';
-        $str_required_mark = '<span class="feedback_required_mark">*</span>';
+        $strrequiredmark = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.
+            get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
 
         $presentation = explode ("|", $item->presentation);
-        $requiredmark =  ($item->required == 1) ? $str_required_mark : '';
+        $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
 
         //print the question and label
         echo '<div class="feedback_item_label_'.$align.'">';
diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php
index 798727682f0..83e9f6e724c 100644
--- a/mod/feedback/lang/en/feedback.php
+++ b/mod/feedback/lang/en/feedback.php
@@ -142,7 +142,6 @@ $string['insufficient_responses_help'] = 'There are insufficient responses for t
 To keep the feedback anonymous, a minimum of 2 responses must be done.';
 $string['item_label'] = 'Label';
 $string['item_name'] = 'Question';
-$string['items_are_required'] = 'Answers are required to starred questions.';
 $string['label'] = 'Label';
 $string['line_values'] = 'Rating';
 $string['mapcourseinfo'] = 'This is a site-wide feedback that is available to all courses using the feedback block. You can however limit the courses to which it will appear by mapping them. Search the course and map it to this feedback.';
diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index e04c0db4b9c..d5dfd817913 100644
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -78,9 +78,10 @@ if (is_array($feedbackitems)) {
     $params = array('feedback'=>$feedback->id, 'required'=>1);
     $countreq = $DB->count_records('feedback_item', $params);
     if ($countreq > 0) {
-        echo '<span class="feedback_required_mark">(*)';
-        echo get_string('items_are_required', 'feedback');
-        echo '</span>';
+        echo '<div class="fdescription required">';
+        echo get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').
+            '" src="'.$OUTPUT->pix_url('req') .'" class="req" />');
+        echo '</div>';
     }
     //print the inserted items
     $itempos = 0;
diff --git a/mod/feedback/styles.css b/mod/feedback/styles.css
index 93dc0ad50e1..151f11d3b77 100644
--- a/mod/feedback/styles.css
+++ b/mod/feedback/styles.css
@@ -1,15 +1,7 @@
 /* styles using by feedback */
-.feedback_required_mark {
-    color: #FF0000;
-}
-
 .feedback_switchrequired img{
 }
 
-div.missingrequire {
-	background:#FFAAAA;
-}
-
 span.feedback_info {
 	font-weight:bold;
 }