+
+ {{#hasnavbar}}
+
+ {{/hasnavbar}}
+
+ {{{pageheadingbutton}}}
+
+
+ {{{courseheader}}}
+
+
{{#contextheader}}
-
@@ -50,19 +63,6 @@
{{/headeractions}}
- {{#hasnavbar}}
-
- {{/hasnavbar}}
-
- {{{pageheadingbutton}}}
-
-
- {{{courseheader}}}
-
-
-
+
@@ -101,7 +105,7 @@
{{#node.children}}
{{#children.count}}
-
+
diff --git a/lib/templates/user_action_menu_items.mustache b/lib/templates/user_action_menu_items.mustache
new file mode 100644
index 00000000000..ff8942af6fd
--- /dev/null
+++ b/lib/templates/user_action_menu_items.mustache
@@ -0,0 +1,84 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see ![](\"http://localhost/stable_master/theme/image.php/boost/core/1617863836/u/f2\")
"
+ }
+ ],
+ "userfullname": "Admin User"
+ }
+}}
+
+ {{userfullname}}
+ {{#metadata}}
+
+ {{/metadata}}
+
+
+{{#avatardata}}
+
+ {{{content}}}
+
+{{/avatardata}}
+
diff --git a/lib/tests/behat/behat_navigation.php b/lib/tests/behat/behat_navigation.php
index 053010c6b0e..d71b8e96313 100644
--- a/lib/tests/behat/behat_navigation.php
+++ b/lib/tests/behat/behat_navigation.php
@@ -41,6 +41,20 @@ use Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException;
*/
class behat_navigation extends behat_base {
+ /**
+ * Checks whether a navigation node is active within the block navigation.
+ *
+ * @Given i should see :name is active in navigation
+ *
+ * @throws ElementNotFoundException
+ * @param string $element The name of the nav elemnent to look for.
+ * @return void
+ */
+ public function i_should_see_is_active_in_navigation($element) {
+ $this->execute("behat_general::assert_element_contains_text",
+ [$element, '.block_navigation .active_tree_node', 'css_element']);
+ }
+
/**
* Helper function to get a navigation nodes text element given its text from within the navigation block.
*
@@ -151,7 +165,7 @@ class behat_navigation extends behat_base {
if ($this->running_javascript()) {
// The user menu must be expanded when JS is enabled.
- $xpath = "//div[contains(concat(' ', @class, ' '), ' usermenu ')]//a[contains(concat(' ', @class, ' '), ' dropdown-toggle ')]";
+ $xpath = "//div[contains(concat(' ', @class, ' '), ' usermenu ')]//button[contains(concat(' ', @class, ' '), ' dropdown-toggle ')]";
$this->execute("behat_general::i_click_on", array($this->escape($xpath), "xpath_element"));
}
@@ -925,7 +939,14 @@ class behat_navigation extends behat_base {
if ($parentnodes) {
$tabname = behat_context_helper::escape($parentnodes[0]);
$tabxpath = '//ul[@role=\'tablist\']/li/a[contains(normalize-space(.), ' . $tabname . ')]';
- if ($node = $this->getSession()->getPage()->find('xpath', $tabxpath)) {
+ $menubarxpath = '//ul[@role=\'menubar\']/li/a[contains(normalize-space(.), ' . $tabname . ')]';
+ $linkname = behat_context_helper::escape(get_string('moremenu'));
+ $menubarmorexpath = '//ul[@role=\'menubar\']/li/a[contains(normalize-space(.), ' . $linkname . ')]';
+ $tabnode = $this->getSession()->getPage()->find('xpath', $tabxpath);
+ $menunode = $this->getSession()->getPage()->find('xpath', $menubarxpath);
+ $menubuttons = $this->getSession()->getPage()->findAll('xpath', $menubarmorexpath);
+ if ($tabnode || $menunode) {
+ $node = is_object($tabnode) ? $tabnode : $menunode;
if ($this->running_javascript()) {
$this->execute('behat_general::i_click_on', [$node, 'NodeElement']);
// Click on the tab and add 'active' tab to the xpath.
@@ -936,6 +957,22 @@ class behat_navigation extends behat_base {
$xpath .= '//div[@id = ' . $tabid . ']';
}
array_shift($parentnodes);
+ } else if (count($menubuttons) > 0) {
+ try {
+ $menubuttons[0]->isVisible();
+ try {
+ $this->execute('behat_general::i_click_on', [$menubuttons[1], 'NodeElement']);
+ } catch (Exception $e) {
+ $this->execute('behat_general::i_click_on', [$menubuttons[0], 'NodeElement']);
+ }
+ $moreitemxpath = '//ul[@data-region=\'moredropdown\']/li/a[contains(normalize-space(.), ' . $tabname . ')]';
+ if ($morenode = $this->getSession()->getPage()->find('xpath', $moreitemxpath)) {
+ $this->execute('behat_general::i_click_on', [$morenode, 'NodeElement']);
+ $xpath .= '//div[contains(@class,\'active\')]';
+ array_shift($parentnodes);
+ }
+ } catch (Exception $e) {
+ }
}
}
@@ -1065,4 +1102,95 @@ class behat_navigation extends behat_base {
}
$this->execute('behat_general::i_visit', [$url]);
}
+
+
+ /**
+ * First checks to see if we are on this page via the breadcrumb. If not we then attempt to follow the link name given.
+ *
+ * @param string $pagename Name of the breadcrumb item to check and follow.
+ */
+ public function go_to_breadcrumb_location(string $pagename): void {
+ $link = $this->getSession()->getPage()->find(
+ 'xpath',
+ "//nav[@aria-label='Navigation bar']/ol/li[last()][contains(normalize-space(.), '" . $pagename . "')]"
+ );
+ if (!$link) {
+ $this->execute("behat_general::click_link", $pagename);
+ }
+ }
+
+ /**
+ * Checks whether an item exists in the user menu.
+ *
+ * @Given :itemtext :selectortype should exist in the user menu
+ * @Given :itemtext :selectortype should :not exist in the user menu
+ *
+ * @throws ElementNotFoundException
+ * @param string $itemtext The menu item to find
+ * @param string $selectortype The selector type
+ * @param string|null $not Instructs to checks whether the element does not exist in the user menu, if defined
+ * @return void
+ */
+ public function should_exist_in_user_menu($itemtext, $selectortype, $not = null) {
+ $callfunction = is_null($not) ? 'should_exist_in_the' : 'should_not_exist_in_the';
+ $this->execute("behat_general::{$callfunction}",
+ [$itemtext, $selectortype, $this->get_user_menu_xpath(), 'xpath_element']);
+ }
+
+ /**
+ * Checks whether an item exists in a given user submenu.
+ *
+ * @Given :itemtext :selectortype should exist in the :submenuname user submenu
+ * @Given :itemtext :selectortype should :not exist in the :submenuname user submenu
+ *
+ * @throws ElementNotFoundException
+ * @param string $itemtext The submenu item to find
+ * @param string $selectortype The selector type
+ * @param string $submenuname The name of the submenu
+ * @param string|null $not Instructs to checks whether the element does not exist in the user menu, if defined
+ * @return void
+ */
+ public function should_exist_in_user_submenu($itemtext, $selectortype, $submenuname, $not = null) {
+ $callfunction = is_null($not) ? 'should_exist_in_the' : 'should_not_exist_in_the';
+ $this->execute("behat_general::{$callfunction}",
+ [$itemtext, $selectortype, $this->get_user_submenu_xpath($submenuname), 'xpath_element']);
+ }
+
+ /**
+ * Checks whether a given user submenu is visible.
+ *
+ * @Then /^I should see "(?P[^"]*)" user submenu$/
+ *
+ * @throws ElementNotFoundException
+ * @throws ExpectationException
+ * @param string $submenuname The name of the submenu
+ * @return void
+ */
+ public function i_should_see_user_submenu($submenuname) {
+ $this->execute('behat_general::should_be_visible',
+ array($this->get_user_submenu_xpath($submenuname), 'xpath_element'));
+ }
+
+ /**
+ * Return the xpath for the user menu element.
+ *
+ * @return string The xpath
+ */
+ protected function get_user_menu_xpath() {
+ return "//div[contains(concat(' ', @class, ' '), ' usermenu ')]" .
+ "//div[contains(concat(' ', @class, ' '), ' dropdown-menu ')]" .
+ "//div[@id='carousel-item-main']";
+ }
+
+ /**
+ * Return the xpath for a given user submenu element.
+ *
+ * @param string $submenuname The name of the submenu
+ * @return string The xpath
+ */
+ protected function get_user_submenu_xpath($submenuname) {
+ return "//div[contains(concat(' ', @class, ' '), ' usermenu ')]" .
+ "//div[contains(concat(' ', @class, ' '), ' dropdown-menu ')]" .
+ "//div[contains(concat(' ', @class, ' '), ' submenu ')][@aria-label='" . $submenuname . "']";
+ }
}
diff --git a/lib/tests/navigation/output/primary_test.php b/lib/tests/navigation/output/primary_test.php
new file mode 100644
index 00000000000..2c4031b3078
--- /dev/null
+++ b/lib/tests/navigation/output/primary_test.php
@@ -0,0 +1,413 @@
+.
+
+namespace core\navigation\output;
+
+use ReflectionMethod;
+
+/**
+ * Primary navigation renderable test
+ *
+ * @package core
+ * @category navigation
+ * @copyright 2021 onwards Peter Dias
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class primary_test extends \advanced_testcase {
+ /**
+ * Basic setup to make sure the nav objects gets generated without any issues.
+ */
+ public function setUp(): void {
+ global $PAGE;
+ $this->resetAfterTest();
+ $pagecourse = $this->getDataGenerator()->create_course();
+ $assign = $this->getDataGenerator()->create_module('assign', ['course' => $pagecourse->id]);
+ $cm = get_coursemodule_from_id('assign', $assign->cmid);
+ $contextrecord = \context_module::instance($cm->id);
+ $pageurl = new \moodle_url('/mod/assign/view.php', ['id' => $cm->instance]);
+ $PAGE->set_cm($cm);
+ $PAGE->set_url($pageurl);
+ $PAGE->set_course($pagecourse);
+ $PAGE->set_context($contextrecord);
+ }
+
+ /**
+ * Test the primary export to confirm we are getting the nodes
+ *
+ * @dataProvider test_primary_export_provider
+ * @param bool $withcustom Setup with custom menu
+ * @param bool $withlang Setup with langs
+ * @param string $userloggedin The type of user ('admin' or 'guest') if creating setup with logged in user,
+ * otherwise consider the user as non-logged in
+ * @param array $expecteditems An array of nodes expected with content in them.
+ */
+ public function test_primary_export(bool $withcustom, bool $withlang, string $userloggedin, array $expecteditems) {
+ global $PAGE, $CFG;
+ if ($withcustom) {
+ $CFG->custommenuitems = "Course search|/course/search.php
+ Google|https://google.com.au/
+ Netflix|https://netflix.com/au";
+ }
+ if ($userloggedin === 'admin') {
+ $this->setAdminUser();
+ } else if ($userloggedin === 'guest') {
+ $this->setGuestUser();
+ } else {
+ $this->setUser(0);
+ }
+
+ // Mimic multiple langs installed. To trigger responses 'get_list_of_translations'.
+ // Note: The text/title of the nodes generated will be 'English(fr), English(de)' but we don't care about this.
+ // We are testing whether the nodes gets generated when the lang menu is available.
+ if ($withlang) {
+ mkdir("$CFG->dataroot/lang/de", 0777, true);
+ mkdir("$CFG->dataroot/lang/fr", 0777, true);
+ // Ensure the new langs are picked up and not taken from the cache.
+ $stringmanager = get_string_manager();
+ $stringmanager->reset_caches(true);
+ }
+
+ $primary = new primary($PAGE);
+ $renderer = $PAGE->get_renderer('core');
+ $data = array_filter($primary->export_for_template($renderer));
+
+ // Assert that the number of returned menu items equals the expected result.
+ $this->assertCount(count($expecteditems), $data);
+ // Assert that returned menu items match the expected items.
+ foreach ($data as $menutype => $value) {
+ $this->assertTrue(in_array($menutype, $expecteditems));
+ }
+ // When the user is logged in (excluding guest access), assert that lang menu is included as a part of the
+ // user menu when multiple languages are installed.
+ if (isloggedin() && !isguestuser()) {
+ // Look for a language menu item within the user menu items.
+ $usermenulang = array_filter($data['user']['items'], function($usermenuitem) {
+ return $usermenuitem->title === get_string('language');
+ });
+ if ($withlang) { // If multiple languages are installed.
+ // Assert that the language menu exists within the user menu.
+ $this->assertNotEmpty($usermenulang);
+ } else { // If the aren't any additional installed languages.
+ $this->assertEmpty($usermenulang);
+ }
+ } else { // Otherwise assert that the user menu does not contain any items.
+ $this->assertArrayNotHasKey('items', $data['user']);
+ }
+ }
+
+ /**
+ * Provider for the test_primary_export function.
+ *
+ * @return array
+ */
+ public function test_primary_export_provider(): array {
+ return [
+ "Export the menu data when: custom menu exists; multiple langs installed; user is not logged in." => [
+ true, true, '', ['moremenu', 'lang', 'user']
+ ],
+ "Export the menu data when: custom menu exists; langs not installed; user is not logged in." => [
+ true, false, '', ['moremenu', 'user']
+ ],
+ "Export the menu data when: custom menu exists; multiple langs installed; logged in as admin." => [
+ true, true, 'admin', ['moremenu', 'user']
+ ],
+ "Export the menu data when: custom menu exists; langs not installed; logged in as admin." => [
+ true, false, 'admin', ['moremenu', 'user']
+ ],
+ "Export the menu data when: custom menu exists; multiple langs installed; logged in as guest." => [
+ true, true, 'guest', ['moremenu', 'lang', 'user']
+ ],
+ "Export the menu data when: custom menu exists; langs not installed; logged in as guest." => [
+ true, false, 'guest', ['moremenu', 'user']
+ ],
+ "Export the menu data when: custom menu does not exist; multiple langs installed; logged in as guest." => [
+ false, true, 'guest', ['moremenu', 'lang', 'user']
+ ],
+ "Export the menu data when: custom menu does not exist; multiple langs installed; logged in as admin." => [
+ false, true, 'admin', ['moremenu', 'user']
+ ],
+ "Export the menu data when: custom menu does not exist; langs not installed; user is not logged in." => [
+ false, false, '', ['moremenu', 'user']
+ ],
+ ];
+ }
+
+ /**
+ * Test the get_lang_menu
+ *
+ * @dataProvider get_lang_menu_provider
+ * @param bool $withadditionallangs
+ * @param string $language
+ * @param array $expected
+ */
+ public function test_get_lang_menu(bool $withadditionallangs, string $language, array $expected) {
+ global $CFG, $PAGE;
+
+ // Mimic multiple langs installed. To trigger responses 'get_list_of_translations'.
+ // Note: The text/title of the nodes generated will be 'English(fr), English(de)' but we don't care about this.
+ // We are testing whether the nodes gets generated when the lang menu is available.
+ if ($withadditionallangs) {
+ mkdir("$CFG->dataroot/lang/de", 0777, true);
+ mkdir("$CFG->dataroot/lang/fr", 0777, true);
+ // Ensure the new langs are picked up and not taken from the cache.
+ $stringmanager = get_string_manager();
+ $stringmanager->reset_caches(true);
+ }
+
+ force_current_language($language);
+
+ $output = new primary($PAGE);
+ $method = new ReflectionMethod('core\navigation\output\primary', 'get_lang_menu');
+ $method->setAccessible(true);
+ $renderer = $PAGE->get_renderer('core');
+
+ $response = $method->invoke($output, $renderer);
+
+ if ($withadditionallangs) { // If there are multiple languages installed.
+ // Assert that the title of the language menu matches the expected one.
+ $this->assertEquals($expected['title'], $response['title']);
+ // Assert that the number of language menu items matches the number of the expected items.
+ $this->assertEquals(count($expected['items']), count($response['items']));
+ foreach ($expected['items'] as $expecteditem) {
+ // We need to manually generate the url key and its value in the expected item array as this cannot
+ // be done in the data provider due to the change of the state of $PAGE.
+ $expecteditem['url'] = $expecteditem['isactive'] ? new \moodle_url('#') :
+ new \moodle_url($PAGE->url, ['lang' => $expecteditem['lang']]);
+ // The lang value is only used to generate the url, so this key can be removed.
+ unset($expecteditem['lang']);
+
+ // Assert that the given expected item exists in the returned items.
+ $this->assertTrue(in_array($expecteditem, $response['items']));
+ }
+ } else { // No multiple languages.
+ $this->assertEquals($expected, $response);
+ }
+ }
+
+ /**
+ * Provider for test_get_lang_menu
+ *
+ * @return array
+ */
+ public function get_lang_menu_provider(): array {
+ return [
+ 'Lang menu with only the current language' => [
+ false, 'en', []
+ ],
+ 'Lang menu with only multiple languages installed' => [
+ true, 'en', [
+ 'title' => 'English (en)',
+ 'items' => [
+ [
+ 'title' => 'English (en)',
+ 'text' => 'English (en)',
+ 'link' => true,
+ 'isactive' => true,
+ 'lang' => 'en'
+ ],
+ [
+ 'title' => 'English (de)',
+ 'text' => 'English (de)',
+ 'link' => true,
+ 'isactive' => false,
+ 'lang' => 'de'
+ ],
+
+ [
+ 'title' => 'English (fr)',
+ 'text' => 'English (fr)',
+ 'link' => true,
+ 'isactive' => false,
+ 'lang' => 'fr'
+ ],
+ ],
+ ],
+ ],
+ 'Lang menu with only multiple languages installed and other than EN set active.' => [
+ true, 'de', [
+ 'title' => 'English (de)',
+ 'items' => [
+ [
+ 'title' => 'English (en)',
+ 'text' => 'English (en)',
+ 'link' => true,
+ 'isactive' => false,
+ 'lang' => 'en'
+ ],
+ [
+ 'title' => 'English (de)',
+ 'text' => 'English (de)',
+ 'link' => true,
+ 'isactive' => true,
+ 'lang' => 'de'
+ ],
+ [
+ 'title' => 'English (fr)',
+ 'text' => 'English (fr)',
+ 'link' => true,
+ 'isactive' => false,
+ 'lang' => 'fr'
+ ],
+ ],
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * Test the custom menu getter to confirm the nodes gets generated and are returned correctly.
+ *
+ * @dataProvider custom_menu_provider
+ * @param string $config
+ * @param array $expected
+ */
+ public function test_get_custom_menu(string $config, array $expected) {
+ global $CFG, $PAGE;
+ $CFG->custommenuitems = $config;
+ $output = new primary($PAGE);
+ $method = new ReflectionMethod('core\navigation\output\primary', 'get_custom_menu');
+ $method->setAccessible(true);
+ $renderer = $PAGE->get_renderer('core');
+ $this->assertEquals($expected, $method->invoke($output, $renderer));
+ }
+
+ /**
+ * Provider for test_get_custom_menu
+ *
+ * @return array
+ */
+ public function custom_menu_provider(): array {
+ return [
+ 'Simple custom menu' => [
+ "Course search|/course/search.php
+ Google|https://google.com.au/
+ Netflix|https://netflix.com/au", [
+ (object) [
+ 'text' => 'Course search',
+ 'url' => 'https://www.example.com/moodle/course/search.php',
+ 'title' => '',
+ 'sort' => 1,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ (object) [
+ 'text' => 'Google',
+ 'url' => 'https://google.com.au/',
+ 'title' => '',
+ 'sort' => 2,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ (object) [
+ 'text' => 'Netflix',
+ 'url' => 'https://netflix.com/au',
+ 'title' => '',
+ 'sort' => 3,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ ]
+ ],
+ 'Complex, nested custom menu' => [
+ "Moodle community|http://moodle.org
+ -Moodle free support|http://moodle.org/support
+ -Moodle development|http://moodle.org/development
+ --Moodle Tracker|http://tracker.moodle.org
+ --Moodle Docs|https://docs.moodle.org
+ -Moodle News|http://moodle.org/news
+ Moodle company
+ -Moodle commercial hosting|http://moodle.com/hosting
+ -Moodle commercial support|http://moodle.com/support", [
+ (object) [
+ 'text' => 'Moodle community',
+ 'url' => 'http://moodle.org',
+ 'title' => '',
+ 'sort' => 1,
+ 'children' => [
+ (object) [
+ 'text' => 'Moodle free support',
+ 'url' => 'http://moodle.org/support',
+ 'title' => '',
+ 'sort' => 2,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ (object) [
+ 'text' => 'Moodle development',
+ 'url' => 'http://moodle.org/development',
+ 'title' => '',
+ 'sort' => 3,
+ 'children' => [
+ (object) [
+ 'text' => 'Moodle Tracker',
+ 'url' => 'http://tracker.moodle.org',
+ 'title' => '',
+ 'sort' => 4,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ (object) [
+ 'text' => 'Moodle Docs',
+ 'url' => 'https://docs.moodle.org',
+ 'title' => '',
+ 'sort' => 5,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ ],
+ 'haschildren' => true,
+ ],
+ (object) [
+ 'text' => 'Moodle News',
+ 'url' => 'http://moodle.org/news',
+ 'title' => '',
+ 'sort' => 6,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ ],
+ 'haschildren' => true,
+ ],
+ (object) [
+ 'text' => 'Moodle company',
+ 'url' => null,
+ 'title' => '',
+ 'sort' => 7,
+ 'children' => [
+ (object) [
+ 'text' => 'Moodle commercial hosting',
+ 'url' => 'http://moodle.com/hosting',
+ 'title' => '',
+ 'sort' => 8,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ (object) [
+ 'text' => 'Moodle commercial support',
+ 'url' => 'http://moodle.com/support',
+ 'title' => '',
+ 'sort' => 9,
+ 'children' => [],
+ 'haschildren' => false,
+ ],
+ ],
+ 'haschildren' => true,
+ ],
+ ]
+ ]
+ ];
+ }
+}
diff --git a/lib/tests/navigation/views/primary_test.php b/lib/tests/navigation/views/primary_test.php
index 41f8e9efa9d..2da990d8afa 100644
--- a/lib/tests/navigation/views/primary_test.php
+++ b/lib/tests/navigation/views/primary_test.php
@@ -58,9 +58,9 @@ class primary_test extends \advanced_testcase {
*/
public function test_setting_initialise_provider() {
return [
- 'Testing as a guest user' => ['guest', ['home', 'courses']],
- 'Testing as an admin' => ['admin', ['home', 'myhome', 'courses', 'siteadminnode']],
- 'Testing as a regular user' => ['user', ['home', 'myhome', 'courses']]
+ 'Testing as a guest user' => ['guest', ['courses']],
+ 'Testing as an admin' => ['admin', ['myhome', 'courses', 'siteadminnode']],
+ 'Testing as a regular user' => ['user', ['myhome', 'courses']]
];
}
}
diff --git a/lib/tests/navigation/views/secondary_test.php b/lib/tests/navigation/views/secondary_test.php
index fa5ef8d85a8..fa511af14b5 100644
--- a/lib/tests/navigation/views/secondary_test.php
+++ b/lib/tests/navigation/views/secondary_test.php
@@ -106,7 +106,7 @@ class secondary_test extends \advanced_testcase {
$assign = $this->getDataGenerator()->create_module('assign', ['course' => $pagecourse->id]);
$cm = get_coursemodule_from_id('assign', $assign->cmid);
$contextrecord = \context_module::instance($cm->id);
- $pageurl = new \moodle_url('/mod/assign/view.php', ['id' => $cm->instance]);
+ $pageurl = new \moodle_url('/mod/assign/view.php', ['id' => $cm->id]);
$PAGE->set_cm($cm);
break;
case 'system':
@@ -135,7 +135,131 @@ class secondary_test extends \advanced_testcase {
return [
'Testing in a course context' => ['course', 'coursehome', 'courseheader', 'Course page'],
'Testing in a module context' => ['module', 'modulepage', 'activityheader', 'Activity'],
- 'Testing in a site admin' => ['system', 'siteadminnode', 'menu', 'Site administration'],
+ 'Testing in a site admin' => ['system', 'siteadminnode', 'homeheader', 'Site administration'],
+ ];
+ }
+
+ /**
+ * Test the force_nodes_into_more_menu method.
+ *
+ * @param array $secondarynavnodesdata The array which contains the data used to generate the secondary navigation
+ * @param array $defaultmoremenunodes The array containing the keys of the navigation nodes which should be added
+ * to the "more" menu by default
+ * @param array $expecedmoremenunodes The array containing the keys of the expected navigation nodes which are
+ * forced into the "more" menu
+ * @dataProvider test_force_nodes_into_more_menu_provider
+ */
+ public function test_force_nodes_into_more_menu(array $secondarynavnodesdata, array $defaultmoremenunodes,
+ array $expecedmoremenunodes) {
+ global $PAGE;
+
+ // Create a dummy secondary navigation.
+ $secondary = new secondary($PAGE);
+ foreach ($secondarynavnodesdata as $nodedata) {
+ $secondary->add($nodedata['text'], '#', secondary::TYPE_SETTING, null, $nodedata['key']);
+ }
+
+ $method = new ReflectionMethod('core\navigation\views\secondary', 'force_nodes_into_more_menu');
+ $method->setAccessible(true);
+ $method->invoke($secondary, $defaultmoremenunodes);
+
+ $actualmoremenunodes = [];
+ foreach ($secondary->children as $node) {
+ if ($node->forceintomoremenu) {
+ $actualmoremenunodes[] = $node->key;
+ }
+ }
+ // Assert that the actual nodes forced into the "more" menu matches the expected ones.
+ $this->assertEquals($expecedmoremenunodes, $actualmoremenunodes);
+ }
+
+ /**
+ * Data provider for the test_force_nodes_into_more_menu function.
+ *
+ * @return array
+ */
+ public function test_force_nodes_into_more_menu_provider(): array {
+ return [
+ 'The total number of navigation nodes exceeds the max display limit (5); ' .
+ 'navnode2 and navnode4 are forced into "more" menu by default.' =>
+ [
+ [
+ [ 'text' => 'Navigation node 1', 'key' => 'navnode1'],
+ [ 'text' => 'Navigation node 2', 'key' => 'navnode2'],
+ [ 'text' => 'Navigation node 3', 'key' => 'navnode3'],
+ [ 'text' => 'Navigation node 4', 'key' => 'navnode4'],
+ [ 'text' => 'Navigation node 5', 'key' => 'navnode5'],
+ [ 'text' => 'Navigation node 6', 'key' => 'navnode6'],
+ [ 'text' => 'Navigation node 7', 'key' => 'navnode7'],
+ [ 'text' => 'Navigation node 8', 'key' => 'navnode8'],
+ [ 'text' => 'Navigation node 9', 'key' => 'navnode9'],
+ ],
+ [
+ 'navnode2',
+ 'navnode4',
+ ],
+ [
+ 'navnode2',
+ 'navnode4',
+ 'navnode8',
+ 'navnode9',
+ ],
+ ],
+ 'The total number of navigation nodes does not exceed the max display limit (5); ' .
+ 'navnode2 and navnode4 are forced into "more" menu by default.' =>
+ [
+ [
+ [ 'text' => 'Navigation node 1', 'key' => 'navnode1'],
+ [ 'text' => 'Navigation node 2', 'key' => 'navnode2'],
+ [ 'text' => 'Navigation node 3', 'key' => 'navnode3'],
+ [ 'text' => 'Navigation node 4', 'key' => 'navnode4'],
+ [ 'text' => 'Navigation node 5', 'key' => 'navnode5'],
+ ],
+ [
+ 'navnode2',
+ 'navnode4',
+ ],
+ [
+ 'navnode2',
+ 'navnode4',
+ ],
+ ],
+ 'The total number of navigation nodes exceeds the max display limit (5); ' .
+ 'no forced navigation nodes into "more" menu by default.' =>
+ [
+ [
+ [ 'text' => 'Navigation node 1', 'key' => 'navnode1'],
+ [ 'text' => 'Navigation node 2', 'key' => 'navnode2'],
+ [ 'text' => 'Navigation node 3', 'key' => 'navnode3'],
+ [ 'text' => 'Navigation node 4', 'key' => 'navnode4'],
+ [ 'text' => 'Navigation node 5', 'key' => 'navnode5'],
+ [ 'text' => 'Navigation node 6', 'key' => 'navnode6'],
+ [ 'text' => 'Navigation node 7', 'key' => 'navnode7'],
+ [ 'text' => 'Navigation node 8', 'key' => 'navnode8'],
+ ],
+ [],
+ [
+ 'navnode6',
+ 'navnode7',
+ 'navnode8',
+ ],
+ ],
+ 'The total number of navigation nodes does not exceed the max display limit (5); ' .
+ 'no forced navigation nodes into "more" menu by default.' =>
+ [
+ [
+ [ 'text' => 'Navigation node 1', 'key' => 'navnode1'],
+ [ 'text' => 'Navigation node 2', 'key' => 'navnode2'],
+ [ 'text' => 'Navigation node 3', 'key' => 'navnode3'],
+ [ 'text' => 'Navigation node 4', 'key' => 'navnode4'],
+ [ 'text' => 'Navigation node 5', 'key' => 'navnode5'],
+ [ 'text' => 'Navigation node 6', 'key' => 'navnode6'],
+ ],
+ [],
+ [
+ 'navnode6',
+ ],
+ ],
];
}
}
diff --git a/lib/tests/navigationlib_test.php b/lib/tests/navigationlib_test.php
index 0848ee8effa..47dd2eabde6 100644
--- a/lib/tests/navigationlib_test.php
+++ b/lib/tests/navigationlib_test.php
@@ -545,6 +545,58 @@ class core_navigationlib_testcase extends advanced_testcase {
// Test it's empty again!
$this->assertEquals(0, count($navigationnodecollection->get_key_list()));
}
+
+ /**
+ * Test the set_force_into_more_menu method.
+ *
+ * @param bool $haschildren Whether the navigation node has children nodes
+ * @param bool $forceintomoremenu Whether to force the navigation node and its children into the "more" menu
+ * @dataProvider test_set_force_into_more_menu_provider
+ */
+ public function test_set_force_into_more_menu(bool $haschildren, bool $forceintomoremenu) {
+ // Create a navigation node.
+ $node = new navigation_node(['text' => 'Navigation node', 'key' => 'navnode']);
+
+ // If required, add some children nodes to the navigation node.
+ if ($haschildren) {
+ for ($i = 1; $i <= 3; $i++) {
+ $node->add("Child navigation node {$i}");
+ }
+ }
+
+ $node->set_force_into_more_menu($forceintomoremenu);
+ // Assert that the expected value has been assigned to the 'forceintomoremenu' property
+ // in the navigation node and its children.
+ $this->assertEquals($forceintomoremenu, $node->forceintomoremenu);
+ foreach ($node->children as $child) {
+ $this->assertEquals($forceintomoremenu, $child->forceintomoremenu);
+ }
+ }
+
+ /**
+ * Data provider for the test_set_force_into_more_menu function.
+ *
+ * @return array
+ */
+ public function test_set_force_into_more_menu_provider(): array {
+ return [
+ 'Navigation node without any children nodes; Force into "more" menu => true.' =>
+ [
+ false,
+ true,
+ ],
+ 'Navigation node with children nodes; Force into "more" menu => true.' =>
+ [
+ true,
+ true,
+ ],
+ 'Navigation node with children nodes; Force into "more" menu => false.' =>
+ [
+ true,
+ false,
+ ],
+ ];
+ }
}
diff --git a/mod/assign/classes/local/views/secondary.php b/mod/assign/classes/local/views/secondary.php
new file mode 100644
index 00000000000..d78577c9c7c
--- /dev/null
+++ b/mod/assign/classes/local/views/secondary.php
@@ -0,0 +1,44 @@
+.
+
+namespace mod_assign\local\views;
+
+use core\navigation\views\secondary as core_secondary;
+
+/**
+ * Class secondary_navigation_view.
+ *
+ * Custom implementation for a plugin.
+ *
+ * @package mod_assign
+ * @category navigation
+ * @copyright 2021 onwards Peter Dias
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class secondary extends core_secondary {
+ protected function get_default_module_mapping(): array {
+ return [
+ self::TYPE_SETTING => [
+ 'modedit' => 1,
+ "mod_{$this->page->activityname}_useroverrides" => 2, // Overrides are module specific.
+ "mod_{$this->page->activityname}_groupoverrides" => 3,
+ ],
+ self::TYPE_CUSTOM => [
+ 'advgrading' => 4,
+ ],
+ ];
+ }
+}
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index d35131f5091..05c71bcbe5a 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4564,18 +4564,19 @@ class assign {
$gradingoptionsform->set_data($gradingoptionsdata);
$actionformtext = $this->get_renderer()->render($gradingactions);
+
+ $currenturl = new moodle_url('/mod/assign/view.php', ['id' => $this->get_course_module()->id, 'action' => 'grading']);
+
$header = new assign_header($this->get_instance(),
$this->get_context(),
false,
$this->get_course_module()->id,
get_string('grading', 'assign'),
- $actionformtext);
+ $actionformtext,
+ '',
+ $currenturl);
$o .= $this->get_renderer()->render($header);
- $currenturl = $CFG->wwwroot .
- '/mod/assign/view.php?id=' .
- $this->get_course_module()->id .
- '&action=grading';
$o .= groups_print_activity_menu($this->get_course_module(), $currenturl, true);
diff --git a/mod/assign/renderable.php b/mod/assign/renderable.php
index 936be1649af..295fc3c93f0 100644
--- a/mod/assign/renderable.php
+++ b/mod/assign/renderable.php
@@ -671,6 +671,8 @@ class assign_header implements renderable {
public $preface = '';
/** @var string $postfix optional postfix (text to show after the intro) */
public $postfix = '';
+ /** @var moodle_url $subpageurl link for the subpage */
+ public $subpageurl = null;
/**
* Constructor
@@ -688,7 +690,8 @@ class assign_header implements renderable {
$coursemoduleid,
$subpage='',
$preface='',
- $postfix='') {
+ $postfix='',
+ moodle_url $subpageurl = null) {
$this->assign = $assign;
$this->context = $context;
$this->showintro = $showintro;
@@ -696,6 +699,7 @@ class assign_header implements renderable {
$this->subpage = $subpage;
$this->preface = $preface;
$this->postfix = $postfix;
+ $this->subpageurl = $subpageurl;
}
}
diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
index 19476ed5a6c..f32e978ff64 100644
--- a/mod/assign/renderer.php
+++ b/mod/assign/renderer.php
@@ -233,7 +233,7 @@ class mod_assign_renderer extends plugin_renderer_base {
$o = '';
if ($header->subpage) {
- $this->page->navbar->add($header->subpage);
+ $this->page->navbar->add($header->subpage, $header->subpageurl);
$args = ['contextname' => $header->context->get_context_name(false, true), 'subpage' => $header->subpage];
$title = get_string('subpagetitle', 'assign', $args);
} else {
diff --git a/mod/assign/version.php b/mod/assign/version.php
index 86058277cd8..08be89e031e 100644
--- a/mod/assign/version.php
+++ b/mod/assign/version.php
@@ -25,5 +25,5 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'mod_assign'; // Full name of the plugin (used for diagnostics).
-$plugin->version = 2021052502; // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2021052503; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2021052500; // Requires this Moodle version.
diff --git a/mod/book/tests/behat/reorganize_chapters.feature b/mod/book/tests/behat/reorganize_chapters.feature
index be0c0883248..4a4601b4921 100644
--- a/mod/book/tests/behat/reorganize_chapters.feature
+++ b/mod/book/tests/behat/reorganize_chapters.feature
@@ -51,7 +51,8 @@ Feature: In a book, chapters and subchapters can be rearranged
Scenario: Moving chapters down rearranges them properly
Given I click on "Move chapter down \"1. Originally first chapter\"" "link"
- When I follow "Test book"
+ When I am on "Course 1" course homepage
+ And I follow "Test book"
Then I should see "1. A great second chapter"
And I should see "#2 chapter content"
And I should see "1.1. Second chapter, subchapter 1"
@@ -61,7 +62,8 @@ Feature: In a book, chapters and subchapters can be rearranged
Scenario: Moving chapters up rearranges them properly
Given I click on "Move chapter up \"3. There aren't 2 without 3\"" "link"
- When I follow "Test book"
+ When I am on "Course 1" course homepage
+ And I follow "Test book"
Then I should see "1. Originally first chapter"
And I should see "#1 chapter content"
And I should see "2. There aren't 2 without 3"
@@ -71,30 +73,26 @@ Feature: In a book, chapters and subchapters can be rearranged
Scenario: Moving subchapters down within chapter rearranges them properly
Given I click on "Move chapter down \"2.1. Second chapter, subchapter 1\"" "link"
- When I follow "Test book"
- Then I should see "2.1. Second chapter, subchapter 2"
- And I should see "2.2. Second chapter, subchapter 1"
+ When I should see "2.1. Second chapter, subchapter 2"
+ Then I should see "2.2. Second chapter, subchapter 1"
Scenario: Moving subchapters down out of chapter rearranges them properly
Given I click on "Move chapter down \"2.2. Second chapter, subchapter 2\"" "link"
- When I follow "Test book"
- Then I should see "3.1. Second chapter, subchapter 2"
- And I click on "Move chapter down \"3. There aren't 2 without 3\"" "link"
+ When I should see "3.1. Second chapter, subchapter 2"
+ Then I click on "Move chapter down \"3. There aren't 2 without 3\"" "link"
And I should not see "4. There aren't 2 without 3"
And I should see "3. There aren't 2 without 3"
And I should see "3.1. Second chapter, subchapter 2"
Scenario: Moving subchapters up within chapter rearranges them properly
Given I click on "Move chapter up \"2.2. Second chapter, subchapter 2\"" "link"
- When I follow "Test book"
- Then I should see "2.1. Second chapter, subchapter 2"
- And I should see "2.2. Second chapter, subchapter 1"
+ When I should see "2.1. Second chapter, subchapter 2"
+ Then I should see "2.2. Second chapter, subchapter 1"
Scenario: Moving subchapters up out of chapter rearranges them properly
Given I click on "Move chapter up \"2.1. Second chapter, subchapter 1\"" "link"
- When I follow "Test book"
- Then I should see "1.1. Second chapter, subchapter 1"
- And I click on "Move chapter up \"1.1. Second chapter, subchapter 1\"" "link"
+ When I should see "1.1. Second chapter, subchapter 1"
+ Then I click on "Move chapter up \"1.1. Second chapter, subchapter 1\"" "link"
And I should not see "1.1. Second chapter, subchapter 1"
And I should see "1. Second chapter, subchapter 1"
And I should see "2. Originally first chapter"
diff --git a/mod/choice/tests/behat/behat_mod_choice.php b/mod/choice/tests/behat/behat_mod_choice.php
index 2ba915656b7..f002f87276f 100644
--- a/mod/choice/tests/behat/behat_mod_choice.php
+++ b/mod/choice/tests/behat/behat_mod_choice.php
@@ -46,7 +46,7 @@ class behat_mod_choice extends behat_base {
* @return array
*/
public function I_choose_option_from_activity($option, $choiceactivity) {
- $this->execute("behat_navigation::i_am_on_page_instance", [$this->escape($choiceactivity), 'choice activity']);
+ $this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($choiceactivity), 'choice activity']);
$this->execute('behat_forms::i_set_the_field_to', array( $this->escape($option), 1));
diff --git a/mod/feedback/tests/behat/templates.feature b/mod/feedback/tests/behat/templates.feature
index 93bc0af7efe..dfa0f6d4b84 100644
--- a/mod/feedback/tests/behat/templates.feature
+++ b/mod/feedback/tests/behat/templates.feature
@@ -57,7 +57,6 @@ Feature: Saving, using and deleting feedback templates
And I press "Use this template"
And I should see "this is a multiple choice 1"
And I press "Save changes"
- And I follow "Edit questions"
And I should see "this is a multiple choice 1"
# Make sure this template is not available in another course
And I am on the "Learning experience course 2" "feedback activity" page
@@ -85,7 +84,6 @@ Feature: Saving, using and deleting feedback templates
And I press "Use this template"
And I set the field "Append new items" to "1"
And I press "Save changes"
- And I follow "Edit questions"
Then "What is your favourite subject" "text" should appear before "this is a multiple choice 1" "text"
# Import template replacing items
And I follow "Templates"
@@ -93,6 +91,7 @@ Feature: Saving, using and deleting feedback templates
And I press "Use this template"
And I set the field "Delete old items" to "1"
And I press "Save changes"
+ And I am on the "Another feedback in course 1" "feedback activity" page
And I follow "Edit questions"
And I should not see "What is your favourite subject"
And I should see "this is a multiple choice 1"
@@ -110,7 +109,6 @@ Feature: Saving, using and deleting feedback templates
And I press "Use this template"
Then I should see "this is a multiple choice 1"
And I press "Save changes"
- And I follow "Edit questions"
And I should see "this is a multiple choice 1"
Scenario: Teacher can delete course templates but can not delete public templates
diff --git a/mod/forum/search.php b/mod/forum/search.php
index 8bd1bb3f7a3..f72e33b56ac 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -139,8 +139,10 @@ $strpage = get_string("page");
if (!$search || $showform) {
- $PAGE->navbar->add($strforums, new moodle_url('/mod/forum/index.php', array('id'=>$course->id)));
- $PAGE->navbar->add(get_string('advancedsearch', 'forum'));
+ $url = new moodle_url('/mod/forum/index.php', array('id' => $course->id));
+ $PAGE->navbar->add($strforums, $url);
+ $url = new moodle_url('/mod/forum/search.php', array('id' => $course->id));
+ $PAGE->navbar->add(get_string('advancedsearch', 'forum'), $url);
$PAGE->set_title($strsearch);
$PAGE->set_heading($course->fullname);
diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
index 55665799ae9..2e62c44df5a 100644
--- a/mod/forum/subscribers.php
+++ b/mod/forum/subscribers.php
@@ -97,7 +97,7 @@ if (data_submitted()) {
}
$strsubscribers = get_string("subscribers", "forum");
-$PAGE->navbar->add($strsubscribers);
+$PAGE->navbar->add($strsubscribers, $url);
$PAGE->set_title($strsubscribers);
$PAGE->set_heading($COURSE->fullname);
if (has_capability('mod/forum:managesubscriptions', $context) && \mod_forum\subscriptions::is_forcesubscribed($forum) === false) {
diff --git a/mod/forum/tests/behat/behat_mod_forum.php b/mod/forum/tests/behat/behat_mod_forum.php
index f6025b6ec62..f0244dea444 100644
--- a/mod/forum/tests/behat/behat_mod_forum.php
+++ b/mod/forum/tests/behat/behat_mod_forum.php
@@ -113,7 +113,7 @@ class behat_mod_forum extends behat_base {
*/
public function i_reply_post_from_forum_using_an_inpage_reply_with($postsubject, $forumname, TableNode $table) {
// Navigate to forum.
- $this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($forumname), 'forum activity']);
+ $this->execute("behat_navigation::go_to_breadcrumb_location", $this->escape($forumname));
$this->execute('behat_general::click_link', $this->escape($postsubject));
$this->execute('behat_general::click_link', get_string('reply', 'forum'));
@@ -132,7 +132,7 @@ class behat_mod_forum extends behat_base {
*/
public function i_navigate_to_post_in_forum($postsubject, $forumname) {
// Navigate to forum discussion.
- $this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($forumname), 'forum activity']);
+ $this->execute("behat_navigation::go_to_breadcrumb_location", $this->escape($forumname));
$this->execute('behat_general::click_link', $this->escape($postsubject));
}
@@ -493,7 +493,7 @@ class behat_mod_forum extends behat_base {
*/
protected function add_new_discussion_inline($forumname, TableNode $table, $buttonstr) {
// Navigate to forum.
- $this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($forumname), 'forum activity']);
+ $this->execute("behat_navigation::go_to_breadcrumb_location", $this->escape($forumname));
$this->execute('behat_general::click_link', $buttonstr);
$this->fill_new_discussion_form($table);
}
diff --git a/mod/forum/tests/behat/discussion_subscriptions.feature b/mod/forum/tests/behat/discussion_subscriptions.feature
index 8bf50661194..fc8e8ba3a67 100644
--- a/mod/forum/tests/behat/discussion_subscriptions.feature
+++ b/mod/forum/tests/behat/discussion_subscriptions.feature
@@ -341,7 +341,6 @@ Feature: A user can control their own subscription preferences for a discussion
And I follow "You are not subscribed to this discussion. Click to subscribe"
And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'"
And "Unsubscribe from this discussion" "checkbox" should exist in the "Test post subject one" "table_row"
- And I follow "Test forum name"
And I navigate to "Subscribe to this forum" in current page administration
And I should see "Student One will be notified of new posts in 'Test forum name'"
And "Unsubscribe from this forum" "link" should exist in current page administration
diff --git a/mod/forum/tests/behat/edit_post_teacher.feature b/mod/forum/tests/behat/edit_post_teacher.feature
index 4875a8d648c..6a9ec280d7e 100644
--- a/mod/forum/tests/behat/edit_post_teacher.feature
+++ b/mod/forum/tests/behat/edit_post_teacher.feature
@@ -57,6 +57,7 @@ Feature: Teachers can edit or delete any forum post
And I should see "Edited by Teacher 1 - original submission"
Scenario: A student can't edit or delete another user's posts
- When I follow "Teacher post subject"
+ When I follow "Test forum name"
+ And I follow "Teacher post subject"
Then I should not see "Edit" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' forumpost ')][contains(., 'Teacher post subject')]" "xpath_element"
And I should not see "Delete" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' forumpost ')][contains(., 'Teacher post subject')]" "xpath_element"
diff --git a/mod/forum/tests/behat/private_replies.feature b/mod/forum/tests/behat/private_replies.feature
index eb2d8eda5ab..364dc3d7fd6 100644
--- a/mod/forum/tests/behat/private_replies.feature
+++ b/mod/forum/tests/behat/private_replies.feature
@@ -36,7 +36,8 @@ Feature: Forum posts can be replied to in private
| Reply privately | 1 |
Scenario: As a teacher I can see my own response
- Given I follow "Answers to the homework"
+ Given I follow "Study discussions"
+ And I follow "Answers to the homework"
Then I should see "How about you and I have a meeting after class about plagiarism?"
Scenario: As a fellow teacher I can see the other teacher's response
diff --git a/mod/glossary/tests/behat/behat_mod_glossary.php b/mod/glossary/tests/behat/behat_mod_glossary.php
index bf84100a699..9ff7c2afb12 100644
--- a/mod/glossary/tests/behat/behat_mod_glossary.php
+++ b/mod/glossary/tests/behat/behat_mod_glossary.php
@@ -61,7 +61,7 @@ class behat_mod_glossary extends behat_base {
*/
public function i_add_a_glossary_entries_category_named($categoryname) {
- $this->execute("behat_general::click_link", get_string('categoryview', 'mod_glossary'));
+ $this->execute("behat_navigation::go_to_breadcrumb_location", get_string('categoryview', 'mod_glossary'));
$this->execute("behat_forms::press_button", get_string('editcategories', 'mod_glossary'));
diff --git a/mod/glossary/tests/behat/entries_require_approval.feature b/mod/glossary/tests/behat/entries_require_approval.feature
index cc04cb760a2..f45b3a7e45a 100644
--- a/mod/glossary/tests/behat/entries_require_approval.feature
+++ b/mod/glossary/tests/behat/entries_require_approval.feature
@@ -43,7 +43,7 @@ Feature: A teacher can choose whether glossary entries require approval
And I follow "Waiting approval"
Then I should see "(this entry is currently hidden)"
And I follow "Approve"
- And I click on "Test glossary name" "link" in the "page-header" "region"
+ And I am on the "Test glossary name" "glossary activity" page
Then I should see "Concept definition"
And I log out
# Check that the entry can now be viewed by students.
diff --git a/mod/lesson/tests/behat/lesson_student_resume.feature b/mod/lesson/tests/behat/lesson_student_resume.feature
index e3d8c4185e0..8e207dfedcb 100644
--- a/mod/lesson/tests/behat/lesson_student_resume.feature
+++ b/mod/lesson/tests/behat/lesson_student_resume.feature
@@ -89,6 +89,7 @@ Feature: In a lesson activity a student should
And I should see "Second page contents"
And I press "Next page"
And I should see "Third page contents"
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
And I should see "You have seen more than one page of this lesson already."
And I should see "Do you want to start at the last page you saw?"
@@ -98,6 +99,7 @@ Feature: In a lesson activity a student should
And I wait "1" seconds
And I press "Next page"
And I should see "Paper is made from trees."
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
And I should see "You have seen more than one page of this lesson already."
And I should see "Do you want to start at the last page you saw?"
@@ -108,6 +110,7 @@ Feature: In a lesson activity a student should
And I press "Submit"
And I press "Continue"
And I should see "Kermit is a frog"
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
And I should see "You have seen more than one page of this lesson already."
And I should see "Do you want to start at the last page you saw?"
@@ -165,6 +168,7 @@ Feature: In a lesson activity a student should
And I wait "1" seconds
And I press "Next page"
And I should see "Third page contents"
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
Then I should see "You have seen more than one page of this lesson already."
And I should see "Do you want to start at the last page you saw?"
@@ -286,6 +290,7 @@ Feature: In a lesson activity a student should
And I press "Submit"
And I press "Continue"
And I should see "2+2=4"
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
And I should see "You have seen more than one page of this lesson already."
Then I should see "Do you want to start at the last page you saw?"
@@ -298,6 +303,7 @@ Feature: In a lesson activity a student should
And I press "Submit"
And I press "Continue"
And I should see "Second content page"
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
And I should see "You have seen more than one page of this lesson already."
And I should see "Do you want to start at the last page you saw?"
@@ -399,6 +405,7 @@ Feature: In a lesson activity a student should
And I press "Submit"
And I press "Continue"
And I should see "2+2=4"
+ And I am on "Course 1" course homepage
And I follow "Test lesson name"
Then I should see "You have seen more than one page of this lesson already."
And I should see "Do you want to start at the last page you saw?"
diff --git a/mod/lti/tests/behat/backup_restore.feature b/mod/lti/tests/behat/backup_restore.feature
index 7ae20306771..9da97b66c9d 100644
--- a/mod/lti/tests/behat/backup_restore.feature
+++ b/mod/lti/tests/behat/backup_restore.feature
@@ -27,13 +27,12 @@ Feature: Restoring Moodle 2 backup restores LTI configuration
And I navigate to "Plugins > Activity modules > External tool > Manage tools" in site administration
And "This tool has not yet been used" "text" should exist in the "//div[contains(@id,'tool-card-container') and contains(., 'My site tool')]" "xpath_element"
And I am on site homepage
- And I follow "Course 1"
+ And I am on "Course 1" course homepage
And I turn editing mode on
And I add a "External tool" to section "1" and I fill the form with:
| Activity name | My LTI module |
| Preconfigured tool | My site tool |
| Launch container | Embed |
- And I follow "Course 1"
And I should see "My LTI module"
And I backup "Course 1" course using this options:
| Confirmation | Filename | test_backup.mbz |
diff --git a/mod/quiz/tests/behat/quiz_activity_completion.feature b/mod/quiz/tests/behat/quiz_activity_completion.feature
index 6879206e7af..2f6c097b826 100644
--- a/mod/quiz/tests/behat/quiz_activity_completion.feature
+++ b/mod/quiz/tests/behat/quiz_activity_completion.feature
@@ -54,6 +54,7 @@ Feature: View activity completion in the quiz activity
And user "student1" has attempted "Test quiz name" with responses:
| slot | response |
| 1 | False |
+ And I am on "Course 1" course homepage
And I follow "Test quiz name"
And the "View" completion condition of "Test quiz name" is displayed as "done"
And the "Make attempts: 1" completion condition of "Test quiz name" is displayed as "done"
diff --git a/mod/workshop/allocation.php b/mod/workshop/allocation.php
index 5901bcff703..ebc5abaff02 100644
--- a/mod/workshop/allocation.php
+++ b/mod/workshop/allocation.php
@@ -46,7 +46,7 @@ require_capability('mod/workshop:allocate', $context);
$PAGE->set_title($workshop->name);
$PAGE->set_heading($course->fullname);
-$PAGE->navbar->add(get_string('allocation', 'workshop'));
+$PAGE->navbar->add(get_string('allocation', 'workshop'), $workshop->allocation_url($method));
$allocator = $workshop->allocator_instance($method);
$initresult = $allocator->init();
diff --git a/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php b/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php
index 4ad7fd94bf1..bc33974f6b4 100644
--- a/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php
+++ b/mod/workshop/allocation/manual/tests/behat/behat_workshopallocation_manual.php
@@ -87,7 +87,7 @@ class behat_workshopallocation_manual extends behat_base {
* @param TableNode $table should have one column with title 'Reviewer' and another with title 'Participant' (or 'Reviewee')
*/
public function i_allocate_submissions_in_workshop_as($workshopname, TableNode $table) {
- $this->execute("behat_general::i_click_on_in_the", [$this->escape($workshopname), 'link', 'page', 'region']);
+ $this->execute("behat_navigation::go_to_breadcrumb_location", $workshopname);
$this->execute('behat_navigation::i_navigate_to_in_current_page_administration', get_string('allocate', 'workshop'));
$rows = $table->getRows();
$reviewer = $participant = null;
diff --git a/mod/workshop/tests/behat/behat_mod_workshop.php b/mod/workshop/tests/behat/behat_mod_workshop.php
index 734bb8c49f3..ca2f6e4f88f 100644
--- a/mod/workshop/tests/behat/behat_mod_workshop.php
+++ b/mod/workshop/tests/behat/behat_mod_workshop.php
@@ -52,7 +52,7 @@ class behat_mod_workshop extends behat_base {
$xpath = "//*[@class='userplan']/descendant::div[./span[contains(.,$phaseliteral)]]";
$continue = $this->escape(get_string('continue'));
- $this->execute("behat_general::i_click_on_in_the", [$this->escape($workshopname), 'link', 'page', 'region']);
+ $this->execute("behat_navigation::go_to_breadcrumb_location", $workshopname);
$this->execute('behat_general::i_click_on_in_the',
array('a.action-icon', "css_element", $this->escape($xpath), "xpath_element")
@@ -73,7 +73,7 @@ class behat_mod_workshop extends behat_base {
$savechanges = $this->escape(get_string('savechanges'));
$xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' ownsubmission ')]/descendant::*[@type='submit']";
- $this->execute("behat_navigation::i_am_on_page_instance", [$this->escape($workshopname), 'workshop activity']);
+ $this->execute("behat_navigation::i_am_on_page_instance", [$workshopname, 'workshop activity']);
$this->execute("behat_general::i_click_on", array($xpath, "xpath_element"));
@@ -116,7 +116,7 @@ class behat_mod_workshop extends behat_base {
$assess = $this->escape(get_string('assess', 'workshop'));
$saveandclose = $this->escape(get_string('saveandclose', 'workshop'));
- $this->execute("behat_navigation::i_am_on_page_instance", [$workshopname, 'workshop activity']);
+ $this->execute("behat_navigation::go_to_breadcrumb_location", $workshopname);
$this->execute('behat_general::i_click_on_in_the',
array($assess, "button", $xpath, "xpath_element")
diff --git a/pix/i/arrow-left.svg b/pix/i/arrow-left.svg
new file mode 100644
index 00000000000..a5058fc73d3
--- /dev/null
+++ b/pix/i/arrow-left.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pix/i/arrow-right.svg b/pix/i/arrow-right.svg
new file mode 100644
index 00000000000..939b57c5b54
--- /dev/null
+++ b/pix/i/arrow-right.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/report/outline/tests/behat/user.feature b/report/outline/tests/behat/user.feature
index 41de4ce28a1..dbeac31bf9f 100644
--- a/report/outline/tests/behat/user.feature
+++ b/report/outline/tests/behat/user.feature
@@ -35,14 +35,14 @@ Feature: View the user page for the outline report
And I am on "Course 1" course homepage
# We want to view this multiple times, to make sure the count is working.
And I follow "Folder name"
- And I follow "Folder name"
- And I follow "Folder name"
- And I follow "Folder name"
- And I am on "Course 1" course homepage
+ And I reload the page
+ And I reload the page
+ And I reload the page
# We want to view this multiple times, to make sure the count is working.
+ And I am on "Course 1" course homepage
And I follow "URL name"
- And I follow "URL name"
- And I follow "URL name"
+ And I reload the page
+ And I reload the page
And I follow "Profile" in the user menu
And I click on "Course 1" "link" in the "region-main" "region"
When I follow "Outline report"
@@ -63,14 +63,14 @@ Feature: View the user page for the outline report
And I am on "Course 1" course homepage
# We want to view this multiple times, to make sure the count is working.
And I follow "Folder name"
- And I follow "Folder name"
- And I follow "Folder name"
- And I follow "Folder name"
+ And I reload the page
+ And I reload the page
+ And I reload the page
And I am on "Course 1" course homepage
# We want to view this multiple times, to make sure the count is working.
And I follow "URL name"
- And I follow "URL name"
- And I follow "URL name"
+ And I reload the page
+ And I reload the page
And I follow "Profile" in the user menu
And I click on "Course 1" "link" in the "region-main" "region"
When I follow "Outline report"
@@ -93,14 +93,14 @@ Feature: View the user page for the outline report
And I am on "Course 1" course homepage
# We want to view this multiple times, to make sure the count is working.
And I follow "Folder name"
- And I follow "Folder name"
- And I follow "Folder name"
- And I follow "Folder name"
+ And I reload the page
+ And I reload the page
+ And I reload the page
And I am on "Course 1" course homepage
# We want to view this multiple times, to make sure the count is working.
And I follow "URL name"
- And I follow "URL name"
- And I follow "URL name"
+ And I reload the page
+ And I reload the page
And I follow "Profile" in the user menu
And I click on "Course 1" "link" in the "region-main" "region"
When I follow "Outline report"
diff --git a/tag/index.php b/tag/index.php
index b0373168bd6..a5857b19b00 100644
--- a/tag/index.php
+++ b/tag/index.php
@@ -78,7 +78,8 @@ if ($ctx && ($context = context::instance_by_id($ctx, IGNORE_MISSING)) && $conte
$tagcollid = $tag->tagcollid;
-$PAGE->set_url($tag->get_view_url($exclusivemode, $fromctx, $ctx, $rec));
+$pageurl = $tag->get_view_url($exclusivemode, $fromctx, $ctx, $rec);
+$PAGE->set_url($pageurl);
$PAGE->set_subpage($tag->id);
$tagnode = $PAGE->navigation->find('tags', null);
$tagnode->make_active();
@@ -97,7 +98,7 @@ if ($PAGE->user_allowed_editing()) {
$buttons .= $OUTPUT->edit_button(clone($PAGE->url));
}
-$PAGE->navbar->add($tagname);
+$PAGE->navbar->add($tagname, $pageurl);
$PAGE->set_title(get_string('tag', 'tag') .' - '. $tag->get_display_name());
$PAGE->set_heading($COURSE->fullname);
$PAGE->set_button($buttons);
diff --git a/tag/tests/behat/collections.feature b/tag/tests/behat/collections.feature
index 50bdd8bf9cb..a1deb030b3e 100644
--- a/tag/tests/behat/collections.feature
+++ b/tag/tests/behat/collections.feature
@@ -86,7 +86,7 @@ Feature: Managers can create and manage tag collections
And I should see "Tag3"
And I should not see "Tag1"
And I should not see "Tag2"
- And I follow "Manage tags"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
# Tag "Swimming" was not standard and was moved completely.
And I should not see "Swimming"
diff --git a/tag/tests/behat/delete_tag.feature b/tag/tests/behat/delete_tag.feature
index 18eb048f16a..b29b1469ac8 100644
--- a/tag/tests/behat/delete_tag.feature
+++ b/tag/tests/behat/delete_tag.feature
@@ -61,6 +61,7 @@ Feature: Manager is able to delete tags
And I press "Yes"
And I should see "Tag(s) deleted"
And I should not see "Dog"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And I should not see "Dog"
And I follow "Cat"
@@ -94,6 +95,7 @@ Feature: Manager is able to delete tags
And I should see "Tag(s) deleted"
And I should not see "Dog"
And I should not see "Neverusedtag"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And I should not see "Dog"
And I should not see "Neverusedtag"
diff --git a/tag/tests/behat/edit_tag.feature b/tag/tests/behat/edit_tag.feature
index c3bc35e51ec..21fd143a93e 100644
--- a/tag/tests/behat/edit_tag.feature
+++ b/tag/tests/behat/edit_tag.feature
@@ -123,7 +123,6 @@ Feature: Users can edit tags to add description or rename
| Related tags | Dog, Turtle,Fish |
| Standard | 0 |
And I press "Update"
- Then "Default collection" "link" should exist in the ".breadcrumb" "css_element"
And I follow "Kitten"
And "Description of tag 1" "text" should exist in the ".tag-description" "css_element"
And I should see "Related tags:" in the ".tag_list" "css_element"
@@ -143,12 +142,10 @@ Feature: Users can edit tags to add description or rename
And I set the following fields to these values:
| Tag name | Kitten |
And I press "Update"
- Then "Default collection" "text" should exist in the ".breadcrumb" "css_element"
And I click on "Edit this tag" "link" in the "Kitten" "table_row"
And I set the following fields to these values:
| Tag name | KITTEN |
And I press "Update"
- And "Default collection" "text" should exist in the ".breadcrumb" "css_element"
And I should see "KITTEN"
And I should not see "Kitten"
@@ -161,6 +158,7 @@ Feature: Users can edit tags to add description or rename
And I set the field "Edit tag name" in the "Cat" "table_row" to "Kitten"
Then I should not see "Cat"
And "New name for tag" "field" should not exist
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And I should see "Kitten"
And I should not see "Cat"
@@ -172,6 +170,7 @@ Feature: Users can edit tags to add description or rename
And I should see "Turtle"
And I should see "Dog"
And I should not see "DOG"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And I should see "Turtle"
And I should see "Dog"
@@ -183,6 +182,7 @@ Feature: Users can edit tags to add description or rename
And "New name for tag" "field" should not exist
And I should see "Turtle"
And I should not see "Penguin"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And I should see "Turtle"
And I should not see "Penguin"
diff --git a/tag/tests/behat/flag_tags.feature b/tag/tests/behat/flag_tags.feature
index 7eda63891eb..b9fade17cf9 100644
--- a/tag/tests/behat/flag_tags.feature
+++ b/tag/tests/behat/flag_tags.feature
@@ -78,6 +78,7 @@ Feature: Users can flag tags and manager can reset flags
And "(1)" "text" should exist in the "//tr[contains(.,'Nicetag')]//td[contains(@class,'col-flag')]" "xpath_element"
And "(" "text" should not exist in the "//tr[contains(.,'Badtag')]//td[contains(@class,'col-flag')]" "xpath_element"
And "(" "text" should not exist in the "//tr[contains(.,'Neverusedtag')]//td[contains(@class,'col-flag')]" "xpath_element"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And "Nicetag" "link" should appear before "Sweartag" "link"
And "Sweartag" "link" should appear before "Badtag" "link"
diff --git a/tag/tests/behat/standard_tags.feature b/tag/tests/behat/standard_tags.feature
index ef06919ff1a..dbc7e98bb0f 100644
--- a/tag/tests/behat/standard_tags.feature
+++ b/tag/tests/behat/standard_tags.feature
@@ -63,6 +63,7 @@ Feature: Manager can add standard tags and change the tag type of existing tags
And "Remove from standard tags" "link" should exist in the "Tag1" "table_row"
And "Make standard" "link" should exist in the "Tag2" "table_row"
And "Make standard" "link" should exist in the "Tag3" "table_row"
+ And I navigate to "Appearance > Manage tags" in site administration
And I follow "Default collection"
And "Make standard" "link" should exist in the "Tag0" "table_row"
And "Remove from standard tags" "link" should exist in the "Tag1" "table_row"
diff --git a/theme/boost/classes/boostnavbar.php b/theme/boost/classes/boostnavbar.php
new file mode 100644
index 00000000000..30dc2f95262
--- /dev/null
+++ b/theme/boost/classes/boostnavbar.php
@@ -0,0 +1,180 @@
+.
+
+namespace theme_boost;
+
+/**
+ * Creates a navbar for boost that allows easy control of the navbar items.
+ *
+ * @package theme_boost
+ * @copyright 2021 Adrian Greeve
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class boostnavbar implements \renderable {
+
+ /** @var array The individual items of the navbar. */
+ protected $items = [];
+
+ /**
+ * Takes a navbar object and picks the necessary parts for display.
+ *
+ * @param \navbar $navbar The navigation bar.
+ */
+ public function __construct(\navbar $navbar) {
+ foreach ($navbar->get_items() as $item) {
+ $this->items[] = $item;
+ }
+ $this->prepare_nodes_for_boost();
+ }
+
+ /**
+ * Prepares the navigation nodes for use with boost.
+ */
+ protected function prepare_nodes_for_boost(): void {
+ // Don't display the navbar if we are in the site navigation.
+ if (!is_null($this->get_item('root'))) {
+ $this->clear_items();
+ return;
+ }
+
+ $this->remove('myhome'); // Dashboard.
+ $this->remove('home');
+
+ // Set the designated one path for courses.
+ $mycoursesnode = $this->get_item('mycourses');
+ if (!is_null($mycoursesnode)) {
+ // TODO: Once MDL-70801 lands point this to the new page.
+ $url = new \moodle_url('/course/');
+ $mycoursesnode->action = $url;
+ $mycoursesnode->text = get_string('courses');
+ }
+
+ $this->remove_no_link_items();
+
+ // Don't display the navbar if there is only one item. Apparently this is bad UX design.
+ if ($this->item_count() <= 1) {
+ $this->clear_items();
+ return;
+ }
+
+ // Make sure that the last item is not a link. Not sure if this is always a good idea.
+ $this->remove_last_item_action();
+ }
+
+ /**
+ * Get all the boostnavbaritem elements.
+ *
+ * @return boostnavbaritem[] Boost navbar items.
+ */
+ public function get_items(): array {
+ return $this->items;
+ }
+
+ /**
+ * Removes all navigation items out of this boost navbar
+ */
+ protected function clear_items(): void {
+ $this->items = [];
+ }
+
+ /**
+ * Retrieve a single navbar item.
+ *
+ * @param string|int $key The identifier of the navbar item to return.
+ * @return \breadcrumb_navigation_node|null The navbar item.
+ */
+ protected function get_item($key): ?\breadcrumb_navigation_node {
+ foreach ($this->items as $item) {
+ if ($key === $item->key) {
+ return $item;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Counts all of the navbar items.
+ *
+ * @return int How many navbar items there are.
+ */
+ protected function item_count(): int {
+ return count($this->items);
+ }
+
+ /**
+ * Remove a boostnavbaritem from the boost navbar.
+ *
+ * @param string|int $itemkey An identifier for the boostnavbaritem
+ */
+ protected function remove($itemkey): void {
+
+ $itemfound = false;
+ foreach ($this->items as $key => $item) {
+ if ($item->key === $itemkey) {
+ unset($this->items[$key]);
+ $itemfound = true;
+ break;
+ }
+ }
+ if (!$itemfound) {
+ return;
+ }
+
+ $itemcount = $this->item_count();
+ if ($itemcount <= 0) {
+ return;
+ }
+
+ $this->items = array_values($this->items);
+ // Set the last item to last item if it is not.
+ $lastitem = $this->items[$itemcount - 1];
+ if (!$lastitem->is_last()) {
+ $lastitem->set_last(true);
+ }
+ }
+
+ /**
+ * Removes the action from the last item of the boostnavbaritem.
+ */
+ protected function remove_last_item_action(): void {
+ $item = end($this->items);
+ $item->action = null;
+ reset($this->items);
+ }
+
+ /**
+ * Returns the second last navbar item. This is for use in the mobile view where we are showing just the second
+ * last item in the breadcrumb navbar.
+ *
+ * @return breakcrumb_navigation_node|null The second last navigation node.
+ */
+ public function get_penultimate_item(): ?\breadcrumb_navigation_node {
+ $number = $this->item_count() - 2;
+ return ($number >= 0) ? $this->items[$number] : null;
+ }
+
+ /**
+ * Remove items that are categories or have no actions associated with them.
+ */
+ protected function remove_no_link_items(): void {
+ foreach ($this->items as $key => $value) {
+ if (!$value->has_action() || $value->type == \navigation_node::TYPE_SECTION) {
+ unset($this->items[$key]);
+ }
+ }
+ $this->items = array_values($this->items);
+ }
+}
diff --git a/theme/boost/classes/output/context_header.php b/theme/boost/classes/output/context_header.php
new file mode 100644
index 00000000000..8e2a25ed6f5
--- /dev/null
+++ b/theme/boost/classes/output/context_header.php
@@ -0,0 +1,239 @@
+.
+
+namespace theme_boost\output;
+
+use moodle_url;
+use get_string;
+
+defined('MOODLE_INTERNAL') || die;
+
+/**
+ * The context header for the boost theme.
+ *
+ * @package theme_boost
+ * @copyright 2021 Adrian Greeve
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class context_header implements \renderable, \templatable {
+
+ /** \moodle_page This current page information. */
+ protected $page;
+
+ /** array Header data. */
+ protected $headerinfo;
+
+ /** int What level the header should be i.e. 1 = . */
+ protected $headinglevel;
+
+ /**
+ * Constructs a new instance.
+ *
+ * @param \moodle_page $page This current page information.
+ * @param array $headerinfo Header data.
+ * @param int $headinglevel What level the header should be i.e. 1 =
. */
+ protected $headinglevel;
+
+ /**
+ * Constructs a new instance.
+ *
+ * @param \moodle_page $page This current page information.
+ * @param array $headerinfo Header data.
+ * @param int $headinglevel What level the header should be i.e. 1 = .
+ */
+ public function __construct(\moodle_page $page, array $headerinfo = null, int $headinglevel = 1) {
+ $this->page = $page;
+ $this->headerinfo = $headerinfo;
+ $this->headinglevel = $headinglevel;
+ }
+
+ /**
+ * Adds an array element for a formatted image.
+ *
+ * @param array $buttons Buttons to format.
+ * @return array The formatted buttons.
+ */
+ protected function format_button_images(array $buttons): array {
+ foreach ($buttons as $key => $button) {
+ // If no image is provided then just use the title.
+ if (!isset($button['image'])) {
+ $buttons[$key]['formattedimage'] = $button['title'];
+ } else {
+ // Check to see if this is an internal Moodle icon.
+ $internalimage = $this->page->theme->resolve_image_location('t/' . $button['image'], 'moodle');
+ if ($internalimage) {
+ $buttons[$key]['formattedimage'] = 't/' . $button['image'];
+ } else {
+ // Treat as an external image.
+ $buttons[$key]['formattedimage'] = $button['image'];
+ }
+ }
+
+ if (isset($button['linkattributes']['class'])) {
+ $class = $button['linkattributes']['class'] . ' btn';
+ } else {
+ $class = 'btn';
+ }
+ // Add the bootstrap 'btn' class for formatting.
+ $buttons[$key]['linkattributes'] = array_merge($button['linkattributes'], ['class' => $class]);
+ $temp = '';
+ foreach ($buttons[$key]['linkattributes'] as $index => $value) {
+ $temp .= "{$index}=\"{$value}\" ";
+ }
+ $buttons[$key]['linkattributes'] = $temp;
+ }
+ return $buttons;
+ }
+
+ /**
+ * Gets the logo data.
+ *
+ * @param \renderer_base $output Renderer output data.
+ * @return array Data to display a logo.
+ */
+ protected function get_logo_data(\renderer_base $output): array {
+ global $SITE;
+ if (!$output->should_display_main_logo($this->headinglevel)) {
+ return [];
+ }
+
+ $sitename = format_string($SITE->fullname, true, ['context' => \context_course::instance(SITEID)]);
+ if (!isset($heading)) {
+ $heading = $output->heading($this->page->heading, $this->headinglevel, 'sr-only');
+ } else {
+ $heading = $output->heading($heading, $this->headinglevel, 'sr-only');
+ }
+
+ return [
+ 'heading' => $heading,
+ 'image' => [
+ 'src' => $output->get_logo_url(null, 150),
+ 'alt' => get_string('logoof', '', $sitename)
+ ]
+ ];
+ }
+
+ /**
+ * Organises all of the relevant data to display the context header.
+ *
+ * @param \renderer_base $output Renderer output data.
+ * @return array Data to display the context header.
+ */
+ public function export_for_template(\renderer_base $output): array {
+ global $DB, $USER, $CFG;
+
+ $page = $this->page;
+ $context = $page->context;
+ $heading = null;
+ $imagedata = null;
+ $userbuttons = null;
+
+ // Make sure to use the heading if it has been set.
+ if (isset($this->headerinfo['heading'])) {
+ $heading = $this->headerinfo['heading'];
+ } else {
+ $heading = $page->heading;
+ }
+
+ // The user context currently has images and buttons. Other contexts may follow.
+ if (isset($this->headerinfo['user']) || $context->contextlevel == CONTEXT_USER) {
+ if (isset($this->headerinfo['user'])) {
+ $user = $this->headerinfo['user'];
+ } else {
+ // Look up the user information if it is not supplied.
+ $user = $DB->get_record('user', ['id' => $context->instanceid]);
+ }
+
+ // If the user context is set, then use that for capability checks.
+ if (isset($this->headerinfo['usercontext'])) {
+ $context = $this->headerinfo['usercontext'];
+ }
+
+ // Only provide user information if the user is the current user, or a user which the current user can view.
+ // When checking user_can_view_profile(), either:
+ // If the page context is course, check the course context (from the page object) or;
+ // If page context is NOT course, then check across all courses.
+ $course = ($context->contextlevel == CONTEXT_COURSE) ? $page->course : null;
+
+ if (user_can_view_profile($user, $course)) {
+ // Use the user's full name if the heading isn't set.
+ if (empty($heading)) {
+ $heading = fullname($user);
+ }
+
+ $imagedata = $output->user_picture($user, ['size' => 100]);
+
+ // Check to see if we should be displaying a message button.
+ if (!empty($CFG->messaging) && has_capability('moodle/site:sendmessage', $context)) {
+ $userbuttons[] = [
+ 'buttontype' => 'message',
+ 'title' => get_string('message', 'message'),
+ 'url' => new moodle_url('/message/index.php', ['id' => $user->id]),
+ 'image' => 'message',
+ 'linkattributes' => \core_message\helper::messageuser_link_params($user->id),
+ 'page' => (isset($page))
+ ];
+ \core_message\helper::togglecontact_requirejs();
+
+ if ($USER->id != $user->id) {
+ $iscontact = \core_message\api::is_contact($USER->id, $user->id);
+ $contacttitle = $iscontact ? 'removefromyourcontacts' : 'addtoyourcontacts';
+ $contacturlaction = $iscontact ? 'removecontact' : 'addcontact';
+ $contactimage = $iscontact ? 'removecontact' : 'addcontact';
+ $userbuttons[] = [
+ 'buttontype' => 'togglecontact',
+ 'title' => get_string($contacttitle, 'message'),
+ 'url' => new moodle_url('/message/index.php', [
+ 'user1' => $USER->id,
+ 'user2' => $user->id,
+ $contacturlaction => $user->id,
+ 'sesskey' => sesskey()
+ ]),
+ 'image' => $contactimage,
+ 'linkattributes' => \core_message\helper::togglecontact_link_params($user, $iscontact),
+ 'page' => (isset($page))
+ ];
+ \core_message\helper::messageuser_requirejs();
+ }
+
+ $page->requires->string_for_js('changesmadereallygoaway', 'moodle');
+ $userbuttons = $this->format_button_images($userbuttons);
+ }
+ } else {
+ $heading = null;
+ }
+ }
+
+ $prefix = null;
+ if ($context->contextlevel == CONTEXT_MODULE) {
+ $heading = $page->cm->name;
+ $imagedata = $output->pix_icon('icon', '', $page->activityname);
+ $prefix = get_string('modulename', $page->activityname);
+ }
+
+ $logo = $this->get_logo_data($output);
+ if (empty($logo)) {
+ $logo = '';
+ $headingdisplay = $this->headinglevel + 1;
+ $headingdisplay = 'h' . $headingdisplay;
+ if (!isset($heading)) {
+ $heading = $output->heading($page->heading, $this->headinglevel, $headingdisplay);
+ } else {
+ $heading = $output->heading($heading, $this->headinglevel, $headingdisplay);
+ }
+ }
+
+ return [
+ 'logo' => $logo,
+ 'heading' => $heading,
+ 'imagedata' => $imagedata,
+ 'userbuttons' => $userbuttons,
+ 'prefix' => $prefix
+ ];
+ }
+}
diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php
index 05c2ef8c68e..e5ad7952896 100644
--- a/theme/boost/classes/output/core_renderer.php
+++ b/theme/boost/classes/output/core_renderer.php
@@ -17,6 +17,8 @@
namespace theme_boost\output;
use moodle_url;
+use html_writer;
+use get_string;
defined('MOODLE_INTERNAL') || die;
@@ -42,4 +44,204 @@ class core_renderer extends \core_renderer {
return $this->render_single_button($button);
}
+ /**
+ * Renders the "breadcrumb" for all pages in boost.
+ *
+ * @return string the HTML for the navbar.
+ */
+ public function navbar(): string {
+ $newnav = new \theme_boost\boostnavbar($this->page->navbar);
+ return $this->render_from_template('core/navbar', $newnav);
+ }
+
+ /**
+ * Renders the context header for the page.
+ *
+ * @param array $headerinfo Heading information.
+ * @param int $headinglevel What 'h' level to make the heading.
+ * @return string A rendered context header.
+ */
+ public function context_header($headerinfo = null, $headinglevel = 1): string {
+ global $DB, $USER, $CFG, $SITE;
+ require_once($CFG->dirroot . '/user/lib.php');
+ $context = $this->page->context;
+ $heading = null;
+ $imagedata = null;
+ $subheader = null;
+ $userbuttons = null;
+
+ // Make sure to use the heading if it has been set.
+ if (isset($headerinfo['heading'])) {
+ $heading = $headerinfo['heading'];
+ } else {
+ $heading = $this->page->heading;
+ }
+
+ // The user context currently has images and buttons. Other contexts may follow.
+ if (isset($headerinfo['user']) || $context->contextlevel == CONTEXT_USER) {
+ if (isset($headerinfo['user'])) {
+ $user = $headerinfo['user'];
+ } else {
+ // Look up the user information if it is not supplied.
+ $user = $DB->get_record('user', array('id' => $context->instanceid));
+ }
+
+ // If the user context is set, then use that for capability checks.
+ if (isset($headerinfo['usercontext'])) {
+ $context = $headerinfo['usercontext'];
+ }
+
+ // Only provide user information if the user is the current user, or a user which the current user can view.
+ // When checking user_can_view_profile(), either:
+ // If the page context is course, check the course context (from the page object) or;
+ // If page context is NOT course, then check across all courses.
+ $course = ($this->page->context->contextlevel == CONTEXT_COURSE) ? $this->page->course : null;
+
+ if (user_can_view_profile($user, $course)) {
+ // Use the user's full name if the heading isn't set.
+ if (empty($heading)) {
+ $heading = fullname($user);
+ }
+
+ $imagedata = $this->user_picture($user, array('size' => 100));
+
+ // Check to see if we should be displaying a message button.
+ if (!empty($CFG->messaging) && has_capability('moodle/site:sendmessage', $context)) {
+ $userbuttons = array(
+ 'messages' => array(
+ 'buttontype' => 'message',
+ 'title' => get_string('message', 'message'),
+ 'url' => new moodle_url('/message/index.php', array('id' => $user->id)),
+ 'image' => 'message',
+ 'linkattributes' => \core_message\helper::messageuser_link_params($user->id),
+ 'page' => $this->page
+ )
+ );
+
+ if ($USER->id != $user->id) {
+ $iscontact = \core_message\api::is_contact($USER->id, $user->id);
+ $contacttitle = $iscontact ? 'removefromyourcontacts' : 'addtoyourcontacts';
+ $contacturlaction = $iscontact ? 'removecontact' : 'addcontact';
+ $contactimage = $iscontact ? 'removecontact' : 'addcontact';
+ $userbuttons['togglecontact'] = array(
+ 'buttontype' => 'togglecontact',
+ 'title' => get_string($contacttitle, 'message'),
+ 'url' => new moodle_url('/message/index.php', array(
+ 'user1' => $USER->id,
+ 'user2' => $user->id,
+ $contacturlaction => $user->id,
+ 'sesskey' => sesskey())
+ ),
+ 'image' => $contactimage,
+ 'linkattributes' => \core_message\helper::togglecontact_link_params($user, $iscontact),
+ 'page' => $this->page
+ );
+ }
+
+ $this->page->requires->string_for_js('changesmadereallygoaway', 'moodle');
+ }
+ } else {
+ $heading = null;
+ }
+ }
+
+ $prefix = null;
+ if ($context->contextlevel == CONTEXT_MODULE) {
+ $heading = $this->page->cm->name;
+ $imagedata = $this->pix_icon('icon', '', $this->page->activityname);
+ $prefix = get_string('modulename', $this->page->activityname);
+ }
+
+ if ($this->should_display_main_logo($headinglevel)) {
+ $sitename = format_string($SITE->fullname, true, ['context' => \context_course::instance(SITEID)]);
+ // Logo.
+ $html = html_writer::div(
+ html_writer::empty_tag('img', [
+ 'src' => $this->get_logo_url(null, 150),
+ 'alt' => get_string('logoof', '', $sitename),
+ 'class' => 'img-fluid'
+ ]),
+ 'logo'
+ );
+ // Heading.
+ if (!isset($heading)) {
+ $html .= $this->heading($this->page->heading, $headinglevel, 'sr-only');
+ } else {
+ $html .= $this->heading($heading, $headinglevel, 'sr-only');
+ }
+ return $html;
+ }
+
+ $contextheader = new \context_header($heading, $headinglevel, $imagedata, $userbuttons, $prefix);
+ return $this->render_context_header($contextheader);
+ }
+
+ /**
+ * Renders the header bar.
+ *
+ * @param context_header $contextheader Header bar object.
+ * @return string HTML for the header bar.
+ */
+ protected function render_context_header(\context_header $contextheader) {
+
+ // Generate the heading first and before everything else as we might have to do an early return.
+ if (!isset($contextheader->heading)) {
+ $heading = $this->heading($this->page->heading, $contextheader->headinglevel, 'h2');
+ } else {
+ $heading = $this->heading($contextheader->heading, $contextheader->headinglevel, 'h2');
+ }
+
+ $showheader = empty($this->page->layout_options['nocontextheader']);
+ if (!$showheader) {
+ // Return the heading wrapped in an sr-only element so it is only visible to screen-readers.
+ return html_writer::div($heading, 'sr-only');
+ }
+
+ // All the html stuff goes here.
+ $html = html_writer::start_div('page-context-header');
+
+ // Image data.
+ if (isset($contextheader->imagedata)) {
+ // Header specific image.
+ $html .= html_writer::div($contextheader->imagedata, 'page-header-image icon-size-6');
+ }
+
+ // Headings.
+ if (isset($contextheader->prefix)) {
+ $prefix = html_writer::div($contextheader->prefix, 'text-muted text-uppercase');
+ $heading = $prefix . $heading;
+ }
+ $html .= html_writer::tag('div', $heading, array('class' => 'page-header-headings'));
+
+ // Buttons.
+ if (isset($contextheader->additionalbuttons)) {
+ $html .= html_writer::start_div('btn-group header-button-group');
+ foreach ($contextheader->additionalbuttons as $button) {
+ if (!isset($button->page)) {
+ // Include js for messaging.
+ if ($button['buttontype'] === 'togglecontact') {
+ \core_message\helper::togglecontact_requirejs();
+ }
+ if ($button['buttontype'] === 'message') {
+ \core_message\helper::messageuser_requirejs();
+ }
+ $image = $this->pix_icon($button['formattedimage'], $button['title'], 'moodle', array(
+ 'class' => 'iconsmall',
+ 'role' => 'presentation'
+ ));
+ $image .= html_writer::span($button['title'], 'header-button-title');
+ } else {
+ $image = html_writer::empty_tag('img', array(
+ 'src' => $button['formattedimage'],
+ 'role' => 'presentation'
+ ));
+ }
+ $html .= html_writer::link($button['url'], html_writer::tag('span', $image), $button['linkattributes']);
+ }
+ $html .= html_writer::end_div();
+ }
+ $html .= html_writer::end_div();
+
+ return $html;
+ }
}
diff --git a/theme/boost/layout/columns2.php b/theme/boost/layout/columns2.php
index 384158d94e5..9ffd403fe75 100644
--- a/theme/boost/layout/columns2.php
+++ b/theme/boost/layout/columns2.php
@@ -42,6 +42,20 @@ $hasblocks = strpos($blockshtml, 'data-block=') !== false;
$buildregionmainsettings = !$PAGE->include_region_main_settings_in_header_actions();
// If the settings menu will be included in the header then don't add it here.
$regionmainsettingsmenu = $buildregionmainsettings ? $OUTPUT->region_main_settings_menu() : false;
+
+$secondarynavigation = false;
+if (!defined('BEHAT_SITE_RUNNING')) {
+ $buildsecondarynavigation = $PAGE->has_secondary_navigation();
+ if ($buildsecondarynavigation) {
+ $moremenu = new \core\navigation\output\more_menu($PAGE->secondarynav, 'nav-tabs');
+ $secondarynavigation = $moremenu->export_for_template($OUTPUT);
+ }
+}
+
+$primary = new core\navigation\output\primary($PAGE);
+$renderer = $PAGE->get_renderer('core');
+$primarymenu = $primary->export_for_template($renderer);
+
$templatecontext = [
'sitename' => format_string($SITE->shortname, true, ['context' => context_course::instance(SITEID), "escape" => false]),
'output' => $OUTPUT,
@@ -50,11 +64,13 @@ $templatecontext = [
'bodyattributes' => $bodyattributes,
'navdraweropen' => $navdraweropen,
'regionmainsettingsmenu' => $regionmainsettingsmenu,
- 'hasregionmainsettingsmenu' => !empty($regionmainsettingsmenu)
+ 'hasregionmainsettingsmenu' => !empty($regionmainsettingsmenu),
+ 'primarymoremenu' => $primarymenu['moremenu'],
+ 'secondarymoremenu' => $secondarynavigation,
+ 'usermenu' => $primarymenu['user'],
+ 'langmenu' => $primarymenu['lang'],
];
-
$nav = $PAGE->flatnav;
$templatecontext['flatnavigation'] = $nav;
$templatecontext['firstcollectionlabel'] = $nav->get_collectionlabel();
echo $OUTPUT->render_from_template('theme_boost/columns2', $templatecontext);
-
diff --git a/theme/boost/layout/drawers.php b/theme/boost/layout/drawers.php
index e2d08c68ab9..64ba52ab045 100644
--- a/theme/boost/layout/drawers.php
+++ b/theme/boost/layout/drawers.php
@@ -69,6 +69,19 @@ $buildregionmainsettings = !$PAGE->include_region_main_settings_in_header_action
// If the settings menu will be included in the header then don't add it here.
$regionmainsettingsmenu = $buildregionmainsettings ? $OUTPUT->region_main_settings_menu() : false;
+$secondarynavigation = false;
+if (!defined('BEHAT_SITE_RUNNING')) {
+ $buildsecondarynavigation = $PAGE->has_secondary_navigation();
+ if ($buildsecondarynavigation) {
+ $moremenu = new \core\navigation\output\more_menu($PAGE->secondarynav, 'nav-tabs');
+ $secondarynavigation = $moremenu->export_for_template($OUTPUT);
+ }
+}
+
+$primary = new core\navigation\output\primary($PAGE);
+$renderer = $PAGE->get_renderer('core');
+$primarymenu = $primary->export_for_template($renderer);
+
$templatecontext = [
'sitename' => format_string($SITE->shortname, true, ['context' => context_course::instance(SITEID), "escape" => false]),
'output' => $OUTPUT,
@@ -80,7 +93,11 @@ $templatecontext = [
'blockdraweropen' => $blockdraweropen,
'regionmainsettingsmenu' => $regionmainsettingsmenu,
'courseindex' => $courseindex,
- 'hasregionmainsettingsmenu' => !empty($regionmainsettingsmenu)
+ 'hasregionmainsettingsmenu' => !empty($regionmainsettingsmenu),
+ 'primarymoremenu' => $primarymenu['moremenu'],
+ 'secondarymoremenu' => $secondarynavigation,
+ 'usermenu' => $primarymenu['user'],
+ 'langmenu' => $primarymenu['lang'],
];
$nav = $PAGE->flatnav;
diff --git a/theme/boost/scss/moodle.scss b/theme/boost/scss/moodle.scss
index 38a65025af4..641ddcf5eb4 100644
--- a/theme/boost/scss/moodle.scss
+++ b/theme/boost/scss/moodle.scss
@@ -45,3 +45,6 @@ $breadcrumb-divider-rtl: "◀" !default;
@import "moodle/navbar";
@import "moodle/reportbuilder";
@import "moodle/courseindex";
+@import "moodle/moremenu";
+@import "moodle/primarynavigation";
+@import "moodle/secondarynavigation";
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 1ba4486ee7e..fe42c6447ea 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -379,10 +379,12 @@ img.resize {
.action-menu .dropdown-toggle {
text-decoration: none;
+ display: inline-block;
}
.action-menu {
white-space: nowrap;
+ display: inline;
}
.block img.resize {
@@ -2076,7 +2078,8 @@ nav.navbar .logo img {
.page-header-image {
margin-right: 1em;
- margin-bottom: 1em;
+ margin-bottom: 0.5em;
+ margin-top: 0.7em;
& > a {
display: inline-block;
}
@@ -2706,7 +2709,7 @@ $picker-emojis-per-row: 7 !default;
}
}
}
- .nav-tabs,
+ .nav-tabs:not(.more-nav),
.nav-pills {
margin: 0;
border: 0;
diff --git a/theme/boost/scss/moodle/moremenu.scss b/theme/boost/scss/moodle/moremenu.scss
new file mode 100644
index 00000000000..a4aa8aaa2e0
--- /dev/null
+++ b/theme/boost/scss/moodle/moremenu.scss
@@ -0,0 +1,39 @@
+.moremenu {
+ opacity: 0;
+ height: $moremenu-height;
+ &.observed {
+ opacity: 1;
+ }
+ .nav-link {
+ height: $moremenu-height;
+ display: flex;
+ align-items: center;
+ }
+ .nav-tabs {
+ margin-left: 0;
+ }
+ // Styling for dropdown menus inside the MoreButton.
+ .dropdownmoremenu > .dropdown-menu {
+ & > .dropdown-item {
+ padding: 0;
+ }
+ .dropdown-menu {
+ position: static;
+ padding: 0;
+ border: 0;
+ &.show {
+ display: block;
+ }
+ .dropdown-item {
+ background-color: $gray-100;
+ @include hover-focus() {
+ color: $dropdown-link-hover-color;
+ @include gradient-bg($dropdown-link-active-bg);
+ }
+ }
+ .dropdown-divider {
+ display: none;
+ }
+ }
+ }
+}
diff --git a/theme/boost/scss/moodle/navbar.scss b/theme/boost/scss/moodle/navbar.scss
index 2d134fa42f6..712e2fa4043 100644
--- a/theme/boost/scss/moodle/navbar.scss
+++ b/theme/boost/scss/moodle/navbar.scss
@@ -33,6 +33,57 @@
.dropdown-toggle::after {
display: none;
}
+ .dropdown-menu {
+ min-width: 235px;
+ .carousel-navigation-link {
+ > * {
+ pointer-events: none;
+ }
+ }
+ .dropdown-item {
+ padding: .25rem 1.75rem .25rem .75rem;
+ &.carousel-navigation-link::after {
+ font-family: FontAwesome;
+ content: $fa-var-caret-right;
+ font-size: 1rem;
+ right: .75rem;
+ position: absolute;
+ }
+ }
+ .submenu {
+ .header {
+ padding: .25rem .75rem;
+ font-size: .975rem;
+ .icon {
+ font-size: 20px;
+ height: 20px;
+ width: 20px;
+ margin: 0;
+ }
+ }
+ .items {
+ .dropdown-item {
+ &[aria-current="true"]::before {
+ font-family: FontAwesome;
+ content: $fa-var-check;
+ font-size: 0.75rem;
+ padding-left: .25rem;
+ }
+ }
+ }
+ }
+ }
+ }
+ .langmenu {
+ .dropdown-menu {
+ .dropdown-item {
+ &[aria-current="true"]::before {
+ content: "\f00c";
+ font-size: 0.75rem;
+ padding-left: .25rem;
+ }
+ }
+ }
}
.moodle-actionmenu .menubar,
.action-menu-trigger .dropdown {
@@ -40,6 +91,33 @@
display: flex;
}
}
+.dir-rtl .navbar.fixed-top {
+ .usermenu {
+ .dropdown-menu {
+ .dropdown-item {
+ &.carousel-navigation-link::after {
+ content: $fa-var-caret-left;
+ }
+ }
+ .carousel {
+ .carousel-inner {
+ .carousel-item-prev.carousel-item-right,
+ .carousel-item-next.carousel-item-left {
+ transform: translateX(0);
+ }
+ .carousel-item-next,
+ .carousel-item-right.active {
+ transform: translateX(-100%);
+ }
+ .carousel-item-prev,
+ .carousel-item-left.active {
+ transform: translateX(100%);
+ }
+ }
+ }
+ }
+ }
+}
#page {
margin-top: $navbar-height;
}
diff --git a/theme/boost/scss/moodle/primarynavigation.scss b/theme/boost/scss/moodle/primarynavigation.scss
new file mode 100644
index 00000000000..e6f55f217a4
--- /dev/null
+++ b/theme/boost/scss/moodle/primarynavigation.scss
@@ -0,0 +1,8 @@
+.navbar.fixed-top {
+ .moremenu {
+ height: $navbar-height;
+ .nav-link {
+ height: $navbar-height;
+ }
+ }
+}
diff --git a/theme/boost/scss/moodle/secondarynavigation.scss b/theme/boost/scss/moodle/secondarynavigation.scss
new file mode 100644
index 00000000000..0fbf2165446
--- /dev/null
+++ b/theme/boost/scss/moodle/secondarynavigation.scss
@@ -0,0 +1,6 @@
+.secondarynavigation {
+ z-index: 1;
+ .moremenu {
+ margin-bottom: -1px;
+ }
+}
diff --git a/theme/boost/scss/moodle/variables.scss b/theme/boost/scss/moodle/variables.scss
index 70f1be5febf..3b322a2e4ef 100644
--- a/theme/boost/scss/moodle/variables.scss
+++ b/theme/boost/scss/moodle/variables.scss
@@ -27,3 +27,5 @@ $course-content-maxwidth: 800px;
$box-shadow-drawer-left: -0.25rem .25rem .8rem rgba($black, .025) !default;
$box-shadow-drawer-right: 0 .25rem .8rem rgba($black, .025) !default;
+
+$moremenu-height: 40px !default;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index c2f45a435fd..c1864e85ff6 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -9990,10 +9990,12 @@ img.resize {
width: 1em; }
.action-menu .dropdown-toggle {
- text-decoration: none; }
+ text-decoration: none;
+ display: inline-block; }
.action-menu {
- white-space: nowrap; }
+ white-space: nowrap;
+ display: inline; }
.block img.resize {
height: 0.9em;
@@ -11353,7 +11355,8 @@ nav.navbar .logo img {
position: relative; }
.page-context-header .page-header-image {
margin-right: 1em;
- margin-bottom: 1em; }
+ margin-bottom: 0.5em;
+ margin-top: 0.7em; }
.page-context-header .page-header-image > a {
display: inline-block; }
.page-context-header .page-header-headings,
@@ -11852,42 +11855,42 @@ input[disabled] {
border: 0; }
#page-header .card .card-body {
padding: 0; }
- .nav-tabs,
+ .nav-tabs:not(.more-nav),
.nav-pills {
margin: 0;
border: 0;
padding: 0.125rem;
background-color: #e9ecef; }
- .nav-tabs .nav-item,
+ .nav-tabs:not(.more-nav) .nav-item,
.nav-pills .nav-item {
flex: 1 1 auto;
text-align: center; }
- .nav-tabs .nav-link,
+ .nav-tabs:not(.more-nav) .nav-link,
.nav-pills .nav-link {
background: #fff;
border: 0;
margin: 0.125rem; }
- .nav-tabs .nav-link.active,
+ .nav-tabs:not(.more-nav) .nav-link.active,
.nav-pills .nav-link.active {
color: #6c757d;
border-color: #6c757d;
border-color: #6c757d; }
- .nav-tabs .nav-link.active:hover,
+ .nav-tabs:not(.more-nav) .nav-link.active:hover,
.nav-pills .nav-link.active:hover {
color: #fff;
background-color: #6c757d;
border-color: #6c757d; }
- .nav-tabs .nav-link.active:focus, .nav-tabs .nav-link.active.focus,
+ .nav-tabs:not(.more-nav) .nav-link.active:focus, .nav-tabs:not(.more-nav) .nav-link.active.focus,
.nav-pills .nav-link.active:focus,
.nav-pills .nav-link.active.focus {
box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); }
- .nav-tabs .nav-link.active.disabled, .nav-tabs .nav-link.active:disabled,
+ .nav-tabs:not(.more-nav) .nav-link.active.disabled, .nav-tabs:not(.more-nav) .nav-link.active:disabled,
.nav-pills .nav-link.active.disabled,
.nav-pills .nav-link.active:disabled {
color: #6c757d;
background-color: transparent; }
- .nav-tabs .nav-link.active:not(:disabled):not(.disabled):active, .nav-tabs .nav-link.active:not(:disabled):not(.disabled).active,
- .show > .nav-tabs .nav-link.active.dropdown-toggle,
+ .nav-tabs:not(.more-nav) .nav-link.active:not(:disabled):not(.disabled):active, .nav-tabs:not(.more-nav) .nav-link.active:not(:disabled):not(.disabled).active,
+ .show > .nav-tabs:not(.more-nav) .nav-link.active.dropdown-toggle,
.nav-pills .nav-link.active:not(:disabled):not(.disabled):active,
.nav-pills .nav-link.active:not(:disabled):not(.disabled).active,
.show >
@@ -11895,8 +11898,8 @@ input[disabled] {
color: #fff;
background-color: #6c757d;
border-color: #6c757d; }
- .nav-tabs .nav-link.active:not(:disabled):not(.disabled):active:focus, .nav-tabs .nav-link.active:not(:disabled):not(.disabled).active:focus,
- .show > .nav-tabs .nav-link.active.dropdown-toggle:focus,
+ .nav-tabs:not(.more-nav) .nav-link.active:not(:disabled):not(.disabled):active:focus, .nav-tabs:not(.more-nav) .nav-link.active:not(:disabled):not(.disabled).active:focus,
+ .show > .nav-tabs:not(.more-nav) .nav-link.active.dropdown-toggle:focus,
.nav-pills .nav-link.active:not(:disabled):not(.disabled):active:focus,
.nav-pills .nav-link.active:not(:disabled):not(.disabled).active:focus,
.show >
@@ -20005,11 +20008,55 @@ div.editor_atto_toolbar button .icon {
align-items: center; }
.navbar.fixed-top .usermenu .dropdown-toggle::after {
display: none; }
+ .navbar.fixed-top .usermenu .dropdown-menu {
+ min-width: 235px; }
+ .navbar.fixed-top .usermenu .dropdown-menu .carousel-navigation-link > * {
+ pointer-events: none; }
+ .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item {
+ padding: .25rem 1.75rem .25rem .75rem; }
+ .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after {
+ font-family: FontAwesome;
+ content: "";
+ font-size: 1rem;
+ right: .75rem;
+ position: absolute; }
+ .navbar.fixed-top .usermenu .dropdown-menu .submenu .header {
+ padding: .25rem .75rem;
+ font-size: .975rem; }
+ .navbar.fixed-top .usermenu .dropdown-menu .submenu .header .icon {
+ font-size: 20px;
+ height: 20px;
+ width: 20px;
+ margin: 0; }
+ .navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current="true"]::before {
+ font-family: FontAwesome;
+ content: "";
+ font-size: 0.75rem;
+ padding-left: .25rem; }
+ .navbar.fixed-top .langmenu .dropdown-menu .dropdown-item[aria-current="true"]::before {
+ content: "\f00c";
+ font-size: 0.75rem;
+ padding-left: .25rem; }
.navbar.fixed-top .moodle-actionmenu .menubar,
.navbar.fixed-top .action-menu-trigger .dropdown {
height: 100%;
display: flex; }
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after {
+ content: ""; }
+
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-prev.carousel-item-right,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-next.carousel-item-left {
+ transform: translateX(0); }
+
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-next,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-right.active {
+ transform: translateX(-100%); }
+
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-prev,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-left.active {
+ transform: translateX(100%); }
+
#page {
margin-top: 50px; }
@@ -20091,6 +20138,43 @@ div.editor_atto_toolbar button .icon {
height: 1rem;
margin: 0.5rem 0; }
+.moremenu {
+ opacity: 0;
+ height: 40px; }
+ .moremenu.observed {
+ opacity: 1; }
+ .moremenu .nav-link {
+ height: 40px;
+ display: flex;
+ align-items: center; }
+ .moremenu .nav-tabs {
+ margin-left: 0; }
+ .moremenu .dropdownmoremenu > .dropdown-menu > .dropdown-item {
+ padding: 0; }
+ .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu {
+ position: static;
+ padding: 0;
+ border: 0; }
+ .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu.show {
+ display: block; }
+ .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu .dropdown-item {
+ background-color: #f8f9fa; }
+ .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu .dropdown-item:hover, .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu .dropdown-item:focus {
+ color: #fff;
+ background-color: #0f6fc5; }
+ .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu .dropdown-divider {
+ display: none; }
+
+.navbar.fixed-top .moremenu {
+ height: 50px; }
+ .navbar.fixed-top .moremenu .nav-link {
+ height: 50px; }
+
+.secondarynavigation {
+ z-index: 1; }
+ .secondarynavigation .moremenu {
+ margin-bottom: -1px; }
+
body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; }
diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index c198024ea18..3db9a36ce4e 100644
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -62,7 +62,11 @@
{{{ output.full_header }}}
-
+
{{#hasregionmainsettingsmenu}}
diff --git a/theme/boost/templates/context_header.mustache b/theme/boost/templates/context_header.mustache
new file mode 100644
index 00000000000..748bb1c7338
--- /dev/null
+++ b/theme/boost/templates/context_header.mustache
@@ -0,0 +1,81 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see 
+
+ {{{heading}}}
+{{/logo}}
+{{^logo}}
+
+ {{#imagedata}}
+ {{{imagedata}}}
+ {{/imagedata}}
+
+ {{#prefix}}
+ {{prefix}}
+ {{/prefix}}
+
+ {{{heading}}}
+
+ {{#userbuttons}}
+
+ {{/userbuttons}}
+
+{{/logo}}
diff --git a/theme/boost/templates/drawers.mustache b/theme/boost/templates/drawers.mustache
index 63bad60ad06..fea71591a31 100644
--- a/theme/boost/templates/drawers.mustache
+++ b/theme/boost/templates/drawers.mustache
@@ -110,6 +110,11 @@
{{/hasblocks}}
{{{ output.full_header }}}
+
{{#hasregionmainsettingsmenu}}
diff --git a/theme/boost/templates/language_menu.mustache b/theme/boost/templates/language_menu.mustache
new file mode 100644
index 00000000000..305f8a85c63
--- /dev/null
+++ b/theme/boost/templates/language_menu.mustache
@@ -0,0 +1,63 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see "
And I press "Save changes"
- Then "" "text" should exist in the ".breadcrumb" "css_element"
+ And I log out
+ And I log in as "user1"
+ Then I should see "" is active in navigation
Examples:
| preference | breadcrumb |
diff --git a/user/tests/userlib_test.php b/user/tests/userlib_test.php
index aaca2547d21..68a383fb4a2 100644
--- a/user/tests/userlib_test.php
+++ b/user/tests/userlib_test.php
@@ -583,6 +583,7 @@ class core_userliblib_testcase extends advanced_testcase {
$PAGE->set_url('/');
$user = $this->getDataGenerator()->create_user();
+ $this->setUser($user);
$opts = user_get_user_navigation_info($user, $PAGE, array('avatarsize' => $testsize));
$avatarhtml = $opts->metadata['useravatar'];
diff --git a/version.php b/version.php
index 403b2c4aee5..ed80c32b00e 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2021082000.00; // YYYYMMDD = weekly release date of this DEV branch.
+$version = 2021082000.03; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.0dev (Build: 20210820)'; // Human-friendly version name
{{{ output.full_header }}}
-
+
{{#hasregionmainsettingsmenu}}
diff --git a/theme/boost/templates/context_header.mustache b/theme/boost/templates/context_header.mustache
new file mode 100644
index 00000000000..748bb1c7338
--- /dev/null
+++ b/theme/boost/templates/context_header.mustache
@@ -0,0 +1,81 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see
{{{ output.full_header }}}
+
+
+
+ {{{heading}}}
+{{/logo}}
+{{^logo}}
+
+ {{#imagedata}}
+
+{{/logo}}
diff --git a/theme/boost/templates/drawers.mustache b/theme/boost/templates/drawers.mustache
index 63bad60ad06..fea71591a31 100644
--- a/theme/boost/templates/drawers.mustache
+++ b/theme/boost/templates/drawers.mustache
@@ -110,6 +110,11 @@
{{/hasblocks}}
{{{imagedata}}}
+ {{/imagedata}}
+
+ {{#prefix}}
+
+ {{#userbuttons}}
+
+ {{/userbuttons}}
+ {{prefix}}
+ {{/prefix}}
+
+ {{{heading}}}
+
{{#hasregionmainsettingsmenu}}
diff --git a/theme/boost/templates/language_menu.mustache b/theme/boost/templates/language_menu.mustache
new file mode 100644
index 00000000000..305f8a85c63
--- /dev/null
+++ b/theme/boost/templates/language_menu.mustache
@@ -0,0 +1,63 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see "
And I press "Save changes"
- Then "" "text" should exist in the ".breadcrumb" "css_element"
+ And I log out
+ And I log in as "user1"
+ Then I should see "" is active in navigation
Examples:
| preference | breadcrumb |
diff --git a/user/tests/userlib_test.php b/user/tests/userlib_test.php
index aaca2547d21..68a383fb4a2 100644
--- a/user/tests/userlib_test.php
+++ b/user/tests/userlib_test.php
@@ -583,6 +583,7 @@ class core_userliblib_testcase extends advanced_testcase {
$PAGE->set_url('/');
$user = $this->getDataGenerator()->create_user();
+ $this->setUser($user);
$opts = user_get_user_navigation_info($user, $PAGE, array('avatarsize' => $testsize));
$avatarhtml = $opts->metadata['useravatar'];
diff --git a/version.php b/version.php
index 403b2c4aee5..ed80c32b00e 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2021082000.00; // YYYYMMDD = weekly release date of this DEV branch.
+$version = 2021082000.03; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.0dev (Build: 20210820)'; // Human-friendly version name