amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-07 06:18:50 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 396cb9daa0f5866edb2141f879e47a4b45dbabce

Browse Source 
Monotone-Revision: 534a14b91a815041d27ce212e28d37e2b61c6344

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-04-24T19:19:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-04-24 19:19:43 +00:00
parent 6f090c6846
commit c3a3f375b7
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -2282,7 +2282,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
@"c_classification", @"c_isallday",
@"c_isopaque", @"c_participants", @"c_partmails",
@"c_partstates", @"c_sequence", @"c_priority",
@"c_cycleinfo", @"c_iscycle", nil];
@"c_cycleinfo", @"c_iscycle", @"c_nextalarm", nil];
return [self fetchFields: infos from: _startDate to: _endDate title: title
component: _component

2
UI/Scheduler/UIxCalListingActions.m
View File

@@ -67,7 +67,7 @@ static NSArray *tasksFields = nil;
@"c_status", @"c_title", @"c_startdate",
@"c_enddate", @"c_location", @"c_isallday",
@"c_classification", @"c_partmails",
@"c_partstates", @"c_owner", @"c_iscycle",
@"c_partstates", @"c_owner", @"c_iscycle", @"c_nextalarm",
@"c_recurrence_id", nil];
[eventsFields retain];
}

24
UI/WebServerResources/SchedulerUI.css
View File

@@ -936,25 +936,19 @@ DIV#calendarHeader DIV.event
DIV.event DIV.text
{ font-size: 92%; }
DIV.event.needs-action DIV.text
{ background-image: url("needs-action.png");
DIV.event.alarm DIV.text
{ background-image: url("alarm.png");
background-repeat: no-repeat;
background-position: top right; }
DIV.event.accepted DIV.text
{ background-image: url("accepted.png");
background-repeat: no-repeat;
background-position: top right; }
DIV.eventInside.needs-action
{ border: 2px dotted #666;
-moz-opacity: 0.6;
opacity: 0.6; }
DIV.event.declined DIV.text
{ background-image: url("declined.png");
background-repeat: no-repeat;
background-position: top right; }
DIV.event.tentative DIV.text
{ background-image: url("tentative.png");
background-repeat: no-repeat;
background-position: top right; }
DIV.eventInside.declined
{ -moz-opacity: 0.3;
opacity: 0.3; }
DIV#daysView DIV[class~="event"].starts0
{ top: 0.000000%; }

14
UI/WebServerResources/SchedulerUI.js
View File

@@ -469,7 +469,7 @@ function performDeleteEventCallback(http) {
var newOccurences = [];
for (var i = 0; i < occurences.length; i++) {
var occurence = occurences[i];
if (occurence[13] != occurenceTime)
if (occurence[14] != occurenceTime)
newOccurences.push(occurence);
}
calendarEvents[calendar][cname] = newOccurences;
@@ -578,7 +578,7 @@ function eventsListCallback(http) {
var row = $(document.createElement("tr"));
table.tBodies[0].appendChild(row);
row.addClassName("eventRow");
var rTime = data[i][13];
var rTime = data[i][14];
var id = escape(data[i][1] + "-" + data[i][0]);
if (rTime)
id += "-" + escape(rTime);
@@ -980,19 +980,21 @@ function newBaseEventDIV(eventRep, event, eventText) {
eventDiv.calendar = event[1];
if (eventRep.recurrenceTime)
eventDiv.recurrenceTime = eventRep.recurrenceTime;
eventDiv.addClassName("event");
if (eventRep.userState >= 0 && userStates[eventRep.userState])
eventDiv.addClassName(userStates[eventRep.userState]);
if (event[13] > 0)
eventDiv.addClassName("alarm");
var innerDiv = $(document.createElement("div"));
eventDiv.appendChild(innerDiv);
innerDiv.addClassName("eventInside");
innerDiv.addClassName("calendarFolder" + event[1]);
if (eventRep.userState >= 0 && userStates[eventRep.userState])
innerDiv.addClassName(userStates[eventRep.userState]);
var gradientDiv = $(document.createElement("div"));
innerDiv.appendChild(gradientDiv);
gradientDiv.addClassName("gradient");
var gradientImg = $(document.createElement("img"));
gradientDiv.appendChild(gradientImg);
gradientImg.src = ResourcesURL + "/event-gradient.png";
@@ -1375,7 +1377,7 @@ function _eventBlocksMatching(calendar, cname, recurrenceTime) {
if (recurrenceTime) {
for (var i = 0; i < occurences.length; i++) {
var occurence = occurences[i];
if (occurence[13] == recurrenceTime)
if (occurence[14] == recurrenceTime)
blocks = occurence.blocks;
}
}