Revert "MDL-71915 question: Update the tertiary nav"

This reverts commit 26eabec.
jbs1 · Feb 15, 2022 · 73aeaba · 73aeaba
1 parent ae377f6
commit 73aeaba
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 196 deletions.
diff --git a/question/bank/exportquestions/export.php b/question/bank/exportquestions/export.php
@@ -48,13 +48,11 @@
 $PAGE->set_heading($COURSE->fullname);
 $PAGE->activityheader->disable();
 
-// Print horizontal nav if needed.
-$renderer = $PAGE->get_renderer('core_question', 'bank');
-
 echo $OUTPUT->header();
 
-$qbankaction = new \core_question\output\qbank_actionbar($thispageurl);
-echo $renderer->qbank_action_menu($qbankaction);
+// Print horizontal nav if needed.
+$renderer = $PAGE->get_renderer('core_question', 'bank');
+echo $renderer->extra_horizontal_navigation();
 
 $exportform = new export_form($thispageurl,
         ['contexts' => $contexts->having_one_edit_tab_cap('export'), 'defaultcategory' => $pagevars['cat']]);

diff --git a/question/bank/importquestions/import.php b/question/bank/importquestions/import.php
@@ -75,13 +75,12 @@
 $PAGE->set_heading($COURSE->fullname);
 $PAGE->activityheader->disable();
 
+echo $OUTPUT->header();
+
 // Print horizontal nav if needed.
 $renderer = $PAGE->get_renderer('core_question', 'bank');
+echo $renderer->extra_horizontal_navigation();
 
-echo $OUTPUT->header();
-
-$qbankaction = new \core_question\output\qbank_actionbar($thispageurl);
-echo $renderer->qbank_action_menu($qbankaction);
 
 // File upload form submitted.
 if ($form = $importform->get_data()) {

diff --git a/question/bank/managecategories/category.php b/question/bank/managecategories/category.php
@@ -152,13 +152,11 @@
 $PAGE->set_heading($COURSE->fullname);
 $PAGE->activityheader->disable();
 
-// Print horizontal nav if needed.
-$renderer = $PAGE->get_renderer('core_question', 'bank');
-
 echo $OUTPUT->header();
 
-$qbankaction = new \core_question\output\qbank_actionbar($url);
-echo $renderer->qbank_action_menu($qbankaction);
+// Print horizontal nav if needed.
+$renderer = $PAGE->get_renderer('core_question', 'bank');
+echo $renderer->extra_horizontal_navigation();
 
 // Display the UI.
 if (!empty($param->edit)) {

diff --git a/question/classes/output/qbank_actionbar.php b/question/classes/output/qbank_actionbar.php
diff --git a/question/edit.php b/question/edit.php
@@ -48,13 +48,11 @@
 $PAGE->set_heading($COURSE->fullname);
 $PAGE->activityheader->disable();
 
+echo $OUTPUT->header();
+
 // Print horizontal nav if needed.
 $renderer = $PAGE->get_renderer('core_question', 'bank');
-
-echo $OUTPUT->header();
-// Render the selection action.
-$qbankaction = new \core_question\output\qbank_actionbar($url);
-echo $renderer->qbank_action_menu($qbankaction);
+echo $renderer->extra_horizontal_navigation();
 
 // Print the question area.
 $questionbank->display($pagevars, 'questions');

diff --git a/question/renderer.php b/question/renderer.php
@@ -182,17 +182,6 @@ public function qbank_chooser($real, $fake, $course, $hiddenparams) {
         return '';
     }
 
-    /**
-     * Get the rendered HTML for the action area in Question bank.
-     *
-     * @param \core_question\output\qbank_actionbar $qbankactionbar qbankactionbar object.
-     * @return string rendered HTML string from template.
-     */
-    public function qbank_action_menu(\core_question\output\qbank_actionbar $qbankactionbar): string {
-        return $this->render_from_template('core_question/qbank_action_menu',
-                $qbankactionbar->export_for_template($this));
-    }
-
     /**
      * Build the HTML for a specified set of question types.
      *

diff --git a/question/templates/qbank_action_menu.mustache b/question/templates/qbank_action_menu.mustache