From f07526423f0f2a0fcac5a132aadc09188babba3c Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 6 Nov 2013 15:25:36 -0500
Subject: [PATCH] Fix display of ICal event in message

---
 .../English.lproj/Localizable.strings         |  2 +
 .../MailPartViewers/UIxMailPartICalViewer.wox | 48 ++++++++-----------
 2 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/UI/MailPartViewers/English.lproj/Localizable.strings b/UI/MailPartViewers/English.lproj/Localizable.strings
index cda317fe4..a23ee4125 100644
--- a/UI/MailPartViewers/English.lproj/Localizable.strings
+++ b/UI/MailPartViewers/English.lproj/Localizable.strings
@@ -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";
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index 12fca2152..4a09a2095 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -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: