From 6371bc29474c812ed3f6a4938b7dff2d0aa95222 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 23 Dec 2011 19:55:05 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: 8eceeb42b5cb1a0094d0a14d7ddb5f819096dce4
Monotone-Revision: 00dcc1dc8b8b274e7cf85d53a4fa495b97e1c52c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-12-23T19:55:05
---
 ChangeLog                                   | 3 +++
 NEWS                                        | 2 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox | 2 +-
 UI/WebServerResources/SchedulerUI.js        | 9 +++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 130f76ba7..c554ed6d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-23  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/Scheduler/UIxAppointmentEditor.m (-viewAction): the end
+	date/time is now also returned.
+
 	* UI/PreferencesUI/UIxPreferences.m (-vacationEndDate): return
 	current date when no end date is defined.
 
diff --git a/NEWS b/NEWS
index 27e17967a..a2b419631 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 1.3-YYYYMMDD (1.3.12)
 ---------------------
 New Features
- - 
+ - show end time in bubble box of events
 
 Enhancements
  - updated Ukrainian translation
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 6cb0de48a..4dc0fe4f1 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -96,8 +96,8 @@
     <div>
       <h1><!-- space --></h1>
       <p><span class="label"><var:string label:value="Calendar:" /></span> <span><!-- space --></span></p>
-      <p><span class="label"><var:string label:value="Start:" /></span> <span><!-- space --></span></p>
       <p><span class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
+      <p><span><!-- space --></span></p>
       <p><!-- space --></p>
     </div>
   </div>
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 63381b8b6..44afeee19 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -733,15 +733,15 @@ function onViewEventCallback(http) {
                 para.hide();
 
             para = $(paras[1]);
-            if (parseInt(data["isAllDay"]) == 0) {
-                para.down("SPAN", 1).update(data["startTime"]);
+            if (data["location"].length) {
+                para.down("SPAN", 1).update(data["location"]);
                 para.show();
             } else
                 para.hide();
 
             para = $(paras[2]);
-            if (data["location"].length) {
-                para.down("SPAN", 1).update(data["location"]);
+            if (parseInt(data["isAllDay"]) == 0) {
+                para.down("SPAN").update(data["startTime"] + " - " + data["endTime"]);
                 para.show();
             } else
                 para.hide();
@@ -2774,6 +2774,7 @@ function onCalendarRemove(event) {
             }
             else {
                 var folderUrl = ApplicationBaseURL + folderId;
+                nodes[i].deselect();
                 unsubscribeFromFolder(folderUrl, owner,
                                       onFolderUnsubscribeCB, folderId);
             }