extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make owner appendix optional for categories

Browse Source
This commit is contained in:
Jörg Lehrke 2009-12-07 16:15:39 +00:00
parent 83a61a8766
commit 459941bd84
8 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/inc/class.uicategories.inc.php
View File

@ -231,11 +231,14 @@
if ($this->appname && $cat['app_name'] == 'phpgw') if ($this->appname && $cat['app_name'] == 'phpgw')
{ {
$appendix = '<' . lang('Global') . '>'; $appendix = ' ♦';
} }
elseif ($cat['owner'] != $accountId) elseif ($cat['owner'] != $accountId)
{ {
$appendix = '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>'; if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
{
$appendix = ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
}
} }
else else
{ {

5
etemplate/inc/class.select_widget.inc.php
View File

@ -195,7 +195,10 @@
} }
elseif ($cat['owner'] != $accountId) elseif ($cat['owner'] != $accountId)
{ {
$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>'; if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
{
$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
}
} }
elseif ($cat['access'] == 'private') elseif ($cat['access'] == 'private')
{ {

5
etemplate/inc/class.tree_widget.inc.php
View File

@ -95,7 +95,10 @@ class tree_widget
} }
elseif ($cat['owner'] != $accountId) elseif ($cat['owner'] != $accountId)
{ {
$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>'; if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
{
$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
}
} }
elseif ($cat['access'] == 'private') { elseif ($cat['access'] == 'private') {
$s .= ' ♥'; $s .= ' ♥';

5
infolog/inc/class.infolog_hooks.inc.php
View File

@ -343,7 +343,10 @@ class infolog_hooks
} }
elseif ($cat['owner'] != $accountId) elseif ($cat['owner'] != $accountId)
{ {
$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>'; if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
{
$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
}
} }
elseif ($cat['access'] == 'private') elseif ($cat['access'] == 'private')
{ {

5
phpgwapi/inc/class.categories.inc.php
View File

@ -405,7 +405,10 @@ class categories
} }
elseif ($cat['owner'] != $this->account_id) elseif ($cat['owner'] != $this->account_id)
{ {
$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>'; if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
{
$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
}
} }
elseif ($cat['access'] == 'private') elseif ($cat['access'] == 'private')
{ {

28
preferences/inc/class.uicategories.inc.php
View File

@ -216,22 +216,22 @@
$GLOBALS['egw']->template->set_var('color',$gray < 128 ? 'style="color: white;"' : ''); $GLOBALS['egw']->template->set_var('color',$gray < 128 ? 'style="color: white;"' : '');
$accountId = $GLOBALS['egw_info']['user']['account_id']; $accountId = $GLOBALS['egw_info']['user']['account_id'];
$appendix = '';
if ($cat['app_name'] == 'phpgw') if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
{ {
$appendix = '&lt;' . lang('Global') . '&gt;'; if ($cat['app_name'] == 'phpgw')
} {
elseif ($cat['owner'] == '-1') $appendix = ' &#9830;';
{ }
$appendix = '&lt;' . lang('Global') . '&nbsp;' . $GLOBALS['egw_info']['apps'][$cats_app]['title'] . '&gt;'; elseif ($cat['owner'] == '-1')
} {
elseif ($cat['owner'] != $accountId) $appendix = ' &#9830;&nbsp;' . $GLOBALS['egw_info']['apps'][$cats_app]['title'];
{ }
$appendix = '&lt;' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '&gt;'; elseif ($cat['owner'] != $accountId)
} {
else $appendix = ' &lt;' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '&gt;';
{ }
$appendix = '';
} }
$level = $cat['level']; $level = $cat['level'];

12
preferences/inc/hook_settings.inc.php
View File

@ -316,6 +316,18 @@
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => false, 'admin' => false,
), ),
'show_category_owner' => array(
'type' => 'select',
'label' => 'Show the category owner with the category name.',
'name' => 'show_category_owner',
'values' => array(
'1' => lang('Yes'),
'0' => lang('No'),
),
'help' => 'The owner is attached to distinguish between categories with the same name. You can turn this off and will get the names only.',
'xmlrpc' => True,
'admin' => False
),
); );
// disable thumbnails, if no size configured by admin // disable thumbnails, if no size configured by admin
if (!$GLOBALS['egw_info']['server']['link_list_thumbnail']) unset($GLOBALS['settings']['link_list_thumbnail']); if (!$GLOBALS['egw_info']['server']['link_list_thumbnail']) unset($GLOBALS['settings']['link_list_thumbnail']);

1
rpc.php
View File

@ -17,6 +17,7 @@ require_once 'Horde/RPC.php';
$GLOBALS['egw_info'] = array( $GLOBALS['egw_info'] = array(
'flags' => array( 'flags' => array(
'currentapp' => 'login', 'currentapp' => 'login',
'login' => True,
'noheader' => True, 'noheader' => True,
'nonavbar' => True, 'nonavbar' => True,
'disable_Template_class' => True 'disable_Template_class' => True