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

Merge branch 'm23_MDL-35156' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-09-11 02:48:22 +02:00
parent 35eb1a0f0c 43b135e598
commit a59f0f25cd
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/grading/form/guide/lib.php
+2 -4
View File
@@ -872,10 +872,8 @@ class gradingform_guide_instance extends gradingform_instance {
$html .= html_writer::tag('div', get_string('restoredfromdraft', 'gradingform_guide'),
array('class' => 'gradingform_guide-restored'));
}
if (!empty($options['showdescriptionteacher'])) {
$html .= html_writer::tag('div', $this->get_controller()->get_formatted_description(),
array('class' => 'gradingform_guide-description'));
}
$html .= html_writer::tag('div', $this->get_controller()->get_formatted_description(),
array('class' => 'gradingform_guide-description'));
$html .= $this->get_controller()->get_renderer($page)->display_guide($criteria, $comments, $options, $mode,
$gradingformelement->getName(), $value, $this->validationerrors);
return $html;
grade/grading/form/guide/preview.php
+1 -3
View File
@@ -49,8 +49,6 @@ $PAGE->set_heading($title);
echo $OUTPUT->header();
echo $OUTPUT->heading($title);
if (!empty($options['showdescriptionstudent'])) {
echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_guide-description');
}
echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_guide-description');
echo $controller->render_preview($PAGE);
echo $OUTPUT->footer();