From 72299b948a6482cf135c1c0f146a2a65ecc2154f Mon Sep 17 00:00:00 2001 From: Pim Snel Date: Thu, 9 Oct 2003 23:08:04 +0000 Subject: [PATCH] port setup to idots template set --- setup/inc/functions.inc.php | 2 +- setup/manageheader.php | 12 ++- setup/templates/default/applications.tpl | 2 +- setup/templates/default/config.tpl | 2 +- setup/templates/default/config_pre_script.tpl | 2 +- setup/templates/default/login_main.tpl | 51 ++++++------ .../templates/default/login_stage_header.tpl | 82 +++++++++---------- setup/templates/default/manageheader.tpl | 12 ++- setup/templates/default/setup_demo.tpl | 8 +- setup/templates/default/setup_main.tpl | 2 +- 10 files changed, 93 insertions(+), 82 deletions(-) diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php index 6b1cff6a60..e200c6698e 100644 --- a/setup/inc/functions.inc.php +++ b/setup/inc/functions.inc.php @@ -35,7 +35,7 @@ if (!function_exists('version_compare'))//version_compare() is only available in PHP4.1+ { - echo 'phpGroupWare now requires PHP 4.1 or greater.
'; + echo 'eGroupWare now requires PHP 4.1 or greater.
'; echo 'Please contact your System Administrator'; exit; } diff --git a/setup/manageheader.php b/setup/manageheader.php index 59efd2b5e2..d22421978a 100644 --- a/setup/manageheader.php +++ b/setup/manageheader.php @@ -142,6 +142,7 @@ check_form_values(); $header_template = CreateObject('setup.Template','../'); $GLOBALS['phpgw_setup']->html->show_header('Generated header.inc.php', False, 'header'); + echo '
'; echo '
' . lang('Save this text as contents of your header.inc.php') . '
'; $newheader = $GLOBALS['phpgw_setup']->html->generate_header(); echo '
';
@@ -152,7 +153,8 @@
 			echo '';
 			echo '';
 			echo '';
-			echo '';
+			echo '
'; + $GLOBALS['phpgw_setup']->html->show_footer(); break; case 'write': check_form_values(); @@ -182,7 +184,7 @@ break; default: $GLOBALS['phpgw_setup']->html->show_header($GLOBALS['phpgw_info']['setup']['HeaderFormMSG'], False, 'header'); - + $detected = ''; if (!get_var('ConfigLang',array('POST','COOKIE'))) @@ -190,7 +192,7 @@ $detected .= '
Please Select your language '.lang_select(True,'en')."
\n"; } - $detected .= '' . "\n"; + $detected .= '
' . "\n"; $detected .= ''; $manual = ''.lang('phpGroupWare Administration Manual').''; @@ -540,7 +542,11 @@ $setup_tpl->set_var('lang_finaldescr',lang('After retrieving the file, put it into place as the header.inc.php. Then, click "continue".')); $setup_tpl->set_var('lang_continue',lang('Continue')); + $setup_tpl->pfp('out','manageheader'); + + $GLOBALS['phpgw_setup']->html->show_footer(); + break; // ending the switch default } ?> diff --git a/setup/templates/default/applications.tpl b/setup/templates/default/applications.tpl index 9fc29f6611..8f5aeb596c 100644 --- a/setup/templates/default/applications.tpl +++ b/setup/templates/default/applications.tpl @@ -26,7 +26,7 @@ function check_all(which)

' . $GLOBALS['phpgw_info']['setup']['PageMSG'] . '
 

{description}
- +
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl index 441ce3e978..b2e807c7c8 100644 --- a/setup/templates/default/config.tpl +++ b/setup/templates/default/config.tpl @@ -3,7 +3,7 @@ -
+
diff --git a/setup/templates/default/config_pre_script.tpl b/setup/templates/default/config_pre_script.tpl index d771336ff5..b47bdbc9f6 100644 --- a/setup/templates/default/config_pre_script.tpl +++ b/setup/templates/default/config_pre_script.tpl @@ -1,5 +1,5 @@ -
 {title}
+
diff --git a/setup/templates/default/login_main.tpl b/setup/templates/default/login_main.tpl index f6d7209ad2..0ab014d5d6 100644 --- a/setup/templates/default/login_main.tpl +++ b/setup/templates/default/login_main.tpl @@ -1,34 +1,29 @@ -

 

-
- + + +
{V_login_stage_header} - + + + - - - - - - - - - - - - - - + + + + + + + + +
 
 Header Admin Login
{HeaderLoginMSG}
- Password: - - -
- {lang_select} - - -
 Header Admin Login
{HeaderLoginMSG}
+
+ Header Password: + + {lang_select} + + +
+
- - diff --git a/setup/templates/default/login_stage_header.tpl b/setup/templates/default/login_stage_header.tpl index 4802eef4d7..9ad3acfd81 100644 --- a/setup/templates/default/login_stage_header.tpl +++ b/setup/templates/default/login_stage_header.tpl @@ -1,47 +1,47 @@ + - -  Setup/Config Admin Login - - - - {ConfigLoginMSG} - - - -
- - - - - - - - - - -
- Domain: - - -
- Password: - - -
- - - - + +  Setup/Config Admin Login + + + + {ConfigLoginMSG} + + + + + + + + + + + + + + +
+ Domain: + + +
+ Password: + + +
+ + Config Password: + - - + + {lang_select} - - -
- - - + + + + + + diff --git a/setup/templates/default/manageheader.tpl b/setup/templates/default/manageheader.tpl index 46b78e6696..5e590b8db8 100644 --- a/setup/templates/default/manageheader.tpl +++ b/setup/templates/default/manageheader.tpl @@ -1,6 +1,11 @@ + + + + + @@ -116,3 +121,8 @@ + + + + +
+ {detected} -
{lang_settings}
{lang_passforconfig}
diff --git a/setup/templates/default/setup_demo.tpl b/setup/templates/default/setup_demo.tpl index a65d07ecb8..fab0801bc1 100644 --- a/setup/templates/default/setup_demo.tpl +++ b/setup/templates/default/setup_demo.tpl @@ -1,15 +1,15 @@ - +
- + - +
{description}{description}

{detailadmin}{detailadmin}
- +
diff --git a/setup/templates/default/setup_main.tpl b/setup/templates/default/setup_main.tpl index e27fb4f05d..061922e352 100644 --- a/setup/templates/default/setup_main.tpl +++ b/setup/templates/default/setup_main.tpl @@ -1,6 +1,6 @@ -
{adminusername}
+
{db_step_text}