Skip to content
Browse files

MDL-32084 theme_fusion: removed default tagline in frontpage.php and …

…changed configtextarea to configtext in settings.php
  • Loading branch information...
1 parent 3c4111e commit 4247b7d47273e6303d29391feac000c20071282d @lazydaisy lazydaisy committed Mar 17, 2012
Showing with 97 additions and 98 deletions.
  1. +66 −66 theme/fusion/layout/frontpage.php
  2. +31 −32 theme/fusion/settings.php
View
132 theme/fusion/layout/frontpage.php
@@ -23,7 +23,7 @@
if (!empty($PAGE->theme->settings->tagline)) {
$tagline = $PAGE->theme->settings->tagline;
} else {
- $tagline = "Another Moodle Theme";
+ $tagline = '<!-- There was no custom tagline set -->';
}
if (!empty($PAGE->theme->settings->footertext)) {
@@ -49,90 +49,90 @@
<div id="page-wrap1">
<div id="page-wrap2">
- <div id="wrapper" class="clearfix">
+ <div id="wrapper" class="clearfix">
<!-- START OF HEADER -->
- <div id="page-header">
- <div id="page-header-wrapper" class="wrapper clearfix">
+ <div id="page-header">
+ <div id="page-header-wrapper" class="wrapper clearfix">
- <div id="headermenus" class="clearfix">
- <div class="headermenu clearfix">
- <?php
- echo $OUTPUT->lang_menu();
- echo $OUTPUT->login_info();
- echo $PAGE->headingmenu;
- ?>
- </div>
- <?php if ($hascustommenu) { ?>
- <div id="custommenu"><?php echo $custommenu; ?></div>
- <?php } else { ?>
- <div id="custommenu" style="line-height:1em;">&nbsp;</div> <!-- temporary until I find a better fix -->
- <?php } ?>
+ <div id="headermenus" class="clearfix">
+ <div class="headermenu clearfix">
+ <?php
+ echo $OUTPUT->lang_menu();
+ echo $OUTPUT->login_info();
+ echo $PAGE->headingmenu;
+ ?>
+ </div>
+ <?php if ($hascustommenu) { ?>
+ <div id="custommenu"><?php echo $custommenu; ?></div>
+ <?php } else { ?>
+ <div id="custommenu" style="line-height:1em;">&nbsp;</div> <!-- temporary until I find a better fix -->
+ <?php } ?>
- </div>
+ </div>
- </div>
- </div>
+ </div>
+ </div>
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
- <div id="page-content-wrapper" class="wrapper clearfix">
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
-
- <div id="region-main-wrap">
- <div id="region-main">
- <div class="region-content">
-
- <div id="region-header">
- <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
- <p class="tagline"><?php echo $tagline ?></p>
- </div>
-
- <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-
- </div>
- </div>
- </div>
-
- <?php if ($hassidepost) { ?>
- <div id="region-post" class="block-region">
- <div id="region-post-wrap-1">
- <div id="region-post-wrap-2">
- <div class="region-content">
- <?php echo $OUTPUT->blocks_for_region('side-post') ?>
- </div>
- </div>
- </div>
- </div>
- <?php } ?>
-
- </div>
- </div>
- </div>
- </div>
+ <div id="page-content-wrapper" class="wrapper clearfix">
+ <div id="page-content">
+ <div id="region-main-box">
+ <div id="region-post-box">
+
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+
+ <div id="region-header">
+ <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+ <p class="tagline"><?php echo $tagline ?></p>
+ </div>
+
+ <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+
+ </div>
+ </div>
+ </div>
+
+ <?php if ($hassidepost) { ?>
+ <div id="region-post" class="block-region">
+ <div id="region-post-wrap-1">
+ <div id="region-post-wrap-2">
+ <div class="region-content">
+ <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+ </div>
+ </div>
+ </div>
+ </div>
+ <?php } ?>
+
+ </div>
+ </div>
+ </div>
+ </div>
<!-- END OF CONTENT -->
- </div> <!-- END #wrapper -->
+ </div> <!-- END #wrapper -->
- </div>
- </div>
+ </div>
+ </div>
<!-- START OF FOOTER -->
<div id="page-footer" class="wrapper clearfix">
<?php echo $footnote ?>
- <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
+ <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
<?php
- echo $OUTPUT->login_info();
- echo $OUTPUT->home_link();
- echo $OUTPUT->standard_footer_html();
- ?>
- </div>
+ echo $OUTPUT->login_info();
+ echo $OUTPUT->home_link();
+ echo $OUTPUT->standard_footer_html();
+ ?>
+ </div>
<!-- END OF FOOTER -->
@@ -141,4 +141,4 @@
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
-</html>
+</html>
View
63 theme/fusion/settings.php
@@ -4,35 +4,34 @@
if ($ADMIN->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);
-
-}
+ // 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);
+
+}

0 comments on commit 4247b7d

Please sign in to comment.
Something went wrong with that request. Please try again.