MDL-72413 quiz: Use the common module for setting the header

moodle · Dec 13, 2021 · 7d3927a · 7d3927a
1 parent 65ae3c1
commit 7d3927a
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 26 deletions.
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
@@ -128,7 +128,7 @@
 $headtags = $attemptobj->get_html_head_contributions($page);
 $PAGE->set_title($attemptobj->attempt_page_title($page));
 $PAGE->set_heading($attemptobj->get_course()->fullname);
-
+$PAGE->activityheader->disable();
 if ($attemptobj->is_last_page($page)) {
     $nextpage = -1;
 } else {

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
@@ -182,6 +182,7 @@
 
 $PAGE->set_title(get_string('editingquizx', 'quiz', format_string($quiz->name)));
 $PAGE->set_heading($course->fullname);
+$PAGE->activityheader->disable();
 $node = $PAGE->settingsnav->find('mod_quiz_edit', navigation_node::TYPE_SETTING);
 if ($node) {
     $node->make_active();

diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php
@@ -87,11 +87,12 @@
 $PAGE->navbar->add($title);
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);
-
+$PAGE->activityheader->set_attrs([
+    "title" => format_string($quiz->name, true, ['context' => $context]),
+    "description" => "",
+    "hidecompletion" => true
+]);
 echo $OUTPUT->header();
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($quiz->name, true, array('context' => $context)));
-}
 
 if ($override->groupid) {
     $group = $DB->get_record('groups', ['id' => $override->groupid], 'id, name');

diff --git a/mod/quiz/overrideedit.php b/mod/quiz/overrideedit.php
@@ -241,10 +241,12 @@
 $PAGE->set_pagelayout('admin');
 $PAGE->set_title($pagetitle);
 $PAGE->set_heading($course->fullname);
+$PAGE->activityheader->set_attrs([
+    "title" => format_string($quiz->name, true, array('context' => $context)),
+    "description" => "",
+    "hidecompletion" => true
+]);
 echo $OUTPUT->header();
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($quiz->name, true, array('context' => $context)));
-}
 
 $mform->display();
 

diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
@@ -68,6 +68,7 @@
 $PAGE->set_pagelayout('admin');
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);
+$PAGE->activityheader->disable();
 
 // Activate the secondary nav tab.
 $PAGE->set_secondary_active_tab("mod_quiz_useroverrides");

diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
@@ -972,24 +972,8 @@ public function view_page_notenrolled($course, $quiz, $cm, $context, $messages,
      * @return string HTML to output.
      */
     public function view_information($quiz, $cm, $context, $messages, bool $quizhasquestions = false) {
-        global $USER;
-
         $output = '';
 
-        // Print quiz name.
-        if (!$this->page->has_secondary_navigation()) {
-            $output .= $this->heading(format_string($quiz->name));
-        }
-
-        // Print any activity information (eg completion requirements / dates).
-        $cminfo = cm_info::create($cm);
-        $completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-        $activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-        $output .= $this->output->activity_information($cminfo, $completiondetails, $activitydates);
-
-        // Print quiz description.
-        $output .= $this->quiz_intro($quiz, $cm);
-
         // Print the preview, quiz buttons for tertiary nav.
         $canedit = has_capability('mod/quiz:manage', $context);
         $canpreview = has_capability('mod/quiz:preview', $context);

diff --git a/mod/quiz/report.php b/mod/quiz/report.php
@@ -65,7 +65,7 @@
 require_login($course, false, $cm);
 $context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('report');
-
+$PAGE->activityheader->disable();
 $reportlist = quiz_report_list($context);
 if (empty($reportlist)) {
     print_error('erroraccessingreport', 'quiz');

diff --git a/mod/quiz/review.php b/mod/quiz/review.php
@@ -108,6 +108,7 @@
 $headtags = $attemptobj->get_html_head_contributions($page, $showall);
 $PAGE->set_title($attemptobj->review_page_title($page, $showall));
 $PAGE->set_heading($attemptobj->get_course()->fullname);
+$PAGE->activityheader->disable();
 
 // Summary table start. ============================================================================
 

diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php
@@ -94,7 +94,7 @@
 $PAGE->navbar->add(get_string('summaryofattempt', 'quiz'));
 $PAGE->set_title($attemptobj->summary_page_title());
 $PAGE->set_heading($attemptobj->get_course()->fullname);
-
+$PAGE->activityheader->disable();
 // Display the page.
 echo $output->summary_page($attemptobj, $displayoptions);
 

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
@@ -143,6 +143,9 @@
 $title = $course->shortname . ': ' . format_string($quiz->name);
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);
+if (html_is_blank($quiz->intro)) {
+    $PAGE->activityheader->set_description('');
+}
 $output = $PAGE->get_renderer('mod_quiz');
 // MDL-71915 Will remove this place holder.
 if (defined('BEHAT_SITE_RUNNING')) {