extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

- insert in document action:

Browse Source 
+ one submenu with default document (if set) on top
  + if more then 9 documents, show them in submenus by mime type
- added copy address as second point to add submenu, beside new
- icons for move to addressbook
- fixed icons for org views
--> addressbook context menu should now be fully functional - let me know if not ;-)
This commit is contained in:
Ralf Becker 2011-04-25 11:30:37 +00:00
parent af75f60ff4
commit e474b0f0d4
3 changed files with 157 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -138,11 +138,14 @@ class addressbook_ui extends addressbook_bo
}
if ($content['nm']['action'] !== '')
{
if ($content['use_all']) $content['nm']['select_all'] = $content['use_all']; // legacy support
if (!count($content['nm']['selected']) && !$content['nm']['select_all'] && $content['nm']['action'] != 'delete_list')
{
$msg = lang('You need to select some contacts first');
}
elseif ($content['nm']['action'] == 'view') // org-view via context menu
{
$content['nm']['org_view'] = array_shift($content['nm']['selected']);
}
else
{
if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
@ -279,13 +282,12 @@ class addressbook_ui extends addressbook_bo
'cc' => 'Cc',
'bcc' => 'Bcc',
);
$content['nm']['actions'] = $this->get_actions($do_email, $content['nm']['col_filter']['tid']);
// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
// dont show tid-selection if we have only one content_type
// be a bit more sophisticated asbout it
// be a bit more sophisticated about it
$content['nm']['header_right'] = 'addressbook.index.right_add';
$availabletypes = array_keys($this->content_types);
if ($content['nm']['col_filter']['tid'] && !in_array($content['nm']['col_filter']['tid'],$availabletypes))
@ -305,6 +307,9 @@ class addressbook_ui extends addressbook_bo
// get the availible org-views plus the label of the contacts view of one org
$sel_options['org_view'] = $this->org_views;
if (isset($org_view)) $content['nm']['org_view'] = $org_view;
$content['nm']['actions'] = $this->get_actions($do_email, $content['nm']['col_filter']['tid'], $content['nm']['org_view']);
if (!isset($sel_options['org_view'][(string) $content['nm']['org_view']]))
{
$org_name = array();
@ -336,42 +341,76 @@ class addressbook_ui extends addressbook_bo
*
* @param boolean $do_email=false
* @param string $tid_filter=null
* @todo org-view uses slightly different actions
* @param string $org_view=null
* @return array see nextmatch_widget::get_actions()
*/
private function get_actions($do_email=false, $tid_filter=null)
private function get_actions($do_email=false, $tid_filter=null, $org_view=null)
{
$actions = array(
'view' => array(
'caption' => 'View',
'default' => true,
'allowOnMultiple' => false,
'url' => 'menuaction=addressbook.addressbook_ui.view&contact_id=$id',
'popup' => egw_link::get_registry('addressbook', 'view_popup'),
'group' => $group=1,
),
'edit' => array(
'caption' => 'Edit',
'allowOnMultiple' => false,
'url' => 'menuaction=addressbook.addressbook_ui.edit&contact_id=$id',
'popup' => egw_link::get_registry('addressbook', 'add_popup'),
'group' => $group,
'enabled' => 'javaScript:nm_not_disableClass',
'disableClass' => 'rowNoEdit',
),
'add' => array(
'caption' => 'Add',
'url' => 'menuaction=addressbook.addressbook_ui.edit',
'popup' => egw_link::get_registry('addressbook', 'add_popup'),
'group' => $group,
),
'select_all' => array(
'caption' => 'Whole query',
'checkbox' => true,
'onExecute' => 'javaScript:nm_select_all', // uses hint to confirm all nm_action='submit'
'hint' => 'Apply the action on the whole query, NOT only the shown contacts!!!',
'group' => ++$group,
),
// we have no org view (view of one org has context menu like regular "add contacts" view, as it shows contacts
if (!isset($this->org_views[(string) $org_view]))
{
$actions = array(
'view' => array(
'caption' => 'View',
'default' => true,
'allowOnMultiple' => false,
'url' => 'menuaction=addressbook.addressbook_ui.view&contact_id=$id',
'popup' => egw_link::get_registry('addressbook', 'view_popup'),
'group' => $group=1,
),
'edit' => array(
'caption' => 'Edit',
'allowOnMultiple' => false,
'url' => 'menuaction=addressbook.addressbook_ui.edit&contact_id=$id',
'popup' => egw_link::get_registry('addressbook', 'add_popup'),
'group' => $group,
'enabled' => 'javaScript:nm_not_disableClass',
'disableClass' => 'rowNoEdit',
),
'add' => array(
'caption' => 'Add',
'group' => $group,
'children' => array(
'new' => array(
'caption' => 'New',
'url' => 'menuaction=addressbook.addressbook_ui.edit',
'popup' => egw_link::get_registry('addressbook', 'add_popup'),
),
'copy' => array(
'caption' => 'Copy',
'url' => 'menuaction=addressbook.addressbook_ui.edit&makecp=1&contact_id=$id',
'popup' => egw_link::get_registry('addressbook', 'add_popup'),
'allowOnMultiple' => false,
),
),
),
);
}
else // org view
{
$actions = array(
'view' => array(
'caption' => 'View',
'default' => true,
'allowOnMultiple' => false,
'group' => $group=1,
),
'add' => array(
'caption' => 'Add',
'group' => $group,
'allowOnMultiple' => false,
'url' => 'menuaction=addressbook.addressbook_ui.edit&org=$id',
'popup' => egw_link::get_registry('addressbook', 'add_popup'),
),
);
}
$actions['select_all'] = array(
'caption' => 'Whole query',
'checkbox' => true,
'onExecute' => 'javaScript:nm_select_all', // uses hint to confirm all nm_action='submit'
'hint' => 'Apply the action on the whole query, NOT only the shown contacts!!!',
'group' => ++$group,
);
if ($do_email)
@ -447,6 +486,14 @@ class addressbook_ui extends addressbook_bo
// move to AB
if (($move2addressbooks = $this->get_addressbooks(EGW_ACL_ADD))) // do we have addressbooks, we should
{
foreach($move2addressbooks as $owner => $label)
{
$this->type_icon((int)$owner, substr($owner,-1) == 'p', 'n', $icon, $type_label);
$move2addressbooks[$owner] = array(
'icon' => $icon,
'caption' => $label,
);
}
$actions['move_to'] = array(
'caption' => 'Move to addressbook',
'children' => $move2addressbooks,
@ -515,20 +562,10 @@ class addressbook_ui extends addressbook_bo
);
}
if ($this->prefs['document_dir'])
{
$actions += array(
'document' => array(
'caption' => lang('Insert in %1',egw_vfs::basename($GLOBALS['egw_info']['user']['preferences']['addressbook']['default_document'])),
'enabled' => (boolean)$GLOBALS['egw_info']['user']['preferences']['addressbook']['default_document'],
'hideOnDisabled' => true,
'group' => ++$group,
),
'documents' => timesheet_merge::document_action(
$GLOBALS['egw_info']['user']['preferences']['addressbook']['document_dir'], $group
),
);
}
$actions['documents'] = addressbook_merge::document_action(
$this->prefs['document_dir'], $group, 'Insert in document', 'document_',
$this->prefs['default_document']
);
++$group;
if (!($tid_filter == 'D' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge'))
@ -550,7 +587,7 @@ class addressbook_ui extends addressbook_bo
);
}
//_debug_array($actions);
//echo "<p>".__METHOD__."($do_email, $tid_filter, $org_view)</p>\n"; _debug_array($actions);
return $actions;
}
@ -800,12 +837,9 @@ class addressbook_ui extends addressbook_bo
return false;
case 'infolog_add':
if ($use_all) // !$use_all is handled purely in javascript
{
egw_framework::set_onload(
"win=window.open('".egw::link('/index.php','menuaction=infolog.infolog_ui.edit&type=task&action=addressbook&action_id=').implode(',',$checked)."','_blank','width=750,height=550,left=100,top=200'); win.focus();");
}
$msg = lang('New window opened to edit Infolog for your selection ');
egw_framework::set_onload(
"win=window.open('".egw::link('/index.php','menuaction=infolog.infolog_ui.edit&type=task&action=addressbook&action_id=').implode(',',$checked)."','_blank','width=750,height=550,left=100,top=200'); win.focus();");
$msg = lang('New window opened to edit Infolog for your selection');
return false;
case 'cat_add':
@ -2383,33 +2417,6 @@ class addressbook_ui extends addressbook_bo
return $document_merge->download($document,$ids);
}
/**
* Returning document actions / files from the document_dir
*
* @return array
*/
function get_document_actions()
{
if (!$this->prefs['document_dir']) return array();
if (!is_array($actions = egw_session::appsession('document_actions','addressbook')))
{
$actions = array();
if (($files = egw_vfs::find($this->prefs['document_dir'],array('need_mime'=>true),true)))
{
foreach($files as $file)
{
// return only the mime-types we support
if (!addressbook_merge::is_implemented($file['mime'],substr($file['name'],-4))) continue;
$actions['document-'.$file['name']] = /*lang('Insert in document').': '.*/$file['name'];
}
}
egw_session::appsession('document_actions','addressbook',$actions);
}
return $actions;
}
/**
* add a new categorie to any addressbock entry
*

67
etemplate/inc/class.bo_merge.inc.php
View File

@ -882,23 +882,82 @@ abstract class bo_merge
}
/**
* Get insert-in-document action
* From this number of documents, show them in submenus by mime type
*/
const SHOW_DOCS_BY_MIME_LIMIT = 10;
/**
* Get insert-in-document action with optional default document on top
*
* If more then SHOW_DOCS_BY_MIME_LIMIT=10 documents found, they are displayed in submenus by mime type.
*
* @param string $dir
* @param int $group see nextmatch_widget::egw_actions
* @param string $caption='Insert in document'
* @param string $prefix='document_'
* @param string $default_doc='' full path to default document to show on top with action == 'document'!
* @return array see nextmatch_widget::egw_actions
*/
public static function document_action($dir, $group=0, $caption='Insert in document', $prefix='document_')
public static function document_action($dir, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='')
{
$documents = self::get_documents($dir, $prefix);
$documents = array();
if ($default_doc && ($file = egw_vfs::stat($default_doc))) // put default document on top
{
$documents['document'] = array(
'icon' => egw_vfs::mime_icon($file['mime']),
'caption' => egw_vfs::decodePath(egw_vfs::basename($default_doc)),
'group' => 1,
);
}
if ($dir && ($files = egw_vfs::find($dir,array(
'need_mime' => true,
'order' => 'fs_name',
'sort' => 'ASC',
),true)))
{
foreach($files as $key => $file)
{
// use only the mime-types we support
if (!self::is_implemented($file['mime'],'.'.array_pop($parts=explode('.',$file['name']))) ||
$file['path'] === $default_doc) // default doc already added
{
unset($files[$key]);
}
}
foreach($files as $file)
{
if (count($files) >= self::SHOW_DOCS_BY_MIME_LIMIT)
{
if (!isset($documents[$file['mime']]))
{
$documents[$file['mime']] = array(
'icon' => egw_vfs::mime_icon($file['mime']),
'caption' => mime_magic::mime2label($file['mime']),
'group' => 2,
'children' => array(),
);
}
$documents[$file['mime']]['children'][$prefix.$file['name']] = egw_vfs::decodePath($file['name']);
}
else
{
$documents[$prefix.$file['name']] = array(
'icon' => egw_vfs::mime_icon($file['mime']),
'caption' => egw_vfs::decodePath($file['name']),
'group' => 2,
);
}
}
}
return array(
'icon' => 'etemplate/merge',
'caption' => $caption,
'children' => $documents,
'enabled' => (boolean)$documents,
'hideOnDisabled' => true,
'hideOnDisabled' => true, // do not show 'Insert in document', if no documents defined
'group' => $group,
);
}

10
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -923,14 +923,10 @@ class timesheet_ui extends timesheet_bo
'prefix' => 'to_status_',
'enabled' => (boolean)$this->status_labels,
),
'document' => array(
'caption' => lang('Insert in %1',egw_vfs::basename($GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'])),
'enabled' => (boolean)$GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'],
'hideOnDisabled' => true,
'group' => ++$group,
),
'documents' => timesheet_merge::document_action(
$GLOBALS['egw_info']['user']['preferences']['timesheet']['document_dir'], $group
$GLOBALS['egw_info']['user']['preferences']['timesheet']['document_dir'],
$group, 'Insert in document', 'document_',
$GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document']
),
'delete' => array(
'caption' => 'Delete',