Permalink
Browse files

MDL-29614 theme_formal_white: Change the way Formal White theme shrin…

…ks pages
  • Loading branch information...
1 parent 8d62463 commit 1bc47427f050596df9c377ba07edcdc36e6d0e36 @kordan kordan committed with Sam Hemelryk Jan 19, 2012
@@ -175,7 +175,7 @@
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
'report' => array(
- 'file' => 'general.php',
+ 'file' => 'report.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
@@ -70,6 +70,8 @@
$string['fontsizereferencedesc'] = 'This allows you to set the default font size for this theme. It is not recommended to set this higher than 13px as it is known to cause display problems with certain blocks.';
$string['footnote'] = 'Footnote';
$string['footnotedesc'] = 'The content from this textarea will be displayed in the footer of every page.';
+$string['framemargin'] = 'Frame margin';
+$string['framemargindesc'] = 'Room between the frame and the edge of the browser window. (This setting will be ignored whether "Formal white 1.9 look" is requested).';
$string['frontpagelogo'] = 'Custom front page logo';
$string['frontpagelogodesc'] = 'Change the logo that is displayed on the front page of your site by entering the URL to the image you wish to use (i.e. http://www.yoursite.local/myfrontpagelogo.png). This setting overrides the custom logo setting. As a reference the default logo is 300px wide, 80px high and a transparent png will work best.';
$string['headerbgc'] = 'Header background colour';
@@ -11,20 +11,22 @@
<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html(); ?>
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
+ <div id="page">
+ <div id="page-content">
+ <div id="region-main-box">
+ <div id="region-post-box">
- <!-- main mandatory content of the moodle page -->
- <div id="region-main-wrap">
- <div id="region-main">
- <div class="region-content">
- <?php echo $OUTPUT->main_content() ?>
+ <!-- main mandatory content of the moodle page -->
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+ <?php echo $OUTPUT->main_content() ?>
+ </div>
</div>
</div>
- </div>
- <!-- end of main mandatory content of the moodle page -->
+ <!-- end of main mandatory content of the moodle page -->
+ </div>
</div>
</div>
</div>
@@ -50,110 +50,111 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
- <?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">
+ <?php echo $OUTPUT->standard_top_of_body_html(); ?>
+ <div id="page">
+
+ <?php if ($hasframe) { ?>
+ <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 -->
- <?php if ($hasheading) { ?>
- <div id="page-header">
- <?php if ($displaylogo) { ?>
- <div id="headerlogo">
- <img src="<?php echo $logourl ?>" alt="Custom logo here" />
- </div>
- <?php } else { ?>
- <h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
- <?php } ?>
-
- <div class="headermenu">
- <?php
- echo $OUTPUT->login_info();
- if (($CFG->langmenu) && (!empty($PAGE->layout_options['langmenu']))) {
- echo $OUTPUT->lang_menu();
- }
- echo $PAGE->headingmenu;
- ?>
- </div>
- </div>
- <?php } ?>
+ <?php if ($hasheading) { ?>
+ <div id="page-header">
+ <?php if ($displaylogo) { ?>
+ <div id="headerlogo">
+ <img src="<?php echo $logourl ?>" alt="Custom logo here" />
+ </div>
+ <?php } else { ?>
+ <h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
+ <?php } ?>
+
+ <div class="headermenu">
+ <?php
+ echo $OUTPUT->login_info();
+ if (($CFG->langmenu) && (!empty($PAGE->layout_options['langmenu']))) {
+ echo $OUTPUT->lang_menu();
+ }
+ echo $PAGE->headingmenu;
+ ?>
+ </div>
+ </div>
+ <?php } ?>
<!-- end of page-header -->
<!-- begin of custom menu -->
- <?php if ($hascustommenu) { ?>
- <div id="custommenu"><?php echo $custommenu; ?></div>
- <?php } ?>
+ <?php if ($hascustommenu) { ?>
+ <div id="custommenu"><?php echo $custommenu; ?></div>
+ <?php } ?>
<!-- end of custom menu -->
<!-- begin of navigation bar -->
- <?php if ($hasnavbar) { ?>
- <div class="navbar clearfix">
- <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
- <div class="navbutton"><?php echo $PAGE->button; ?></div>
- </div>
- <?php } ?>
+ <?php if ($hasnavbar) { ?>
+ <div class="navbar clearfix">
+ <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+ <div class="navbutton"><?php echo $PAGE->button; ?></div>
+ </div>
+ <?php } ?>
<!-- end of navigation bar -->
<!-- start of moodle content -->
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
-
- <!-- main mandatory content of the moodle page -->
- <div id="region-main-wrap">
- <div id="region-main">
- <div class="region-content">
- <?php echo $OUTPUT->main_content() ?>
+ <div id="page-content">
+ <div id="region-main-box">
+ <div id="region-post-box">
+
+ <!-- main mandatory content of the moodle page -->
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+ <?php echo $OUTPUT->main_content() ?>
+ </div>
+ </div>
+ </div>
+ <!-- end of main mandatory content of the moodle page -->
+
+
+ <!-- left column block - diplayed only if... -->
+ <?php if ($hassidepre) { ?>
+ <div id="region-pre" class="block-region">
+ <div class="region-content">
+ <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+ </div>
+ </div>
+ <?php } ?>
+ <!-- end of left column block - diplayed only if... -->
+
+ <!-- right column block - diplayed only if... -->
+ <?php if ($hassidepost) { ?>
+ <div id="region-post" class="block-region">
+ <div class="region-content">
+ <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+ </div>
+ </div>
+ <?php } ?>
+ <!-- end of right column block - diplayed only if... -->
+
+ </div>
</div>
</div>
- </div>
- <!-- end of main mandatory content of the moodle page -->
-
-
- <!-- left column block - diplayed only if... -->
- <?php if ($hassidepre) { ?>
- <div id="region-pre" class="block-region">
- <div class="region-content">
- <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
- </div>
- </div>
- <?php } ?>
- <!-- end of left column block - diplayed only if... -->
-
- <!-- right column block - diplayed only if... -->
- <?php if ($hassidepost) { ?>
- <div id="region-post" class="block-region">
- <div class="region-content">
- <?php echo $OUTPUT->blocks_for_region('side-post') ?>
- </div>
- </div>
- <?php } ?>
- <!-- end of right column block - diplayed only if... -->
-
- </div>
- </div>
- </div>
<!-- end of moodle content -->
- <div class="clearfix"></div>
+ <div class="clearfix"></div>
<?php if ($hasframe) { ?>
- </div> <!-- end of wrapper -->
- </div> <!-- </frameright> -->
- </div> <!-- </frameleft> -->
- <div id="framebottomright">
- <div>&nbsp;</div>
- </div>
- </div> <!-- </framebottom> -->
- </div> <!-- </frametop> -->
+ </div> <!-- </wrapper> -->
+ </div> <!-- </frameright> -->
+ </div> <!-- </frameleft> -->
+ <div id="framebottomright">
+ <div>&nbsp;</div>
+ </div>
+ </div> <!-- </framebottom> -->
+ </div> <!-- </frametop> -->
<?php }
@@ -162,59 +163,66 @@
<!-- START OF FOOTER -->
<div id="page-footer">
- <?php if (!empty($PAGE->theme->settings->footnote)) { ?>
+ <?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> <!-- </footerwrapper> -->
+
+ </div> <!-- </footerframeright> -->
+ </div> <!-- </footerframeleft> -->
<div id="footerframebottomright">
<div>&nbsp;</div>
</div>
- </div>
- </div> <!-- </footerframebottom></footerframetop> -->
- <?php }
- //one more div is waiting to be closed
+ </div> <!-- </footerframebottom> -->
+ </div> <!-- </footerframetop> -->
+ <?php }
+ //one more div is waiting to be closed
} else { ?>
<!-- START OF FOOTER -->
<div id="page-footer" class="noframefooter">
<?php if (!empty($PAGE->theme->settings->footnote)) { ?>
- <div id="page-footer-content">
+ <div id="page-footer-content">
- <!-- the content to show -->
- <div id="footerwrapper">
- <?php echo $PAGE->theme->settings->footnote; ?>
- </div> <!-- end of footerwrapper -->
+ <!-- the content to show -->
+ <div id="footerwrapper">
+ <?php echo $PAGE->theme->settings->footnote; ?>
+ </div> <!-- </footerwrapper> -->
- </div> <!-- end of page-footer_noframe-content -->
+ </div> <!-- </page-footer-content> -->
<?php }
- //one more div is waiting to be closed
+ //one more div is waiting to be closed
+
} ?>
+
<div class="moodledocsleft">
- <?php
+ <?php
echo $OUTPUT->login_info();
if ($PAGE->theme->settings->creditstomoodleorg) {
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 //the waiting div has been closed
-}
+ </div> <!-- </page-footer> -->
+ </div> <!-- </page"> -->
+
+ <div class="clearfix"></div>
+
+<?php } //the waiting div has been closed: </page-footer>
echo $OUTPUT->standard_end_of_body_html(); ?>
</body>
</html>
Oops, something went wrong.

0 comments on commit 1bc4742

Please sign in to comment.