Skip to content

Commit

Permalink
MDL-30243 theme - whitespace fixes to afterburner
Browse files Browse the repository at this point in the history
  • Loading branch information
Aparup Banerjee committed Nov 28, 2011
1 parent 00347b3 commit 900d5fd
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 42 deletions.
6 changes: 3 additions & 3 deletions theme/afterburner/layout/default.php
Expand Up @@ -111,9 +111,9 @@

<div class="footer-left">

<?php if ($hasfootnote) { ?>
<div id="footnote"><?php echo $PAGE->theme->settings->footnote;?></div>
<?php } ?>
<?php if ($hasfootnote) { ?>
<div id="footnote"><?php echo $PAGE->theme->settings->footnote;?></div>
<?php } ?>

<a href="http://moodle.org" title="Moodle">
<img src="<?php echo $OUTPUT->pix_url('footer/moodle-logo','theme')?>" alt="Moodle logo" />
Expand Down
35 changes: 17 additions & 18 deletions theme/afterburner/lib.php
Expand Up @@ -2,13 +2,13 @@

function afterburner_process_css($css, $theme) {

// Set the background image for the logo
if (!empty($theme->settings->logo)) {
$logo = $theme->settings->logo;
} else {
$logo = null;
}
$css = afterburner_set_logo($css, $logo);
// Set the background image for the logo
if (!empty($theme->settings->logo)) {
$logo = $theme->settings->logo;
} else {
$logo = null;
}
$css = afterburner_set_logo($css, $logo);

// Set custom CSS
if (!empty($theme->settings->customcss)) {
Expand All @@ -22,17 +22,16 @@ function afterburner_process_css($css, $theme) {
}

function afterburner_set_logo($css, $logo) {
global $OUTPUT;
$tag = '[[setting:logo]]';
$replacement = $logo;
if (is_null($replacement)) {
$replacement = $OUTPUT->pix_url('images/logo','theme');
}

$css = str_replace($tag, $replacement, $css);
global $OUTPUT;
$tag = '[[setting:logo]]';
$replacement = $logo;
if (is_null($replacement)) {
$replacement = $OUTPUT->pix_url('images/logo','theme');
}

return $css;
$css = str_replace($tag, $replacement, $css);

return $css;
}

function afterburner_set_customcss($css, $customcss) {
Expand All @@ -42,7 +41,7 @@ function afterburner_set_customcss($css, $customcss) {
$replacement = '';
}

$css = str_replace($tag, $replacement, $css);
$css = str_replace($tag, $replacement, $css);

return $css;
return $css;
}
42 changes: 21 additions & 21 deletions theme/afterburner/settings.php
Expand Up @@ -4,28 +4,28 @@

if ($ADMIN->fulltree) {

// Logo file setting
$name = 'theme_afterburner/logo';
$title = get_string('logo','theme_afterburner');
$description = get_string('logodesc', 'theme_afterburner');
$default = '';
$setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_URL);
$settings->add($setting);
// Logo file setting
$name = 'theme_afterburner/logo';
$title = get_string('logo','theme_afterburner');
$description = get_string('logodesc', 'theme_afterburner');
$default = '';
$setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_URL);
$settings->add($setting);

// Foot note setting
$name = 'theme_afterburner/footnote';
$title = get_string('footnote','theme_afterburner');
$description = get_string('footnotedesc', 'theme_afterburner');
$default = '';
$setting = new admin_setting_confightmleditor($name, $title, $description, $default);
$settings->add($setting);
// Foot note setting
$name = 'theme_afterburner/footnote';
$title = get_string('footnote','theme_afterburner');
$description = get_string('footnotedesc', 'theme_afterburner');
$default = '';
$setting = new admin_setting_confightmleditor($name, $title, $description, $default);
$settings->add($setting);

// Custom CSS file
$name = 'theme_afterburner/customcss';
$title = get_string('customcss','theme_afterburner');
$description = get_string('customcssdesc', 'theme_afterburner');
$default = '';
$setting = new admin_setting_configtextarea($name, $title, $description, $default);
$settings->add($setting);
// Custom CSS file
$name = 'theme_afterburner/customcss';
$title = get_string('customcss','theme_afterburner');
$description = get_string('customcssdesc', 'theme_afterburner');
$default = '';
$setting = new admin_setting_configtextarea($name, $title, $description, $default);
$settings->add($setting);

}

0 comments on commit 900d5fd

Please sign in to comment.