MDL-29614 whitespace fixes
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 11:55:23 +0000 (12:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 11:55:23 +0000 (12:55 +0100)
theme/formal_white/layout/report.php
theme/formal_white/style/formal_white.css

index 1f508b7..9baa353 100755 (executable)
-<?php\r
-\r
-$hasheading = ($PAGE->heading);\r
-$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());\r
-$hasfooter = (empty($PAGE->layout_options['nofooter']));\r
-$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));\r
-$haslogininfo = (empty($PAGE->layout_options['nologininfo']));\r
-\r
-$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));\r
-\r
-$custommenu = $OUTPUT->custom_menu();\r
-$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));\r
-\r
-$bodyclasses = array();\r
-if (!$showsidepre) {\r
-    $bodyclasses[] = 'content-only';\r
-}\r
-if ($hascustommenu) {\r
-    $bodyclasses[] = 'has_custom_menu';\r
-}\r
-\r
-/************************************************************************************************/\r
-if (!empty($PAGE->theme->settings->logo)) {\r
-    $logourl = $PAGE->theme->settings->logo;\r
-} else {\r
-    $logourl = $OUTPUT->pix_url('logo_small', 'theme');\r
-}\r
-\r
-$hasframe = !isset($PAGE->theme->settings->noframe) || !$PAGE->theme->settings->noframe;\r
-\r
-$displaylogo = !isset($PAGE->theme->settings->displaylogo) || $PAGE->theme->settings->displaylogo;\r
-/************************************************************************************************/\r
-\r
-echo $OUTPUT->doctype() ?>\r
-<html <?php echo $OUTPUT->htmlattributes() ?>>\r
-<head>\r
-    <title><?php echo $PAGE->title ?></title>\r
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />\r
-    <?php echo $OUTPUT->standard_head_html() ?>\r
-</head>\r
-<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">\r
-    <?php echo $OUTPUT->standard_top_of_body_html(); ?>\r
-    <div id="page">\r
-\r
-    <?php if ($hasframe) { ?>\r
-        <div id="frametop">\r
-            <div id="framebottom">\r
-                <div id="frametopright">\r
-                    <div>&nbsp;</div>\r
-                </div>\r
-                <div id="frameleft">\r
-                    <div id="frameright">\r
-                        <div id="wrapper">\r
-<?php } ?>\r
-\r
-<!-- begin of page-header -->\r
-                            <?php if ($hasheading) { ?>\r
-                            <div id="page-header">\r
-                            <?php if ($displaylogo) { ?>\r
-                                <div id="headerlogo">\r
-                                    <img src="<?php echo $logourl ?>" alt="Custom logo here" />\r
-                                </div>\r
-                            <?php } else { ?>\r
-                                <h1 class="headerheading"><?php echo $PAGE->heading ?></h1>\r
-                            <?php } ?>\r
-\r
-                                <div class="headermenu">\r
-                                    <?php\r
-                                    echo $OUTPUT->login_info();\r
-                                    if (($CFG->langmenu) && (!empty($PAGE->layout_options['langmenu']))) {\r
-                                        echo $OUTPUT->lang_menu();\r
-                                    }\r
-                                    echo $PAGE->headingmenu;\r
-                                    ?>\r
-                                </div>\r
-                            </div>\r
-                            <?php } ?>\r
-<!-- end of page-header -->\r
-\r
-<!-- begin of custom menu -->\r
-                            <?php if ($hascustommenu) { ?>\r
-                            <div id="custommenu"><?php echo $custommenu; ?></div>\r
-                            <?php } ?>\r
-<!-- end of custom menu -->\r
-\r
-<!-- begin of navigation bar -->\r
-                            <?php if ($hasnavbar) { ?>\r
-                            <div class="navbar clearfix">\r
-                                <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>\r
-                                <div class="navbutton"><?php echo $PAGE->button; ?></div>\r
-                            </div>\r
-                            <?php } ?>\r
-<!-- end of navigation bar -->\r
-\r
-<!-- start of moodle content -->\r
-                            <div id="page-content" class="clearfix">\r
-                                <div id="report-main-content">\r
-                                    <div class="region-content">\r
-                                        <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>\r
-                                    </div>\r
-                                </div>\r
-                                <?php if ($hassidepre) { ?>\r
-                                <div id="report-region-wrap">\r
-                                    <div id="report-region-pre" class="block-region">\r
-                                        <div class="region-content">\r
-                                            <?php echo $OUTPUT->blocks_for_region('side-pre') ?>\r
-                                        </div>\r
-                                    </div>\r
-                                </div>\r
-                                <?php } ?>\r
-                            </div>\r
-<!-- end of moodle content -->\r
-\r
-                            <div class="clearfix"></div>\r
-\r
-<?php if ($hasframe) { ?>\r
-                        </div> <!-- end of wrapper -->\r
-                    </div> <!-- </frameright> -->\r
-                </div> <!-- </frameleft> -->\r
-                <div id="framebottomright">\r
-                    <div>&nbsp;</div>\r
-                </div>\r
-            </div> <!-- </framebottom> -->\r
-        </div> <!-- </frametop> -->\r
-\r
-<?php }\r
-\r
-if ($hasfooter) {\r
-    if ($hasframe) { ?>\r
-\r
-        <!-- START OF FOOTER -->\r
-        <div id="page-footer">\r
-            <?php if (!empty($PAGE->theme->settings->footnote)) { ?>\r
-            <div id="footerframetop">\r
-                <div id="footerframebottom">\r
-                    <div id="footerframetopright">\r
-                        <div>&nbsp;</div>\r
-                    </div>\r
-                    <div id="footerframeleft">\r
-                        <div id="footerframeright">\r
-\r
-                            <!-- the content to show -->\r
-                            <div id="footerwrapper">\r
-                                <?php echo $PAGE->theme->settings->footnote; ?>\r
-                            </div> <!-- </footerwrapper> -->\r
-\r
-                        </div> <!-- </footerframeright> -->\r
-                    </div> <!-- </footerframeleft> -->\r
-                    <div id="footerframebottomright">\r
-                        <div>&nbsp;</div>\r
-                    </div>\r
-                </div> <!-- </footerframebottom> -->\r
-            </div> <!-- </footerframetop> -->\r
-            <?php }\r
-            //one more div is waiting to be closed\r
-\r
-    } else { ?>\r
-\r
-        <!-- START OF FOOTER -->\r
-        <div id="page-footer" class="noframefooter">\r
-            <?php if (!empty($PAGE->theme->settings->footnote)) { ?>\r
-            <div id="page-footer-content">\r
-\r
-                <!-- the content to show -->\r
-                <div id="footerwrapper">\r
-                    <?php echo $PAGE->theme->settings->footnote; ?>\r
-                </div> <!-- </footerwrapper> -->\r
-\r
-            </div> <!-- </page-footer-content> -->\r
-            <?php }\r
-            //one more div is waiting to be closed\r
-\r
-    } ?>\r
-\r
-            <div class="moodledocsleft">\r
-                <?php\r
-                //echo $OUTPUT->login_info();\r
-                //echo $OUTPUT->home_link();\r
-                echo $OUTPUT->standard_footer_html();\r
-                ?>\r
-            </div>\r
-            <div class="moodledocs">\r
-                <?php echo page_doc_link(get_string('moodledocslink')); ?>\r
-            </div>\r
-        </div> <!-- </page-footer> -->\r
-    </div> <!-- </page"> -->\r
-\r
-    <div class="clearfix"></div>\r
-\r
-<?php  } //the waiting div has been closed: </page-footer>\r
-    echo $OUTPUT->standard_end_of_body_html(); ?>\r
-</body>\r
-</html>
\ No newline at end of file
+<?php
+
+$hasheading = ($PAGE->heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
+
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if (!$showsidepre) {
+    $bodyclasses[] = 'content-only';
+}
+if ($hascustommenu) {
+    $bodyclasses[] = 'has_custom_menu';
+}
+
+/************************************************************************************************/
+if (!empty($PAGE->theme->settings->logo)) {
+    $logourl = $PAGE->theme->settings->logo;
+} else {
+    $logourl = $OUTPUT->pix_url('logo_small', 'theme');
+}
+
+$hasframe = !isset($PAGE->theme->settings->noframe) || !$PAGE->theme->settings->noframe;
+
+$displaylogo = !isset($PAGE->theme->settings->displaylogo) || $PAGE->theme->settings->displaylogo;
+/************************************************************************************************/
+
+echo $OUTPUT->doctype() ?>
+<html <?php echo $OUTPUT->htmlattributes() ?>>
+<head>
+    <title><?php echo $PAGE->title ?></title>
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
+    <?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(); ?>
+    <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 } ?>
+<!-- end of page-header -->
+
+<!-- begin of custom menu -->
+                            <?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 } ?>
+<!-- end of navigation bar -->
+
+<!-- start of moodle content -->
+                            <div id="page-content" class="clearfix">
+                                <div id="report-main-content">
+                                    <div class="region-content">
+                                        <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+                                    </div>
+                                </div>
+                                <?php if ($hassidepre) { ?>
+                                <div id="report-region-wrap">
+                                    <div id="report-region-pre" class="block-region">
+                                        <div class="region-content">
+                                            <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <?php } ?>
+                            </div>
+<!-- end of moodle content -->
+
+                            <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> -->
+
+<?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> <!-- </footerwrapper> -->
+
+                        </div> <!-- </footerframeright> -->
+                    </div> <!-- </footerframeleft> -->
+                    <div id="footerframebottomright">
+                        <div>&nbsp;</div>
+                    </div>
+                </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> <!-- </footerwrapper> -->
+
+            </div> <!-- </page-footer-content> -->
+            <?php }
+            //one more div is waiting to be closed
+
+    } ?>
+
+            <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> <!-- </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>
index d3564d8..f57b3f6 100644 (file)
@@ -227,8 +227,8 @@ pre, code, tt {
 table#defineroletable th {border-top:none;}
 
 form.loginform .rememberusername {
-       padding-left:0.3em;
-       width: auto;
+    padding-left:0.3em;
+    width: auto;
 }
 
 /** Custom CSS **/