merging forgotten changes from MOODLE_18_STABLE

diff --git a/theme/formal_white/footer.html b/theme/formal_white/footer.html
index 94ae2447d0e49f048f82b3138276cc6a5a61a985..ec3b78dc3514399843b71e6db9929528fa283623 100644 (file)
--- a/theme/formal_white/footer.html
+++ b/theme/formal_white/footer.html
@@ -4,27 +4,26 @@
 <div id="footer">
 
 <?php
-   echo '<p class="helplink">';
-    echo page_doc_link(get_string('moodledocslink'));  
+    echo '<p class="helplink">';
+    echo page_doc_link(get_string('moodledocslink'));
     echo '</p>';
-  ?>
+?>
 
-<?php if ($navigation) { ?>
-    <div class="navbar">
+<?php if ($navigation and false) { ?>
+    <div class="navbar clearfix">
         <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
         <div class="menu"><?php echo $menu; ?></div>
     </div>
-    <div class="clearer">&nbsp;</div>
 <?php } ?>
 
 <hr />
-<div align="center">
-<?php echo $loggedinas ?>
+
+<?php echo $loggedinas ?><br />
 <?php echo $homelink ?>
 <?php if (!empty($performanceinfo)) {
           echo $performanceinfo;
 } ?>
-</div>
+
 <?php if (debugging()) {
 ?>
         <div class="validators"><ul>