mirror of
https://github.com/moodle/moodle.git
synced 2025-03-19 15:10:05 +01:00
Merge branch 'MDL-79250-401' of https://github.com/junpataleta/moodle into MOODLE_401_STABLE
This commit is contained in:
commit
d7834ce7c3
@ -898,7 +898,8 @@ class core_admin_renderer extends plugin_renderer_base {
|
||||
$url = "https://campaign.moodle.org/current/lms/{$lang}/install/";
|
||||
$params = [
|
||||
'url' => $url,
|
||||
'iframeid' => 'campaign-content'
|
||||
'iframeid' => 'campaign-content',
|
||||
'title' => get_string('campaign', 'admin'),
|
||||
];
|
||||
|
||||
return $this->render_from_template('core/external_content_banner', $params);
|
||||
@ -919,7 +920,8 @@ class core_admin_renderer extends plugin_renderer_base {
|
||||
$url = "https://campaign.moodle.org/current/lms/{$lang}/servicesandsupport/";
|
||||
$params = [
|
||||
'url' => $url,
|
||||
'iframeid' => 'services-support-content'
|
||||
'iframeid' => 'services-support-content',
|
||||
'title' => get_string('supportandservices', 'admin'),
|
||||
];
|
||||
|
||||
return $this->render_from_template('core/external_content_banner', $params);
|
||||
|
@ -114,6 +114,7 @@ $string['calendarsettings'] = 'Calendar';
|
||||
$string['calendartype'] = 'Calendar type';
|
||||
$string['calendartype_desc'] = 'Choose a default calendar type for the whole site. This setting can be overridden in the course settings or by users in their personal profile.';
|
||||
$string['calendar_weekend'] = 'Weekend days';
|
||||
$string['campaign'] = 'Campaign';
|
||||
$string['cannotdeletemodfilter'] = 'You cannot uninstall the \'{$a->filter}\' because it is part of the \'{$a->module}\' module.';
|
||||
$string['cannotuninstall'] = '{$a} can not be uninstalled.';
|
||||
$string['categoryemail'] = 'Email';
|
||||
@ -1296,6 +1297,7 @@ $string['stickyblocksmymoodle'] = 'My Moodle';
|
||||
$string['stickyblockspagetype'] = 'Page type to configure';
|
||||
$string['strictformsrequired'] = 'Strict validation of required fields';
|
||||
$string['stripalltitletags'] = 'Remove HTML tags from all activity names';
|
||||
$string['supportandservices'] = 'Support and services';
|
||||
$string['supportcontact'] = 'Support contact';
|
||||
$string['supportemail'] = 'Support email';
|
||||
$string['supportemailsubject'] = 'Site support request - {$a}';
|
||||
|
@ -34,10 +34,11 @@
|
||||
{
|
||||
"iframeid": "external-content",
|
||||
"url": "http://example.com/link",
|
||||
"title": "External content"
|
||||
}
|
||||
}}
|
||||
<div class="alert alert-secondary alert-block fade in">
|
||||
<iframe id="{{iframeid}}" class="w-100 border-0"></iframe>
|
||||
<iframe id="{{iframeid}}" title="{{title}}" class="w-100 border-0"></iframe>
|
||||
</div>
|
||||
{{#js}}
|
||||
(function() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user