L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error-Content-Displayed-in-red' of https://github.com/michael-milette/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2014-04-08 14:11:59 +08:00
parent 48395a9cdb cba011942c
commit a5cd92574d
13 changed files with 139 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/complete.php
+8 -7
View File
@@ -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');
mod/feedback/complete_guest.php
+10 -8
View File
@@ -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');
mod/feedback/edit.php
+4 -3
View File
@@ -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
mod/feedback/item/captcha/lib.php
+11 -6
View File
@@ -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.'">';
mod/feedback/item/info/lib.php
+10 -5
View File
@@ -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;';
mod/feedback/item/multichoice/lib.php
+26 -29
View File
@@ -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
mod/feedback/item/multichoicerated/lib.php
+21 -14
View File
@@ -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.'">';
mod/feedback/item/numeric/lib.php
+15 -13
View File
@@ -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.'">';
mod/feedback/item/textarea/lib.php
+15 -13
View File
@@ -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.'">';
mod/feedback/item/textfield/lib.php
+15 -13
View File
@@ -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.'">';
mod/feedback/lang/en/feedback.php
-1
View File
@@ -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.';
mod/feedback/print.php
+4 -3
View File
@@ -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;
mod/feedback/styles.css
-8
View File
@@ -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;
}