Updated navigation.

Posts weren't captured when using the navigation.

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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index af70d9b8d429e7ac29cdf097f783aee2cb8578fa..636d63955940a30a10eb2fded77ad32a38176b89 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -84,7 +84,7 @@ class setup
     }
 
     /* Check if step was selected */
-    if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last'])){
+    if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last']) || isset($_POST['setup_goto_step'])){
 
       /* check if current setup step is completed now 
           and activate the next step if possible */
@@ -97,19 +97,29 @@ class setup
           $this->disable_steps_from($i+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;
+    }
+  
+    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;
+    $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;
     }
   }
 
@@ -123,7 +133,6 @@ class setup
       }
 
       if($found){ 
-        echo $key." ";
         $this->o_steps[$key]->set_enabled(false);
         $this->o_steps[$key]->set_completed(false);
       }
@@ -142,24 +151,51 @@ class setup
       $b_active   = $step -> is_active();
       $b_enabled  = $step -> is_enabled();
 
-      $str .="<div >";
-      if($b_enabled){
-        if($b_active){
-          $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>";
-          $str .= "</a><br>\n";
+      $_SESSION['js'] = 0;
+      if($_SESSION['js']){
+
+        $str .="<div >";
+        if($b_enabled){
+          if($b_active){
+            $str .= "<div class='navigation_element_active'>";
+            $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
+              class='navigation_title_active'>".$s_title."</div>";
+            $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
+              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_title."</div>";
+            $str .= "</div>";
+          }
         }else{
-          $str .= "<a href='?step=".$key."' class='navigation_element'>";
-          $str .= "<div class='navigation_title_inactive'>".$s_title."</div>";
-          $str .= "</a><br>\n";
+          $str .= "<div class='navigation_element'>";
+          $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
+          $str .= "</div>";
         }
+        $str .= "</div>" ;
       }else{
-        $str .= "<div class='navigation_element'>";
-        $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
-        $str .= "</div>";
+        $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='submit' 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>";
+          }
+        }else{
+          $str .= "<div class='navigation_element'>";
+          $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
+          $str .= "</div>";
+        }
+        $str .= "</div>" ;
       }
-      $str .= "</div>" ;
     }
     return($str);
   }

diff --git a/setup/class_setupStep7.inc b/setup/class_setupStep7.inc
index 71bd17efff71c5a01b6fdc266aeff2014e2de836..f1360c0bd0c8ba8921fc280a7afee1e6e8f01362 100644 (file)
--- a/setup/class_setupStep7.inc
+++ b/setup/class_setupStep7.inc
@@ -25,8 +25,9 @@ class setup_step_7 extends setup_step
   var $checked = array();
   var $not_checked = array();
   var $schema_readable  = FALSE;
-  var $attributes       = array();
+  var $attributes       = array("enable_schema_check");
   var $display_type     = "failed";
+  var $enable_schema_check = TRUE;
 
   function setup_step_7()
   {
@@ -53,8 +54,10 @@ class setup_step_7 extends setup_step
     }
 
     $smarty = get_smarty();
+    $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
     $smarty->assign("display_type",$this->display_type);
     $smarty->assign("schema_readable",$this->schema_readable);
+    $smarty->assign("enable_schema_check",$this->enable_schema_check);
     $smarty->assign("checks",$this->checked);
     $smarty->assign("not_checked",$this->not_checked);
     $smarty->assign("failed_checks",$failed_checks);

diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 5338dcad081cb0898ec2868ab4aa49873df96e3f..b5866db653f3391d7ceae6da88cd90e47d6c18c0 100644 (file)
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -33,6 +33,7 @@
                </div>
        </div>
 </div>
+<input type='hidden' name='setup_goto_step' value=''>
 </form>
 </center>
 

diff --git a/setup/setup_step7.tpl b/setup/setup_step7.tpl
index f7c829e4e169842e0d75d3fd408c717a73c0266e..2105ab37f8cdc1d147c27b575f563757e1a13df0 100644 (file)
--- a/setup/setup_step7.tpl
+++ b/setup/setup_step7.tpl
@@ -1,49 +1,67 @@
+    <div style='float:left; width:600px;'>
+        <br>
+        <b>{t}Validate schema when login into GOsa?{/t}</b>
+    </div>
 
-<input {if $display_type == "failed"} checked  {/if} onClick='document.mainform.submit();' 
-       type='radio' name='display_type' value='failed'>{t}Only display failed tests{/t}<br>
-<input {if $display_type == "checked"} checked {/if} onClick='document.mainform.submit();' 
-       type='radio' name='display_type' value='checked'>{t}Display checked object classes{/t}<br>
-<input {if $display_type == "all"} checked {/if} onClick='document.mainform.submit();' 
-       type='radio' name='display_type' value='all'>{t}Display all objectClasses also not checked but available classes{/t}
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable schema validation{/t}
+        </div>
+        <div class='step4_value'>
+                       <select name='enable_schema_check'>
+                               {html_options options=$bool selected=$enable_schema_check}
+            </select>
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+       <div style='float:left'>
 
+               {if $failed_checks == 0}
+                       <h2>{t}Schema check was completely successful{/t}</h2>
+               {else}
+                       <h2>{t}The schema check returned the following results{/t}</h2>
+               {/if}
 
-{if $failed_checks == 0}
-       <h2>{t}Schema check was completely successful{/t}</h2>
-{else}
-       <h2>{t}The schema check returned the following results{/t}</h2>
-{/if}
+               <input {if $display_type == "failed"} checked  {/if} onClick='document.mainform.submit();' 
+                       type='radio' name='display_type' value='failed'>{t}Only display failed tests{/t}<br>
+               <input {if $display_type == "checked"} checked {/if} onClick='document.mainform.submit();' 
+                       type='radio' name='display_type' value='checked'>{t}Display checked object classes{/t}<br>
+               <input {if $display_type == "all"} checked {/if} onClick='document.mainform.submit();' 
+                       type='radio' name='display_type' value='all'>{t}Display all objectClasses also not checked but available classes{/t}
 
        <div style='float:left'>
-{foreach from=$checks item=val key=key}
-       {if (   $display_type == "failed" && !$checks[$key].STATUS) || 
-                       $display_type == "checked" || 
-                       $display_type == "all"}
+               {foreach from=$checks item=val key=key}
+                       {if (   $display_type == "failed" && !$checks[$key].STATUS) || 
+                                       $display_type == "checked" || 
+                                       $display_type == "all"}
 
-       <br>
-               <b>{$key}</b>
-               {$checks[$key].INFO}
-               <br>
-               <i>
-               {if !$checks[$key].STATUS}
-                       {if $checks[$key].IS_MUST_HAVE}
-                               <font color='red'>{$checks[$key].MSG}</font>
-                       {else}
-                               <font color='orange'>{$checks[$key].MSG}</font>
+                       <br>
+                               <b>{$key}</b>
+                               {$checks[$key].INFO}
+                               <br>
+                               {if !$checks[$key].STATUS}
+                                       {if $checks[$key].IS_MUST_HAVE}
+                                               <i><font color='red'>{$checks[$key].MSG}</font></i>
+                                       {else}
+                                               <i><font color='orange'>{$checks[$key].MSG}</font></i>
+                                       {/if}
+                               {else}
+                                       <i><font color='green'>{$checks[$key].MSG}</font></i>
+                               {/if}
                        {/if}
-               {else}
-                       <font color='green'>{$checks[$key].MSG}</font>
-               {/if}
-               </i>
-       {/if}
-{/foreach}
-       </div>
-{if $display_type == "all"}
-       <div style='float:left'>
-       <h2>{t}All available objectClasses{/t}</h2>
-       {foreach from=$not_checked item=val key=key}
-               <b>{$key}</b> &nbsp; {$val}<br>
-       {/foreach}
+               {/foreach}
        </div>
-{/if}
 
+       {if $display_type == "all"}
+               <div style='float:left'>
+                       <h2>{t}All available objectClasses{/t}</h2>
+                       {foreach from=$not_checked item=val key=key}
+                               <b>{$key}</b> &nbsp; {$val}<br>
+                       {/foreach}
+               </div>
+       {/if}
+</div>
 <input type='hidden' value='1' name='step7_posted'>