Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Paul Barrett
2 parents 901fe0d8 83562c6d
Showing 3 changed files with 58 additions and 52 deletions
setup/wizard/resources/graphics/background.gif
setup/wizard/resources/wizard.css
setup/wizard/templates/wizard.tpl
-* { margin:0; padding:0; }
+* { margin: 0; padding: 0; }
  
 body {
     background: white;
@@ -49,52 +49,64 @@ td {
     padding: 2px 5px;
 }
  
-.container {
+/* *** Layout Styles *** */
+
+#outer-wrapper {
+    text-align: left;
     border: solid 1px #A1A1A1;
     margin: 50px;
     margin-top: 20px;
-    text-align: left;
-    z-index: -1;
 }
  
-.header {
+#header {
     background: url("graphics/gradient.png") repeat-y;
     background-position: top right;
     height: 60px;
 }
  
-.logo {
-    background: url("graphics/logo.png") no-repeat;
-    background-position: top left;
-    height: inherit;
-    width: 200px;
-    margin-left: 10px;
+#wrapper {
+    background: white url("graphics/background.gif") repeat-y left;
 }
  
-.content {
-    /*background: #F1F1F1;*/
+#container {
+  width: 100%;
+  background: white url("graphics/background.gif") repeat-y left;
+  float: right;
+  margin-left: -200px;
 }
  
-.left {
-    position: relative;
-    float: left;
-    width: 200px;
-    text-align: center;
-    /*background: url("graphics/left.png") repeat-y;*/
-    background-position: top left;
-    /*background: #F1F1F1;*/
-    height: inherit;
-    padding-bottom: 20px;
-    padding-top: 40px;
+#content {
+    margin-left: 200px;
+    padding: 10px;
+    padding-top: 0;
 }
  
-.right {
-    position: relative;
-    float: left;
-    padding: 20px;
-    min-width: 600px;
-    width: 800px;
-    background: white;
+#sidebar {
+  width: 200px;
+  float: left;
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+#footer {
+    background: url("graphics/footer.png") repeat-x;
+    height: 50px;
+    clear: both;
+}
+
+.clearing {
+    height: 0;
+    clear: both;
+}
+
+/* Content Styles */
+
+.logo {
+    background: url("graphics/logo.png") no-repeat;
+    background-position: top left;
+    height: inherit;
+    width: 200px;
+    margin-left: 10px;
 }
  
 .menu {
@@ -187,12 +199,6 @@ td {
     color: #EC7725;
 }
  
-.footer {
-    background: url("graphics/footer.png") repeat-x;
-    height: 50px;
-    clear: both;
-}
-
 .powered-by {
     background: url("graphics/powered-by-kt.png") no-repeat;
     background-position: center left;
@@ -6,29 +6,29 @@
 </head>
  
 <body>
-<div class="container">
-    <div class="header">
+
+<div id="outer-wrapper">
+    <div id="header">
         <div class="logo"></div>
     </div>
-    <div class="content">
  
-        <div class="left">
-            <?php echo $left; ?>
-        </div>
-        <div class="right">
-        
-           <?php echo $content; ?>
-<!--
-            <div class="buttons">
-                <a href="index.php?step_name=&step=previous" class="next">Previous</a>
-                <a href="index.php?step_name=&step=next" class="next">Next</a>
+    <div id="wrapper">
+        <div id="container">
+            <div id="content">
+                <?php echo $content; ?>
             </div>
-            -->
         </div>
+
+        <div id="sidebar">
+            <?php echo $left; ?>
+        </div>
+        <div class="clearing">&nbsp;</div>
     </div>
-    <div class="footer">
+
+    <div id="footer">
         <div class="powered-by"></div>
     </div>
 </div>
+
 </body>
 </html>
 \ No newline at end of file