mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-79250-401' of https://github.com/junpataleta/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Andrew Nicols 2023-09-07 22:37:53 +08:00 committed by Jun Pataleta
commit d7834ce7c3
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/renderer.php
View File

@ -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);

2
lang/en/admin.php
View File

@ -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}';

3
lib/templates/external_content_banner.mustache
View File

@ -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() {