LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix display of ICal event in message

pull/15/merge
Francis Lachapelle 2013-11-06 15:25:36 -05:00
parent ba35a4b003
commit f07526423f
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/MailPartViewers/English.lproj/Localizable.strings
View File

@ -12,6 +12,8 @@ publish_info_text = "The sender informs you of the attached event.";
cancel_info_text = "Your invitation or the whole event was canceled.";
request_info_no_attendee = "is proposing a meeting to the attendees. You receive this mail as a notification, you are not scheduled as a participant.";
Appointment = "Appointment";
"Status Update" = "Status Update";
was = "was";
Organizer = "Organizer";
Time = "Time";

48
UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
View File

@ -109,7 +109,6 @@
</var:if>
</var:if>
<var:if condition="inCalendar.method.uppercaseString" const:value="REPLY">
<!-- sent to organizer to update the status of the participant -->
<var:if condition="isReplySenderAnAttendee" const:negate="1">
@ -118,52 +117,43 @@
<var:if condition="isReplySenderAnAttendee">
<var:if condition="canOriginalEventBeUpdated"
><p class="uix_ical_toolbar">
<input id="iCalendarUpdateUserStatus" class="button"
type="button" label:value="Update status"/>
</p>
<!-- TODO: replies to events not in the calendar? -->
<p>
Status Update:
<var:string label:value="$inReplyAttendee.partStatWithDefault" />,
was:
<var:string
label:value="$storedReplyAttendee.partStatWithDefault" />.
</p></var:if>
><dl class="dl-horizontal">
<dt><var:string label:value="Status Update" />:</dt>
<dd><i><var:string label:value="$inReplyAttendee.partStatWithDefault" /></i>,
<var:string label:value="was" />
<i><var:string label:value="$storedReplyAttendee.partStatWithDefault" /></i>.
<br/><input id="iCalendarUpdateUserStatus" class="button"
type="button" label:value="Update status"/></dd>
</dl></var:if>
</var:if>
</var:if>
<var:if condition="inCalendar.method.uppercaseString" const:value="CANCEL">
<!-- sent to attendees to notify of the attendee being removed or the
event being deleted -->
<dl class="dl-horizontal">
<dd><var:string label:value="cancel_info_text" />
<var:if condition="isEventStoredInCalendar">
<div class="uix_ical_toolbar">
<a href="#" id="iCalendarDeleteFromCalendar" class="button">
<br/><a href="#" id="iCalendarDeleteFromCalendar" class="button">
<span><var:string label:value="Delete from calendar" /></span></a>
</div>
</var:if>
<p class="clear">
<!-- todo: if there are no attendees, the whole meeting was stopped -->
<var:string label:value="cancel_info_text" />
</p>
</var:if></dd>
</dl>
</var:if>
<var:if condition="inCalendar.method.uppercaseString" const:value="ADD">
<!-- TODO -->
<p><var:string label:value="add_info_text" /></p>
<dl class="dl-horizontal">
<dd><var:string label:value="add_info_text" /></dd>
</dl>
</var:if>
<var:if condition="inCalendar.method.uppercaseString" const:value="PUBLISH">
<!-- none-scheduling event sent to someone for adding to the calendar -->
<p><var:string label:value="publish_info_text" /></p>
<dl class="dl-horizontal">
<dd><var:string label:value="publish_info_text" /></dd>
</dl>
</var:if>
<var:if condition="isLoggedInUserTheOrganizer">
<!--
Possible Status: