context menu for calendar list

calendar/inc/class.calendar_uiforms.inc.php

@@ -1477,19 +1477,14 @@ function replace_eTemplate_onsubmit()
 		}
 
 		// Allow admins to restore deleted events
-		$config = config::read('phpgwapi');
+		if($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'] )
-		if($config['calendar_delete_history'] && $event['deleted'] )
 		{
 			$content['deleted'] = $preserv['deleted'] = null;
 			$etpl->set_cell_attribute('button[save]', 'label', 'Recover');
 			$etpl->set_cell_attribute('button[apply]', 'disabled', true);
-			if(!$GLOBALS['egw_info']['user']['apps']['admin'] && $config['calendar_delete_history'] != 'user_purge')
-			{
-				$readonlys['button[delete]'] = true;
-			}
 		}
 		// Allow users to prevent notifications?
-		$etpl->set_cell_attribute('no_notifications', 'disabled', !$config['calendar_allow_no_notification']);
+		$etpl->set_cell_attribute('no_notifications', 'disabled', !$GLOBALS['egw_info']['server']['calendar_allow_no_notification']);
 
 		// Setup history tab
 		$this->setup_history($content, $sel_options);

calendar/inc/class.calendar_uilist.inc.php

@@ -1,11 +1,11 @@
 <?php
 /**
- * eGroupWare - Calendar's Listview and Search
+ * EGroupware - Calendar's Listview and Search
  *
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-9 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2005-11 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -97,40 +97,33 @@ class calendar_uilist extends calendar_ui
 
 		$etpl = new etemplate('calendar.list');
 
-		if (is_array($content) && $content['nm']['rows']['delete'])
+		if (is_array($content))
 		{
-			// handle a single delete like delete with the checkboxes
+			// handle a single button like actions
-			list($id) = @each($content['nm']['rows']['delete']);
+			foreach(array('delete','timesheet','document') as $button)
-			$content['action'] = 'delete';
-			$content['nm']['rows']['checked'] = array($id);
-		}
-		if (is_array($content) && $content['nm']['rows']['timesheet'])
 			{
-			// handle a single timesheet like timesheet with the checkboxes
+				if ($content['nm']['rows'][$button])
-			list($id) = @each($content['nm']['rows']['timesheet']);
-			$content['action'] = 'timesheet-add';
-			$content['nm']['rows']['checked'] = array($id);
-		}
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
 				{
-			list($id) = @each($content['nm']['rows']['document']);
+					list($id) = each($content['nm']['rows'][$button]);
-			$content['action'] = 'document';
+					$content['nm']['action'] = $button;
-			$content['nm']['rows']['checked'] = array($id);
+					$content['nm']['selected'] = array($id);
+				}
 			}
-	
 			// Handle actions
-		if ($content['action'] != '')
+			if ($content['nm']['action'])
 			{
 				// Allow merge using the date range filter
-			if(strpos($content['action'],'document') !== false && !count($content['nm']['rows']['checked']) && !$content['use_all']) {
+				if(strpos($content['nm']['action'],'document') !== false &&
-				$content['nm']['rows']['checked'][] = $this->get_merge_range($content['nm']);
+					!count($content['nm']['selected']) && !$content['nm']['select_all']) {
+					$content['nm']['selected'][] = $this->get_merge_range($content['nm']);
 				}
-			if (!count($content['nm']['rows']['checked']) && !$content['use_all']) {
+				if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
+				{
 					$msg = lang('You need to select some events first');
 				}
 				else
 				{
-				if ($this->action($content['action'],$content['nm']['rows']['checked'],$content['use_all'],
+					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
 						$success,$failed,$action_msg,'calendar_list',$msg, $content['no_notifications']))
 					{
 						$msg .= lang('%1 event(s) %2',$success,$action_msg);
@@ -140,7 +133,7 @@ class calendar_uilist extends calendar_ui
 						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
 					}
 				}
-			$content['nm']['rows']['checked'] = array();
+			}
 		}
 		$content = array(
 			'nm'  => egw_session::appsession('calendar_list','calendar'),
@@ -153,13 +146,14 @@ class calendar_uilist extends calendar_ui
 	 			'filter_no_lang'  => True,	// I  set no_lang for filter (=dont translate the options)
 				'no_filter2'      => True,	// I  disable the 2. filter (params are the same as for filter)
 				'no_cat'          => True,	// I  disable the cat-selectbox
-//				'bottom_too'     => True,// I  show the nextmatch-line (arrows, filters, search, ...) again after the rows
 				'filter'          => 'after',
 				'order'           => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
 				'sort'            => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
 				'default_cols'    => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id',
 				'filter_onchange' => "set_style_by_class('table','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
 				'header_left'     => 'calendar.list.dates',
+				'row_id'          => 'row_id',	// set in get rows "$event[id]:$event[recur_date]"
+				'actions'         => $this->get_actions(),
 			);
 		}
 		if ($_GET['search']) {
@@ -169,39 +163,8 @@ class calendar_uilist extends calendar_ui
 		{
 			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
 		}
-		$sel_options = array(
+		$sel_options['filter'] = &$this->date_filters;
-			'action'     => array(
-				'delete' => array('label' => 'Delete', 'title' => 'Delete this event'),
-                                'ical' => array('label' => 'Export (iCal)', 'title' => 'Download this event as iCal'),
-                        ),
-			'filter'	=> &$this->date_filters
-		);
 
-		// More actions
-		if($GLOBALS['egw_info']['apps']['timesheet']) {
-			$sel_options['action']['timesheet-add'] = array('label' => 'Create timesheet', 'title' => 'Create a timesheet entry from this event');
-		}
-		// Add in deleted for admins
-		$config = config::read('phpgwapi');
-		if($config['calendar_delete_history'])
-		{
-			$sel_options['action']['undelete'] = array('label' => 'Un-Delete', 'title' => 'Recover this event');
-			if(!$GLOBALS['egw_info']['user']['apps']['admin'] && $config['calendar_delete_history'] != 'user_purge')
-			{
-				unset($sel_options['action']['delete']);
-				$content['nm']['no_delete'] = true;
-			}
-		}
-		foreach($this->bo->verbose_status as $key => $value)
-		{
-			if($key == 'G') continue;
-			$sel_options['action'][lang('Change your participant status')]['status-'.$key] = $value;
-		}
-		// Merge print
-		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
-                {
-                        $sel_options['action'][lang('Insert in document').':'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
-                }
 		// add scrollbar to long describtion, if user choose so in his prefs
 		if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '')
 		{
@@ -209,8 +172,6 @@ class calendar_uilist extends calendar_ui
 				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	   // dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
-		unset($sel_options['action'][lang('Change your participant status')]['G']);
-		$GLOBALS['egw_info']['flags']['java_script'] .= $this->get_javascript();
 
 		$html = $etpl->exec('calendar.calendar_uilist.listview',$content,$sel_options,$readonlys,'',$home ? -1 : 0);
 
@@ -367,12 +328,27 @@ class calendar_uilist extends calendar_ui
 		{
 			$search_params['users'] = explode(',',$this->owner);
 		}
-		$rows = array();
+		$rows = $js_integration_data = array();
 		foreach((array) $this->bo->search($search_params) as $event)
 		{
-			$readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event));
+			if (($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event)))
+			{
+				$event['class'] .= 'rowNoEdit ';
+			}
+			// show only edit or view icon, not both
+			$readonlys['view['.$event['id'].']'] = !$readonlys['edit['.$event['id'].']'];
+
 			// Delete disabled for other applications
-			$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']) || $params['no_delete'];
+			if (($readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id'])))
+			{
+				$event['class'] .= 'rowNoDelete ';
+			}
+
+			// mark deleted events
+			if ($event['deleted'])
+			{
+				$event['class'] .= 'rowDeleted ';
+			}
 			// Filemanager disabled for other applications
 			$readonlys['filemanager['.$event['id'].']'] = !is_numeric($event['id']);
 
@@ -409,6 +385,15 @@ class calendar_uilist extends calendar_ui
 					$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
 				}
 			}
+			else
+			{
+				$is_private = !$this->bo->check_perms(EGW_ACL_READ,$event);
+			}
+			if ($is_private)
+			{
+				$readonlys['filemanager['.$event['id'].']'] = $readonlys['view['.$event['id'].']'] = true;	// no view icon
+				$event['class'] .= 'rowNoView ';
+			}
 
 			$event['app'] = 'calendar';
 			$event['app_id'] = $event['id'];
@@ -423,6 +408,18 @@ class calendar_uilist extends calendar_ui
 
 				$event['app'] = $app;
 				$event['app_id'] = $app_id;
+
+				// populate js_integration_data, if not already set
+				if (!isset($js_integration_data[$app]))
+				{
+					$js_integration_data[$app] = calendar_bo::integration_get_data($app,'edit_link');
+					if (!is_array($js_integration_data[$app]) || !isset($js_integration_data[$app]['edit']))
+					{
+						$js_integration_data[$app]['edit'] = egw_link::get_registry($app, 'edit');
+						$js_integration_data[$app]['edit_id'] = egw_link::get_registry($app, 'edit_id');
+						$js_integration_data[$app]['edit_popup'] = egw_link::get_registry($app, 'edit_popup');
+					}
+				}
 			}
 			elseif ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
@@ -435,10 +432,18 @@ class calendar_uilist extends calendar_ui
 				$event['edit_link'] = $this->popup($view_link).'; return false;';
 			}
 
+			// set id for grid
+			$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.$event['recur_date'] : '');
+
 			$rows[] = $event;
 			unset($app);
 			unset($app_id);
 		}
+		// set js_calendar_integration object, for app.js cal_open() function
+		$GLOBALS['egw_info']['flags']['java_script'] = '<script type="text/javascript">
+	var js_integration_data='.json_encode($js_integration_data).';
+</script>';
+
 		$wv=0;
 		$dv=0;
 		$params['options-selectcols']['week'] = lang('Week');
@@ -484,9 +489,12 @@ class calendar_uilist extends calendar_ui
 		$success = $failed = 0;
 
 		// Split out combined values
-		if(strpos($action, 'status') !== false) {
+		if(strpos($action, 'status') !== false)
+		{
 			list($action, $status) = explode('-', $action);
-		} elseif (strpos($action, '_') !== false) {
+		}
+		elseif (strpos($action, '_') !== false)
+		{
 			list($action, $settings) = explode('_', $action,2);
 		}
 
@@ -497,17 +505,23 @@ class calendar_uilist extends calendar_ui
 			@set_time_limit(0);					 // switch off the execution time limit, as for big selections it's too small
 			$query['num_rows'] = -1;		// all
 			$this->get_rows($query,$checked,$readonlys,($action != 'ical'));	   // true = only return the id's
-                } else {
+		}
+		else
+		{
 			// Pull the date for recurring events
 			$split = array();
-			foreach($checked as $key) {
+			foreach($checked as $key)
-				if(!is_array($key) && strpos($key,':') !== false) {
+			{
+				if(!is_array($key) && strpos($key,':') !== false)
+				{
 					list($id, $recur_date) = explode(':', $key);
 					$split[] = array(
 						'id' => $id,
 						'recur_date' => $recur_date
 					);
-				} else {
+				}
+				else
+				{
 					$split[] = $key;
 				}
 			}
@@ -531,7 +545,8 @@ class calendar_uilist extends calendar_ui
 		}
 
 		// Actions where the action is applied to each entry
-		if(strpos($action, 'timesheet') !== false) {
+		if(strpos($action, 'timesheet') !== false)
+		{
 			$timesheet_bo = new timesheet_bo();
 		}
 		foreach($checked as $event)
@@ -540,7 +555,9 @@ class calendar_uilist extends calendar_ui
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
-			} else {
+			}
+			else
+			{
 				$id = $event['id'];
 				$recur_date = $event['recur_date'];
 			}
@@ -548,13 +565,10 @@ class calendar_uilist extends calendar_ui
 			{
 				case 'delete':
 					$action_msg = lang('deleted');
-                                        if ($id && $this->bo->check_perms(EGW_ACL_DELETE,$id))
+					if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification))
-					{
-						if($this->bo->delete($id, $recur_date,false,$skip_notification)) 
 					{
 						$success++;
 					}
-					}
 					else
 					{
 						$failure++;
@@ -575,7 +589,7 @@ class calendar_uilist extends calendar_ui
 					$failure++;
 					break;
 				case 'status':
-					if($id && $event = $this->bo->read($id, $recur_date)) 
+					if($id && ($event = $this->bo->read($id, $recur_date)))
 					{
 						$old_status = $event['participants'][$GLOBALS['egw_info']['user']['account_id']];
 						calendar_so::split_status($old_status, $quantity, $role);
@@ -590,7 +604,9 @@ class calendar_uilist extends calendar_ui
 								$msg = lang('Status changed');
 							}
 						}
-					} else {
+					}
+					else
+					{
 						$failure++;
 					}
 					break;
@@ -639,7 +655,8 @@ class calendar_uilist extends calendar_ui
 					}
 					$timesheet_bo->data = array();
 					$err = $timesheet_bo->save($timesheet);
-					if(!$err) {
+					if(!$err)
+					{
 						$success++;
 
 						// Can't link to just one of a recurring series of events
@@ -663,27 +680,6 @@ class calendar_uilist extends calendar_ui
 		return ($failure == 0);
 	}
 
-	public function get_javascript() 
-	{
-		return '<script LANGUAGE="JavaScript">
-		function do_action(selbox)
-		{
-			if (selbox.value != "")
-			{
-				if (selbox.value == "delete") 
-				{
-					if (confirm("' . lang('Delete') . '")) selbox.form.submit();
-				}
-				else
-				{
-					selbox.form.submit();
-				}
-			}
-				selbox.value = "";
-		}
-		</script>';
-	}
-
 	/**
 	 * Get date ranges to select for merging instead of individual events
 	 *
@@ -700,8 +696,11 @@ class calendar_uilist extends calendar_ui
 			$last = $this->bo->date2array($nm['enddate']);
 			$last['hour'] = '23'; $last['minute'] = $last['sec'] = '59';
 			$checked['end'] = $this->bo->date2ts($last);
-		} else {
+		}
-			switch($nm['filter']) {
+		else
+		{
+			switch($nm['filter'])
+			{
 				case 'after':
 					$checked['start'] = $nm['startdate'] ? $nm['startdate'] : strtotime('today');
 					break;
@@ -738,8 +737,119 @@ class calendar_uilist extends calendar_ui
 		{
 			return lang("Document '%1' does not exist or is not readable for you!",$document);
 		}
-		require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.calendar_merge.inc.php');
 		$document_merge = new calendar_merge();
+
 		return $document_merge->download($document,$ids);
 	}
+
+	/**
+	 * Get actions / context menu items
+	 *
+	 * @return array see nextmatch_widget::get_actions()
+	 */
+	private function get_actions()
+	{
+		$actions = array(
+			'open' => array(
+				'caption' => 'Open',
+				'default' => true,
+				'allowOnMultiple' => false,
+				'url' => 'menuaction=calendar.calendar_uiforms.edit&cal_id=$id',
+				'popup' => egw_link::get_registry('calendar', 'view_popup'),
+				'group' => $group=1,
+				'onExecute' => 'javaScript:cal_open',
+				'disableClass' => 'rowNoView',
+			),
+			'select_all' => array(
+				'caption' => 'Whole query',
+				'checkbox' => true,
+				'hint' => 'Apply the action on the whole query, NOT only the shown events',
+				'group' => ++$group,
+			),
+			'no_notifications' => array(
+				'caption' => 'Do not notify',
+				'checkbox' => true,
+				'hint' => 'Do not notify of these changes',
+				'group' => $group,
+			),
+		);
+		$status = $this->bo->verbose_status;
+		unset($status['G']);
+		$actions['status'] = array(
+			'caption' => 'Change your status',
+			'icon' => 'check',
+			'prefix' => 'status-',
+			'children' => $status,
+			'group' => ++$group,
+		);
+		++$group;	// integration with other apps: infolog, calendar, filemanager
+		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
+		{
+			$actions['filemanager'] = array(
+				'icon' => 'filemanager/navbar',
+				'caption' => 'Filemanager',
+				'url' => 'menuaction=filemanager.filemanager_ui.index&path=/apps/$app/$id',
+				'group' => $group,
+				'allowOnMultiple' => false,
+				'onExecute' => 'javaScript:cal_fix_app_id',
+				'disableClass' => 'rowNoView',
+			);
+		}
+		if ($GLOBALS['egw_info']['user']['apps']['timesheet'])
+		{
+			$actions['timesheet'] = array(	// interactive add for a single event
+				'icon' => 'timesheet/navbar',
+				'caption' => 'Timesheet',
+				'url' => 'menuaction=timesheet.timesheet_ui.edit&link_app[]=$app&link_id[]=$id',
+				'group' => $group,
+				'allowOnMultiple' => false,
+				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'onExecute' => 'javaScript:cal_fix_app_id',
+				'popup' => egw_link::get_registry('timesheet', 'add_popup'),
+			);
+			$actions['timesheet-add'] = array(	// automatic add for multiple events
+				'icon' => 'timesheet/navbar',
+				'caption' => 'Timesheet',
+				'group' => $group,
+				'allowOnMultiple' => 'only',
+				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+			);
+		}
+		$actions['ical'] = array(
+			'icon' => 'filesave',
+			'caption' => 'Export (iCal)',
+			'group' => ++$group,
+			'hint' => 'Download this event as iCal',
+			'disableClass' => 'rowNoView',
+		);
+
+		$actions['documents'] = addressbook_merge::document_action(
+			$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
+			$this->bo->cal_prefs['default_document']
+		);
+
+		++$group;
+		$actions['delete'] = array(
+			'caption' => 'Delete',
+			'confirm' => 'Delete this event',
+			'confirm_multiple' => 'Delete these entries',
+			'group' => $group,
+			'disableClass' => 'rowNoDelete',
+		);
+		// Add in deleted for admins
+		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		{
+			$actions['undelete'] = array(
+				'caption' => 'Un-delete',
+				'hint' => 'Recover this event',
+				'group' => $group,
+				'enabled' => 'javaScript:nm_enableClass',
+				'enableClass' => 'rowDeleted',
+				'hideOnDisabled' => true,
+			);
+		}
+
+		//_debug_array($actions);
+		return $actions;
+	}
 }

calendar/js/app.js

@@ -0,0 +1,85 @@
+/**
+ * Calendar - static javaScript functions
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker@stylite.de>
+ * @package calendar
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+/**
+ * Fix calendar specific id: "cal_id:recurrence" or "appId:", replacing $app and $id in url
+ * 
+ * Cut away the recurrence date from id, and use app from calendar integration
+ * 
+ * @param _action
+ * @param _senders
+ */
+function cal_fix_app_id(_action, _senders)
+{
+	var app = 'calendar';
+	var id = _senders[0].id;
+	var matches = id.match(/^([0-9]+):([0-9]+)$/);
+	if (matches)
+	{
+		id = matches[1];
+	}
+	else if (matches = id.match(/^([a-z_-]+)([0-9]+)/i))
+	{
+		app = matches[1];
+		id = matches[2];
+	}
+	var backup_url = _action.data.url;
+	
+	_action.data.url = _action.data.url.replace(/(\$|%24)id/,id);
+	_action.data.url = _action.data.url.replace(/(\$|%24)app/,app);
+
+	nm_action(_action, _senders);
+	
+	_action.data.url = backup_url;	// restore url
+}
+
+/**
+ * Open calendar entry, taking into accout the calendar integration of other apps
+ * 
+ * calendar_uilist::get_rows sets var js_calendar_integration object
+ * 
+ * @param _action
+ * @param _senders
+ */
+function cal_open(_action, _senders)
+{
+	var id = _senders[0].id;
+	var matches = id.match(/^([0-9]+):([0-9]+)$/);
+	var backup = _action.data;
+	if (matches)
+	{
+		edit_series(matches[1],matches[2]);
+		return;
+	}
+	else if (matches = id.match(/^([a-z_-]+)([0-9]+)/i))
+	{
+		var app = matches[1];
+		_action.data.url = window.egw_webserverUrl+'/index.php?';
+		var get_params = js_integration_data[app].edit;
+		get_params[js_integration_data[app].edit_id] = matches[2];
+		for(var name in get_params)
+			_action.data.url += name+"="+encodeURIComponent(get_params[name])+"&";
+
+		if (js_integration_data[app].edit_popup &&
+			(matches = js_integration_data[app].edit_popup.match(/^(.*)x(.*)$/)))
+		{
+			_action.data.width = matches[1];
+			_action.data.height = matches[2];
+		}
+		else
+		{
+			_action.data.nm_action = 'location';
+		}
+	}
+	console.log(_action);
+	nm_action(_action, _senders);
+	
+	_action.data = backup;	// restore url, width, height, nm_action
+}

calendar/lang/egw_de.lang

@@ -39,7 +39,7 @@ all incl. rejected	calendar	de	Alle einschl. abgesagte
 all participants	calendar	de	Alle Teilnehmer
 allows to edit the event again	calendar	de	Erlaubt den Termin erneut zu bearbeiten
 always	calendar	de	Immer
-apply the action on the whole query, not only the shown events	calendar	de	Befehl auf die ganze Abfrage anwenden, NICHT nur auf die angezeigten Termine
+apply the action on the whole query, not only the shown events	calendar	de	Befehl auf die gesamte Abfrage anwenden, NICHT nur auf die angezeigten Termine
 apply the changes	calendar	de	Übernimmt die Änderungen
 are you sure you want to delete this country ?	calendar	de	Sind Sie sicher, dass Sie dieses Land löschen möchten?
 are you sure you want to delete this holiday ?	calendar	de	Sind Sie sicher, dass Sie diesen Feiertag löschen möchten?
@@ -81,7 +81,7 @@ category acl	common	de	Kategorie Rechte
 category acl only restrict adding a category to an event or changing status of a participant. it does not change the visibility of an event!	calendar	de	Kategorie Rechte beschränken nur das Hinzufügen einer Kategorie zu einem Termin oder das Ändern des Status eines Teilnehmers. Sie ändern NICHT die Sichtbarkeit eines Termins!
 chair	calendar	de	Vorsitz
 change history	calendar	de	Änderungshistorie
