mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 17:14:36 +01:00
- fix the "Home" text missing in appTitles in edge-it, idots, and jerryt
templates. - remove noop if (foo) { continue; } - remove obsolete commented out code that special cased the home app which is no longer valid.
This commit is contained in:
parent
9c5edb9b04
commit
2425ccea19
@ -58,7 +58,6 @@
|
|||||||
|
|
||||||
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
|
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
|
||||||
{
|
{
|
||||||
//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
|
|
||||||
if($app != 'preferences' && $app != 'about' && $app != 'logout')
|
if($app != 'preferences' && $app != 'about' && $app != 'logout')
|
||||||
{
|
{
|
||||||
$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
||||||
@ -67,11 +66,8 @@
|
|||||||
|
|
||||||
if($app=='home')
|
if($app=='home')
|
||||||
{
|
{
|
||||||
|
$title = lang('home');
|
||||||
$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
|
$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
|
||||||
if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($i<$max_icons)
|
if($i<$max_icons)
|
||||||
|
@ -58,7 +58,6 @@
|
|||||||
|
|
||||||
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
|
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
|
||||||
{
|
{
|
||||||
//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
|
|
||||||
if($app != 'preferences' && $app != 'about' && $app != 'logout')
|
if($app != 'preferences' && $app != 'about' && $app != 'logout')
|
||||||
{
|
{
|
||||||
$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
||||||
@ -67,11 +66,8 @@
|
|||||||
|
|
||||||
if($app=='home')
|
if($app=='home')
|
||||||
{
|
{
|
||||||
|
$title = lang('home');
|
||||||
$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
|
$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
|
||||||
if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($i<$max_icons)
|
if($i<$max_icons)
|
||||||
|
@ -56,22 +56,15 @@
|
|||||||
|
|
||||||
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
|
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
|
||||||
{
|
{
|
||||||
//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
|
|
||||||
if($app != 'preferences' && $app != 'about' && $app != 'logout')
|
if($app != 'preferences' && $app != 'about' && $app != 'logout')
|
||||||
{
|
{
|
||||||
$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
||||||
$icon = '<img src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" />';
|
$icon = '<img src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" />';
|
||||||
|
|
||||||
// 300304 ndee
|
|
||||||
if($app == 'home') $title = lang('Home');
|
|
||||||
|
|
||||||
if($app=='home')
|
if($app=='home')
|
||||||
{
|
{
|
||||||
|
$title = lang('home');
|
||||||
$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
|
$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
|
||||||
if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($i<$max_icons)
|
if($i<$max_icons)
|
||||||
|
Loading…
Reference in New Issue
Block a user