Modified classes to use the renmaned templates

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

diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index 91613989d0bd23c2990937b4089ca027450e54fd..0cd8f5626538db804b534302d377cb9dc17eb20a 100644 (file)
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -48,7 +48,7 @@ class Step_Checks extends setup_step
     $smarty->assign("basic"       ,$this->basic_checks);
     $smarty->assign("config"      ,$this->config_checks);
     $smarty->assign("is_writeable",$this->is_writeable);
-    return($smarty->fetch(get_template_path("setup_step2.tpl",TRUE,dirname(__FILE__))));
+    return($smarty->fetch(get_template_path("setup_checks.tpl",TRUE,dirname(__FILE__))));
   }
 
 

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 11872bff37894fe4d495c480d5a5016b89e2ec88..8ee39b2f2b24495c626c45db32cfb8b7187257c6 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -92,7 +92,7 @@ class Step_Config1 extends setup_step
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
     }
-    return($smarty -> fetch (get_template_path("../setup/setup_step5.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_config1.tpl")));
   }
 
 

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index b572ff74d6a7de9eacaa9526c6de0cd89c294f82..9f3076b131415ffaa79ab53cc821f60e84b8501a 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -83,7 +83,7 @@ class Step_Config2 extends setup_step
         foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
     }
-    return($smarty -> fetch (get_template_path("../setup/setup_step6.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_config2.tpl")));
   }
 
   function save_object()

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 1c21c6a97aaa2c32728b9742d230fbbe036d5ef1..846868ffb49a33463c8440affe3602892e229e46 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -87,7 +87,7 @@ class Step_Config3 extends setup_step
     $smarty->assign("warnings" ,$this->check());
     $smarty->assign("warnings_cnt" ,count($this->check()));
 
-    return($smarty -> fetch (get_template_path("../setup/setup_step6a.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_config3.tpl")));
   }
 
 

diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index c247596bbed191cbe875073286e8281115dfe224..2e29ccddae9cef471e66d1ed5af82e34e0c4a150 100644 (file)
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -158,7 +158,7 @@ class Step_Finish extends setup_step
     $smarty->assign("cv",$this->parent->captured_values);
     $smarty->assign("msg_permissions",
       sprintf(_("The following file(s), folders(s) must be writeable for the web-user '%s'."),$info['name']));
-    return($smarty -> fetch (get_template_path("../setup/setup_step8.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_finish.tpl")));
   }
 
 

diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 363b9b4df488153d61546a3eac19dedb27a130b8..7790e90e155192f37e74440f34d40410d3287899 100644 (file)
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -56,7 +56,7 @@ class Step_Language extends setup_step
     $smarty->assign("languages",    $this->languages);
     $smarty->assign("lang",         $this->lang);
     $smarty->assign("lang_selected",$this->lang_selected);
-    return($smarty->fetch(get_template_path("setup_step1.tpl",TRUE,dirname(__FILE__))));
+    return($smarty->fetch(get_template_path("setup_language.tpl",TRUE,dirname(__FILE__))));
   }
 
   function save_object()

diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 6d09bd71c01de9305fbd4f83de258cb7be680374..ff5b2a78803c97a2be5a2e126753f9d05c05fe89 100644 (file)
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -77,7 +77,7 @@ class Step_Ldap extends setup_step
       $smarty->assign("resolved_users_count",count($tmp));
       $smarty->assign("resolve_filter",$this->resolve_filter);
     }
-    return($smarty -> fetch (get_template_path("../setup/setup_step4.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_ldap.tpl")));
   }
 
   function get_connection_status()

diff --git a/setup/class_setupStep_License.inc b/setup/class_setupStep_License.inc
index 956d76e70adb117baae6dccd199b6eb358d24872..39f6577b4bd98d4052b0bf3f308c26d40969d0c9 100644 (file)
--- a/setup/class_setupStep_License.inc
+++ b/setup/class_setupStep_License.inc
@@ -63,7 +63,7 @@ class Step_License extends setup_step
     $smarty -> assign("License",nl2br($this->License));
     $smarty -> assign("license_found",$this->license_found);
 
-    return($smarty -> fetch (get_template_path("../setup/setup_step3.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_license.tpl")));
   }
 
   

diff --git a/setup/class_setupStep_Schema.inc b/setup/class_setupStep_Schema.inc
index bcfa7b56abb9e1240c8c2bf7a7f9415b4978c0cd..d8e9e32c859d3505bfae937ce7b8485a5d97f5ff 100644 (file)
--- a/setup/class_setupStep_Schema.inc
+++ b/setup/class_setupStep_Schema.inc
@@ -66,7 +66,7 @@ class Step_Schema extends setup_step
     $smarty->assign("checks",$this->checked);
     $smarty->assign("not_checked",$this->not_checked);
     $smarty->assign("failed_checks",$failed_checks);
-    return($smarty -> fetch (get_template_path("../setup/setup_step7.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_schema.tpl")));
   }
 
   function check_schema_version($description, $version)

diff --git a/setup/setup_license.tpl b/setup/setup_license.tpl
new file mode 100644 (file)
index 0000000..539ce25
--- /dev/null
+++ b/setup/setup_license.tpl
@@ -0,0 +1,7 @@
+<div style='float:left'>
+       <div class='default' style='margin:10px;'>
+               <div style='height:350px;padding:5px;overflow:auto; '>
+                       {$License}
+               </div>
+       </div>
+</div>

diff --git a/setup/setup_step3.tpl b/setup/setup_step3.tpl
deleted file mode 100644 (file)
index 539ce25..0000000
--- a/setup/setup_step3.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div style='float:left'>
-       <div class='default' style='margin:10px;'>
-               <div style='height:350px;padding:5px;overflow:auto; '>
-                       {$License}
-               </div>
-       </div>
-</div>