styles_layout.css updated for new sideblocks code. header.html remove…

…d logo.
moodle · May 30, 2005 · 606f29f · 606f29f
1 parent 6a43c2a
commit 606f29f
Show file tree

Hide file tree

Showing 2 changed files with 148 additions and 76 deletions.
diff --git a/theme/cornflower/header.html b/theme/cornflower/header.html
@@ -1,74 +1,148 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html<?php echo $direction ?>>
+
-<head>
+<html<?php echo $direction ?>>
-    <?php echo $meta ?>
+
-    <meta name="keywords" content="moodle, <?php echo $title ?> " />
+<head>
-    <title><?php echo $title ?></title>
+
-    <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+    <?php echo $meta ?>
-    <?php include("$CFG->javascript"); ?>
+
-</head>
+    <meta name="keywords" content="moodle, <?php echo $title ?> " />
-
+
-<body background="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/bg.gif" ?>" <?php
+    <title><?php echo $title ?></title>
-    echo " $bodytags";
+
-    if ($focus) {
+    <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
-        echo " onload=\"setfocus()\"";
+
-    }
+    <?php include("$CFG->javascript"); ?>
-    ?>>
+
-<table align="center" width="100%" border="2" cellpadding="0" cellspacing="0" bgcolor="#D0E2EE">
+</head>
-<tr><td>    
+
-<div id="page">
+
-
+
-<?php if ($home) {  // This is what gets printed on the home page only  
+<body background="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/bg.gif" ?>" <?php
-?>
+
-
+    echo " $bodytags";
-<table width="100%"  cellpadding="0" cellspacing="0" border="0">
+
-
+    if ($focus) {
-    <tr>
+
-        <td>
+        echo " onload=\"setfocus()\"";
-        <table background="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/headerbg.jpg" ?>" width="100%" height="112"  cellpadding="0" cellspacing="0" border="0">
+
-
+    }
-        <tr>
+
-
+    ?>>
-        <td valign="top" class="header1"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/logo.jpg" ?>" border="0">&nbsp;</td>
+
-
+<table align="center" width="100%" border="2" cellpadding="0" cellspacing="0" bgcolor="#D0E2EE">
-
+
-
+<tr><td>    
-      <td align="right" style="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
+
-
+<div id="page">
-    </tr>
+
- </table></tr></td>
+
-  </table>
+
-<?php } else if ($heading) {  // This is what gets printed on any other page with a heading ?>
+<?php if ($home) {  // This is what gets printed on the home page only  
-
+
-   <table width="100%"  cellpadding="0" cellspacing="0" border="0">
+?>
-        <tr>
+
-        <td>
+
-
+
-<table background="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/headerbg.jpg" ?>" width="100%" height="112"  cellpadding="0" cellspacing="0" border="0">
+<table width="100%"  cellpadding="0" cellspacing="0" border="0">
-        <tr>
+
-        <td valign="top"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/logo2.jpg" ?>" border="0">&nbsp;</td>
+
-        <td align="right" style="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
+
-    </tr>
+    <tr>
-</table>
+
-        </tr>
+        <td>
-        </td>
+
-</table>
+        <table background="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/headerbg.jpg" ?>" width="100%" height="112"  cellpadding="0" cellspacing="0" border="0">
-
+
-<?php } ?>
+
-    <div class="clearer">&nbsp;</div>
+
-
+        <tr>
-<?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
+
-     <table border="0" cellpadding="3" cellspacing="0" width="100%">
+
-    <tr>
+
-      <td><?php print_navigation("$navigation"); ?></td>
+        <td valign="top" class="header1">&nbsp;</td>
-      <td align="right" width="20" valign="top"><?php echo $button; ?></td>
+
-    </tr>
+
-  </table>
+
-  <img src="<?php echo $CFG->wwwroot?>/pix/spacer.gif" alt="" height="5" width="1" /><br />
+
-
+
-<?php } else if ($heading) { // If no navigation, but a heading, then print a line  
+
-?>
+
-<?php } ?>
+      <td align="right" style="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
-    <div class="clearer">&nbsp;</div>
+
-    <!-- END OF HEADER -->
+
-    <div id="content">
+
+    </tr>
+
+ </table></tr></td>
+
+  </table>
+
+<?php } else if ($heading) {  // This is what gets printed on any other page with a heading ?>
+
+
+
+   <table width="100%"  cellpadding="0" cellspacing="0" border="0">
+
+        <tr>
+
+        <td>
+
+
+
+<table background="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/headerbg.jpg" ?>" width="100%" height="112"  cellpadding="0" cellspacing="0" border="0">
+
+        <tr>
+
+        <td valign="top">&nbsp;</td>
+
+        <td align="right" style="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
+
+    </tr>
+
+</table>
+
+        </tr>
+
+        </td>
+
+</table>
+
+
+
+<?php } ?>
+
+    <div class="clearer">&nbsp;</div>
+
+
+
+<?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
+
+     <table border="0" cellpadding="3" cellspacing="0" width="100%">
+
+    <tr>
+
+      <td><?php print_navigation("$navigation"); ?></td>
+
+      <td align="right" width="20" valign="top"><?php echo $button; ?></td>
+
+    </tr>
+
+  </table>
+
+  <img src="<?php echo $CFG->wwwroot?>/pix/spacer.gif" alt="" height="5" width="1" /><br />
+
+
+
+<?php } else if ($heading) { // If no navigation, but a heading, then print a line  
+
+?>
+
+<?php } ?>
+
+    <div class="clearer">&nbsp;</div>
+
+    <!-- END OF HEADER -->
+
+    <div id="content">
+
diff --git a/theme/cornflower/styles_layout.css b/theme/cornflower/styles_layout.css
@@ -618,7 +618,6 @@ body#admin-config .confighelp {
 
 .sideblock .header .hide-show {
 
-  float:right;
 
 }
 
@@ -648,7 +647,6 @@ body#admin-config .confighelp {
 
 .sideblock .header .title {
 
-  float: left;
 
 }