Updated setup.

-Removed menu
-Added pager
-Added check button

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

diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 36bf7620913013ee85102fcc9c9cdf729db03e78..54694846d6994bc7270626ef71614b06e170a473 100644 (file)
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -229,6 +229,8 @@ class setup
             }else{
                 $str .= "<button disabled type='submit' name='last'>".msgPool::backButton()."</button>";
             }
+
+            $str .= "<button type='submit' name='test'>"._("check")."</button>";
             $str .= "<button type='submit' name='next'>"._("next")."</button>";
             $str .="</div>";
         }
@@ -239,7 +241,23 @@ class setup
     /* Create header entry */
     function get_header_html()
     {
-        $str=   $this->o_steps[$this->i_current]->print_header();
+        $title = $this->o_steps[$this->i_current]->getTitle();
+        $image = $this->o_steps[$this->i_current]->getImage();
+        $page = $this->i_current ." / ".count($this->o_steps);
+
+
+        $str = "<div style='100%'>
+                    <div style='float: left; '>
+                        <img src='{$image}' alt=''>
+                    </div>
+                    <div style='float: left; margin-left:10px;margin-top:10px;font-size:24px;font-weight:bold;'>
+                        {$title}
+                    </div>
+                    <div style='float: right; margin-top:10px;font-size:24px;font-weight:bold;'>
+                        {$page}
+                    </div>
+                </div>
+                <div class='clear'></div> ";
         return ($str);
     }
 

diff --git a/gosa-core/setup/class_setupStep.inc b/gosa-core/setup/class_setupStep.inc
index 69977840fbdce088ef9e31f5b03d687e7f2d76d1..8393efc9dfd556ca9c8ae13bd215679355bdab66 100644 (file)
--- a/gosa-core/setup/class_setupStep.inc
+++ b/gosa-core/setup/class_setupStep.inc
@@ -115,15 +115,16 @@ class setup_step extends plugin
     return($tmp);
   }
 
-  function print_header()
+  function getTitle()
   {
-    $image= get_template_path($this->header_image);
-    $display= "<div style='padding:3px;'>";
-    $display.= "  <p class=\"center\" style=\"margin:0px 0px 0px 5px;padding:0px;font-size:24px;font-weight:bold;\"><img class=\"center\" src=\"$image\" align=\"middle\" alt=\"*\">&nbsp;".$this->s_title_long."</p>\n";
-    $display.= "</div>\n";
+      return($this->s_title_long);
+  }
 
-    return($display);
+  function getImage()
+  {
+      return($this->header_image);
   }
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/gosa-core/setup/setup_frame.tpl b/gosa-core/setup/setup_frame.tpl
index 8d20ad7fcd456a225b723da7d8dc7d5f258561ee..11323af144fb46fbb2043abdc0ec4afb30391012 100644 (file)
--- a/gosa-core/setup/setup_frame.tpl
+++ b/gosa-core/setup/setup_frame.tpl
@@ -11,14 +11,14 @@
   <form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
    {$msg_dialogs}
 
-    <br>
+ <!--  
    <div class='navigation'>
     <div class='menu'>
      {$navigation}     
     </div>     
    </div>
-
-   <div class='plugin-area'>
+ -->
+   <div class='plugin-area' style='margin:10px;'>
     <div class='plugin'>
     {$errors}
     {$header}