Permalink
Browse files

MDL-31189 whitespace fixes

  • Loading branch information...
1 parent f69ad21 commit 0b1595881f02e90f657131241d6eab03d9ccc4da @stronk7 stronk7 committed Jan 24, 2012
Showing with 71 additions and 77 deletions.
  1. +32 −34 theme/sky_high/layout/frontpage.php
  2. +39 −43 theme/sky_high/layout/general.php
View
66 theme/sky_high/layout/frontpage.php
@@ -18,7 +18,7 @@
$bodyclasses[] = 'content-only';
}
if ($hassidepre || $hassidepost) {
- $bodyclasses[] = 'background';
+ $bodyclasses[] = 'background';
}
if (!empty($PAGE->theme->settings->logo)) {
@@ -45,29 +45,28 @@
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
- <div id="wrapper" class="clearfix">
+ <div id="wrapper" class="clearfix">
<!-- START OF HEADER -->
<div id="page-header" class="clearfix">
- <div id="page-header-wrapper">
- <?php if($logourl == NULL) { ?>
- <h1 class="headermain">
- <?php echo $PAGE->heading ?>
- </h1>
- <?php } else { ?>
- <img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" />
- <?php } ?>
-
-
- <div class="headermenu">
- <?php
- echo $OUTPUT->login_info();
- echo $OUTPUT->lang_menu();
- echo $PAGE->headingmenu;
- ?>
- </div>
- </div>
+ <div id="page-header-wrapper">
+ <?php if($logourl == NULL) { ?>
+ <h1 class="headermain">
+ <?php echo $PAGE->heading ?>
+ </h1>
+ <?php } else { ?>
+ <img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" />
+ <?php } ?>
+
+ <div class="headermenu">
+ <?php
+ echo $OUTPUT->login_info();
+ echo $OUTPUT->lang_menu();
+ echo $PAGE->headingmenu;
+ ?>
+ </div>
+ </div>
</div>
<!-- END OF HEADER -->
@@ -119,26 +118,25 @@
<!-- START OF FOOTER -->
- <div id="page-footer">
-
+ <div id="page-footer">
- <!-- START OF FOOTER-INNER -->
- <div id="page-footer-inner">
- <div class="footnote"><?php echo $footnote; ?></div>
- <?php
- echo $OUTPUT->login_info();
- ?>
- </div>
+ <!-- START OF FOOTER-INNER -->
- <!-- END OF FOOTER-INNER -->
+ <div id="page-footer-inner">
+ <div class="footnote"><?php echo $footnote; ?></div>
+ <?php
+ echo $OUTPUT->login_info();
+ ?>
+ </div>
- <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')); ?></p>
- <?php echo $OUTPUT->home_link(); ?>
- <?php echo $OUTPUT->standard_footer_html(); ?>
+ <!-- END OF FOOTER-INNER -->
+ <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')); ?></p>
+ <?php echo $OUTPUT->home_link(); ?>
+ <?php echo $OUTPUT->standard_footer_html(); ?>
- </div>
+</div>
<!-- END OF FOOTER -->
View
82 theme/sky_high/layout/general.php
@@ -19,7 +19,7 @@
$bodyclasses[] = 'content-only';
}
if ($hassidepre || $hassidepost) {
- $bodyclasses[] = 'background';
+ $bodyclasses[] = 'background';
}
if (!empty($PAGE->theme->settings->logo)) {
@@ -46,31 +46,30 @@
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
- <div id="wrapper" class="clearfix">
+ <div id="wrapper" class="clearfix">
<!-- START OF HEADER -->
<div id="page-header" class="clearfix">
- <div id="page-header-wrapper">
- <?php if($logourl == NULL) { ?>
- <h1 class="headermain">
- <?php echo $PAGE->heading ?>
- </h1>
- <?php } else { ?>
- <img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" /><h1 class="headerwlogo">- <?php echo $PAGE->heading ?></h1>
- <?php } ?>
-
-
- <div class="headermenu">
- <?php
- echo $OUTPUT->login_info();
- if (!empty($PAGE->layout_options['langmenu'])) {
- echo $OUTPUT->lang_menu();
- }
- echo $PAGE->headingmenu
- ?>
- </div>
- </div>
+ <div id="page-header-wrapper">
+ <?php if($logourl == NULL) { ?>
+ <h1 class="headermain">
+ <?php echo $PAGE->heading ?>
+ </h1>
+ <?php } else { ?>
+ <img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" /><h1 class="headerwlogo">- <?php echo $PAGE->heading ?></h1>
+ <?php } ?>
+
+ <div class="headermenu">
+ <?php
+ echo $OUTPUT->login_info();
+ if (!empty($PAGE->layout_options['langmenu'])) {
+ echo $OUTPUT->lang_menu();
+ }
+ echo $PAGE->headingmenu
+ ?>
+ </div>
+ </div>
</div>
<!-- END OF HEADER -->
@@ -80,14 +79,11 @@
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } ?>
<div class="navbar clearfix">
- <?php if ($hasnavbar) { ?>
- <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
- <div class="navbutton"> <?php echo $PAGE->button; ?></div>
- <?php } ?>
- </div>
-
-
-
+ <?php if ($hasnavbar) { ?>
+ <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+ <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+ <?php } ?>
+</div>
<div id="page-content-wrapper">
<div id="page-content">
@@ -130,27 +126,27 @@
<!-- END OF WRAPPER -->
<!-- START OF FOOTER -->
- <?php if ($hasfooter) { ?>
- <div id="page-footer">
+ <?php if ($hasfooter) { ?>
+ <div id="page-footer">
<!-- START OF FOOTER-INNER -->
- <div id="page-footer-inner">
- <div class="footnote"><?php echo $footnote; ?></div>
- <?php
- echo $OUTPUT->login_info();
- ?>
- </div>
+ <div id="page-footer-inner">
+ <div class="footnote"><?php echo $footnote; ?></div>
+ <?php
+ echo $OUTPUT->login_info();
+ ?>
+ </div>
<!-- END OF FOOTER-INNER -->
- <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')); ?></p>
- <?php echo $OUTPUT->home_link(); ?>
- <?php echo $OUTPUT->standard_footer_html(); ?>
+ <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')); ?></p>
+ <?php echo $OUTPUT->home_link(); ?>
+ <?php echo $OUTPUT->standard_footer_html(); ?>
- </div>
- <?php } ?>
+</div>
+<?php } ?>
<!-- END OF FOOTER -->

0 comments on commit 0b15958

Please sign in to comment.