The displayed header image is part of the setup_step class

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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 5b1ca78723a23b107da7a1b75e9166720b4d7da5..4b9af867d5d8ebc1df6984739bbdcc9d58a1bfdd 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -233,26 +233,7 @@ class setup
   /* Create header entry */
   function get_header_html()
   {
-    $str ="";
-    $str.=" <div >";
-    $str.="   <div style='padding:3px;'>";
-    $str.="     <img src='images/system.png' alt='' class='center'>";
-    $str.=   $this->o_steps[$this->i_current]->get_long_title();
-    $str.="     ";
-    $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>";
+    $str=   $this->o_steps[$this->i_current]->print_header();
     return ($str);
   }
 

diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index cbbb73926bd165345ca3b290e1b3cbc2267a421d..f685da56cc6d4beebb594c0685c092bbdd99a7e2 100644 (file)
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -20,7 +20,7 @@
 */
 
 
-class setup_step 
+class setup_step extends plugin
 {
   var $s_title      = "Still undefined";
   var $s_title_long = "This is a still undefined long title";
@@ -29,9 +29,12 @@ class setup_step
   var $is_enabled   = false;
   var $is_completed = false;
 
+  var $header_image = "images/personal.png";
+
   var $attributes   = array();
   var $parent       = NULL;
 
+  
   function setup_step()
   {
   }
@@ -111,6 +114,12 @@ class setup_step
     }
     return($tmp);
   }
+
+  function print_header()
+  {
+    $display= print_header(get_template_path($this->header_image),$this->s_title_long,"");  
+    return($display);
+  }
 }
 
 

diff --git a/setup/class_setupStep1.inc b/setup/class_setupStep1.inc
index 2dae4b87ebecc6db450e1fe31c0719709db23760..59a45524e6643c3340dfc770e9289f12a646e4b6 100644 (file)
--- a/setup/class_setupStep1.inc
+++ b/setup/class_setupStep1.inc
@@ -26,6 +26,7 @@ class setup_step_1 extends setup_step
   var $lang           = "en_EN";  /* Detected language */
   var $languages      = array();
   var $attributes     = array("lang","lang_selected");
+  var $header_image   = "images/system.png";
 
   function setup_step_1()
   {

diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 79c3218ed0df9a388f616a1398d704e57a83ef12..f3e20530e22c300648d254074c9885a6118b7637 100644 (file)
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -21,9 +21,7 @@
                        <li>
                                <div style='border-top: solid 1px #BBBBBB; '>
                                        <div style='padding:12px;'>
-                                               <div class='plugtop'>
-                                                       {$header}
-                                               </div>
+                                               {$header}
                                        </div>
                                </div>
                        </li>