update/add support options in setup and about EGroupware page

api/src/Framework/About.php

@@ -79,7 +79,14 @@ Chrome, Firefox and Safari are prefered internet browsers for best EGroupware ex
 EGroupware can be integrated easily into existing authentication solutions such as LDAP or Active Directory.</p>
 <p>EGroupware offers CalDAV, CardDAV, WebDAV and Active Sync for synchronising data to your smartphone or desktop client.</p>
 <p>EGroupware is developed by EGroupware GmbH with contributions from community developers.</p>
-<p><b>For more information visit the <a href="http://www.egroupware.org" target="_blank">EGroupware Website</a></b></p>');
+<p>For more information visit the <b><a href="http://www.egroupware.org" target="_blank">EGroupware Website</a></b></p>
+<p><b>Support is available</b> via the following options:
+<ul>
+<li><a href="https://www.egroupware.org/egroupware-support/" target="_blank">Commercial support and consulting</a> from EGroupware GmbH</li>
+<li><a href="https://www.egroupware.org/happy-people/partners/" target="_blank">EGroupware partners</a></li>
+<li><a href="https://help.egroupware.org/" target="_blank">Community forum</a></li>
+</ul>
+</p>');
 
 		// get informations about the applications
 		$apps = array();

setup/inc/class.setup_html.inc.php

@@ -174,22 +174,14 @@ class setup_html
 			'check_install' => $check_install,
 			'register_hooks'=> $register_hooks,
 			'main_menu'     => lang('Setup Main Menu'),
-			'user_login'    => lang('Back to user login')
+			'user_login'    => lang('Back to user login'),
+			'help_menu'     => lang('Help and support'),
+			'documentation' => lang('Documentation'),
+			'commercial_support' => lang('Commercial support'),
+			'community_forum' => lang('Community forum'),
 		));
 
-		// manual / help link to the install manual on egroupware.org
-		$manual_remote_egw_url = 'http://manual.egroupware.org/egroupware';
-		$url_parts = explode('/',$_SERVER['PHP_SELF']);
-		$script = array_pop($url_parts);
-		$lang = setup::get_lang();
-		$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','<a href="'.$url.'" target="manual" onclick="'.
-			"window.open('$url','manual','width=800,height=600,scrollbars=yes,resizable=yes'); return false;".'">'.
-			htmlspecialchars(lang('Manual / help')).'</a>');
-
 		$GLOBALS['setup_tpl']->pparse('out','T_head');
-		/* $setup_tpl->set_var('T_head',''); */
 	}
 
 	static function show_footer()

setup/lang/egw_de.lang

@@ -157,6 +157,8 @@ click <a href="index.php">here</a> to return to setup.	setup	de	<a href="index.p
 click here	setup	de	Hier klicken
 click here to re-run the installation tests	setup	de	zum Wiederholen der Installationstests hier klicken
 comma separated ip-addresses or host-names, default access to setup from everywhere	setup	de	Komma getrennte IP-Adressen oder Hostnamen, Vorgabe Zugriff von überall
+commercial support	setup	de	Kommerzieller Support
+community forum	setup	de	Community Forum
 complete path to aspell program	setup	de	Vollständiger Pfad zum Programm ASPELL
 completed	setup	de	Abgeschlossen
 config password	setup	de	Konfigurationspasswort
@@ -234,6 +236,7 @@ developers' table schema toy	setup	de	Entwickler Tabellen Schema "Spielzeug"
 did not find any valid db support!	setup	de	Konnte keine gültige Datenbankunterstützung finden!
 do you want persistent connections (higher performance, but consumes more resources)	setup	de	Wollen Sie eine permanente Datenbankverbindung (höhere Performance, braucht aber mehr Ressourcen)
 do you want to manage homedirectory and loginshell attributes?	setup	de	Wollen Sie Benutzerverzeichnisse und Login-Shell Attribute verwalten?
+documentation	setup	de	Dokumentation
 does not exist	setup	de	existiert nicht
 domain	setup	de	Domain
 domain '%1' does not exist !!!	setup	de	Domain '%1' existiert NICHT !!!
@@ -316,6 +319,7 @@ header password	setup	de	Passwort Headerverwaltung
 header username	setup	de	Benutzer Headerverwaltung
 header-password[,header-user(admin)]	setup	de	Passwort Headerverwaltung[,Benutzer Headerverwaltung(admin)]
 header.inc.php successful written.	setup	de	header.inc.php erfolgreich geschrieben.
+help and support	setup	de	Hilfe und Support
 historylog removed	setup	de	Historylog gelöscht
 hooks deregistered	setup	de	Haken nicht mehr aktiv
 hooks registered	setup	de	Haken registriert

setup/lang/egw_en.lang

@@ -157,6 +157,8 @@ click <a href="index.php">here</a> to return to setup.	setup	en	Click <a href="i
 click here	setup	en	Click here
 click here to re-run the installation tests	setup	en	Click here to re-run the installation tests
 comma separated ip-addresses or host-names, default access to setup from everywhere	setup	en	Comma separated IP addresses or host names, default access to setup from everywhere
+commercial support	setup	en	Commercial support
+community forum	setup	en	Community forum
 complete path to aspell program	setup	en	Complete path to aspell program
 completed	setup	en	Completed
 config password	setup	en	Config password
@@ -234,6 +236,7 @@ developers' table schema toy	setup	en	Developers' Table Schema Toy
 did not find any valid db support!	setup	en	Did not find any valid DB support!
 do you want persistent connections (higher performance, but consumes more resources)	setup	en	Do you want persistent connections (higher performance, but consumes more resources)
 do you want to manage homedirectory and loginshell attributes?	setup	en	Do you want to manage home directory and login shell attributes?
+documentation	setup	en	Documentation
 does not exist	setup	en	Does not exist
 domain	setup	en	Domain
 domain '%1' does not exist !!!	setup	en	Domain '%1' does NOT exist !!!
@@ -316,6 +319,7 @@ header password	setup	en	Header password
 header username	setup	en	Header user name
 header-password[,header-user(admin)]	setup	en	header-password[,header-user(admin)]
 header.inc.php successful written.	setup	en	header.inc.php successful written.
+help and support	setup	en	Help and support
 historylog removed	setup	en	History log removed
 hooks deregistered	setup	en	Hooks deregistered.
 hooks registered	setup	en	Hooks registered.

setup/templates/default/head.tpl

@@ -76,8 +76,22 @@
 								<tr class="divSideboxEntry">
 									<td colspan="2" class="textSidebox">&nbsp;</td>
 								</tr>
+							</table>
+						</div>
+						<div class="divSideboxHeader"><span>{help_menu}</span></div>
+						<div>
+							<table width="100%" cellspacing="0" cellpadding="0">
 								<tr class="divSideboxEntry">
-									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../api/templates/default/images/bullet.png" alt="ball" /></td><td class="textSidebox">{manual}</td>
+									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../api/templates/default/images/bullet.png" alt="ball" /></td>
+									<td class="textSidebox"><a href="https://github.com/EGroupware/egroupware/wiki" target="_blank">{documentation}</a></td>
+								</tr>
+								<tr class="divSideboxEntry">
+									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../api/templates/default/images/bullet.png" alt="ball" /></td>
+									<td class="textSidebox"><a href="https://www.egroupware.org/egroupware-support/" target="_blank">{commercial_support}</a></td>
+								</tr>
+								<tr class="divSideboxEntry">
+									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../api/templates/default/images/bullet.png" alt="ball" /></td>
+									<td class="textSidebox"><a href="https://help.egroupware.org/" target="_blank">{community_forum}</a></td>
 								</tr>
 							</table>
 						</div>