mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 21:45:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-02-16 16:48:04 +01:00
commit fa6426a069
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
question/engine/lib.php
View File

@ -595,9 +595,11 @@ class question_display_options {
/**
* @since 2.9
* @var string extra HTML to include in the info box of the question display.
* This is normally shown after the information about the question, and before
* any controls like the flag or the edit icon.
* @var string extra HTML to include at the end of the outcome (feedback) box
* of the question display.
*
* This field is now badly named. The place it included is was changed
* (for the better) but the name was left unchanged for backwards compatibility.
*/
public $extrainfocontent = '';

3
question/engine/renderer.php
View File

@ -144,7 +144,6 @@ class core_question_renderer extends plugin_renderer_base {
$output .= $this->number($number);
$output .= $this->status($qa, $behaviouroutput, $options);
$output .= $this->mark_summary($qa, $behaviouroutput, $options);
$output .= $options->extrainfocontent;
$output .= $this->question_flag($qa, $options->flags);
$output .= $this->edit_question_link($qa, $options);
return $output;
@ -412,6 +411,8 @@ class core_question_renderer extends plugin_renderer_base {
$qtoutput->feedback($qa, $options), array('class' => 'feedback'));
$output .= html_writer::nonempty_tag('div',
$behaviouroutput->feedback($qa, $options), array('class' => 'im-feedback'));
$output .= html_writer::nonempty_tag('div',
$options->extrainfocontent, array('class' => 'extra-feedback'));
return $output;
}

7
question/engine/upgrade.txt
View File

@ -1,5 +1,12 @@
This files describes API changes for the core question engine.
=== 3.1, 3.0.3, 2.9.5 ===
1) The field question_display_options::$extrainfocontent is now displayed in the
outcomes (yellow) div by default. It used to be in the info div. If you have
overriden the question renderer, you may need to make a corresponding change.
=== 3.0, 2.9.2, 2.8.8 ===
1) The extra internal PARAM constant question_attempt::PARAM_MARK should no