Permalink
Browse files

MDL-34570 Accessibility: Adding labels on text inputs and selects to …

…questions
  • Loading branch information...
1 parent daa3c5f commit d3187c299a14659bd5ec5ccc3e4a243ba3659583 @FMCorz FMCorz committed Aug 23, 2012
@@ -86,25 +86,30 @@ public function manual_comment_fields(question_attempt $qa, question_display_opt
$commenteditor = html_writer::tag('div', html_writer::tag('textarea', s($commenttext),
array('id' => $id, 'name' => $inputname, 'rows' => 10, 'cols' => 60)));
+ $commenteditor .= html_writer::end_tag('div');
- $commenteditor .= html_writer::start_tag('div');
+ $editorformat = '';
if (count($formats) == 1) {
reset($formats);
- $commenteditor .= html_writer::empty_tag('input', array('type' => 'hidden',
+ $editorformat .= html_writer::empty_tag('input', array('type' => 'hidden',
'name' => $inputname . 'format', 'value' => key($formats)));
-
} else {
- $commenteditor .= html_writer::label(get_string('formattexttype'), 'menu' . $inputname . 'format', false, array('class' => 'accesshide'));
- $commenteditor .= html_writer::select(
- $formats, $inputname . 'format', $commentformat, '');
+ $editorformat = html_writer::start_tag('div', array('class' => 'fitem'));
+ $editorformat .= html_writer::start_tag('div', array('class' => 'fitemtitle'));
+ $editorformat .= html_writer::tag('label', get_string('format'), array('for'=>'menu'.$inputname.'format'));
+ $editorformat .= html_writer::end_tag('div');
+ $editorformat .= html_writer::start_tag('div', array('class' => 'felement fhtmleditor'));
+ $editorformat .= html_writer::select($formats, $inputname.'format', $commentformat, '');
+ $editorformat .= html_writer::end_tag('div');
+ $editorformat .= html_writer::end_tag('div');
}
- $commenteditor .= html_writer::end_tag('div');
$comment = html_writer::tag('div', html_writer::tag('div',
html_writer::tag('label', get_string('comment', 'question'),
array('for' => $id)), array('class' => 'fitemtitle')) .
html_writer::tag('div', $commenteditor, array('class' => 'felement fhtmleditor')),
array('class' => 'fitem'));
+ $comment .= $editorformat;
$mark = '';
if ($qa->get_max_mark()) {
@@ -118,6 +123,7 @@ public function manual_comment_fields(question_attempt $qa, question_display_opt
'type' => 'text',
'size' => $fieldsize,
'name' => $markfield,
+ 'id'=> $markfield
);
if (!is_null($currentmark)) {
$attributes['value'] = $qa->format_fraction_as_mark(
@@ -115,19 +115,22 @@ protected function writequestion($question) {
}
shuffle( $ans_list ); // random display order
- // build drop down for answers
- $dropdown = html_writer::label(get_string('selectansweroption'), 'quest_'.$id, false, array('class' => 'accesshide'));
- $dropdown .= "<select id=\"quest_$id\" name=\"quest_$id\">\n";
+ // Build select options.
+ $selectoptions = '';
foreach($ans_list as $ans) {
- $dropdown .= "<option value=\"" . s($ans) . "\">" . s($ans) . "</option>\n";
+ $selectoptions .= "<option value=\"" . s($ans) . "\">" . s($ans) . "</option>\n";
}
- $dropdown .= "</select>\n";
- // finally display
+ // display
+ $option = 0;
foreach($question->options->subquestions as $subquestion) {
- $quest_text = $this->repchar( $subquestion->questiontext );
- $expout .= " <li>$quest_text</li>\n";
- $expout .= $dropdown;
+ // build drop down for answers
+ $quest_text = $this->repchar( $subquestion->questiontext );
+ $dropdown = html_writer::label(get_string('answer', 'qtype_match', $option+1), 'quest_'.$id.'_'.$option, false, array('class' => 'accesshide'));
+ $dropdown .= "<select id=\"quest_{$id}_{$option}\" name=\"quest_{$id}_{$option}\">\n".$selectoptions."</select>\n";
+ $expout .= " <li>$quest_text</li>\n";
+ $expout .= $dropdown;
+ $option++;
}
$expout .= "</ul>\n";
break;
@@ -26,4 +26,3 @@
$string['pluginname'] = 'XHTML format';
$string['pluginname_help'] = 'XHTML format enables all questions in the category to be exported to a single page of strict XHTML for possible use in another application.';
$string['pluginname_link'] = 'qformat/xhtml';
-$string['selectansweroption'] = 'Select answer option';
@@ -38,4 +38,3 @@
$string['pluginnamesummary'] = 'Allows a response of a few sentences or paragraphs. This must then be graded manually.';
$string['responsefieldlines'] = 'Input box size';
$string['responseformat'] = 'Response format';
-$string['selectanswerformat'] = 'Select answer format';
@@ -225,7 +225,8 @@ public function response_area_input($name, $qa, $step, $lines, $context) {
'name' => $inputname . 'format', 'value' => key($formats)));
} else {
- $output .= html_writer::label(get_string('selectanswerformat'), 'menu' . $inputname . 'format', false, array("class" => 'accesshide'));
+ $output .= html_writer::label(get_string('format'), 'menu' . $inputname . 'format', false);
+ $output .= ' ';
$output .= html_writer::select($formats, $inputname . 'format', $responseformat, '');
}
$output .= html_writer::end_tag('div');
@@ -24,6 +24,7 @@
*/
$string['addmoreqblanks'] = '{no} More Sets of Blanks';
+$string['answer'] = 'Answer {$a}';
$string['availablechoices'] = 'Available choices';
$string['correctansweris'] = 'The correct answer is: {$a}';
$string['filloutthreeqsandtwoas'] = 'You must provide at least two questions and three answers. You can provide extra wrong answers by giving an answer with a blank question. Entries where both the question and the answer are blank will be ignored.';
@@ -40,4 +41,3 @@
$string['pluginnameadding'] = 'Adding a Matching question';
$string['pluginnameediting'] = 'Editing a Matching question';
$string['pluginnamesummary'] = 'The answer to each of a number of sub-question must be selected from a list of possibilities.';
-$string['selectananswer'] = 'Select an answer';
@@ -53,6 +53,7 @@ public function formulation_and_controls(question_attempt $qa,
$result .= html_writer::start_tag('tbody');
$parity = 0;
+ $i = 1;
foreach ($stemorder as $key => $stemid) {
$result .= html_writer::start_tag('tr', array('class' => 'r' . $parity));
@@ -80,13 +81,14 @@ public function formulation_and_controls(question_attempt $qa,
}
$result .= html_writer::tag('td',
- html_writer::label(get_string('selectananswer', 'qtype_match'), 'menu' . $qa->get_qt_field_name('sub' . $key), false, array('class' => 'accesshide')) .
+ html_writer::label(get_string('answer', 'qtype_match', $i), 'menu' . $qa->get_qt_field_name('sub' . $key), false, array('class' => 'accesshide')) .
html_writer::select($choices, $qa->get_qt_field_name('sub' . $key), $selected,
array('0' => 'choose'), array('disabled' => $options->readonly)) .
' ' . $feedbackimage, array('class' => $classes));
$result .= html_writer::end_tag('tr');
$parity = 1 - $parity;
+ $i++;
}
$result .= html_writer::end_tag('tbody');
$result .= html_writer::end_tag('table');
@@ -223,11 +223,11 @@ public function subquestion(question_attempt $qa, question_display_options $opti
s($correctanswer->answer), $options);
$output = '';
- $output .= html_writer::start_tag('label', array('class' => 'subq', 'for' => $inputattributes['id']));
+ $output .= html_writer::tag('label', get_string('answer'),
+ array('class' => 'subq accesshide', 'for' => $inputattributes['id']));
$output .= html_writer::empty_tag('input', $inputattributes);
$output .= $feedbackimg;
$output .= $feedbackpopup;
- $output .= html_writer::end_tag('label');
return $output;
}
@@ -274,8 +274,7 @@ public function subquestion(question_attempt $qa, question_display_options $opti
$inputattributes['class'] = $this->feedback_class($matchinganswer->fraction);
$feedbackimg = $this->feedback_image($matchinganswer->fraction);
}
- $select = html_writer::label($response, $inputattributes['id'], false, array('class' => 'accesshide'));
- $select .= html_writer::select($choices, $qa->get_qt_field_name($fieldname),
+ $select = html_writer::select($choices, $qa->get_qt_field_name($fieldname),
$response, array('' => ''), $inputattributes);
$order = $subq->get_order($qa);
@@ -288,11 +287,11 @@ public function subquestion(question_attempt $qa, question_display_options $opti
$qa, 'question', 'answer', $rightanswer->id), $options);
$output = '';
- $output .= html_writer::start_tag('label', array('class' => 'subq'));
+ $output .= html_writer::tag('label', get_string('answer'),
+ array('class' => 'subq accesshide', 'for' => $inputattributes['id']));
$output .= $select;
$output .= $feedbackimg;
$output .= $feedbackpopup;
- $output .= html_writer::end_tag('label');
return $output;
}
@@ -26,6 +26,7 @@
$string['acceptederror'] = 'Accepted error';
$string['addmoreanswerblanks'] = 'Blanks for {no} More Answers';
$string['addmoreunitblanks'] = 'Blanks for {no} More Units';
+$string['answercolon'] = 'Answer:';
$string['answermustbenumberorstar'] = 'The answer must be a number, for example -1.234 or 3e8, or \'*\'.';
$string['answerno'] = 'Answer {$a}';
$string['decfractionofquestiongrade'] = 'as a fraction (0-1) of the question grade';
@@ -76,8 +76,7 @@ public function formulation_and_controls(question_attempt $qa,
$inputattributes['size'] = round(strlen($placeholder) * 1.1);
}
- $input = html_writer::label($inputattributes['name'], $inputattributes['id'], false, array('class' => 'accesshide'));
- $input .= html_writer::empty_tag('input', $inputattributes) . $feedbackimg;
+ $input = html_writer::empty_tag('input', $inputattributes) . $feedbackimg;
if ($question->has_separate_unit_field()) {
if ($question->unitdisplay == qtype_numerical::UNITRADIO) {
@@ -99,7 +98,7 @@ public function formulation_and_controls(question_attempt $qa,
array('class' => 'unitchoices'));
} else if ($question->unitdisplay == qtype_numerical::UNITSELECT) {
- $unitchoice = html_writer::label(get_string('selectunits', 'qtype_numerical'),
+ $unitchoice = html_writer::label(get_string('selectunit', 'qtype_numerical'),
'menu' . $qa->get_qt_field_name('unit'), false, array('class' => 'accesshide'));
$unitchoice .= html_writer::select($question->ap->get_unit_options(),
$qa->get_qt_field_name('unit'), $selectedunit, array(''=>'choosedots'),
@@ -114,16 +113,19 @@ public function formulation_and_controls(question_attempt $qa,
}
if ($placeholder) {
- $questiontext = substr_replace($questiontext, $input,
+ $inputinplace = html_writer::tag('label', get_string('answer'),
+ array('for' => $inputattributes['id'], 'class' => 'accesshide'));
+ $inputinplace .= $input;
+ $questiontext = substr_replace($questiontext, $inputinplace,
strpos($questiontext, $placeholder), strlen($placeholder));
}
$result = html_writer::tag('div', $questiontext, array('class' => 'qtext'));
if (!$placeholder) {
$result .= html_writer::start_tag('div', array('class' => 'ablock'));
- $result .= get_string('answer', 'qtype_shortanswer',
- html_writer::tag('div', $input, array('class' => 'answer')));
+ $result .= html_writer::tag('label', get_string('answercolon', 'qtype_numerical'), array('for' => $inputattributes['id']));
+ $result .= html_writer::tag('span', $input, array('class' => 'answer'));
$result .= html_writer::end_tag('div');
}
@@ -71,20 +71,23 @@ public function formulation_and_controls(question_attempt $qa,
$placeholder = $matches[0];
$inputattributes['size'] = round(strlen($placeholder) * 1.1);
}
- $input = html_writer::label($inputattributes['name'], $inputattributes['id'], false, array('class' => 'accesshide'));
- $input .= html_writer::empty_tag('input', $inputattributes) . $feedbackimg;
+ $input = html_writer::empty_tag('input', $inputattributes) . $feedbackimg;
if ($placeholder) {
- $questiontext = substr_replace($questiontext, $input,
+ $inputinplace = html_writer::tag('label', get_string('answer'),
+ array('for' => $inputattributes['id'], 'class' => 'accesshide'));
+ $inputinplace .= $input;
+ $questiontext = substr_replace($questiontext, $inputinplace,
strpos($questiontext, $placeholder), strlen($placeholder));
}
$result = html_writer::tag('div', $questiontext, array('class' => 'qtext'));
if (!$placeholder) {
$result .= html_writer::start_tag('div', array('class' => 'ablock'));
- $result .= get_string('answer', 'qtype_shortanswer',
- html_writer::tag('div', $input, array('class' => 'answer')));
+ $result .= html_writer::tag('label', get_string('answer', 'qtype_shortanswer',
+ html_writer::tag('span', $input, array('class' => 'answer'))),
+ array('for' => $inputattributes['id']));
$result .= html_writer::end_tag('div');
}

0 comments on commit d3187c2

Please sign in to comment.