-change your participant status	calendar	de	Teilnehmerstatus ändern
+change your status	calendar	de	Eigenen Status ändern
 charset of file	calendar	de	Zeichensatz der Datei
 check all	calendar	de	Alle auswählen
 choose a category	calendar	de	Wählen Sie eine Kategorie
@@ -137,7 +137,8 @@ display status of events	calendar	de	Status von Terminen anzeigen
 displayed view	calendar	de	Ansicht
 displays this calendar view on the home page (page you get when you enter egroupware or click on the home page icon)?	calendar	de	Zeigt diese Ansicht auf der Startseite (Seite die Sie bekommen wenn Sie EGroupware starten oder das Home Icon anklicken)?
 do not include events of group members	calendar	de	Zeige nicht die Termine der Gruppenmitglieder
-do not notify of these changes	calendar	de	Keine Benachrichtigung senden
+do not notify	calendar	de	Nicht benachrichtigen
+do not notify of these changes	calendar	de	Nicht über diese Änderungen benachrichtigen
 do you really want to change the start of this series? if you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.	calendar	de	Wollen Sie wirklich den Beginn dieses Serientermins ändern? Wenn Sie das tun, so wird die bestehende Serie heute beendet und für die Zukunft ein neuer Wiederholungstermin mit Ihren Änderungen erzeugt.
 do you want a weekview with or without weekend?	calendar	de	Möchten Sie eine Wochenansicht mit oder ohne Wochenende?
 do you want to be notified about changes of appointments you modified?	calendar	de	Wollen Sie auch über eigene Änderungen Benachrichtigt werden?
