diff --git a/setup/manageheader.php b/setup/manageheader.php index a35308ad9d..268aa4219c 100644 --- a/setup/manageheader.php +++ b/setup/manageheader.php @@ -268,10 +268,13 @@ $setup_tpl->set_var('lang_select','
Please Select your language '.lang_select(True,'en')."
"); } - $detected = ''; - $detected .= '

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

'; + $setup_tpl->set_var('pagemsg',$GLOBALS['egw_info']['setup']['PageMSG']); + $setup_tpl->set_var('lang_analysis',lang('Analysis')); + + //$detected = ''; + //$detected .= '

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

'; - $detected .= '' . lang('Analysis') . ''."\n".''. "\n"; + //$detected .= '' . lang('Analysis') . ''."\n".''. "\n"; $supported_db = array(); foreach(array( @@ -521,7 +524,7 @@ $GLOBALS['egw_info']['server']['include_root'] = $updir; } - $detected .= "\n"; + $setup_tpl->set_var('detected',$detected); /* End of detected settings, now display the form with the detected or prior values */ @@ -576,7 +579,8 @@ $setup_tpl->set_var('mcrypt',$GLOBALS['egw_info']['server']['versions']['mcrypt']); $setup_tpl->set_var('mcrypt_iv',$GLOBALS['egw_info']['server']['mcrypt_iv']); - $setup_tpl->set_var('lang_setup_acl',lang('Limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)')); + $setup_tpl->set_var('lang_setup_acl',lang('Limit access')); + $setup_tpl->set_var('lang_setup_acl_descr',lang('Limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)')); $setup_tpl->set_var('setup_acl',$GLOBALS['egw_info']['server']['setup_acl']); if(@$GLOBALS['egw_info']['server']['show_domain_selectbox']) @@ -625,8 +629,11 @@ $setup_tpl->set_var('lang_adddomain',lang('Add new database instance (eGW domain)')); $setup_tpl->set_var('lang_serverroot',lang('Server Root')); $setup_tpl->set_var('lang_includeroot',lang('Include Root (this should be the same as Server Root unless you know what you are doing)')); - $setup_tpl->set_var('lang_adminuser',lang('Admin user for header manager')); - $setup_tpl->set_var('lang_adminpass',lang('Admin password to header manager')); + $setup_tpl->set_var('lang_adminuser',lang('Header loginname')); + $setup_tpl->set_var('lang_adminuser_descr',lang('Admin user for header manager')); + $setup_tpl->set_var('lang_adminpass',lang('Header password')); + $setup_tpl->set_var('lang_adminpass_descr',lang('Admin password to header manager.')); + $setup_tpl->set_var('lang_leave_empty',lang('Leave empty to keep current.')); $setup_tpl->set_var('lang_dbhost',lang('DB Host')); $setup_tpl->set_var('lang_dbhostdescr',lang('Hostname/IP of database server').'
'. lang('Postgres: Leave it empty to use the prefered unix domain sockets instead of a tcp/ip connection').'
'. @@ -642,8 +649,9 @@ $setup_tpl->set_var('lang_dbtype',lang('DB Type')); $setup_tpl->set_var('lang_whichdb',lang('Which database type do you want to use with eGroupWare?')); $setup_tpl->set_var('lang_configuser',lang('Configuration User')); + $setup_tpl->set_var('lang_configuser_descr',lang('Loginname needed for domain configuration')); $setup_tpl->set_var('lang_configpass',lang('Configuration Password')); - $setup_tpl->set_var('lang_passforconfig',lang('Password needed for configuration')); + $setup_tpl->set_var('lang_passforconfig',lang('Password needed for domain configuration.')); $setup_tpl->set_var('lang_persist',lang('Persistent connections')); $setup_tpl->set_var('lang_persistdescr',lang('Do you want persistent connections (higher performance, but consumes more resources)')); $setup_tpl->set_var('lang_sesstype',lang('Sessions Type')); @@ -657,6 +665,7 @@ $setup_tpl->set_var('lang_mcryptiv',lang('MCrypt initialization vector')); $setup_tpl->set_var('lang_mcryptivdescr',lang('This should be around 30 bytes in length.
Note: The default has been randomly generated.')); $setup_tpl->set_var('lang_domselect',lang('Domain select box on login')); + $setup_tpl->set_var('lang_domselect_descr',lang('Alternatively domains can be accessed by logging in with username@domain.')); $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->set_var('lang_Yes',lang('Yes')); diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl index a28e5be7d3..81157ebcf4 100644 --- a/setup/templates/default/head.tpl +++ b/setup/templates/default/head.tpl @@ -39,15 +39,42 @@ - + diff --git a/setup/templates/default/manageheader.tpl b/setup/templates/default/manageheader.tpl index ee3fe2eee4..30b183f83e 100644 --- a/setup/templates/default/manageheader.tpl +++ b/setup/templates/default/manageheader.tpl @@ -1,166 +1,182 @@ - - - {lang_select} - {detected} +
+ + {lang_select} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {comment_l} + + + + {comment_r} + + + + + + - - - - - - - - - + + + +

{pagemsg}

{lang_analysis}
+ {detected} +
{lang_settings}
{lang_serverroot}
{lang_includeroot}
{lang_adminuser}
{lang_adminuser_descr}
{lang_adminpass}
{lang_adminpass_descr} {lang_leave_empty}
{lang_setup_acl}
{lang_setup_acl_descr}
{lang_persist}
+ + 		{lang_persistdescr}
{lang_sesstype}
+ + 		{lang_sesstypedescr}
{lang_enablemcrypt}
+ + 		{lang_mcrypt_warning}
{lang_mcryptversion}
{lang_mcryptversiondescr}
{lang_mcryptiv}
{lang_mcryptivdescr}
{lang_domselect}
+ 		{lang_domselect_descr}
+ {domains} +
{errors}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{domains}{comment_l} - - - {comment_r} - - - - -
{lang_settings}
{lang_serverroot}
{lang_includeroot}
{lang_adminuser}
{lang_adminpass}
{lang_setup_acl}
{lang_persist}
- - 		{lang_persistdescr}
{lang_sesstype}
- - 		{lang_sesstypedescr}
{lang_enablemcrypt}
- - 		{lang_mcrypt_warning}
{lang_mcryptversion}
{lang_mcryptversiondescr}
{lang_mcryptiv}
{lang_mcryptivdescr}
{lang_domselect}
- 		  -
{errors}
-
-
-
- - - - - - -
-
{lang_finaldescr}
- - - - - - -
-
-
+
+ + + + + + +
+
{lang_finaldescr}
+ + + + + + +
+
+
- - {lang_domain}: -    {lang_delete} - - - {lang_dbtype}
- - - {lang_whichdb} - - - {lang_dbhost}
{lang_dbhostdescr} - - - {lang_dbport}
{lang_dbportdescr} - - - {lang_dbname}
{lang_dbnamedescr} - - - {lang_dbuser}
{lang_dbuserdescr} - - - {lang_dbpass}
{lang_dbpassdescr} - - - {lang_configuser}
- - - {lang_configpass}
- {lang_passforconfig} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{lang_domain}:    {lang_delete}
{lang_dbtype}
+ + 		{lang_whichdb}
{lang_dbhost}
{lang_dbhostdescr}
{lang_dbport}
{lang_dbportdescr}
{lang_dbname}
{lang_dbnamedescr}
{lang_dbuser}
{lang_dbuserdescr}
{lang_dbpass}
{lang_dbpassdescr}
{lang_configuser}
{lang_configuser_descr}
{lang_configpass}
{lang_passforconfig} {lang_leave_empty}