Moved setup navigation buttons to page bottom

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

diff --git a/html/setup.php b/html/setup.php
index 37c3802116babb64b7005ecbfac7cf1ff723f25d..a05c3a0866d9fb33b23491da3557334b92a378e8 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
@@ -114,6 +114,7 @@ $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('setup_headers.t
 $smarty->assign("contents"  , $display);
 $smarty->assign("navigation", $_SESSION['setup']->get_navigation_html());
 $smarty->assign("header", $_SESSION['setup']->get_header_html());
+$smarty->assign("bottom", $_SESSION['setup']->get_bottom_html());
 
 if ($error_collector != ""){
   $smarty->assign("php_errors", $error_collector."</div>");

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 83311ed2f9dec5e12d61ae8a6a58242b77112090..327a1f9d41f5c747618e0b1d2f78cbb3b5df2ab1 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -213,6 +213,23 @@ class setup
   }
 
   
+
+  function get_bottom_html()
+  {
+    $str ="";
+    $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='"._("Backward")."'>";
+    }else{
+      $str .= "<input type='button' name='last' value='"._("Backward")."' disabled>";
+    }
+
+    $str .= "<input type='submit' name='next' value='"._("Forward")."'>";
+    $str .="</div>";
+    return($str);
+  }
+
+  
   /* Create header entry */
   function get_header_html()
   {
@@ -223,18 +240,18 @@ class setup
     $str.=   $this->o_steps[$this->i_current]->get_long_title();
     $str.="     </font>";
     $str.="   </div>";
-    $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 class='center' type='image' name='last' src='images/setup_step_back.png'  title='"._("Last step")."'>";
-    }else{
-      $str.="   <img class='center' src='images/setup_step_back_gray.png' title='"._("Last step")."'>";
-    }
-#   if(isset($this->o_steps[$this->i_current +1]) && $this->o_steps[$this->i_current +1]->is_enabled()){
-      $str.="   <input class='center' type='image' name='next' src='images/setup_step_forward.png'  title='"._("Next step")."'>";
-#   }else{
-#     $str.="   <img class='center' src='images/setup_step_forward_gray.png'  title='"._("Next step")."'>";
-#   }
-    $str.= "  </div>";
+#     $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 class='center' type='image' name='last' src='images/setup_step_back.png'  title='"._("Last step")."'>";
+#     }else{
+#       $str.="   <img class='center' src='images/setup_step_back_gray.png' title='"._("Last step")."'>";
+#     }
+#     if(isset($this->o_steps[$this->i_current +1]) && $this->o_steps[$this->i_current +1]->is_enabled()){
+#       $str.="   <input class='center' type='image' name='next' src='images/setup_step_forward.png'  title='"._("Next step")."'>";
+#     }else{
+#       $str.="   <img class='center' src='images/setup_step_forward_gray.png'  title='"._("Next step")."'>";
+#     }
+#     $str.= "  </div>";
     $str.= "</div>";
     return ($str);
   }

diff --git a/setup/class_setupStep4.inc b/setup/class_setupStep4.inc
index 69a2ba8633f7c746c2c97af8acc31f2ef8b0a8b6..3e3bc899a12e63b904c61afa50d668445665974d 100644 (file)
--- a/setup/class_setupStep4.inc
+++ b/setup/class_setupStep4.inc
@@ -37,6 +37,7 @@ class setup_step_4 extends setup_step
 
   var $attributes = array("connection","location","admin","password","base","tls");
 
+
   function setup_step_4()
   {
     $this->update_strings();

diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index e067df5d5d4b01b16e61736ad9c28c661b2c5eaa..7e15475c32a3d9012347a8c7f62ae8045a1fdbfe 100644 (file)
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -29,13 +29,16 @@
                </div>
 
                <div class='setup_bottom'>
-                       {$version}      
+                       {$bottom}
                </div>
        </div>
 </div>
 <input type='hidden' name='setup_goto_step' value=''>
 </form>
 </center>
+<div style='width:100%; text-align:right'>
+       {$version}
+</div>
 
 <script type='javascript'>
        document.getElementById('focus').focus();

diff --git a/setup/setup_step4.tpl b/setup/setup_step4.tpl
index e468d8bb58ed624927c6577c4252b918ab5c2892..d760b8c0a675e761019a27f5c0202b59a7945c16 100644 (file)
--- a/setup/setup_step4.tpl
+++ b/setup/setup_step4.tpl
@@ -8,6 +8,21 @@
 
 </div>
 <div style=';float:left;'>
+
+       {if $resolve_user}
+
+       <div style='float:left; width:680px;margin-bottom:20px;border: solid 1px #CCC;'>
+               <input type='text' value='{$resolve_filter}' name='resolve_filter'>
+               <input type='submit' value='{t}Search{/t}' name='resolve_search'>
+               <input type='submit' value='{t}Use selected user{/t}' name='use_selected_user'>
+               <input type='submit' value='{t}Cancel{/t}' name='resolve_user'>
+               <select name='admin_to_use' size=6 style="width:680px;background-color:#DDD;">                          
+                       {html_options options=$resolved_users selected=$admin}
+               </select>
+       </div>          
+
+       {else}
+
        <div class='step4_container'>
                <div class='step4_name'>
                        {t}Location description{/t}
@@ -63,22 +78,6 @@
                </div>
        </div>
 
-       {if $resolve_user}
-       <div style='float:left; width:680px;margin-bottom:20px;border: solid 1px #CCC;'>
-        <div class='step4_name' style='background-color:#DDD'>
-                       <input type='text' value='{$resolve_filter}' name='resolve_filter'>
-        </div>
-               <div class='step4_value' style='background-color:#CCC'>
-                       <input type='submit' value='{t}Search{/t}' name='resolve_search'>
-        </div>
-               <div class='step4_status'>
-                       <input type='submit' value='{t}Use selected user{/t}' name='use_selected_user' style='width:90%;'>
-               </div>
-               <select name='admin_to_use' size=6 style="width:680px;background-color:#DDD;">                          
-                       {html_options options=$resolved_users selected=$admin}
-               </select>
-       </div>          
-       {/if}
 
        <div class='step4_container'>
                <div class='step4_name'>
@@ -113,6 +112,7 @@
             <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
         </div>
     </div>
+       {/if}
 </div>
        <div style='float:left; width:680px;padding-bottom:10px;'>
                {t}Status{/t}: {$connection_status}