mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-30883' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-07-03 11:01:39 +08:00
commit 7d27947851
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
question/engine/renderer.php
View File

@ -207,36 +207,52 @@ class core_question_renderer extends plugin_renderer_base {
*/
protected function question_flag(question_attempt $qa, $flagsoption) {
global $CFG;
$divattributes = array('class' => 'questionflag');
switch ($flagsoption) {
case question_display_options::VISIBLE:
$flagcontent = $this->get_flag_html($qa->is_flagged());
break;
case question_display_options::EDITABLE:
$id = $qa->get_flag_field_name();
if ($qa->is_flagged()) {
$checked = 'checked="checked" ';
} else {
$checked = '';
}
$postdata = question_flags::get_postdata($qa);
// The checkbox id must be different from any element name, because
// of a stupid IE bug:
// http://www.456bereastreet.com/archive/200802/beware_of_id_and_name_attribute_mixups_when_using_getelementbyid_in_internet_explorer/
$flagcontent = '<input type="hidden" name="' . $id . '" value="0" />' .
'<input type="checkbox" id="' . $id . 'checkbox" name="' . $id .
'" value="1" ' . $checked . ' />' .
'<input type="hidden" value="' . s($postdata) .
'" class="questionflagpostdata" />' .
'<label id="' . $id . 'label" for="' . $id . 'checkbox">' .
$this->get_flag_html($qa->is_flagged(), $id . 'img') .
'</label>' . "\n";
$checkboxattributes = array(
'type' => 'checkbox',
'id' => $id . 'checkbox',
'name' => $id,
'value' => 1,
);
if ($qa->is_flagged()) {
$checkboxattributes['checked'] = 'checked';
}
$postdata = question_flags::get_postdata($qa);
$flagcontent = html_writer::empty_tag('input',
array('type' => 'hidden', 'name' => $id, 'value' => 0)) .
html_writer::empty_tag('input', $checkboxattributes) .
html_writer::empty_tag('input',
array('type' => 'hidden', 'value' => $postdata, 'class' => 'questionflagpostdata')) .
html_writer::tag('label', $this->get_flag_html($qa->is_flagged(), $id . 'img'),
array('id' => $id . 'label', 'for' => $id . 'checkbox')) . "\n";
$divattributes = array(
'class' => 'questionflag editable',
'aria-atomic' => 'true',
'aria-relevant' => 'text',
'aria-live' => 'assertive',
);
break;
default:
$flagcontent = '';
}
if ($flagcontent) {
return '<div class="questionflag">' . $flagcontent . "</div>\n";
}
return html_writer::nonempty_tag('div', $flagcontent, $divattributes);
}
/**

2
theme/base/style/question.css
View File

@ -46,7 +46,7 @@ body.jsenabled #qtypechoicecontainer {display: block;}
.que h2.no {margin: 0;font-size: 0.8em;line-height: 1;}
.que span.qno {font-size: 1.5em;font-weight:bold;}
.que .info > div {font-size: 0.8em;margin-top: 0.7em;}
.que .info .questionflag {cursor:pointer;}
.que .info .questionflag.editable {cursor:pointer;}
.que .info .editquestion img,
.que .info .questionflag img,
.que .info .questionflag input {vertical-align: bottom;}