From e3e4ca6895e5c5bb7f7b425b283e68ff809f87f7 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sat, 17 Mar 2012 21:33:59 +0000 Subject: [PATCH] MDL-32084 theme_fusion: removed default tagline in frontpage.php and changed configtextarea to configtext --- theme/fusion/layout/frontpage.php | 132 +++++++++++++++++++------------------- theme/fusion/settings.php | 75 +++++++++++----------- 2 files changed, 103 insertions(+), 104 deletions(-) rewrite theme/fusion/settings.php (92%) diff --git a/theme/fusion/layout/frontpage.php b/theme/fusion/layout/frontpage.php index 4b499f380a4..c1ca1191d13 100644 --- a/theme/fusion/layout/frontpage.php +++ b/theme/fusion/layout/frontpage.php @@ -23,7 +23,7 @@ if ($hascustommenu) { if (!empty($PAGE->theme->settings->tagline)) { $tagline = $PAGE->theme->settings->tagline; } else { - $tagline = "Another Moodle Theme"; + $tagline = ''; } if (!empty($PAGE->theme->settings->footertext)) { @@ -49,90 +49,90 @@ echo $OUTPUT->doctype() ?>
-
+
-
-
+
+
-
-
- lang_menu(); - echo $OUTPUT->login_info(); - echo $PAGE->headingmenu; - ?> -
- -
- -
 
- +
+
+ lang_menu(); + echo $OUTPUT->login_info(); + echo $PAGE->headingmenu; + ?> +
+ +
+ +
 
+ -
+
-
-
+
+
-
-
-
-
- -
-
-
- -
-

heading ?>

-

-
- - main_content() ?> - -
-
-
- - -
-
-
-
- blocks_for_region('side-post') ?> -
-
-
-
- - -
-
-
-
+
+
+
+
+ +
+
+
+ +
+

heading ?>

+

+
+ + main_content() ?> + +
+
+
+ + +
+
+
+
+ blocks_for_region('side-post') ?> +
+
+
+
+ + +
+
+
+
-
+
-
-
+ +
-

+

login_info(); - echo $OUTPUT->home_link(); - echo $OUTPUT->standard_footer_html(); - ?> -
+ echo $OUTPUT->login_info(); + echo $OUTPUT->home_link(); + echo $OUTPUT->standard_footer_html(); + ?> + @@ -141,4 +141,4 @@ echo $OUTPUT->doctype() ?> standard_end_of_body_html() ?> - \ No newline at end of file + diff --git a/theme/fusion/settings.php b/theme/fusion/settings.php dissimilarity index 92% index bd94d71e67a..d96a89fa28e 100644 --- a/theme/fusion/settings.php +++ b/theme/fusion/settings.php @@ -1,38 +1,37 @@ -fulltree) { - -// link color setting -$name = 'theme_fusion/linkcolor'; -$title = get_string('linkcolor','theme_fusion'); -$description = get_string('linkcolordesc', 'theme_fusion'); -$default = '#2d83d5'; -$previewconfig = NULL; -$setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); -$settings->add($setting); - - -// Tag line setting -$name = 'theme_fusion/tagline'; -$title = get_string('tagline','theme_fusion'); -$description = get_string('taglinedesc', 'theme_fusion'); -$setting = new admin_setting_configtextarea($name, $title, $description, ''); -$settings->add($setting); - -// Foot note setting -$name = 'theme_fusion/footertext'; -$title = get_string('footertext','theme_fusion'); -$description = get_string('footertextdesc', 'theme_fusion'); -$setting = new admin_setting_confightmleditor($name, $title, $description, ''); -$settings->add($setting); - -// Custom CSS file -$name = 'theme_fusion/customcss'; -$title = get_string('customcss','theme_fusion'); -$description = get_string('customcssdesc', 'theme_fusion'); -$setting = new admin_setting_configtextarea($name, $title, $description, ''); -$settings->add($setting); - -} \ No newline at end of file +fulltree) { + + // link color setting + $name = 'theme_fusion/linkcolor'; + $title = get_string('linkcolor','theme_fusion'); + $description = get_string('linkcolordesc', 'theme_fusion'); + $default = '#2d83d5'; + $previewconfig = NULL; + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); + + // Tag line setting + $name = 'theme_fusion/tagline'; + $title = get_string('tagline','theme_fusion'); + $description = get_string('taglinedesc', 'theme_fusion'); + $setting = new admin_setting_configtext($name, $title, $description, ''); + $settings->add($setting); + + // Foot note setting + $name = 'theme_fusion/footertext'; + $title = get_string('footertext','theme_fusion'); + $description = get_string('footertextdesc', 'theme_fusion'); + $setting = new admin_setting_confightmleditor($name, $title, $description, ''); + $settings->add($setting); + + // Custom CSS file + $name = 'theme_fusion/customcss'; + $title = get_string('customcss','theme_fusion'); + $description = get_string('customcssdesc', 'theme_fusion'); + $setting = new admin_setting_configtextarea($name, $title, $description, ''); + $settings->add($setting); + +} -- 2.11.4.GIT