From aef42b33da66d28c8decc2c8e542d894c768177a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@opensides.be>
Date: Tue, 19 Aug 2014 17:34:56 +0200
Subject: [PATCH] Fixes #3239 Fixed setup look

---
 html/themes/default/setup.css | 52 ++++++++++-------------------------
 setup/class_setup.inc         | 44 ++++++++++++++---------------
 setup/setup_migrate.tpl       |  2 +-
 3 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/html/themes/default/setup.css b/html/themes/default/setup.css
index fbdbed8e3..2ab5109ed 100644
--- a/html/themes/default/setup.css
+++ b/html/themes/default/setup.css
@@ -3,24 +3,15 @@
 /*********
  * Setup
  *********/
-/* The body style */
-body.setup_body {
-margin:0;
-color:#00008F;
-font-family:arial,helvetica,sans-serif;
-font-size:12px;
-background-color:#FFF;
-background-image:none;
-}
-
-/* The setup complete setup dialog */
-div.setup_dialog {
-background-color:#FFF;
-text-align:left;
+html.ltr body.setup div#header_left .plugtop {
+margin-left:80px;
 }
 html.rtl div.setup_dialog {
 text-align:left;
 }
+body.setup .plugin_window {
+border-radius:5px;
+}
 
 div.setup_menu {
 background-color:#F8F8F8;
@@ -70,7 +61,7 @@ margin-left:2px;
 
 /* default.*/
 div.default {
-padding:2px;
+padding:2px 10px;
 vertical-align:middle;
 }
 
@@ -99,45 +90,32 @@ border-top:1px solid #AAA;
 }
 
 /* The box used for each setup step */
-a.navigation_element,div.navigation_element {
+#menucell.setup_navigation li.menuitem {
 text-decoration:none;
 padding-top:8px;
 padding-bottom:8px;
-border-top:1px solid #AAA;
-width:100%;
+margin-top:5px;
+margin-bottom:5px;
 }
 
 /* The box used for each setup step */
-a.navigation_element_active,div.navigation_element_active {
-text-decoration:none;
-width:100%;
-padding-top:8px;
-padding-bottom:8px;
-border-top:1px solid #AAA;
-background-color:#F0F0F0;
+#menucell.setup_navigation li.menuitem > a {
+margin:0;
 }
 
 /* An enabled setup step will use this style in navigation*/
-div.navigation_title_active {
-font-size:1.2em;
-background-color:#F0F0F0;
-font-weight:bold;
+li.menuitem.menucurrent a.navigation_title {
 cursor:default;
-padding:3px;
 }
 
 /* Disabled setup steps */
-div.navigation_title_disabled {
-font-size:1.2em;
-font-weight:bold;
-padding:3px;
+li.menuitem.disabled a.navigation_title {
 cursor:default;
-text-decoration:none;
 color:#AAA;
 }
 
 /* Disabled setup steps */
-div.navigation_title_inactive {
+li.menuitem a.navigation_title {
 font-size:1.2em;
 font-weight:bold;
 text-decoration:none;
@@ -146,7 +124,7 @@ padding:3px;
 }
 
 /* The style for the info of an active setup */
-div.navigation_info {
+li.menuitem a.navigation_info {
 font-size:1em;
 color:#000;
 padding:4px 4px 3px 23px;
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 3ce0cc619..9b98a8e1b 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -185,7 +185,7 @@ class setup
   /* Create navigation menu */
   function get_navigation_html()
   {
-    $str = "";
+    $str = '<ul class="menu"><li><a>FusionDirectory Setup</a><ul>';
     foreach ($this->o_steps as $key => $step) {
 
       $step->update_strings();
@@ -197,32 +197,33 @@ class setup
       $b_completed  = $step->is_completed();
 
       if ($b_completed) {
-        $s = "<img src='geticon.php?context=status&icon=task-complete&size=16' alt='"._("Completed")."' class='center'>&nbsp;";
+        $s = '<img src="geticon.php?context=status&icon=task-complete&size=16" alt="'._('Completed').'" class="center optional"/>&nbsp;';
       } else {
-        $s = "<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
+        $s = '<img src="images/empty.png" alt=" " class="center optional"/>&nbsp;';
       }
 
       $str .= "<div >";
 
       if ($b_enabled) {
         if ($b_active) {
-          $str .= "<div class='navigation_element_active'>";
-          $str .= "<div class='navigation_title_active'>".$s.$s_title."</div>";
-          $str .= "<div class='navigation_info'>".$s_info."</div>";
-          $str .= "</div>";
+          $str .= '<li class="menuitem menucurrent" title="'.$s_info.'">';
+          $str .= '<a class="navigation_title">'.$s.$s_title.'</a>';
+          $str .= '<a class="navigation_info">'.$s_info.'</a>';
+          $str .= '</li>';
         } else {
-          $str .= "<div class='navigation_element'>";
-          $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
-            class='navigation_title_inactive'>".$s.$s_title."</div>";
-          $str .= "</div>";
+          $str .= '<li class="menuitem" title="'.$s_info.'">';
+          $str .= '<a onClick="document.mainform.setup_goto_step.value=\''.$key.'\';document.mainform.submit();"
+            class="navigation_title">'.$s.$s_title.'</a>';
+          $str .= '</li>';
         }
       } else {
-        $str .= "<div class='navigation_element'>";
-        $str .= "<div class='navigation_title_disabled'>".$s.$s_title."</div>";
-        $str .= "</div>";
+        $str .= '<li class="menuitem disabled" title="'.$s_info.'">';
+        $str .= '<a class="navigation_title">'.$s.$s_title.'</a>';
+        $str .= '</li>';
       }
       $str .= "</div>";
     }
+    $str .= '</li></ul>';
     return $str;
   }
 
@@ -233,18 +234,17 @@ class setup
      *  if the currently opened step is a sub dialog
      */
     if ($this->o_steps[$this->i_current]->dialog) {
-      $str = "";
+      $str = '';
     } else {
-      $str = "<p class='seperator' style='margin-bottom:10px;'>&nbsp;</p>";
-      $str .= "   <div style='text-align:right;float:top;'>";
+      $str = '   <p class="plugbottom">';
       if (isset($this->o_steps[$this->i_current - 1]) && $this->o_steps[$this->i_current - 1]->is_enabled()) {
-        $str .= "<input type='submit' name='last' value='".msgPool::backButton()."'>";
+        $str .= '<input type="submit" name="last" value="'.msgPool::backButton().'"/>';
       } else {
-        $str .= "<input type='button' name='last' value='".msgPool::backButton()."' disabled>";
+        $str .= '<input type="button" name="last" value="'.msgPool::backButton().'" disabled="disabled"/>';
       }
-      $str .= "&nbsp;";
-      $str .= "<input type='submit' name='next' value='"._("Next")."'>";
-      $str .= "</div>";
+      $str .= '&nbsp;';
+      $str .= '<input type="submit" name="next" value="'._('Next').'"/>';
+      $str .= '</p>';
     }
     return $str;
   }
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index c5eb7ea2b..9397b46f6 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -1,5 +1,5 @@
 <div>
-    <div class='default'>
+    <div class="default">
 
   {if $method == "default"}
       <p>{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to FusionDirectory base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t}
-- 
GitLab