Added setup fixes

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

diff --git a/html/setup.php b/html/setup.php
index c414bb491a1127c0fa0d91070a31b82e2acd5e65..882fce2459b0a9d789bec6af94bbbfa9ec41b980 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
@@ -100,8 +100,9 @@ require_once("../setup/main.inc");
 /* Print_out last ErrorMessage repeated string. */
 print_red(NULL);
 
+$smarty->assign("date", date("l, dS F Y H:i:s O"));
 $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
-
+/* show web frontend */
 $smarty->assign("contents"  , $display);
 $smarty->assign("navigation", $_SESSION['setup']->get_navigation_html());
 $smarty->assign("header", $_SESSION['setup']->get_header_html());

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index ff6756c29ce97c9dad2766e31a1eef043ee0c248..cad63a4dbd736233c957dd433c0e43310820c64d 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -872,26 +872,24 @@ div.setup_navigation_border {
 /* Navigation title */
 div.setup_navigation_title {
        font-size: 1.7em;
-        background: #CCF6CC ;
-        text-decoration:none;
-        width:100%;
-        margin-bottom: 7px;
-        border-right: solid 1px #BBBBBB;
-        border-bottom: solid 1px #CCCCCC;
-
+       background: #CCF6CC ;
+       text-decoration:none;
+       width:100%;
+       margin-bottom: 7px;
+       border-right: solid 1px #AAAAAA;
+       border-bottom: solid 1px #BBBBBB;
 }
 
 /* The box used for each setup step */
 a.navigation_element, div.navigation_element {
        float: left;
        clear: left;
-       background: #EEF6EE ;
+       background: #E4E4E4 ;
        text-decoration:none;
        width:100%;
        margin-bottom: 4px;
-       border-right: solid 1px #DDDDDD;
-       border-bottom: solid 1px #DDDDDD;
-       
+       border-right: solid 1px #AAAAAA;
+       border-bottom: solid 1px #BBBBBB;
 }
 
 /* The box used for each setup step */
@@ -899,12 +897,12 @@ a.navigation_element_active, div.navigation_element_active {
        float: left;
        clear: left;
        position: relative;
-       background: #EEF6EE ;
+       background: #E4E4E4 ;
        text-decoration:none;
        width:100%;
        margin-bottom: 4px;
-       border-right: solid 1px #BBBBBB;
-       border-bottom: solid 1px #CCCCCC;
+       border-right: solid 1px #AAAAAA;
+       border-bottom: solid 1px #BBBBBB;
 }
 
 /* An enabled setup step will use this style in navigation*/
@@ -920,7 +918,7 @@ div.navigation_title_disabled {
        font-size: 1.2em;
        font-weight: bold;
        padding: 3px;
-       color: #DDDDDD;
+       color: #AAAAAA;
 }
 
 /* Disabled setup steps */

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 792dec9a979bfbdeea7b0bfbce37f2627770edc0..5236619d1e4cd38baf68fdd932a2923b94a7ddbc 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -97,13 +97,12 @@ class setup extends plugin
       if($b_enabled){
         if($b_active){
           $str .= "<a href='?step=".$key."' class='navigation_element_active'>";
-          $str .= "<span class='navigation_title_active'>".$s_title."</span>";
-          $str .= "<br>";
-          $str .= "<span class='navigation_info'>".$s_info."</span>";
+          $str .= "<div class='navigation_title_active'>".$s_title."</div>";
+          $str .= "<div class='navigation_info'>".$s_info."</div>";
           $str .= "</a><br>\n";
         }else{
           $str .= "<a href='?step=".$key."' class='navigation_element'>";
-          $str .= "<span class='navigation_title_inactive'>".$s_title."</span>";
+          $str .= "<div class='navigation_title_inactive'>".$s_title."</div>";
           $str .= "</a><br>\n";
         }
       }else{

diff --git a/setup/main.inc b/setup/main.inc
index fe41c80304c8d522d04480d1f9ca39bb36cc74ce..bce41ef68ff02ca28599b1f85ec7dd6974b016c3 100644 (file)
--- a/setup/main.inc
+++ b/setup/main.inc
@@ -18,8 +18,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-restore_error_handler();
-
 /* Create a new setup class if necessary  */
 if (!isset($_SESSION['setup']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
   $_SESSION['setup']= new setup ();