mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-58970-master' of https://github.com/abias/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-06-05 22:27:52 +02:00
commit f3f4c142fc
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/outputrenderers.php
View File

@ -4294,7 +4294,7 @@ EOD;
$context->cookieshelpiconformatted = $this->help_icon('cookiesenabled');
$context->errorformatted = $this->error_text($context->error);
return $this->render_from_template('core/login', $context);
return $this->render_from_template('core/loginform', $context);
}
/**

2
lib/templates/login.mustache → lib/templates/loginform.mustache
View File

@ -15,7 +15,7 @@
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template core/login
@template core/loginform
Moodle template for the login page.

2
theme/boost/classes/output/core_renderer.php
View File

@ -465,7 +465,7 @@ class core_renderer extends \core_renderer {
$context->logourl = $url;
$context->sitename = format_string($SITE->fullname, true, ['context' => context_course::instance(SITEID), "escape" => false]);
return $this->render_from_template('core/login', $context);
return $this->render_from_template('core/loginform', $context);
}
/**

2
theme/boost/templates/core/login.mustache → theme/boost/templates/core/loginform.mustache
View File

@ -15,7 +15,7 @@
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template core/login
@template core/loginform
Moodle template for the login page.

4
theme/upgrade.txt
View File

@ -7,6 +7,10 @@ information provided here is intended especially for theme designer.
setup for this module have been moved from core standard_head_html to the bootstrapbase
renderer. If your theme needs this javascript you will need to ensure the bootstrap renderer
is called, or require the JS yourself
* There was a mustache template login.mustache in /lib/templates/ rendering the login form
and a template with the same name in /theme/boost/templates/ rendering the pagelayout "login".
To prevent misunderstanding when overriding one of these templates in a Boost child theme,
the first one was renamed to loginform.mustache - see MDL-58970.
=== 3.2 ===