Mobile theme:

- Eliminates some actions from contextmenu only on mobile
This commit is contained in:
Hadi Nategh 2016-03-09 12:31:55 +00:00
parent f5a6d52ae2
commit dbd97cd37a
5 changed files with 37 additions and 19 deletions

View File

@ -372,7 +372,8 @@ class addressbook_ui extends addressbook_bo
'disableClass' => 'contact_organisation', 'disableClass' => 'contact_organisation',
'hideOnDisabled' => true, 'hideOnDisabled' => true,
// Children added below // Children added below
'children' => array() 'children' => array(),
'hideOnMobile' => true
), ),
'open' => array( 'open' => array(
'caption' => 'Open', 'caption' => 'Open',
@ -404,6 +405,7 @@ class addressbook_ui extends addressbook_bo
'icon' => 'copy', 'icon' => 'copy',
), ),
), ),
'hideOnMobile' => true
), ),
); );
// CRM view options // CRM view options
@ -548,6 +550,7 @@ class addressbook_ui extends addressbook_bo
'prefix' => 'move_to_', 'prefix' => 'move_to_',
'group' => $group, 'group' => $group,
'disableClass' => 'rowNoDelete', 'disableClass' => 'rowNoDelete',
'hideOnMobile' => true
); );
} }
$actions['merge'] = array( $actions['merge'] = array(
@ -556,6 +559,7 @@ class addressbook_ui extends addressbook_bo
'hint' => 'Merge into first or account, deletes all other!', 'hint' => 'Merge into first or account, deletes all other!',
'allowOnMultiple' => 'only', 'allowOnMultiple' => 'only',
'group' => $group, 'group' => $group,
'hideOnMobile' => true
); );
++$group; // integration with other apps: infolog, calendar, filemanager ++$group; // integration with other apps: infolog, calendar, filemanager
@ -580,7 +584,8 @@ class addressbook_ui extends addressbook_bo
'popup' => egw_link::get_registry('infolog', 'add_popup'), 'popup' => egw_link::get_registry('infolog', 'add_popup'),
'onExecute' => 'javaScript:app.addressbook.add_task', // call server for org-view only 'onExecute' => 'javaScript:app.addressbook.add_task', // call server for org-view only
), ),
) ),
'hideOnMobile' => true
); );
} }
if ($GLOBALS['egw_info']['user']['apps']['calendar']) if ($GLOBALS['egw_info']['user']['apps']['calendar'])
@ -604,6 +609,7 @@ class addressbook_ui extends addressbook_bo
'onExecute' => 'javaScript:app.addressbook.add_cal', 'onExecute' => 'javaScript:app.addressbook.add_cal',
), ),
), ),
'hideOnMobile' => true
); );
} }
//Send to email //Send to email
@ -664,6 +670,7 @@ class addressbook_ui extends addressbook_bo
'group' => $group, 'group' => $group,
// disable for for org-views, as it needs contact-ids // disable for for org-views, as it needs contact-ids
'disableClass' => 'contact_organisation', 'disableClass' => 'contact_organisation',
'hideOnMobile' => true
); );
} }
// check if user is an admin or the export is not generally turned off (contact_export_limit is non-numerical, eg. no) // check if user is an admin or the export is not generally turned off (contact_export_limit is non-numerical, eg. no)
@ -687,6 +694,7 @@ class addressbook_ui extends addressbook_bo
'icon' => egw_vfs::mime_icon('text/vcard'), 'icon' => egw_vfs::mime_icon('text/vcard'),
), ),
), ),
'hideOnMobile' => true
); );
} }
@ -703,6 +711,7 @@ class addressbook_ui extends addressbook_bo
'onExecute' => 'javaScript:app.addressbook.adb_mail_vcard', 'onExecute' => 'javaScript:app.addressbook.adb_mail_vcard',
'disableClass' => 'contact_organisation', 'disableClass' => 'contact_organisation',
'hideOnDisabled' => true, 'hideOnDisabled' => true,
'hideOnMobile' => true
); );
} }
++$group; ++$group;

View File

