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

allways display topmenu item "Password" addtional to "Preferences" and shorten "Manual / Help" in topmenu to "Help"

Browse Source
This commit is contained in:
Ralf Becker 2011-06-03 18:36:47 +00:00
parent 7e036516ef
commit 994d1b63d4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -648,7 +648,7 @@ abstract class egw_framework
} }
// We handle this here becuase its special // We handle this here becuase its special
$apps['about']['title'] = lang('About %1','EGroupware'); $apps['about']['title'] = 'EGroupware';
$apps['about']['url'] = egw::link('/about.php'); $apps['about']['url'] = egw::link('/about.php');
$apps['about']['icon'] = common::image('phpgwapi',Array('about','nonav')); $apps['about']['icon'] = common::image('phpgwapi',Array('about','nonav'));
@ -875,19 +875,22 @@ abstract class egw_framework
{ {
$this->_add_topmenu_item($apps['preferences']); $this->_add_topmenu_item($apps['preferences']);
} }
elseif(($pw_app = $GLOBALS['egw_info']['user']['apps']['password']) && // allways display pasword in topmenu
if((($pw_app = $GLOBALS['egw_info']['user']['apps']['preferences']) ||
($pw_app = $GLOBALS['egw_info']['user']['apps']['password'])) &&
!$GLOBALS['egw']->acl->check('nopasswordchange', 1)) !$GLOBALS['egw']->acl->check('nopasswordchange', 1))
{ {
$this->_add_topmenu_item(array( $this->_add_topmenu_item(array(
'title' => $pw_app['title'], 'name' => $pw_app['name'] == 'password' ? 'about' : $pw_app['name'],
'url' => egw::link($pw_app['index']), 'title' => lang('Password'),
'url' => egw::link('/preferences/password.php'),
'icon' => common::image($pw_app['icon'],$pw_app['icon_app']), 'icon' => common::image($pw_app['icon'],$pw_app['icon_app']),
)); ));
} }
if($GLOBALS['egw_info']['user']['apps']['manual'] && isset($apps['manual'])) if($GLOBALS['egw_info']['user']['apps']['manual'] && isset($apps['manual']))
{ {
$this->_add_topmenu_item($apps['manual']); $this->_add_topmenu_item(array_merge($apps['manual'],array('title' => lang('Help'))));
} }
$GLOBALS['egw']->hooks->process('topmenu_info',array(),true); $GLOBALS['egw']->hooks->process('topmenu_info',array(),true);