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

calendar/email: distinguish between meeting request and meeting reply, while displaying ics

Browse Source
This commit is contained in:
Klaus Leithoff 2012-06-06 07:39:57 +00:00
parent 1f2ee8faf2
commit 2eec3dd075
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1646,6 +1646,7 @@ function replace_eTemplate_onsubmit()
$session_data = egw_cache::getSession('calendar', 'ical');
$ical_string = $session_data['attachment'];
$ical_charset = $session_data['charset'];
$ical_method = $session_data['method'];
unset($session_data);
}
$ical = new calendar_ical();
@ -1755,7 +1756,8 @@ function replace_eTemplate_onsubmit()
}
$event['msg'] = implode("\n",(array)$msg);
$readonlys['button[edit]'] = !$event['id'];
$event['ics_method'] = $readonlys['ics_method'] = strtolower($ical_method);
$event['ics_method_label'] = (strtolower($ical_method)=='request'?lang('Meeting request'):lang('Meeting status information'));
$tpl = new etemplate('calendar.meeting');
$tpl->exec('calendar.calendar_uiforms.meeting', $event, $sel_options, $readonlys, $event, 2);
}

1
calendar/lang/egw_de.lang
View File

@ -281,6 +281,7 @@ make freebusy information available to not loged in persons? calendar de Die Bel
max. number of entries to show (leave empty for no restriction) calendar de Max. Anzahl von Einträgen die angezeigt werden sollen (Kein Eintrag = Keine Beschränkung)
maximum available quantity of %1 exceeded! calendar de Maximale Anzahl von %1 erreicht!
meeting request calendar de Termineinladung
meeting status information calendar de Terminstatus
merge document... calendar de Dokument einfügen...
minutes calendar de Minuten
modified calendar de Geändert

1
calendar/lang/egw_en.lang
View File

@ -281,6 +281,7 @@ make freebusy information available to not loged in persons? calendar en Make Fr
max. number of entries to show (leave empty for no restriction) calendar en Max. number of entries to show. Leave empty for no restriction.
maximum available quantity of %1 exceeded! calendar en Maximum available quantity of %1 exceeded!
meeting request calendar en Meeting request
meeting status information calendar en Meeting status information
merge document... calendar en Merge document...
minutes calendar en Minutes
modified calendar en Modified

6
calendar/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

19
calendar/templates/default/meeting.xet
View File

@ -1,15 +1,26 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
<template id="calendar.meeting" template="" lang="" group="0" version="1.9.001">
<template id="calendar.meeting" template="" lang="" group="0" version="1.9.002">
<description id="msg" class="redItalic leftPad5"/>
<hbox>
<grid border="0">
<columns>
<column/>
<column/>
<column/>
<column/>
<column/>
</columns>
<rows>
<row disabled="!@ics_method=request">
<description value="This mail contains a meeting request" class="meetingRequestMessage"/>
<button label="Accept" id="button[accept]" class="leftPad5"/>
<button label="Tentative" id="button[tentativ]" class="leftPad5"/>
<button label="Reject" id="button[reject]" class="leftPad5"/>
<buttononly statustext="Edit event in calendar" label="Edit" id="button[edit]" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5"/>
</hbox>
</row>
</rows>
</grid>
<description/>
<grid width="100%" class="meetingRequest">
<columns>
@ -18,7 +29,7 @@
</columns>
<rows>
<row class="th">
<description value="Meeting request" span="all"/>
<description id="ics_method_label" span="all"/>
</row>
<row class="row">
<description value="Title"/>