'.
@@ -220,6 +223,7 @@ class feedback_item_captcha extends feedback_item_base {
@@ -268,7 +272,8 @@ class feedback_item_captcha extends feedback_item_base {
}
}
- $requiredmark = '
';
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)?'
*':'';
+ $requiredmark = ($item->required == 1)?'
 .')
':'';
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)?'
*':'';
+ $requiredmark = ($item->required == 1)?'
 .')
':'';
$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 '
';
+ echo '
';
+ echo '';
echo format_text($item->name.$requiredmark, true, false, false);
+ echo '';
echo '
';
//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)?'
*':'';
+ $requiredmark = ($item->required == 1)?'
 .')
':'';
if ($presentation == 1) {
$value = $value ? userdate($value) : ' ';
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 = '
*';
+ $strrequiredmark = '
 .')
';
//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 '
';
@@ -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 = '
*';
+ $strrequiredmark = '
 .')
';
//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 '
';
+ $inputname = $item->typ . '_' . $item->id;
+ echo '
';
if ($info->subtype == 'd') {
- echo '
';
//print the presentation
- echo '
';
+ echo '
';
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 = '
*';
+ $requiredmark = '
 .')
';
}
//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 = '
*';
+ $strrequiredmark = '
 .')
';
$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 '
';
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 = '
*';
+ $strrequiredmark = '
 .')
';
$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 '
';
+ $inputname = $item->typ . '_' . $item->id;
+ echo '
';
if ($info->subtype == 'd') {
- echo '';
- echo format_text($item->name . $requiredmark, FORMAT_HTML, array('noclean' => true, 'para' => false));
+ echo '';
+ echo format_text($item->name.$requiredmark, true, false, false);
+ if ($highlightrequire AND $item->required AND intval($value) <= 0) {
+ echo '
'.get_string('err_required', 'form').
+ '
';
+ }
echo '';
} else {
echo format_text($item->name . $requiredmark, FORMAT_HTML, array('noclean' => true, 'para' => false));
+ if ($highlightrequire AND $item->required AND intval($value) <= 0) {
+ echo '
'.get_string('err_required', 'form').
+ '
';
+ }
}
echo '
';
//print the presentation
- echo '
';
+ echo '
';
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)?'
*':'';
+ $requiredmark = ($item->required == 1)?'
 .')
':'';
//print the question and label
echo '
';
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 = '
*';
+ $strrequiredmark = '
 .')
';
//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 '
';
@@ -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 = '
*';
+ $strrequiredmark = '
 .')
';
//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 '
';
+ echo '
';
echo '';
echo format_text($item->name . $requiredmark, true, false, false);
echo '';
@@ -361,11 +358,15 @@ class feedback_item_numeric extends feedback_item_base {
break;
}
echo '';
+ if ($highlightrequire AND (!$this->check_value($value, $item))) {
+ echo '
'.get_string('err_required', 'form').
+ '
';
+ }
echo '';
echo '
';
//print the presentation
- echo '
';
+ echo '
';
echo '
';
echo '*';
+ $strrequiredmark = '
 .')
';
//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 '
';
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 = '
*';
+ $strrequiredmark = '
 .')
';
$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 '
';
@@ -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 = '
*';
+ $strrequiredmark = '
 .')
';
$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 '
';
+ echo '
';
echo '';
echo format_text($item->name . $requiredmark, true, false, false);
+ if ($highlightrequire AND $item->required AND strval($value) == '') {
+ echo '
'.get_string('err_required', 'form').
+ '
';
+ }
echo '';
echo '
';
//print the presentation
- echo '
';
+ echo '
';
echo '
';
echo '';
+ $strrequiredmark = '
 .')
';
$presentation = explode ("|", $item->presentation);
- $requiredmark = ($item->required == 1) ? $str_required_mark : '';
+ $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
//print the question and label
echo '
';
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 = '
*';
+ $strrequiredmark = '
 .')
';
$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 '
';
@@ -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 = '
*';
+ $strrequiredmark = '
 .')
';
$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 '
';
+ echo '
';
echo '';
echo format_text($item->name.$requiredmark, true, false, false);
+ if ($highlightrequire AND $item->required AND strval($value) == '') {
+ echo '
'.get_string('err_required', 'form').
+ '
';
+ }
echo '';
echo '
';
//print the presentation
- echo '
';
+ echo '
';
echo '
';
echo '*';
+ $strrequiredmark = '
 .')
';
$presentation = explode ("|", $item->presentation);
- $requiredmark = ($item->required == 1) ? $str_required_mark : '';
+ $requiredmark = ($item->required == 1) ? $strrequiredmark : '';
//print the question and label
echo '
';
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 '
(*)';
- echo get_string('items_are_required', 'feedback');
- echo '';
+ echo '
';
+ echo get_string('somefieldsrequired', 'form', '
 .')
');
+ echo '
';
}
//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;
}