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

Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-08-27 20:12:18 +02:00
commit a72ff024fb
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grade/grading/form/guide/lib.php
View File

@ -506,6 +506,14 @@ class gradingform_guide_controller extends gradingform_controller {
$comments = $this->definition->guide_comment;
$options = $this->get_options();
$guide = '';
if (has_capability('moodle/grade:managegradingforms', $page->context)) {
$showdescription = true;
} else {
$showdescription = $options['showdescriptionstudent'];
}
if ($showdescription) {
$guide .= $output->box($this->get_formatted_description(), 'gradingform_guide-description');
}
if (has_capability('moodle/grade:managegradingforms', $page->context)) {
$guide .= $output->display_guide_mapping_explained($this->get_min_max_score());
$guide .= $output->display_guide($criteria, $comments, $options, self::DISPLAY_PREVIEW, 'guide');

3
grade/grading/form/guide/preview.php
View File

@ -49,8 +49,5 @@ $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 $controller->render_preview($PAGE);
echo $OUTPUT->footer();

8
grade/grading/form/rubric/lib.php
View File

@ -508,6 +508,14 @@ class gradingform_rubric_controller extends gradingform_controller {
$criteria = $this->definition->rubric_criteria;
$options = $this->get_options();
$rubric = '';
if (has_capability('moodle/grade:managegradingforms', $page->context)) {
$showdescription = true;
} else {
$showdescription = $options['showdescriptionstudent'];
}
if ($showdescription) {
$rubric .= $output->box($this->get_formatted_description(), 'gradingform_rubric-description');
}
if (has_capability('moodle/grade:managegradingforms', $page->context)) {
$rubric .= $output->display_rubric_mapping_explained($this->get_min_max_score());
$rubric .= $output->display_rubric($criteria, $options, self::DISPLAY_PREVIEW, 'rubric');

3
grade/grading/form/rubric/preview.php
View File

@ -49,8 +49,5 @@ $PAGE->set_heading($title);
echo $OUTPUT->header();
echo $OUTPUT->heading($title);
if (!empty($options['showdescriptionstudent'])) {
echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_rubric-description');
}
echo $controller->render_preview($PAGE);
echo $OUTPUT->footer();

1
grade/grading/manage.php
View File

@ -233,7 +233,6 @@ if (!empty($method)) {
$tag = html_writer::tag('span', get_string('statusdraft', 'core_grading'), array('class' => 'status draft'));
}
echo $output->heading(s($definition->name) . ' ' . $tag, 3, 'definition-name');
echo $output->box($controller->get_formatted_description());
echo $output->box($controller->render_preview($PAGE), 'definition-preview');
}
}