diff --git a/admin/tool/lp/tests/behat/plan_crud.feature b/admin/tool/lp/tests/behat/plan_crud.feature index 24c03893c2a..c5d579b9d2d 100644 --- a/admin/tool/lp/tests/behat/plan_crud.feature +++ b/admin/tool/lp/tests/behat/plan_crud.feature @@ -25,7 +25,7 @@ Feature: Manage plearning plan Given the following lp "templates" exist: | shortname | description | | Science template | science template description | - And I follow "Home" + And I am on homepage And I navigate to "Competencies > Learning plan templates" in site administration And I click on ".template-userplans" "css_element" in the "Science template" "table_row" And I open the autocomplete suggestions list @@ -50,7 +50,7 @@ Feature: Manage plearning plan | user | cohort | | student-plan1 | COHORTPLAN | | student-plan2 | COHORTPLAN | - And I follow "Home" + And I am on homepage And I navigate to "Competencies > Learning plan templates" in site administration And I click on ".template-cohorts" "css_element" in the "Science template cohort" "table_row" And I set the field "Select cohorts to sync" to "cohort plan" diff --git a/admin/tool/policy/styles.css b/admin/tool/policy/styles.css index da4ef21f959..f590e731eb1 100644 --- a/admin/tool/policy/styles.css +++ b/admin/tool/policy/styles.css @@ -9,6 +9,10 @@ display: none; z-index: 9999999; } +.eupopup-container .eupopup-body a { + color: #fff; + text-decoration: underline; +} .behat-site .eupopup-container-bottom { position: relative; diff --git a/calendar/tests/behat/minicalendar.feature b/calendar/tests/behat/minicalendar.feature index d71582d60d8..5b8784a6842 100644 --- a/calendar/tests/behat/minicalendar.feature +++ b/calendar/tests/behat/minicalendar.feature @@ -30,7 +30,7 @@ Feature: Open calendar popup When I reload the page Then I should see "Event 1:1" And I should see "Event 1:2" - And I follow "Home" + And I am on homepage And I should see "Event 1:1" And I should see "Event 1:2" @@ -58,5 +58,5 @@ Feature: Open calendar popup | Type of event | site | | Event title | Today's event | Then I should see "Today's event" - And I follow "Home" + And I am on homepage And I should see "Today's event" diff --git a/lang/en/moodle.php b/lang/en/moodle.php index f5af44be563..56205be2b7e 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -1623,6 +1623,7 @@ $string['potentialadmins'] = 'Potential admins'; $string['potentialcreators'] = 'Potential course creators'; $string['potentialstudents'] = 'Potential students'; $string['potentialteachers'] = 'Potential teachers'; +$string['poweredbymoodle'] = 'Powered by Moodle'; $string['preferences'] = 'Preferences'; $string['preferredlanguage'] = 'Preferred language'; $string['preferredtheme'] = 'Preferred theme'; diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php index 301414a4f16..76cb315c85b 100644 --- a/lib/classes/output/icon_system_fontawesome.php +++ b/lib/classes/output/icon_system_fontawesome.php @@ -53,6 +53,7 @@ class icon_system_fontawesome extends icon_system_font { public function get_core_icon_map() { return [ 'core:docs' => 'fa-info-circle', + 'core:book' => 'fa-book', 'core:help' => 'fa-question-circle text-info', 'core:req' => 'fa-exclamation-circle text-danger', 'core:a/add_file' => 'fa-file-o', diff --git a/lib/editor/tinymce/tests/behat/edit_available_icons.feature b/lib/editor/tinymce/tests/behat/edit_available_icons.feature index 5bcc3f6e41c..cc0e528e64a 100644 --- a/lib/editor/tinymce/tests/behat/edit_available_icons.feature +++ b/lib/editor/tinymce/tests/behat/edit_available_icons.feature @@ -13,7 +13,7 @@ Feature: Add or remove items from the TinyMCE editor toolbar And I follow "Editor preferences" And I set the field "Text editor" to "TinyMCE HTML editor" And I press "Save changes" - And I follow "Home" + And I am on homepage Scenario: Remove icons When the following config values are set as admin: diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 58463fa52af..000cbfbefd6 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -813,8 +813,7 @@ class core_renderer extends renderer_base { } /** - * The standard tags (typically performance information and validation links, - * if we are in developer debug mode) that should be output in the footer area + * content that should be output in the footer area * of the page. Designed to be called in theme layout.php files. * * @return string HTML fragment. @@ -844,10 +843,6 @@ class core_renderer extends renderer_base { ); } - // This function is normally called from a layout.php file in {@link core_renderer::header()} - // but some of the content won't be known until later, so we return a placeholder - // for now. This will be replaced with the real content in {@link core_renderer::footer()}. - $output .= $this->unique_performance_info_token; if ($this->page->devicetypeinuse == 'legacy') { // The legacy theme is in use print the notification $output .= html_writer::tag('div', get_string('legacythemeinuse'), array('class'=>'legacythemeinuse')); @@ -856,6 +851,23 @@ class core_renderer extends renderer_base { // Get links to switch device types (only shown for users not on a default device) $output .= $this->theme_switch_links(); + return $output; + } + + /** + * Performance information and validation links for debugging. + * + * @return string HTML fragment. + */ + public function debug_footer_html() { + global $CFG; + $output = ''; + + // This function is normally called from a layout.php file + // but some of the content won't be known until later, so we return a placeholder + // for now. This will be replaced with the real content in the footer. + $output .= $this->unique_performance_info_token; + if (!empty($CFG->debugpageinfo)) { $output .= '
' . get_string('pageinfodebugsummary', 'core_admin', $this->page->debug_summary()) . '
'; @@ -2194,7 +2206,7 @@ class core_renderer extends renderer_base { public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) { global $CFG; - $icon = $this->pix_icon('docs', '', 'moodle', array('class'=>'iconhelp icon-pre', 'role'=>'presentation')); + $icon = $this->pix_icon('book', '', 'moodle', array('class' => 'iconhelp icon-pre', 'role' => 'presentation')); $attributes['href'] = new moodle_url(get_docs_url($path)); if (!empty($CFG->doctonewwindow) || $forcepopup) { @@ -4857,6 +4869,17 @@ EOD; public function render_checkbox_toggleall(\core\output\checkbox_toggleall $element) { return $this->render_from_template($element->get_template(), $element->export_for_template($this)); } + + /** + * Renders release information in the footer popup + * @return string Moodle release info. + */ + public function moodle_release() { + global $CFG; + if (is_siteadmin()) { + return $CFG->release; + } + } } /** diff --git a/lib/pagelib.php b/lib/pagelib.php index 5b8e6a3e833..189ece5d763 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -74,7 +74,7 @@ use core\navigation\output\primary as primaryoutput; * course table. (Also available as $COURSE global.) If we are not inside * an actual course, this will be the site course. * @property-read string $devicetypeinuse The name of the device type in use - * @property-read string $docspath The path to the Moodle docs for this page. + * @property-read string $docspath The path to the Help and documentation. * @property-read string $focuscontrol The id of the HTML element to be focused when the page has loaded. * @property-read bool $headerprinted True if the page header has already been printed. * @property-read string $heading The main heading that should be displayed at the top of the . @@ -205,7 +205,7 @@ class moodle_page { protected $_subpage = ''; /** - * @var string Set a different path to use for the 'Moodle docs for this page' link. + * @var string Set a different path to use for the 'Help and documentation' link. * By default, it uses the path of the file for instance mod/quiz/attempt. */ protected $_docspath = null; @@ -629,7 +629,7 @@ class moodle_page { /** * Please do not call this method directly, use the ->docspath syntax. {@link moodle_page::__get()}. - * @return string the path to the Moodle docs for this page. + * @return string the path to the Help and documentation. */ protected function magic_get_docspath() { if (is_string($this->_docspath)) { @@ -1371,7 +1371,7 @@ class moodle_page { } /** - * Set a different path to use for the 'Moodle docs for this page' link. + * Set a different path to use for the 'Help and documentation' link. * * By default, it uses the pagetype, which is normally the same as the * script name. So, for example, for mod/quiz/attempt.php, pagetype is diff --git a/lib/templates/content/export/external_page.mustache b/lib/templates/content/export/external_page.mustache index 4f5f0f844a0..833065a1f9b 100644 --- a/lib/templates/content/export/external_page.mustache +++ b/lib/templates/content/export/external_page.mustache @@ -69,7 +69,7 @@ {{$pagecontent}}{{/pagecontent}} -