' +
+ $('
' +
'
![]()
' +
'
').insertAfter('#main-menu-right .main-menu-additions-item');
diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
index cf5d297..a6603c2 100644
--- a/classes/output/core_renderer.php
+++ b/classes/output/core_renderer.php
@@ -88,17 +88,6 @@ public static function is_examweb(): bool {
return self::$isexamweb;
}
- /**
- * core_renderer constructor.
- * Overrides parent to require admin tree init in $PAGE->settingsnav
- *
- * @param moodle_page $page the page we are doing output for.
- * @param string $target one of rendering target constants.
- */
- public function __construct(moodle_page $page, $target) {
- parent::__construct($page, $target);
- }
-
/**
* Renders logo heading.
* @return string HTML string.
@@ -214,18 +203,7 @@ public function navbar_plugin_output() {
* @throws \coding_exception
*/
public function edit_button(moodle_url $url, string $method = 'post'): string {
- $url->param('sesskey', sesskey());
- $class = '';
- if ($this->page->user_is_editing()) {
- $url->param('edit', 'off');
- $editstring = get_string('turneditingoff');
- $class = 'red-edit-button';
- } else {
- $url->param('edit', 'on');
- $editstring = get_string('turneditingon');
- }
-
- return $this->single_button($url, $editstring, $method, ['class' => 'singlebutton ' . $class]);
+ return $this->edit_switch();
}
/**
@@ -966,7 +944,7 @@ private function get_user_settings_submenu($context) {
if (has_capability('moodle/user:changeownpassword', $context)) {
$menu[] = [
'name' => get_string('changepassword'),
- 'icon' => (new pix_icon('i/key', ''))->export_for_pix(),
+ 'icon' => (new pix_icon('i/lock', ''))->export_for_pix(),
'href' => (new moodle_url('/login/change_password.php'))->out(false),
'hasmenu' => false,
];
@@ -1051,6 +1029,15 @@ public function full_header() {
return $this->render_from_template('theme_wwu2019/full_header', $header);
}
+ /**
+ * Function to return the page heading.
+ *
+ * @param string $tag
+ * @return string
+ * @throws \coding_exception
+ * @throws \dml_exception
+ * @throws \moodle_exception
+ */
public function page_heading($tag = 'h1') {
if (self::is_examweb() && $this->page->pagelayout === 'course') {
$handler = \core_customfield\handler::get_handler('core_course', 'course');
@@ -1077,10 +1064,6 @@ public function page_heading($tag = 'h1') {
return $this->page->heading;
}
- public function course_content_header($onlyifnotcalledbefore = false) {
- return parent::course_content_header($onlyifnotcalledbefore);
- }
-
/**
* returns false if user is logged in, or an array of urls otherwise.
*/
@@ -1156,7 +1139,8 @@ public function render_login(\core_auth\output\login $form) {
// form method needs to be 'get', because an xsso forward would drop post values.
// within the get action of a form query string values are dropped as well.
$params = [];
- parse_str(parse_url($wantsurl, PHP_URL_QUERY), $params);
+ $query = parse_url($wantsurl, PHP_URL_QUERY);
+ parse_str(is_string($query) ? $query : '', $params);
$paramsmustache = [];
foreach ($params as $key => $val) {
$paramsmustache[] = ["key" => $key, "value" => $val];
diff --git a/classes/output/icon_system_fontawesome.php b/classes/output/icon_system_fontawesome.php
index f1336c9..760e0d0 100644
--- a/classes/output/icon_system_fontawesome.php
+++ b/classes/output/icon_system_fontawesome.php
@@ -52,7 +52,6 @@ public function get_core_icon_map() {
'core:i/navigationitem' => 'fa-angle-double-right',
'core:i/book' => 'fa-book',
'core:i/trophy' => 'fa-trophy',
- 'core:i/key' => 'fa-key',
'core:i/comment' => 'fa-comment',
'core:i/rss-square' => 'fa-rss-square',
'core:i/hidden' => 'fa-eye-slash',
diff --git a/templates/core/loginform.mustache b/templates/core/loginform.mustache
index a6d7df3..c620a60 100644
--- a/templates/core/loginform.mustache
+++ b/templates/core/loginform.mustache
@@ -95,7 +95,7 @@
{{#error}}