From 213d4cff9c23eb0d980c322e9bd80a59a910cc22 Mon Sep 17 00:00:00 2001 From: Dean Lennard Date: Tue, 3 May 2011 13:45:37 +0100 Subject: [PATCH] MDL-20636 updates to view/renderer code --- mod/quiz/renderer.php | 3 ++- mod/quiz/view.php | 15 +++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php index 6b1d2a02f3ffb..03023b8c14585 100644 --- a/mod/quiz/renderer.php +++ b/mod/quiz/renderer.php @@ -660,6 +660,7 @@ private function view_attempt_button($course, $quiz, $cm, $context, $viewobj){ // Determine if we should be showing a start/continue attempt button, // or a button to go back to the course page. $output .= $this->box_start('quizattempt'); + $output .= 'TEST'; $buttontext = ''; // This will be set something if as start/continue attempt button should appear. if (!quiz_clean_layout($quiz->questions, true)) { $output .= quiz_no_questions_message($quiz, $cm, $context); @@ -703,7 +704,7 @@ private function view_attempt_button($course, $quiz, $cm, $context, $viewobj){ // Now actually print the appropriate button. if ($buttontext) { - $viewobj->accessmanager->print_start_attempt_button($viewobj->canpreview, $buttontext, $viewobj->unfinished); + $output .= $viewobj->accessmanager->print_start_attempt_button($viewobj->canpreview, $buttontext, $viewobj->unfinished); } else if ($buttontext === '') { $output .= $this->single_button(new moodle_url('/course/view.php', array('id' => $course->id)), get_string('backtocourse', 'quiz'), 'get', array('class' => 'continuebutton')); diff --git a/mod/quiz/view.php b/mod/quiz/view.php index 35acd760c2e72..842d407ed8808 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -133,12 +133,9 @@ $moreattempts = $unfinished || !$accessmanager->is_finished($numattempts, $lastfinishedattempt); -$title = $course->shortname . ': ' . format_string($quiz->name); -$PAGE->set_title($title); -$PAGE->set_heading($course->fullname); -$output = $PAGE->get_renderer('mod_quiz'); -echo $OUTPUT->header(); - +/* + * Create view object for use within renderers file + */ $viewobj->attempts = $attempts; $viewobj->accessmanager = $accessmanager; $viewobj->canattempt = $canattempt; @@ -160,6 +157,12 @@ $viewobj->unfinished = $unfinished; $viewobj->lastfinishedattempt = $lastfinishedattempt; +$title = $course->shortname . ': ' . format_string($quiz->name); +$PAGE->set_title($title); +$PAGE->set_heading($course->fullname); +$output = $PAGE->get_renderer('mod_quiz'); +echo $OUTPUT->header(); + echo $output->view_page($course, $quiz, $cm, $context, $viewobj); // Mark module as viewed (note, we do this here and not in finish_page,