Some setup changes

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5665 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index eeeb361b208c4b9a29a21e15617504c0471d3074..7b38f5cbb470e46ad86c32902f42f009b38431ef 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -777,3 +777,97 @@ td.tbhead {
 td.tbrhead {
        border-bottom:1px solid #B0B0B0;
 }
+
+
+/*********
+ * Setup
+ *********/
+
+/* The body style */
+body.setup_body {
+       background-image: none;
+       background-color: #979797;
+       margin: 4px;
+}
+
+/* The setup complete setup dialog */
+div.setup_dialog {
+        background-color: #F0F0F0;
+       width:100%;
+       float: left;
+}
+
+/* Navigation col */
+div.setup_navigation {
+       background-color: #F0F0F0;
+       width: 200px;
+       float: left;
+       clear: left;
+}
+
+/* Header col */
+div.setup_header {
+       width:100%;
+       background-color: #559955;
+       border: solid 5px #77BB77;
+       height: 50px;
+}
+
+/* Step header col */
+div.setup_plug_header {
+       background-color: #F0F0F0;
+       height: 40px;
+}
+
+/* content col */
+div.setup_content {
+       background-color: #F0F0F0;
+}
+
+/* The box used for each setup step */
+a.navigation_element, div.navigation_element {
+       float: left;
+       clear: left;
+       background: #F7F7F7 ;
+       text-decoration:none;
+       width:100%;
+       margin-bottom: 1px;
+}
+
+/* The box used for each setup step */
+a.navigation_element_active, div.navigation_element_active {
+       float: left;
+       clear: left;
+       position: relative;
+       background: #F7F7F7 ;
+       text-decoration:none;
+       width:100%;
+}
+
+/* An enabled setup step will use this style in navigation*/
+div.navigation_title_active {
+       font-size: 2em;
+       cursor: pointer;
+}
+
+/* Disabled setup steps */
+div.navigation_title_disabled {
+       font-size: 2em;
+       color: #DDDDDD;
+}
+
+/* Disabled setup steps */
+div.navigation_title_inactive {
+       font-family: Arial;
+       font-size: 2em;
+}
+
+/* The style for the info of an active setup */
+div.navigation_info {
+       font-size: 1em;
+       color: black;
+       padding: 4px 4px 3px 10px;
+       margin: 0px;
+       cursor: pointer;
+}
+

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 89949ecd27416681bd33c0f1d6a99f13df939aca..7ff77bc6a4a5fa1f98dc689fcc4e6f1be033d88d 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -85,8 +85,7 @@ class setup extends plugin
   /* Create navigation menu */
   function get_navigation_html()
   {
-    $str = "<table>";
-  
+    $str = "";
     foreach($this->o_steps as $key => $step){
 
       $s_title    = $step -> get_title();
@@ -94,23 +93,22 @@ class setup extends plugin
       $b_active   = $step -> is_active();
       $b_enabled  = $step -> is_enabled();
 
-      $str .= "<tr><td>";  
       if($b_enabled){
-        $str .= "<a href='?step=".$key."'>";
-        $str .= "<font color='darkblue' style='font-size:14pt;'>".$s_title."</font>";
         if($b_active){
-          $str .= "<div style='padding-left:16px;'>";
-          $str .= "  <font style='font-size:10pt;'>".$s_info."</font>";
-          $str .= "</div>";
+          $str .= "<a href='?step=".$key."' class='navigation_element_active'>";
+          $str .= "<div class='navigation_title_active'>".$s_title."</div>";
+          $str .= "<div class='navigation_info'>".$s_info."</div>";
+        }else{
+          $str .= "<a href='?step=".$key."' class='navigation_element'>";
+          $str .= "<div class='navigation_title_inactive'>".$s_title."</div>";
         }
-        $str .= "</a>";
+        $str .= "</a><br>\n";
       }else{
-        $str .= "<font color='darkgrey' style='font-size:14pt;'>".$s_title."</font>";
+        $str .= "<div class='navigation_element'>";
+        $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
+        $str .= "</div>";
       }
-      $str .= "<p class='seperator'>&nbsp;</p>";
-      $str .= "</td></tr>";
     }
-    $str .="</table>";
     return($str);
   }
 

diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 888a8bcbfac2b2cbae9b3c6a79db0fc7c71d5268..6269169e70dc2a91df6ec2a97e4008988e9b2436 100644 (file)
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -1,27 +1,38 @@
-<body style='background-image:none;background-color: #F4F4F4; padding:10px;'>
-
+<body class='setup_body'>
 {$php_errors}
 <form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
-<table style='width:100%;'>
-       <tr>
-               <td colspan=2 style='border:1px solid #CCC; height: 40px; vertical-align:top;' >
-                       GOsa Setup blabla
-               </td>
-       </tr>
-       <tr>
-               <td style='border:1px solid #CCC; height: 450px; width:200px; vertical-align:top;' rowspan=2>
-                       {$navigation}                   
-               </td>
-               <td colspan=2 style='border:1px solid #CCC; height: 40px; vertical-align:top;' >
-                       {$header}
-               </td>
-       </tr>
-       <tr>
-               <td style='border:1px solid #CCC; vertical-align:top;'>
-                       {$contents}
-               </td>
-       </tr>
-</table>
+
+<!-- All over div -->
+<div class='setup_dialog'>
+
+       <!-- Basic header  -->
+       <div class='setup_header'>
+               GOsa Setup blabla
+       </div>
+
+       <!-- Navigation div   -->
+       <div class='setup_navigation'> 
+               {$navigation}                   
+       </div>
+
+       <!-- Setup step div -->
+       <div  style='clear: right'>i
+
+               <!-- Div to skip horizontal scrolling -->       
+               <div style='float: top; clear: top ;padding:0px;width:100%' >
+
+                       <!-- Step header -->    
+                       <div class='setup_plug_header' >
+                               {$header}
+                       </div>
+       
+                       <!-- Step content -->
+                       <div class='setup_content'>
+                               {$contents}
+                       </div>
+               </div>
+       </div>
+</div>
 </form>
 </body>
 </html>