MDL-29614 theme_formal_white: Change the way Formal White theme shrinks pages
[moodle.git] / theme / formal_white / layout / general.php
index 8d0a497..8dfd26c 100644 (file)
@@ -48,110 +48,111 @@ echo $OUTPUT->doctype() ?>
     <?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 }
 
@@ -160,7 +161,7 @@ if ($hasfooter) {
 
         <!-- 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">
@@ -168,62 +169,68 @@ if ($hasfooter) {
                     </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">
-                    <!-- the content to show -->
-                    <div id="footerwrapper">
-                        <?php echo $PAGE->theme->settings->footnote; ?>
-                    </div> <!-- end of footerwrapper -->
-                </div> <!-- end of page-footer_noframe-content -->
+            <div id="page-footer-content">
+
+                <!-- the content to show -->
+                <div id="footerwrapper">
+                    <?php echo $PAGE->theme->settings->footnote; ?>
+                </div> <!-- </footerwrapper> -->
+
+            </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();
                 //echo $OUTPUT->home_link();
-            ?>
+                ?>
                 <div class="moodledocs">
                     <?php echo page_doc_link(get_string('moodledocslink')); ?>
                 </div>
-            <?php
+                <?php
                 if ($PAGE->theme->settings->creditstomoodleorg == 2) {
                     // can not use $OUTPUT->home_link() here because whether $OUTPUT->page->pagetype != 'site-index'
                     // the output of the function is not the classic nice moodle logo $this->pix_url('moodlelogo')
-            ?>
+                ?>
                     <div class="sitelink">
                         <a title="Moodle" href="http://moodle.org/">
                             <img style="width:100px;height:30px" src="<?php echo $this->pix_url('moodlelogo') ?>" alt="moodlelogo" />
                         </a>
                     </div>
-            <?php
+                <?php
                 }
-            ?>
-            <?php                   
                 echo $OUTPUT->standard_footer_html();
-            ?>
+                ?>
             </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>
\ No newline at end of file