@@ -528,9 +529,7 @@ weekview without weekend	calendar	de	Wochenansicht ohne Wochenende
 when selected, birthdays and/or holidays will be displayed as events in your calendar. please note that this option only changes the appereance inside of egroupware, but does not change the information being sent via ical or other calendar interfaces.	calendar	de	Wenn ausgewählt werden Geburts- und/oder Feiertage als Ereignisse in Ihrem Kalender angezeigt. Bitte beachten Sie, dass diese Option nur die Erscheinung innerhalb von EGroupware verändert, nicht aber die Informationen, die via iCal oder über andere Kalender-Schnittstellen gesendet werden.
 which view to show on home page	calendar	de	Welche Ansicht soll auf der Startseite angezeigt werden
 while selecting up to x users day- and weekview is not consolidated (5 is used when not set)	admin	de	Für diese Ansicht steht Ihnen nur eine begrenzte Anzahl von Benutzer zur Verfügung.
-Der Standard sind 5 Benutzer. Sie können in der Konfiguration diese Einstellung anpassen.
 whole day	calendar	de	ganztägig
-whole query	calendar	de	Ganze Abfrage
 with credentials included	calendar	de	Mit Zugangsdaten im URL
 wk	calendar	de	KW
 work day ends on	calendar	de	Arbeitstag endet um

