MDL-31189 whitespace fixes

This commit is contained in:
Eloy Lafuente (stronk7)
2012-01-24 13:12:25 +01:00
parent 42906f4657
commit df31835a44
2 changed files with 70 additions and 76 deletions
+32 -34
View File
@@ -18,7 +18,7 @@ if ($showsidepre && !$showsidepost) {
$bodyclasses[] = 'content-only';
}
if ($hassidepre || $hassidepost) {
$bodyclasses[] = 'background';
$bodyclasses[] = 'background';
}
if (!empty($PAGE->theme->settings->logo)) {
@@ -45,29 +45,28 @@ echo $OUTPUT->doctype() ?>
<?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 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 class="headermenu">
<?php
echo $OUTPUT->login_info();
echo $OUTPUT->lang_menu();
echo $PAGE->headingmenu;
?>
</div>
</div>
</div>
<!-- END OF HEADER -->
@@ -119,26 +118,25 @@ echo $OUTPUT->doctype() ?>
<!-- START OF FOOTER -->
<div id="page-footer">
<div id="page-footer">
<!-- START OF FOOTER-INNER -->
<!-- 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 -->
<!-- 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>
</div>
<!-- END OF FOOTER -->
@@ -147,4 +145,4 @@ echo $OUTPUT->doctype() ?>
<!-- END OF PAGE -->
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
</html>
</html>
+38 -42
View File
@@ -19,7 +19,7 @@ if ($showsidepre && !$showsidepost) {
$bodyclasses[] = 'content-only';
}
if ($hassidepre || $hassidepost) {
$bodyclasses[] = 'background';
$bodyclasses[] = 'background';
}
if (!empty($PAGE->theme->settings->logo)) {
@@ -46,31 +46,30 @@ echo $OUTPUT->doctype() ?>
<?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 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 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 @@ echo $OUTPUT->doctype() ?>
<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 @@ echo $OUTPUT->doctype() ?>
<!-- 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 -->