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

See ChangeLog. 

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

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-12-23T19:55:05
maint-2.0.2
Francis Lachapelle 2011-12-23 19:55:05 +00:00
parent 49c5a107db
commit 6371bc2947
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2011-12-23 Francis Lachapelle <flachapelle@inverse.ca> 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 * UI/PreferencesUI/UIxPreferences.m (-vacationEndDate): return
current date when no end date is defined. current date when no end date is defined.

2
NEWS
View File

@ -1,7 +1,7 @@
1.3-YYYYMMDD (1.3.12) 1.3-YYYYMMDD (1.3.12)
--------------------- ---------------------
New Features New Features
- - show end time in bubble box of events
Enhancements Enhancements
- updated Ukrainian translation - updated Ukrainian translation

2
UI/Templates/SchedulerUI/UIxCalMainView.wox
View File

@ -96,8 +96,8 @@
<div> <div>
<h1><!-- space --></h1> <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="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 class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
<p><span><!-- space --></span></p>
<p><!-- space --></p> <p><!-- space --></p>
</div> </div>
</div> </div>

9
UI/WebServerResources/SchedulerUI.js
View File

@ -733,15 +733,15 @@ function onViewEventCallback(http) {
para.hide(); para.hide();
para = $(paras[1]); para = $(paras[1]);
if (parseInt(data["isAllDay"]) == 0) { if (data["location"].length) {
para.down("SPAN", 1).update(data["startTime"]); para.down("SPAN", 1).update(data["location"]);
para.show(); para.show();
} else } else
para.hide(); para.hide();
para = $(paras[2]); para = $(paras[2]);
if (data["location"].length) { if (parseInt(data["isAllDay"]) == 0) {
para.down("SPAN", 1).update(data["location"]); para.down("SPAN").update(data["startTime"] + " - " + data["endTime"]);
para.show(); para.show();
} else } else
para.hide(); para.hide();
@ -2774,6 +2774,7 @@ function onCalendarRemove(event) {
} }
else { else {
var folderUrl = ApplicationBaseURL + folderId; var folderUrl = ApplicationBaseURL + folderId;
nodes[i].deselect();
unsubscribeFromFolder(folderUrl, owner, unsubscribeFromFolder(folderUrl, owner,
onFolderUnsubscribeCB, folderId); onFolderUnsubscribeCB, folderId);
} }