calendar/lang/egw_en.lang

@@ -37,7 +37,7 @@ all exceptions are converted into single events.	calendar	en	All exceptions are
 all future	calendar	en	All future
 all incl. rejected	calendar	en	All incl. rejected
 all participants	calendar	en	All participants
-allow users to prevent change notifications ('Do not notify')	calendar	en	Allow users to prevent change notifications ('Do not notify')
+allow users to prevent change notifications ('do not notify')	calendar	en	Allow users to prevent change notifications ('Do not notify')
 allows to edit the event again	calendar	en	Allows to edit the event again
 always	calendar	en	Always
 apply the action on the whole query, not only the shown events	calendar	en	Apply the action on the whole query, NOT only the shown events
@@ -82,7 +82,7 @@ category acl	common	en	Category ACL
 category acl only restrict adding a category to an event or changing status of a participant. it does not change the visibility of an event!	calendar	en	Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!
 chair	calendar	en	Chair
 change history	calendar	en	Change history
-change your participant status	calendar	en	Change your participant status
+change your status	calendar	en	Change your status
 charset of file	calendar	en	Charset of file
 check all	calendar	en	Check all
 choose a category	calendar	en	Choose a category
@@ -138,6 +138,7 @@ display status of events	calendar	en	Display status of events
 displayed view	calendar	en	Displayed view
 displays this calendar view on the home page (page you get when you enter egroupware or click on the home page icon)?	calendar	en	Displays this calendar view on the home page (page you get when you enter EGroupware or click on the home page icon)?
 do not include events of group members	calendar	en	Do not include events of group members
