Author: ralfbecker
New Revision: 55321
URL: http://svn.stylite.de/viewvc/egroupware?rev=55321&view=rev
Log:
nicer UI to select apps for mobile device and not storing default, to allow chaning it, when more apps become available
Modified:
trunk/admin/inc/class.uiconfig.inc.php
trunk/admin/inc/hook_config_validate.inc.php
trunk/admin/lang/egw_de.lang
trunk/admin/lang/egw_en.lang
trunk/admin/templates/default/config.tpl
trunk/jdots/inc/class.jdots_framework.inc.php
— trunk/admin/inc/class.uiconfig.inc.php (original)
+++ trunk/admin/inc/class.uiconfig.inc.php Wed Mar 9 10:29:13 2016
@@ -124,7 +124,7 @@
$c->config_data[$key] = $config;
if (in_array($key, (array)$GLOBALS[‘egw_info’][‘server’][‘found_validation_hook’], true) && function_exists($key))
{
— trunk/admin/inc/hook_config_validate.inc.php (original)
+++ trunk/admin/inc/hook_config_validate.inc.php Wed Mar 9 10:29:13 2016
@@ -14,7 +14,7 @@
/*
Set global flag to indicate for which config settings we have equally named validation methods
*/
-$GLOBALS[‘egw_info’][‘server’][‘found_validation_hook’] = array(‘vfs_image_dir’);
+$GLOBALS[‘egw_info’][‘server’][‘found_validation_hook’] = array(‘vfs_image_dir’,‘fw_mobile_app_list’);
/**
- Check VFS dir exists and delete image map to recreate it, if vfs-image-dir changes
@@ -39,4 +39,23 @@
// Set the global now, or the old value will get re-loaded
$GLOBALS[‘egw_info’][‘server’][‘vfs_image_dir’] = $vfs_image_dir;
}
+}
+/**
— trunk/admin/lang/egw_de.lang (original)
+++ trunk/admin/lang/egw_de.lang Wed Mar 9 10:29:13 2016
@@ -96,6 +96,7 @@
application name admin de Name der Anwendung
application title admin de Titel der Anwendung
applications admin de Anwendungen
+applications available on mobile devices admin de Anwendungen die auf Mobilgeräten zur Verfügung stehen
applications list admin de Liste der Anwendungen
applications run rights updated. admin de Anwendungsrechte aktualisiert.
applies the changes admin de übernimmt Ãnderungen
@@ -416,7 +417,6 @@
list config settings admin de Konfigurationseinstellungen auflisten
list current sessions admin de aktive Sitzungen anzeigen
list of current users admin de Liste der gegenwärtigen Benutzer
-list of enabled applications on mobile template (apps must be comma separated) admin de Liste freigeschalteter Anwendung für Mobilgeräte (komma separiert)
log user-agent and action of changes in history-log of entries admin de Protokolliere Browser-Typ und Aktion von Ãnderungen in der History der Einträge
logged out admin de abgemeldet
login history admin de Login-Kontrolle
— trunk/admin/lang/egw_en.lang (original)
+++ trunk/admin/lang/egw_en.lang Wed Mar 9 10:29:13 2016
@@ -96,6 +96,7 @@
application name admin en Application name
application title admin en Application title
applications admin en Applications
+applications available on mobile devices admin en Applications available on mobile devices
applications list admin en Applications list
applications run rights updated. admin en Applications run rights updated.
applies the changes admin en Applies the changes
@@ -416,7 +417,6 @@
list config settings admin en List config settings
list current sessions admin en List current sessions
list of current users admin en List of current users
-list of enabled applications on mobile template (apps must be comma separated) admin en List of enabled applications on mobile template (apps must be comma separated)
log user-agent and action of changes in history-log of entries admin en Log user-agent and action of changes in history-log of entries
logged out admin en Logged out
login history admin en Login history
— trunk/admin/templates/default/config.tpl (original)
+++ trunk/admin/templates/default/config.tpl Wed Mar 9 10:29:13 2016
@@ -114,7 +114,7 @@
<tr class="row_off">
— trunk/jdots/inc/class.jdots_framework.inc.php (original)
+++ trunk/jdots/inc/class.jdots_framework.inc.php Wed Mar 9 10:29:13 2016
@@ -1101,17 +1101,37 @@
}
/**
-
- Apps available for mobile, if admin did not configured something else
-
- (needs to kept in sync with list in phpgwapi/js/framework/fw_mobile.js!)
- */
- const DEFAULT_MOBILE_APPS = ‘calendar,infolog,timesheet,resources,addressbook,projectmanager,tracker,mail,filemanager’;
-
- /**
- Enabled applications on mobile
-
- Generates input field and set values on site configuration for list of enabled
- applications on mobile theme.
-
-
-
@param array $config
-
@return string return DOM string for input field
*/
- static function mobile_app_list()
- {
-
$value = $GLOBALS['egw_info']['server']['fw_mobile_app_list']? $GLOBALS['egw_info']['server']['fw_mobile_app_list']:
-
'calendar,infolog,timesheet,resources,addressbook,projectmanager,tracker,mail';
-
return '<input size="60" value="'.$value.'" name="newsettings[fw_mobile_app_list]" />';
- static function mobile_app_list($config)
- {
-
$value = $config['fw_mobile_app_list'] ? $config['fw_mobile_app_list'] :
-
explode(',', self::DEFAULT_MOBILE_APPS);
-
-
$apps = array();
-
foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
-
{
-
if (!$data['enabled'] || !$data['status'] || $data['status'] == 3)
-
{
-
continue; // app not enabled (user can not have run rights for these apps)
-
}
-
$apps[$app] = lang($app);
-
}
-
natcasesort($apps);
-
-
return html::select('newsettings[fw_mobile_app_list]', $value,
-
$apps, true, '', 5, true);
}
}
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
