diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang index 1edfe08c6c..f50a6a2f32 100644 --- a/admin/lang/egw_en.lang +++ b/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. diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl index 2a16bca796..45627517e6 100644 --- a/admin/templates/default/config.tpl +++ b/admin/templates/default/config.tpl @@ -102,11 +102,13 @@ - {lang_Disable_EGroupware_Tutorial_in_sidebox_menu}: + {lang_Disable_EGroupware_Tutorial}: diff --git a/home/inc/class.home_tutorial_ui.inc.php b/home/inc/class.home_tutorial_ui.inc.php index a6d99ddbac..eab44ef195 100644 --- a/home/inc/class.home_tutorial_ui.inc.php +++ b/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( diff --git a/phpgwapi/inc/class.config.inc.php b/phpgwapi/inc/class.config.inc.php index e543ae299a..b92be9e5de 100755 --- a/phpgwapi/inc/class.config.inc.php +++ b/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'), diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js index 0dfdf0c367..db3940de26 100644 --- a/phpgwapi/js/jsapi/egw.js +++ b/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()