* All apps/Tutorials:

- Add two more options in admin's site configuration to be able to switch tutorials in sidebox and/or "ask show introduction dialog" on/off
- Add some translation

admin/lang/egw_en.lang

@@ -108,6 +108,7 @@ are you sure you want to delete this global category ?	admin	en	Are you sure you
 are you sure you want to delete this group ?	admin	en	Are you sure you want to delete this group?
 are you sure you want to delete this server?	admin	en	Are you sure you want to delete this server?
 are you sure you want to kill this session ?	admin	en	Are you sure you want to kill this session?
+ask show introduction video	admin	en	ask show introduction video
 async services last executed	admin	en	Async services last executed
 asynchronous timed services	admin	en	Asynchronous timed services
 asyncservices not yet installed or other error (%1) !!!	admin	en	Async services not yet installed or other error (%1) !
@@ -228,6 +229,7 @@ destination account #%1 does exist and is not renamed itself! can not merge acco
 determines the order the fields are displayed	admin	en	Determines the order the fields are displayed
 disable	admin	en	Disable
 disable "auto completion" of the login form	admin	en	Disable "auto completion" of the login form
+disable egroupware tutorial	admin	en	Disable EGroupware Tutorial
 disable minifying of javascript and css files	admin	en	Disable minifying of javascript and CSS files
 disable wysiwyg-editor	admin	en	Disable WYSIWYG-editor
 disabled (not recomended)	admin	en	Disabled (not recommended)
@@ -575,6 +577,7 @@ show error log	admin	en	Show error log
 show members	admin	en	Show members
 show phpinfo()	admin	en	Show phpinfo()
 show session ip address	admin	en	Show session IP address
+sidebox video tutorials	admin	en	Sidebox video tutorials
 site	admin	en	Site
 soap	admin	en	SOAP
 sorry, that group name has already been taken.	admin	en	Sorry, that group name has already been taken.

admin/templates/default/config.tpl

@@ -102,11 +102,13 @@
    </tr>
    
    <tr class="row_off">
-    <td>{lang_Disable_EGroupware_Tutorial_in_sidebox_menu}:</td>
+    <td>{lang_Disable_EGroupware_Tutorial}:</td>
     <td>
      <select name="newsettings[egw_tutorial_disable]">
       <option value="">{lang_No}</option>
-      <option value="True">{lang_Yes}</option>
+      <option value="sidebox"{selected_egw_tutorial_disable_sidebox}>{lang_Sidebox_video_tutorials}</option>
+	  <option value="intro"{selected_egw_tutorial_disable_intro}>{lang_ask_show_introduction_video}</option>
+	  <option value="all"{selected_egw_tutorial_disable_all}>{lang_All}</option>
      </select>
     </td>
    </tr>

home/inc/class.home_tutorial_ui.inc.php

@@ -135,7 +135,8 @@ class home_tutorial_ui
 		$tutorials = json_decode(self::getJsonData(),true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!is_array($tutorials[$appname])) return false;
-		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable'])
+		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
+			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{
 			$file = Array (
 				array(

phpgwapi/inc/class.config.inc.php

@@ -264,7 +264,7 @@ class config
 				'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file',
 				'markuntranslated','link_list_thumbnail','enabled_spellcheck','debug_minify',
 				'call_link','call_popup',	// addressbook
-				'hide_birthdays','calview_no_consolidate'),	// calendar
+				'hide_birthdays','calview_no_consolidate', 'egw_tutorial_disable'),	// calendar
 			'projectmanager' => array('hours_per_workday', 'duration_units'),
 			'manual' => array('manual_remote_egw_url'),
 			'infolog' => array('status'),

phpgwapi/js/jsapi/egw.js

@@ -325,7 +325,8 @@
 			// Open tutorial popup with an introduction video about egroupware
 			if (window.framework === window.top.framework && typeof et2_dialog != 'undefined' &&
 				!egw.preference('egw_tutorial_noautoload', 'common') &&
-				!parseInt(document.getElementById('egw_script_id').getAttribute('data-framework-reload')))
+				!parseInt(document.getElementById('egw_script_id').getAttribute('data-framework-reload')) &&
+				!egw.config('egw_tutorial_disable', 'phpgwapi') || egw.config('egw_tutorial_disable', 'phpgwapi') == 'sidebox')
 			{
 				// we need to wait until common translations are loaded
 				egw.langRequireApp(window, 'common', function()