+do not notify	calendar	en	Do not notify
 do not notify of these changes	calendar	en	Do not notify of these changes
 do you really want to change the start of this series? if you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.	calendar	en	Do you really want to change the start of this series? If you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.
 do you want a weekview with or without weekend?	calendar	en	Do you want a weekview with or without weekend?
@@ -530,7 +531,6 @@ when selected, birthdays and/or holidays will be displayed as events in your cal
 which view to show on home page	calendar	en	Which view to show on home page
 while selecting up to x users day- and weekview is not consolidated (5 is used when not set)	admin	en	While selecting up to X users day- and weekview is not consolidated (5 is used when not set)
 whole day	calendar	en	Whole day
-whole query	calendar	en	whole query
 with credentials included	calendar	en	With credentials included
 wk	calendar	en	Wk
 work day ends on	calendar	en	Work day ends on

calendar/templates/default/list.xet

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="calendar.list.rows" template="" lang="" group="0" version="1.7.004">
+	<template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004">
 		<grid width="100%">
 			<columns>
 				<column/>
@@ -31,7 +31,6 @@
 					<nextmatch-sortheader label="Title" id="cal_title"/>
 					<nextmatch-sortheader label="Description" id="cal_description"/>
 					<nextmatch-sortheader label="Recurrence" id="recure"/>
-					<nextmatch-header label="Project" id="pm_id"/>
 					<nextmatch-header label="Category" id="cat_id"/>
 					<vbox>
 						<nextmatch-sortheader label="Owner" readonly="true" id="cal_owner"/>
@@ -40,28 +39,38 @@
 					<nextmatch-sortheader label="Owner" readonly="true" id="cal_owner"/>
 					<nextmatch-sortheader label="Location" id="cal_location"/>
 					<nextmatch-accountfilter label="Participants" id="participant" options="All"/>
+					<vbox>
+						<nextmatch-sortheader label="Created" id="cal_created"/>
+						<nextmatch-header id="cal_creator" options="Creator" label="Creator"/>
+						<description value="Last changed"/>
+					</vbox>
 					<nextmatch-customfields label="Custom fields" readonly="true" id="cfs"/>
 					<hbox label="Actions" class="noPrint">
-						<description value="Actions" statustext="Check all" class="noPrint"/>
+						<nextmatch-header label="Actions" statustext="Check all" class="noPrint" id="legacy_actions"/>
 						<button label="Check all" onclick="toggle_all(this.form,form::name('checked[]')); return false;" needed="1" align="right" id="check_all" image="check" statustext="Check all"/>
 					</hbox>
 				</row>
-				<row class="$row_cont[category]" valign="top">
+				<row class="$row_cont[category] $row_cont[class]" valign="top">
 					<vbox id="start">
 						<date-time readonly="true" id="${row}[start]" options=",$cont[format]" class="noWrap"/>
 						<date-time readonly="true" id="${row}[end]" options=",$cont[format]" class="noWrap"/>
 					</vbox>
 					<vbox class="listVbox">
+						<hbox readonly="true" no_lang="1">
 							<description readonly="true" no_lang="1" id="${row}[title]" options="b"/>
+							<description value="#%s" id="${row}[id]" options="b" align="right"/>
+						</hbox>
 						<box no_lang="1" class="listDescription">
 							<description no_lang="1" id="${row}[description]"/>
 						</box>
 						<description no_lang="1" id="${row}[recure]"/>
 					</vbox>
