From: hickert Date: Fri, 13 Apr 2007 07:26:41 +0000 (+0000) Subject: Modified classes to use the renmaned templates X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=18d3f71e9d76c94029ebaa1021c7cbf6ab7c4219;p=gosa.git 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 91613989d..0cd8f5626 100644 --- 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 11872bff3..8ee39b2f2 100644 --- 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 b572ff74d..9f3076b13 100644 --- 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 1c21c6a97..846868ffb 100644 --- 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 c247596bb..2e29ccdda 100644 --- 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 363b9b4df..7790e90e1 100644 --- 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 6d09bd71c..ff5b2a788 100644 --- 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 956d76e70..39f6577b4 100644 --- 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 bcfa7b56a..d8e9e32c8 100644 --- 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 index 000000000..539ce256a --- /dev/null +++ b/setup/setup_license.tpl @@ -0,0 +1,7 @@ +
+
+
+ {$License} +
+
+
diff --git a/setup/setup_step3.tpl b/setup/setup_step3.tpl deleted file mode 100644 index 539ce256a..000000000 --- a/setup/setup_step3.tpl +++ /dev/null @@ -1,7 +0,0 @@ -
-
-
- {$License} -
-
-