@ -868,7 +868,8 @@ class calendar_uilist extends calendar_ui
$actions = array( $actions = array(
'add' => array( 'add' => array(
'caption' => 'Add', 'caption' => 'Add',
'egw_open' => 'add-calendar' 'egw_open' => 'add-calendar',
'hideOnMobile' => true
), ),
'open' => array( 'open' => array(
'caption' => 'Open', 'caption' => 'Open',

View File

@ -1089,6 +1089,7 @@ class infolog_ui
'enabled' => 'javaScript:app.infolog.has_parent', 'enabled' => 'javaScript:app.infolog.has_parent',
'onExecute' => 'javaScript:app.infolog.view_parent', 'onExecute' => 'javaScript:app.infolog.view_parent',
'group' => $group, 'group' => $group,
'hideOnMobile' => true
), ),
'add' => array( 'add' => array(
'caption' => 'Add', 'caption' => 'Add',
@ -1115,6 +1116,7 @@ class infolog_ui
'icon' => 'copy', 'icon' => 'copy',
), ),
), ),
'hideOnMobile' => true
), ),
'no_notifications' => array( 'no_notifications' => array(
'caption' => 'Do not notify', 'caption' => 'Do not notify',
@ -1165,6 +1167,7 @@ class infolog_ui
'nm_action' => 'open_popup', 'nm_action' => 'open_popup',
), ),
), ),
'hideOnMobile' => true
), ),
'close' => array( 'close' => array(
'caption' => 'Close', 'caption' => 'Close',
@ -1245,6 +1248,7 @@ class infolog_ui
'postSubmit' => true, // download needs post submit to work 'postSubmit' => true, // download needs post submit to work
'group' => $group, 'group' => $group,
'allowOnMultiple' => true, 'allowOnMultiple' => true,
'hideOnMobile' => true
); );
$actions['delete'] = array( $actions['delete'] = array(

View File

@ -438,7 +438,7 @@ class mail_ui
'actions' => self::get_actions(), 'actions' => self::get_actions(),
'row_id' => 'row_id', // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid 'row_id' => 'row_id', // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
'placeholder_actions' => array('composeasnew'), 'placeholder_actions' => array('composeasnew'),
); );
} }
if (html::$ua_mobile) $content[self::$nm_index]['header_row'] = 'mail.index.header_right'; if (html::$ua_mobile) $content[self::$nm_index]['header_row'] = 'mail.index.header_right';
@ -609,7 +609,7 @@ class mail_ui
'sieve' => array( 'sieve' => array(
'caption' => 'Mail filter', 'caption' => 'Mail filter',
'onExecute' => 'javaScript:app.mail.edit_sieve', 'onExecute' => 'javaScript:app.mail.edit_sieve',
'enabled' => 'javaScript:app.mail.sieve_enabled', 'enabled' => 'javaScript:app.mail.sieve_enabled',
'icon' => 'etemplate/fav_filter', // funnel 'icon' => 'etemplate/fav_filter', // funnel
'hideOnMobile' => true 'hideOnMobile' => true
@ -677,7 +677,7 @@ class mail_ui
); );
break; break;
} }
$junkFolder = $this->mail_bo->getJunkFolder(); $junkFolder = $this->mail_bo->getJunkFolder();
//error_log(__METHOD__.__LINE__.$junkFolder); //error_log(__METHOD__.__LINE__.$junkFolder);
if ($junkFolder && !empty($junkFolder)) if ($junkFolder && !empty($junkFolder))
@ -691,9 +691,9 @@ class mail_ui
); );
} }
$tree_actions['sieve']['group'] = $tree_actions['vacation']['group'] = ++$group; // new group for filter $tree_actions['sieve']['group'] = $tree_actions['vacation']['group'] = ++$group; // new group for filter
$tree_actions['edit_account']['group'] = $tree_actions['edit_acl']['group'] = ++$group; $tree_actions['edit_account']['group'] = $tree_actions['edit_acl']['group'] = ++$group;
// enforce global (group-specific) ACL // enforce global (group-specific) ACL
if (!mail_hooks::access('aclmanagement')) if (!mail_hooks::access('aclmanagement'))
{ {
@ -721,10 +721,10 @@ class mail_ui
// sending preview toolbar actions // sending preview toolbar actions
if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions()); if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
// We need to send toolbar actions to client-side because view template needs them // We need to send toolbar actions to client-side because view template needs them
if (html::$ua_mobile) $sel_options['toolbar'] = $this->get_toolbar_actions(); if (html::$ua_mobile) $sel_options['toolbar'] = $this->get_toolbar_actions();
//we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....) //we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....)
if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['cat_id']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'); if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['cat_id']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
$readonlys = $preserv = array(); $readonlys = $preserv = array();
@ -955,6 +955,7 @@ class mail_ui
'onExecute' => 'javaScript:app.mail.mail_compose', 'onExecute' => 'javaScript:app.mail.mail_compose',
), ),
), ),
'hideOnMobile' => true
), ),
'composeasnew' => array( 'composeasnew' => array(
'caption' => 'Compose', 'caption' => 'Compose',
@ -1063,6 +1064,7 @@ class mail_ui
'allowOnMultiple' => false, 'allowOnMultiple' => false,
), ),
), ),
'hideOnMobile' => true
), ),
'view' => array( 'view' => array(
'caption' => 'View', 'caption' => 'View',
@ -1102,6 +1104,7 @@ class mail_ui
'allowOnMultiple' => false, 'allowOnMultiple' => false,
), ),
), ),
'hideOnMobile' => true
), ),
'mark' => array( 'mark' => array(
'caption' => 'Set / Remove Flags', 'caption' => 'Set / Remove Flags',
@ -1976,7 +1979,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
); );
$actions['tracker']['toolbarDefault'] = true; $actions['tracker']['toolbarDefault'] = true;
$actions['forward']['toolbarDefault'] = true; $actions['forward']['toolbarDefault'] = true;
$compose = $actions['composeasnew']; $compose = $actions['composeasnew'];
unset($actions['composeasnew']); unset($actions['composeasnew']);
$actions = array_reverse($actions,true); $actions = array_reverse($actions,true);
@ -2527,7 +2530,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
function vfsSaveAttachment($ids,$path) function vfsSaveAttachment($ids,$path)
{ {
//error_log(__METHOD__.__LINE__.'("'.array2string($ids).'","'.$path."\")');"); //error_log(__METHOD__.__LINE__.'("'.array2string($ids).'","'.$path."\")');");
if (is_array($ids) && !egw_vfs::is_writable($path) || !is_array($ids) && !egw_vfs::is_writable(dirname($path))) if (is_array($ids) && !egw_vfs::is_writable($path) || !is_array($ids) && !egw_vfs::is_writable(dirname($path)))
{ {
return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); egw(window).close();'; return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); egw(window).close();';
@ -2535,7 +2538,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$err=null; $err=null;
$dupe_count = array(); $dupe_count = array();
$rememberServerID = $this->mail_bo->profileID; $rememberServerID = $this->mail_bo->profileID;
/** /**
* Extract all parameteres from the given id * Extract all parameteres from the given id
* @param int $id message id ('::' delimited mailbox::uid::part-id::is_winmail::name) * @param int $id message id ('::' delimited mailbox::uid::part-id::is_winmail::name)
@ -2556,7 +2559,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
'icServer' => $hA['profileID'] 'icServer' => $hA['profileID']
); );
}; };
//Examine the first attachment to see if attachment //Examine the first attachment to see if attachment
//is winmail.dat embedded attachments. //is winmail.dat embedded attachments.
$isMultipleDownload=is_array($ids); $isMultipleDownload=is_array($ids);
@ -3757,7 +3760,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$response->call('app.mail.mail_reloadNode',$refreshData); $response->call('app.mail.mail_reloadNode',$refreshData);
} }
/** /**
* ResolveWinmail fetches the encoded attachments * ResolveWinmail fetches the encoded attachments
* from winmail.dat and will response expected structure back * from winmail.dat and will response expected structure back
@ -3773,11 +3776,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
function ajax_resolveWinmail ($_rowid) function ajax_resolveWinmail ($_rowid)
{ {
$response = egw_json_response::get(); $response = egw_json_response::get();
$idParts = self::splitRowID($_rowid); $idParts = self::splitRowID($_rowid);
$uid = $idParts['msgUID']; $uid = $idParts['msgUID'];
$mbox = $idParts['folder']; $mbox = $idParts['folder'];
$attachments = $this->mail_bo->getMessageAttachments($uid, null, null, false,true,true,$mbox); $attachments = $this->mail_bo->getMessageAttachments($uid, null, null, false,true,true,$mbox);
if (is_array($attachments)) if (is_array($attachments))
{ {
@ -3789,7 +3792,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$response->call('egw.message', lang('Can not resolve the winmail.dat attachment!')); $response->call('egw.message', lang('Can not resolve the winmail.dat attachment!'));
} }
} }
/** /**
* move folder * move folder
* *

View File

@ -195,6 +195,7 @@ class resources_ui
'url' => 'menuaction=resources.resources_ui.edit&accessory_of=-1', 'url' => 'menuaction=resources.resources_ui.edit&accessory_of=-1',
'popup' => egw_link::get_registry('resources', 'add_popup'), 'popup' => egw_link::get_registry('resources', 'add_popup'),
'group' => $group, 'group' => $group,
'hideOnMobile' => true
), ),
'view-acc' => array( 'view-acc' => array(
'caption' => 'View accessories', 'caption' => 'View accessories',