+					<hbox>
 						<description id="${row}[title]"/>
+						<description value="#%s" id="${row}[id]" options="b" align="right"/>
+					</hbox>
 					<description no_lang="1" id="${row}[description]"/>
 					<description id="${row}[recure]"/>
-					<link-string id="${row}[id]" options="calendar,projectmanager"/>
 					<menulist>
 						<menupopup type="select-cat" readonly="true" id="${row}[category]"/>
 					</menulist>
@@ -76,44 +85,53 @@
 					</menulist>
 					<description no_lang="1" id="${row}[location]"/>
 					<html readonly="true" no_lang="1" id="${row}[parts]"/>
+					<vbox>
+						<date-time id="${row}[created]" readonly="true"/>
+						<menulist>
+							<menupopup type="select-account" id="${row}[creator]" readonly="true"/>
+						</menulist>
+						<date-time id="${row}[modified]" readonly="true"/>
+					</vbox>
 					<customfields-list id="$row"/>
 					<vbox options="0,0" class="noPrint">
 						<hbox class="noPrint">
 							<button label="View" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$row_cont[id]&amp;date=$row_cont[date]'),'425','dependent=yes,width=750,height=450,scrollbars=yes,status=yes'); return false;" id="view[$row_cont[id]]" image="view" statustext="View this event"/>
-							<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=$row_cont[app]&amp;cat_id=$row_cont[category]&amp;link_id[]=$row_cont[app_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
 							<button label="Edit" onclick="$row_cont[edit_link]" id="edit[$row_cont[id]]" image="edit" statustext="Edit this event"/>
 							<button label="Delete" onclick="return confirm('Delete this event');" id="delete[$row_cont[id]]" image="delete" statustext="Delete this event"/>
 							<checkbox align="right" id="checked[]" options="$row_cont[id]:$row_cont[recur_date]" statustext="Select multiple contacts for a further action"/>
 						</hbox>
 						<hbox options="0,0">
+							<button image="etemplate/merge" label="merge" id="document[$row_cont[id]:$row_cont[recur_date]]"/>
 							<button label="Filemanager" image="filemanager/navbar" id="filemanager[$row_cont[id]]" class="image16" onclick="window.location.href=egw::link('/index.php','menuaction=filemanager.filemanager_ui.index&amp;path=/apps/calendar/$row_cont[id]'); return false;"/>
+							<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=$row_cont[app]&amp;cat_id=$row_cont[category]&amp;link_id[]=$row_cont[app_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
 						</hbox>
 					</vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.list" template="" lang="" group="0" version="1.7.003">
+	<template id="calendar.list" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
 			<columns>
 				<column/>
+				<column width="30%"/>
 			</columns>
 			<rows>
 				<row disabled="!@css">
+					<description/>
 					<html span="all" id="css"/>
 				</row>
 				<row disabled="!@msg">
+					<description align="center" no_lang="1" id="msg" span="all" class="redItalic"/>
 					<description align="center" no_lang="1" id="msg" class="redItalic"/>
 				</row>
 				<row>
-					<nextmatch id="nm" options="calendar.list.rows"/>
+					<nextmatch id="nm" options="calendar.list.rows" span="all"/>
 				</row>
-				<row class="noPrint">
+				<row class="noPrint" disabled="!@nm[selectcols]=/legacy_actions/">
+					<description/>
 					<hbox align="right">
-						<checkbox label="whole query" onchange="if (this.checked==true &amp;&amp; !confirm('Apply the action on the whole query, NOT only the shown events')) this.checked=false;" id="use_all" statustext="Apply the action on the whole query, NOT only the shown events"/>
+						<buttononly label="Select action" onclick="if (!egw_objectManager.executeActionImplementation(this, 'popup')) alert(egw::lang('You need to select some entries first!')); return false;;" id="legacy_actions" statustext="Select action"/>
-						<menulist>
-							<menupopup onchange="do_action(this);" no_lang="1" id="action" options="Select an action..." statustext="Select an action"/>
-						</menulist>
 						<button label="Check all" onclick="toggle_all(this.form,form::name('nm[rows][checked][]')); return false;" needed="1" id="check_all" image="arrow_ltr" statustext="Check all" class="checkAllArrow"/>
 					</hbox>
 				</row>