Updated setup

-Removed hundreds of <divs>

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

diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 88a8cf829c9315712f190308614adf85b8da77b9..36bf7620913013ee85102fcc9c9cdf729db03e78 100644 (file)
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -25,279 +25,244 @@ require_once("class_setupStep.inc");
 
 class setup 
 {
-  var $i_steps  = 9;  // Number of setup steps 
-  var $i_current= 1;  // Current step
-  var $i_last   = 1;  // Last setup step;
-  var $o_steps  = array(); 
-  var $captured_values = array();
-
-  function setup()
-  {
-    $i = 1; 
-    $this->o_steps[$i++] = new Step_Welcome();
+    var $i_steps  = 9;  // Number of setup steps 
+    var $i_current= 1;  // Current step
+    var $i_last   = 1;  // Last setup step;
+    var $o_steps  = array(); 
+    var $captured_values = array();
+
+    function setup()
+    {
+        $i = 1; 
+        $this->o_steps[$i++] = new Step_Welcome();
 #    $this->o_steps[$i++] = new Step_Language();
-    $this->o_steps[$i++] = new Step_Checks();
-    $this->o_steps[$i++] = new Step_License();
-    $this->o_steps[$i++] = new Step_Ldap();
+        $this->o_steps[$i++] = new Step_Checks();
+        $this->o_steps[$i++] = new Step_License();
+        $this->o_steps[$i++] = new Step_Ldap();
 #    $this->o_steps[$i++] = new Step_Schema();
-#    $this->o_steps[$i++] = new Step_Config1();
-#    $this->o_steps[$i++] = new Step_Config2();
-#    $this->o_steps[$i++] = new Step_Config3();
-    $this->o_steps[$i++] = new Step_Migrate();
-    $this->o_steps[$i++] = new Step_Feedback();
-    $this->o_steps[$i++] = new Step_Finish();
-    $this->i_steps = $i-1;
-
-    /* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */
-    if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){
-      session::destroy();
-      header("Location: index.php")    ;
-      exit();
-    }
-    
-    foreach($this->o_steps as $key => $step){
-      $this->o_steps[$key]->parent = &$this;
-    }
-  }
-
-  function execute()
-  {
-    /* Display phpinfo() dialog when $_GET['info'] is set,
-     *  but only do this, if user is allowed to use the setup.
-     * If setupStep_Welcome is_completed, we are allowed to view those infos-
-     */
-    if(isset($_GET['info']) &&  preg_match("/Step_Welcome/i",get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()){
-      phpinfo();
-      exit();
+        $this->o_steps[$i++] = new Step_Migrate();
+        $this->o_steps[$i++] = new Step_Feedback();
+        $this->o_steps[$i++] = new Step_Finish();
+        $this->i_steps = $i-1;
+
+        /* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */
+        if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){
+            session::destroy();
+            header("Location: index.php")    ;
+            exit();
+        }
+
+        foreach($this->o_steps as $key => $step){
+            $this->o_steps[$key]->parent = &$this;
+        }
     }
 
-    /* display step error msgs */
-    $msgs = $this->o_steps[$this->i_current]->check();
-    foreach($msgs as $msg){
-      msg_dialog::display(_("Setup error"), $msg, ERROR_DIALOG);
+    function execute()
+    {
+        /* Display phpinfo() dialog when $_GET['info'] is set,
+         *  but only do this, if user is allowed to use the setup.
+         * If setupStep_Welcome is_completed, we are allowed to view those infos-
+         */
+        if(isset($_GET['info']) &&  preg_match("/Step_Welcome/i",get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()){
+            phpinfo();
+            exit();
+        }
+
+        /* display step error msgs */
+        $msgs = $this->o_steps[$this->i_current]->check();
+        foreach($msgs as $msg){
+            msg_dialog::display(_("Setup error"), $msg, ERROR_DIALOG);
+        }
+
+        $this->o_steps[$this->i_last]->set_active(FALSE);
+        $this->o_steps[$this->i_current]->set_active();
+        $content = $this->o_steps[$this->i_current]->execute();
+        return($content);
     }
 
-    $this->o_steps[$this->i_last]->set_active(FALSE);
-    $this->o_steps[$this->i_current]->set_active();
-    $content = $this->o_steps[$this->i_current]->execute();
-    return($content);
-  }
 
+    /* Save posted attributes  */
+    function save_object()
+    {
+        /* Call save_object for current setup step */
+        $this->o_steps[$this->i_current] -> save_object();
 
-  /* Save posted attributes  */
-  function save_object()
-  {
-    /* Call save_object for current setup step */
-    $this->o_steps[$this->i_current] -> save_object();
+        /* Get attributes from setup step */
+        $tmp = $this->o_steps[$this->i_current]->get_attributes();
+        foreach($tmp as $name => $value){
+            $this->captured_values[$name] = $value;
+        }
 
-    /* Get attributes from setup step */
-    $tmp = $this->o_steps[$this->i_current]->get_attributes();
-    foreach($tmp as $name => $value){
-      $this->captured_values[$name] = $value;
-    }
+        /* Set parent */
+        foreach($this->o_steps as $key => $value){
+            $this->o_steps[$key]->parent = $this;
+        }
 
-    /* Set parent */
-    foreach($this->o_steps as $key => $value){
-      $this->o_steps[$key]->parent = $this;
-    }
+        /* Check if image button requests next page */
+        foreach($_POST as $name => $value){
+            if(preg_match("/^next_(x|y)/",$name)){
+                $_POST['next'] = TRUE;
+            }
+            if(preg_match("/^last_(x|y)/",$name)){
+                $_POST['last'] = TRUE;
+            }
+        }
 
-    /* Check if image button requests next page */
-    foreach($_POST as $name => $value){
-      if(preg_match("/^next_(x|y)/",$name)){
-        $_POST['next'] = TRUE;
-      }
-      if(preg_match("/^last_(x|y)/",$name)){
-        $_POST['last'] = TRUE;
-      }
-    }
+        /* Check if step was selected */
+        if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last'])){
+
+            /* check if current setup step is completed now 
+               and activate the next step if possible */
+            for($i = 1 ; $i <= $this->i_steps ; $i ++ ){
+                if($this->o_steps[$i]->is_completed()){
+                    if(isset($this->o_steps[($i+1)])){
+                        $this->o_steps[($i+1)]->set_enabled();
+                    }
+                }else{
+                    $this->disable_steps_from($i+1);
+                }
+            }
+        }
 
-    /* Check if step was selected */
-    if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last'])){
+        /* Disable all following steps, if one step isn't compelted right now .*/
+        for($i = 1 ; $i <= $this->i_steps ; $i ++ ){
+            if($this->o_steps[$i]->is_completed()){
+            }else{
+                $this->disable_steps_from($i+1);
+            }
+        }
 
-      /* check if current setup step is completed now 
-          and activate the next step if possible */
-      for($i = 1 ; $i <= $this->i_steps ; $i ++ ){
-        if($this->o_steps[$i]->is_completed()){
-          if(isset($this->o_steps[($i+1)])){
-            $this->o_steps[($i+1)]->set_enabled();
-          }
-        }else{
-          $this->disable_steps_from($i+1);
+        $step = -1;
+
+        if(isset($_POST['setup_goto_step'])){
+            $step= $_POST['setup_goto_step'];
         }
-      }
-    }
- 
-    /* Disable all following steps, if one step isn't compelted right now .*/
-    for($i = 1 ; $i <= $this->i_steps ; $i ++ ){
-      if($this->o_steps[$i]->is_completed()){
-      }else{
-        $this->disable_steps_from($i+1);
-      }
-    }
- 
-    $step = -1;
 
-    if(isset($_POST['setup_goto_step'])){
-      $step= $_POST['setup_goto_step'];
-    }
+        if(isset($_GET['step'])){
+            $step = $_GET['step'];
+        }elseif(isset($_POST['next'])){
+            $step = $this->i_current + 1;
+        }elseif(isset($_POST['last'])){
+            $step = $this->i_current - 1;
+        }
 
-    if(isset($_GET['step'])){
-      $step = $_GET['step'];
-    }elseif(isset($_POST['next'])){
-      $step = $this->i_current + 1;
-    }elseif(isset($_POST['last'])){
-      $step = $this->i_current - 1;
-    }
-  
-    $once = true;
-    foreach($_POST as $name => $value){
-      if(preg_match("/^step_[0-9]*$/",$name) && $once ){
-        $step = preg_replace("/^step_/","",$name);
-      }
-    }
+        $once = true;
+        foreach($_POST as $name => $value){
+            if(preg_match("/^step_[0-9]*$/",$name) && $once ){
+                $step = preg_replace("/^step_/","",$name);
+            }
+        }
 
-    if($this->selectable_step($step)){
-      $this->i_last    = $this->i_current;
-      $this->i_current = $step;
+        if($this->selectable_step($step)){
+            $this->i_last    = $this->i_current;
+            $this->i_current = $step;
+        }
     }
-  }
 
 
-  function disable_steps_from($start)
-  {
-    $found = false;
-    foreach($this->o_steps as $key => $step){
-      if($key == $start){
-        $found = true;
-      }
+    function disable_steps_from($start)
+    {
+        $found = false;
+        foreach($this->o_steps as $key => $step){
+            if($key == $start){
+                $found = true;
+            }
 
-      if($found){ 
-        $this->o_steps[$key]->set_enabled(false);
-        $this->o_steps[$key]->set_completed(false);
-      }
+            if($found){ 
+                $this->o_steps[$key]->set_enabled(false);
+                $this->o_steps[$key]->set_completed(false);
+            }
+        }
     }
-  }
-
-
-  /* Create navigation menu */
-  function get_navigation_html()
-  {
-    $str = "";
-    foreach($this->o_steps as $key => $step){
-
-      $step -> update_strings();
-
-      $s_title    = $step -> get_title();
-      $s_info     = $step -> get_small_info();
-      $b_active   = $step -> is_active();
-      $b_enabled  = $step -> is_enabled();
-      $b_completed= $step -> is_completed();
-
-      if($b_completed){
-        $s = "<img src='images/true.png' alt='"._("Completed")."' class='center'>&nbsp;"; 
-      }else{
-        $s = "<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
-      }
-
-      if(session::get('js')){
-
-        $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>";
-          }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>";
-          }
-        }else{
-          $str .= "<div class='navigation_element'>";
-          $str .= "<div class='navigation_title_disabled'>".$s.$s_title."</div>";
-          $str .= "</div>";
+
+
+    /* Create navigation menu */
+    function get_navigation_html()
+    {
+        $str = "<ul>";
+        $str .= "<li class='menu-header'>"._("Setup")."</li>";
+        foreach($this->o_steps as $key => $step){
+
+            $step -> update_strings();
+
+            $s_title    = $step -> get_title();
+            $s_info     = $step -> get_small_info();
+            $b_active   = $step -> is_active();
+            $b_enabled  = $step -> is_enabled();
+            $b_completed= $step -> is_completed();
+
+            if($b_completed){
+                $s = "<img src='images/true.png' alt='"._("Completed")."' class='center'>&nbsp;"; 
+            }else{
+                $s = "<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
+            }
+
+            if($b_enabled){
+                if($b_active){
+                    $str .= "<li class='active'>".$s.$s_title."</li>";
+                }else{
+                    $str .= "<li onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
+                        class='enabled'>".$s.$s_title."</li>";
+                }
+            }else{
+                $str .= "<li class='disabled'>".$s.$s_title."</li>";
+            }
         }
-        $str .= "</div>" ;
-      }else{
-        $str .="<div >";
-        if($b_enabled){
-          if($b_active){
-            $str .= "<div class='navigation_element_active'>";
-            $str .= "<input style='text-align: left; color: #00008F; font-weight: bold; width:100%;' 
-                        type='button' value='".$s_title."' name='step_".$key."'>";
-            $str .= "</div>";
-          }else{
-            $str .= "<div class='navigation_element'>";
-            $str .= "<input style='text-align: left; color: #00008F; font-weight: bold; width:100%;' 
-                        type='submit' value='".$s_title."' name='step_".$key."'>";
-            $str .= "</div>";
-          }
+        $str .="</ul>";
+        $str .="<div class='v-spacer'></div>";
+        return($str);
+    }
+
+
+
+    function get_bottom_html()
+    {
+        /* Skip adding forward/backward button,   
+         *  if the currently opened step is a sub dialog 
+         */
+        if($this->o_steps[$this->i_current]->dialog){
+            $str ="";
         }else{
-          $str .= "<div class='navigation_element'>";
-          $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
-          $str .= "</div>";
+            $str ="<div class='plugin-actions'>";
+            if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){
+                $str .= "<button type='submit' name='last'>".msgPool::backButton()."</button>";
+            }else{
+                $str .= "<button disabled type='submit' name='last'>".msgPool::backButton()."</button>";
+            }
+            $str .= "<button type='submit' name='next'>"._("next")."</button>";
+            $str .="</div>";
         }
-        $str .= "</div>" ;
-      }
+        return($str);
     }
-    return($str);
-  }
-
-  
-
-  function get_bottom_html()
-  {
-    /* Skip adding forward/backward button,   
-     *  if the currently opened step is a sub dialog 
-     */
-    if($this->o_steps[$this->i_current]->dialog){
-      $str ="";
-    }else{
-      $str ="<p class='seperator' style='margin-bottom:10px;'>&nbsp;</p>";
-      $str.="   <div style='text-align:right;float:top;'>";
-      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()."'>";
-      }else{
-        $str .= "<input type='button' name='last' value='".msgPool::backButton()."' disabled>";
-      }
-      $str.= "&nbsp;";
-        $str .= "<input type='submit' name='next' value='"._("Next")."'>";
-      $str .="</div>";
+
+
+    /* Create header entry */
+    function get_header_html()
+    {
+        $str=   $this->o_steps[$this->i_current]->print_header();
+        return ($str);
     }
-    return($str);
-  }
-
-  
-  /* Create header entry */
-  function get_header_html()
-  {
-    $str=   $this->o_steps[$this->i_current]->print_header();
-    return ($str);
-  }
-
-
-  /* Check if the given step id is valid and selectable */
-  function selectable_step($id)
-  {
-    if(isset($this->o_steps[$id]) && $this->o_steps[$id]->is_enabled()){
-      return(true);
+
+
+    /* Check if the given step id is valid and selectable */
+    function selectable_step($id)
+    {
+        if(isset($this->o_steps[$id]) && $this->o_steps[$id]->is_enabled()){
+            return(true);
+        }
+        return(false);
     }
-    return(false);
-  }
-
-  function step_name_to_id($name)
-  {
-    foreach($this->o_steps as $id => $class){
-      if(get_class($class) == $name){
-        return($id);
-      }
+
+    function step_name_to_id($name)
+    {
+        foreach($this->o_steps as $id => $class){
+            if(get_class($class) == $name){
+                return($id);
+            }
+        }
+        return(0);
     }
-    return(0);
-  }
-  
+
 }
 
 

diff --git a/gosa-core/setup/setup.tpl b/gosa-core/setup/setup.tpl
deleted file mode 100644 (file)
index 3bb21f7..0000000
--- a/gosa-core/setup/setup.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div style='background-color: #009900;'>
-{$php_errors}
-sadffasdsdfa
-</div>

diff --git a/gosa-core/setup/setup_frame.tpl b/gosa-core/setup/setup_frame.tpl
index f6554f51457c090dcac69cf9e55e4b38eb2798f5..8d20ad7fcd456a225b723da7d8dc7d5f258561ee 100644 (file)
--- a/gosa-core/setup/setup_frame.tpl
+++ b/gosa-core/setup/setup_frame.tpl
@@ -1,47 +1,34 @@
-<body class='setup_body'>
-{$php_errors}
-<form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
-       {$msg_dialogs}
-<input id='focus' name='focus' type='image' src='images/empty.png' style='width:0px; height:0px;' >
-<div class='setup_dialog'>
-       <div class='setup_header'>
-               <div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='GOsa'></div>
-               <div style="padding-top:8px;text-align:right;height:28px">{$version}</div>
-       </div>
-       <div class='setup_menu'>
-               <b>{t}GOsa setup wizard{/t}</b>
-       </div>
+ <body>
+  {$php_errors}
+  <div class='title-bar'>
+   <ul>
+    <li><img src='themes/default/images/logo.png'></li>
+    <li>{t}GOsa setup wizard{/t}</li>
+    <li>{$version}</li>
+   </ul>
+  </div>
 
-       <div style="padding:10px;background-color:white;">
+  <form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
+   {$msg_dialogs}
 
-               <div class='setup_navigation'>
-                       <div style='padding:4px'>
-                               <img src='images/setup/fai.png' class='center' alt='{t}Installation{/t}'>&nbsp;&nbsp;<font style="font-size:24px;">{t}Setup{/t}</font>
-                       </div>
-                       {$navigation}           
-               </div>
-       
-               <div class='setup_contents'>
-                       <div style='border-bottom:1px dashed #AAAAAA'>
-                               {$errors}
-                               {$header}
-                       </div>
-                       <div style='padding-left:12px;'>
-                               {$contents}
-                               {$bottom}
-                               <br>
-                       </div>
-               </div>
-               <div style="clear:both">        </div>
-       </div>
-</div>
+    <br>
+   <div class='navigation'>
+    <div class='menu'>
+     {$navigation}     
+    </div>     
+   </div>
 
-
-<input type='hidden' name='setup_goto_step' value=''>
-</form>
-
-<script type='javascript'>
-       document.getElementById('focus').focus();
-</script>
-</body>
+   <div class='plugin-area'>
+    <div class='plugin'>
+    {$errors}
+    {$header}
+    <hr>
+    {$contents}
+    <hr>
+    {$bottom}
+   </div>
+   </div>
+   <input type='hidden' name='setup_goto_step' value=''>
+  </form>
+ </body>
 </html>