extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 08:39:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

register home hooks if tutorial_menu hook is not registered eg. on call of intro video, moved hook to tutorial class

Browse Source
This commit is contained in:
Ralf Becker 2015-10-28 08:36:37 +00:00
parent ad6cfe4871
commit 979a910e7f
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
home/inc/class.home_tutorial_ui.inc.php
View File

@ -28,6 +28,15 @@ class home_tutorial_ui
*/ */
function popup ($content=null) function popup ($content=null)
{ {
// check and if not done register tutorial_menu hook
if (!$GLOBALS['egw']->hooks->hook_exists('sidebox_all', 'home') ||
$GLOBALS['egw']->hooks->locations['sidebox_all']['home'] != 'home_tutorial_ui::tutorial_menu')
{
$setup_info = array();
include(EGW_SERVER_ROOT.'/home/setup/setup.inc.php');
$GLOBALS['egw']->hooks->register_hooks('home', $setup_info['home']['hooks']);
}
//Allow youtube frame to pass the CSP check //Allow youtube frame to pass the CSP check
egw_framework::csp_frame_src_attrs(array('www.youtube.com')); egw_framework::csp_frame_src_attrs(array('www.youtube.com'));
@ -116,4 +125,28 @@ class home_tutorial_ui
return $json; return $json;
} }
/**
* Static function to build egw tutorial sidebox menu
*
*/
public static function tutorial_menu()
{
$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'])
{
$file = Array (
array(
'text' => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
'no_lang' => true,
'link' => false,
'icon' => false,
),
'menuOpened' => true
);
display_sidebox($appname, lang('Video Tutorials'), $file);
}
}
} }

2
home/setup/setup.inc.php
View File

@ -27,7 +27,7 @@ $setup_info['home']['maintainer'] = array(
/* The hooks this app includes, needed for hooks registration */ /* The hooks this app includes, needed for hooks registration */
$setup_info['home']['hooks']['hasUpdates'] = 'home.updates.hasUpdates'; $setup_info['home']['hooks']['hasUpdates'] = 'home.updates.hasUpdates';
$setup_info['home']['hooks']['showUpdates'] = 'home.updates.showUpdates'; $setup_info['home']['hooks']['showUpdates'] = 'home.updates.showUpdates';
$setup_info['home']['hooks']['sidebox_all'] = 'hooks::egw_tutorial_menu'; $setup_info['home']['hooks']['sidebox_all'] = 'home_tutorial_ui::tutorial_menu';
/* Dependencies for this app to work */ /* Dependencies for this app to work */
$setup_info['home']['depends'][] = array( $setup_info['home']['depends'][] = array(

18
phpgwapi/inc/class.hooks.inc.php
View File

@ -383,24 +383,10 @@ class hooks
/** /**
* Static function to build egw tutorial sidebox menu * Static function to build egw tutorial sidebox menu
* *
* @deprecated can be removed 2016, as replaced by home_tutorial_ui::tutorial_menu
*/ */
public static function egw_tutorial_menu() public static function egw_tutorial_menu()
{ {
$tutorials = json_decode(home_tutorial_ui::getJsonData(),true); home_tutorial_ui::tutorial_menu();
$appname = $GLOBALS['egw_info']['flags']['currentapp'];
if (!is_array($tutorials[$appname])) return false;
if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable'])
{
$file = Array (
array(
'text' => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
'no_lang' => true,
'link' => false,
'icon' => false,
),
'menuOpened' => true
);
display_sidebox($appname, lang('Video Tutorials'), $file);
}
} }
} }