L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-34916 theme_formal_white: added support for relative path of logos

Browse Source
This commit is contained in:
Kordan
2012-09-04 09:46:18 +02:00
parent 8f3c8e78a9
commit e8cfd996f0
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/formal_white/layout/frontpage.php
+3
View File
@@ -36,6 +36,9 @@ if (!empty($PAGE->theme->settings->frontpagelogo)) {
} else {
$logourl = $OUTPUT->pix_url('logo', 'theme');
}
if (strtolower(substr($logourl, 0, 4)) != 'http') {
$logourl = $CFG->wwwroot.'/'.$logourl;
}
$hasframe = !isset($PAGE->theme->settings->noframe) || !$PAGE->theme->settings->noframe;
theme/formal_white/layout/general.php
+4 -1
View File
@@ -31,6 +31,9 @@ if ($hascustommenu) {
/************************************************************************************************/
if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
if (strtolower(substr($logourl, 0, 4)) != 'http') {
$logourl = $CFG->wwwroot.'/'.$logourl;
}
} else {
$logourl = $OUTPUT->pix_url('logo_small', 'theme');
}
@@ -217,7 +220,7 @@ if ($hasfooter) {
<?php
}
?>
<?php
<?php
echo $OUTPUT->standard_footer_html();
?>
</div>
theme/formal_white/settings.php
+2 -2
View File
@@ -38,7 +38,7 @@ if ($ADMIN->fulltree) {
$title = get_string('logo','theme_formal_white');
$description = get_string('logodesc', 'theme_formal_white');
$default = '';
$setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_URL);
$setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_RAW); // we want it accepting ../ at the beginning. Security is not at its top but Moodle trusts admins.
$settings->add($setting);
// Custom front page site logo setting
@@ -46,7 +46,7 @@ if ($ADMIN->fulltree) {
$title = get_string('frontpagelogo','theme_formal_white');
$description = get_string('frontpagelogodesc', 'theme_formal_white');
$default = '';
$setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_URL);
$setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_RAW); // we want it accepting ../ at the beginning. Security is not at its top but Moodle trusts admins.
$settings->add($setting);
// page header background colour setting