holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move default app preference out of Text editor settings into template settings section

Browse Source
This commit is contained in:
Nathan Gray 2013-01-17 23:21:28 +00:00
parent 3fe0ecf662
commit 575464654c
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpgwapi/templates/idots/hook_settings.inc.php
View File

@ -11,6 +11,15 @@
/* $Id$ */ /* $Id$ */
$user_apps = array();
foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
{
if($GLOBALS['egw_info']['apps'][$app]['status'] != 2 && $app)
{
$user_apps[$app] = $GLOBALS['egw_info']['apps'][$app]['title'] ? $GLOBALS['egw_info']['apps'][$app]['title'] : lang($app);
}
}
$top_menu = array( $top_menu = array(
'topmenu' => lang('Show as Topmenu'), 'topmenu' => lang('Show as Topmenu'),
'sidebox' => lang('Show in sidebox') 'sidebox' => lang('Show in sidebox')
@ -32,6 +41,16 @@
'xmlrpc' => False, 'xmlrpc' => False,
'admin' => False, 'admin' => False,
), ),
'default_app' => array(
'type' => 'select',
'label' => 'Default application',
'name' => 'default_app',
'values' => $user_apps,
'help' => "The default application will be started when you enter eGroupWare or click on the homepage icon.<br>You can also have more than one application showing up on the homepage, if you don't choose a specific application here (has to be configured in the preferences of each application).",
'xmlrpc' => False,
'admin' => False,
'default'=> '',
),
'show_general_menu' => array( 'show_general_menu' => array(
'type' => 'select', 'type' => 'select',
'label' => 'How to show the general eGroupWare menu ?', 'label' => 'How to show the general eGroupWare menu ?',

19
phpgwapi/templates/jerryr/hook_settings.inc.php
View File

@ -11,6 +11,15 @@
/* $Id$ */ /* $Id$ */
$user_apps = array();
foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
{
if($GLOBALS['egw_info']['apps'][$app]['status'] != 2 && $app)
{
$user_apps[$app] = $GLOBALS['egw_info']['apps'][$app]['title'] ? $GLOBALS['egw_info']['apps'][$app]['title'] : lang($app);
}
}
$top_menu = array( $top_menu = array(
'topmenu' => lang('Show as Topmenu'), 'topmenu' => lang('Show as Topmenu'),
'sidebox' => lang('Show in sidebox') 'sidebox' => lang('Show in sidebox')
@ -32,6 +41,16 @@
'xmlrpc' => False, 'xmlrpc' => False,
'admin' => False 'admin' => False
), ),
'default_app' => array(
'type' => 'select',
'label' => 'Default application',
'name' => 'default_app',
'values' => $user_apps,
'help' => "The default application will be started when you enter eGroupWare or click on the homepage icon.<br>You can also have more than one application showing up on the homepage, if you don't choose a specific application here (has to be configured in the preferences of each application).",
'xmlrpc' => False,
'admin' => False,
'default'=> '',
),
'show_general_menu' => array( 'show_general_menu' => array(
'type' => 'select', 'type' => 'select',
'label' => 'How to show the general eGroupWare menu ?', 'label' => 'How to show the general eGroupWare menu ?',

19
preferences/inc/class.preferences_hooks.inc.php
View File

@ -73,15 +73,6 @@ class preferences_hooks
'v2' => lang ('Silver theme') 'v2' => lang ('Silver theme')
); );
$user_apps = array();
foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
{
if($GLOBALS['egw_info']['apps'][$app]['status'] != 2 && $app)
{
$user_apps[$app] = $GLOBALS['egw_info']['apps'][$app]['title'] ? $GLOBALS['egw_info']['apps'][$app]['title'] : lang($app);
}
}
$account_sels = array( $account_sels = array(
'selectbox' => lang('Selectbox'), 'selectbox' => lang('Selectbox'),
'primary_group' => lang('Selectbox with primary group and search'), 'primary_group' => lang('Selectbox with primary group and search'),
@ -408,16 +399,6 @@ class preferences_hooks
'admin' => false, 'admin' => false,
'default'=> 'extended' 'default'=> 'extended'
), ),
'default_app' => array(
'type' => 'select',
'label' => 'Default application',
'name' => 'default_app',
'values' => $user_apps,
'help' => "The default application will be started when you enter eGroupWare or click on the homepage icon.<br>You can also have more than one application showing up on the homepage, if you don't choose a specific application here (has to be configured in the preferences of each application).",
'xmlrpc' => False,
'admin' => False,
'default'=> '',
),
); );
// 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($settings['link_list_thumbnail']); if (!$GLOBALS['egw_info']['server']['link_list_thumbnail']) unset($settings['link_list_thumbnail']);