diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php index 0aa8203494..ac4be325ae 100644 --- a/setup/inc/class.setup_html.inc.php +++ b/setup/inc/class.setup_html.inc.php @@ -69,7 +69,7 @@ } $GLOBALS['header_template']->set_var('domain',''); - + $setting = get_var('setting',Array('POST')); while($setting && list($k,$v) = @each($setting)) { @@ -164,6 +164,18 @@ 'main_menu' => lang('Setup Main Menu'), 'user_login' => lang('Back to user login') )); + + // manual / help link to the install manual on egroupware.org + $manual_remote_egw_url = 'http://egroupware.org/egroupware'; + $url_parts = explode('/',$_SERVER['PHP_SELF']); + $script = array_pop($url_parts); + $lang = get_var('ConfigLang',Array('POST','COOKIE')); + $url = $manual_remote_egw_url.'/manual/index.php?referer='.urlencode($manual_remote_egw_url.'/setup/'.$script). + ($lang ? '&lang='.urlencode($lang) : ''); + $GLOBALS['setup_tpl']->set_var('manual',''. + htmlspecialchars(lang('Manual / help')).''); + $GLOBALS['setup_tpl']->pparse('out','T_head'); /* $setup_tpl->set_var('T_head',''); */ } diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang index 4b2f25940a..003d3d7077 100644 --- a/setup/lang/phpgw_de.lang +++ b/setup/lang/phpgw_de.lang @@ -276,6 +276,7 @@ mail server protocol setup de Mail Server Protokol make sure that your database is created and the account permissions are set setup de Stellen Sie sicher, dass Ihre Datenbank erstellt und die Benutzerrechte gesetzt wurden manage applications setup de Anwendungen verwalten manage languages setup de Sprachen verwalten +manual / help setup de Handbuch / Hilfe max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures setup de max_execution_time (maximale Ausführungszeit eines Skripts) ist auf weniger als 30 (Sekunden) gesetzt: eGroupWare benötigt teilweise längere Ausführungszeiten. Sie müssen mit gelegentlichen Fehlern rechnen. maximum account id (e.g. 65535 or 1000000) setup de Maximum für Benutzer-ID (z.B. 65535 oder 1000000) may be broken setup de kann kaput sein diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang index 8ea7fb523e..ef1a474107 100644 --- a/setup/lang/phpgw_en.lang +++ b/setup/lang/phpgw_en.lang @@ -276,6 +276,7 @@ mail server protocol setup en Mail server protocol make sure that your database is created and the account permissions are set setup en Make sure that your database is created and the account permissions are set manage applications setup en Manage Applications manage languages setup en Manage Languages +manual / help setup en Manual / help max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures setup en max_execution_time is set to less than 30 (seconds): eGroupWare sometimes needs a higher execution_time, expect occasional failures maximum account id (e.g. 65535 or 1000000) setup en Maximum account id (e.g. 65535 or 1000000) may be broken setup en may be broken diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl index 3d1b358032..a28e5be7d3 100644 --- a/setup/templates/default/head.tpl +++ b/setup/templates/default/head.tpl @@ -110,6 +110,12 @@ ball{logoutbutton} + +   + + + ball{manual} +