Permalink
Browse files

theme-formal_white MDL-26300, MDL-25628 , MDL-25520 Fixed whitespace …

…and nesting issues
  • Loading branch information...
1 parent 8b759a9 commit e1f517fcc7c70d28e082fbf48c5b0acc1c837039 Sam Hemelryk committed Mar 14, 2011
@@ -23,14 +23,15 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['pluginname'] = 'Formal white';
-$string['region-side-post'] = 'Right';
-$string['region-side-pre'] = 'Left';
-
+$string['blockcolumnbgc'] = 'Blocks columns background colour';
+$string['blockcolumnbgcdesc'] = 'This sets the blocks columns background colour for the theme.';
+$string['blockcolumnwidth'] = 'Blocks colum width';
+$string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. <strong>Using widths lower than 200px, the calendar block is not supposed to fit.</strong>';
+$string['blockcontentbgc'] = 'Blocks content background colour';
+$string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.';
$string['choosereadme'] = '
<div class="clearfix">
<div class="theme_screenshot">
-
<h2>Formal White</h2>
<img src="formal_white/pix/screenshot.gif" />
@@ -46,54 +47,34 @@
<h3>Report a bug:</h3>
<p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p>
</div>
-
<div class="theme_description">
-
<h2>About</h2>
<p>Formal White is a fluid-width, three-column theme ported over to 2.0 from Moodle 1.X.</p>
-
<h2>Tweaks</h2>
<p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you want to modify this theme, we recommend that you first duplicate it, then rename it before making your changes. This will prevent your customized theme from being overwritten by future Moodle upgrades, and you\'ll still have the original files if you make a mess. More information on modifying themes can be found in the <a href="http://docs.moodle.org/en/Theme">MoodleDocs</a>.</p>
-
<h2>Credits</h2>
<p>This theme was coded and is maintained by MediaTouch 2000. </p>
-
<h2>License</h2>
<p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.
</div>
</div>';
$string['configtitle'] = 'Formal white theme';
-
-$string['noframe'] = 'Formal white 1.9 look';
-$string['noframedesc'] = 'Select this option to require your moodle page to look like moodle 1.*, alias, without the surrounding frame.';
-
-$string['displaylogo'] = 'Pages header content';
-$string['displaylogodesc'] = 'Choose whether display moodle logo or page heading text in the header.';
-$string['moodlelogo'] = 'Display moodle logo';
-$string['heading'] = 'Display page heading';
-
-$string['blockcolumnwidth'] = 'Blocks colum width';
-$string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. <strong>Using widths lower than 200px, the calendar block is not supposed to fit.</strong>';
-
-$string['headerbgc'] = 'Header background colour';
-$string['headerbgcdesc'] = 'This sets the blocks header background colour for the theme.';
-
-$string['blockcontentbgc'] = 'Blocks content background colour';
-$string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.';
-
-$string['blockcolumnbgc'] = 'Blocks columns background colour';
-$string['blockcolumnbgcdesc'] = 'This sets the blocks columns background colour for the theme.';
-
-$string['configtitle'] = 'formal_white settings';
-
$string['customcss'] = 'Custom CSS';
$string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';
-
+$string['displaylogo'] = 'Pages header content';
+$string['displaylogodesc'] = 'Choose whether display moodle logo or page heading text in the header.';
$string['footnote'] = 'Footnote';
$string['footnotedesc'] = 'The content from this textarea will be displayed in the footer of every page.';
-
+$string['headerbgc'] = 'Header background colour';
+$string['headerbgcdesc'] = 'This sets the blocks header background colour for the theme.';
+$string['heading'] = 'Display page heading';
$string['logo'] = 'logo';
$string['logodesc'] = 'Change the logo of this theme by entering the URL to a new one (i.e., http://www.somesite/animage.png). As a reference, the default logo is 300px wide by 80px high. A transparent .png will work best.<br />The chosen logo will be shown in each page of the site without any distinction between front page and other pages.';
-
+$string['moodlelogo'] = 'Display moodle logo';
+$string['noframe'] = 'Formal white 1.9 look';
+$string['noframedesc'] = 'Select this option to require your moodle page to look like moodle 1.*, alias, without the surrounding frame.';
+$string['pluginname'] = 'Formal white';
+$string['region-side-post'] = 'Right';
+$string['region-side-pre'] = 'Left';
$string['regionwidth'] = 'Column width';
-$string['regionwidthdesc'] = 'This sets the width of the two block regions that form the left and right columns.';
+$string['regionwidthdesc'] = 'This sets the width of the two block regions that form the left and right columns.';
@@ -28,7 +28,6 @@
$bodyclasses[] = 'has_custom_menu';
}
-
/************************************************************************************************/
if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
@@ -52,10 +51,14 @@
<?php echo $OUTPUT->standard_top_of_body_html();
if ($hasframe) { ?>
- <div id="frametop"><div id="framebottom">
- <div id="frametopright"><div>&nbsp;</div></div>
- <div id="frameleft"><div id="frameright">
- <div id="wrapper">
+ <div id="frametop">
+ <div id="framebottom">
+ <div id="frametopright">
+ <div>&nbsp;</div>
+ </div>
+ <div id="frameleft">
+ <div id="frameright">
+ <div id="wrapper">
<?php } ?>
<!-- begin of page-header -->
@@ -141,34 +144,42 @@
<div class="clearfix"></div>
<?php if ($hasframe) { ?>
- </div> <!-- end of wrapper -->
- </div></div> <!-- </frameright></frameleft> -->
- <div id="framebottomright"><div>&nbsp;</div></div>
- </div></div> <!-- </framebottom></frametop> -->
+ </div> <!-- end of wrapper -->
+ </div> <!-- </frameright> -->
+ </div> <!-- </frameleft> -->
+ <div id="framebottomright">
+ <div>&nbsp;</div>
+ </div>
+ </div> <!-- </framebottom> -->
+ </div> <!-- </frametop> -->
<?php }
-
if ($hasfooter) {
-
if ($hasframe) { ?>
<!-- START OF FOOTER -->
<div id="page-footer">
- <?php if (!empty($PAGE->theme->settings->footnote)) { ?>
- <div id="footerframetop"><div id="footerframebottom">
- <div id="footerframetopright"><div>&nbsp;</div></div>
- <div id="footerframeleft"><div id="footerframeright">
-
- <!-- the content to show -->
- <div id="footerwrapper">
- <?php echo $PAGE->theme->settings->footnote; ?>
- </div> <!-- end of footerwrapper -->
-
- </div></div> <!-- </footerframeright></footerframeleft> -->
- <div id="footerframebottomright"><div>&nbsp;</div></div>
- </div></div> <!-- </footerframebottom></footerframetop> -->
- <?php }
+ <?php if (!empty($PAGE->theme->settings->footnote)) { ?>
+ <div id="footerframetop">
+ <div id="footerframebottom">
+ <div id="footerframetopright">
+ <div>&nbsp;</div>
+ </div>
+ <div id="footerframeleft">
+ <div id="footerframeright">
+ <!-- the content to show -->
+ <div id="footerwrapper">
+ <?php echo $PAGE->theme->settings->footnote; ?>
+ </div> <!-- end of footerwrapper -->
+ </div>
+ </div> <!-- </footerframeright></footerframeleft> -->
+ <div id="footerframebottomright">
+ <div>&nbsp;</div>
+ </div>
+ </div>
+ </div> <!-- </footerframebottom></footerframetop> -->
+ <?php }
//manco di una div da chiudere
} else { ?>
@@ -186,25 +197,20 @@
</div> <!-- end of page-footer_noframe-content -->
<?php }
//manco di una div da chiudere
-
} ?>
-
<div class="moodledocsleft">
<?php
//echo $OUTPUT->login_info();
//echo $OUTPUT->home_link();
echo $OUTPUT->standard_footer_html();
?>
</div>
-
<div class="moodledocs">
<?php echo page_doc_link(get_string('moodledocslink')); ?>
</div>
-
</div> <!-- end of page-footer or page-footer_noframe -->
<?php //ho chiuso la div di cui mancavo prima
}
-
echo $OUTPUT->standard_end_of_body_html(); ?>
</body>
</html>
@@ -28,7 +28,6 @@
$bodyclasses[] = 'has_custom_menu';
}
-
/************************************************************************************************/
if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
@@ -52,10 +51,14 @@
<?php echo $OUTPUT->standard_top_of_body_html();
if ($hasframe) { ?>
- <div id="frametop"><div id="framebottom">
- <div id="frametopright"><div>&nbsp;</div></div>
- <div id="frameleft"><div id="frameright">
- <div id="wrapper">
+ <div id="frametop">
+ <div id="framebottom">
+ <div id="frametopright">
+ <div>&nbsp;</div>
+ </div>
+ <div id="frameleft">
+ <div id="frameright">
+ <div id="wrapper">
<?php } ?>
<!-- begin of page-header -->
@@ -141,51 +144,55 @@
<div class="clearfix"></div>
<?php if ($hasframe) { ?>
- </div> <!-- end of wrapper -->
- </div></div> <!-- </frameright></frameleft> -->
- <div id="framebottomright"><div>&nbsp;</div></div>
- </div></div> <!-- </framebottom></frametop> -->
+ </div> <!-- end of wrapper -->
+ </div> <!-- </frameright> -->
+ </div> <!-- </frameleft> -->
+ <div id="framebottomright">
+ <div>&nbsp;</div>
+ </div>
+ </div> <!-- </framebottom> -->
+ </div> <!-- </frametop> -->
<?php }
-
if ($hasfooter) {
-
if ($hasframe) { ?>
<!-- START OF FOOTER -->
<div id="page-footer">
- <?php if (!empty($PAGE->theme->settings->footnote)) { ?>
- <div id="footerframetop"><div id="footerframebottom">
- <div id="footerframetopright"><div>&nbsp;</div></div>
- <div id="footerframeleft"><div id="footerframeright">
-
- <!-- the content to show -->
- <div id="footerwrapper">
- <?php echo $PAGE->theme->settings->footnote; ?>
- </div> <!-- end of footerwrapper -->
-
- </div></div> <!-- </footerframeright></footerframeleft> -->
- <div id="footerframebottomright"><div>&nbsp;</div></div>
- </div></div> <!-- </footerframebottom></footerframetop> -->
- <?php }
- //manco di una div da chiudere
+ <?php if (!empty($PAGE->theme->settings->footnote)) { ?>
+ <div id="footerframetop">
+ <div id="footerframebottom">
+ <div id="footerframetopright">
+ <div>&nbsp;</div>
+ </div>
+ <div id="footerframeleft">
+ <div id="footerframeright">
+ <!-- the content to show -->
+ <div id="footerwrapper">
+ <?php echo $PAGE->theme->settings->footnote; ?>
+ </div> <!-- end of footerwrapper -->
+ </div>
+ </div> <!-- </footerframeright></footerframeleft> -->
+ <div id="footerframebottomright">
+ <div>&nbsp;</div>
+ </div>
+ </div>
+ </div> <!-- </footerframebottom></footerframetop> -->
+ <?php }
} else { ?>
<!-- START OF FOOTER -->
<div id="page-footer" class="noframefooter">
<?php if (!empty($PAGE->theme->settings->footnote)) { ?>
<div id="page-footer-content">
-
<!-- the content to show -->
<div id="footerwrapper">
<?php echo $PAGE->theme->settings->footnote; ?>
</div> <!-- end of footerwrapper -->
-
</div> <!-- end of page-footer_noframe-content -->
<?php }
- //manco di una div da chiudere
} ?>
@@ -196,11 +203,9 @@
echo $OUTPUT->standard_footer_html();
?>
</div>
-
<div class="moodledocs">
<?php echo page_doc_link(get_string('moodledocslink')); ?>
</div>
-
</div> <!-- end of page-footer or page-footer_noframe -->
<?php //ho chiuso la div di cui mancavo prima
}

0 comments on commit e1f517f

Please sign in to comment.