From 491089e194a413dcb317a6267da24144fb2ed3cd Mon Sep 17 00:00:00 2001 From: Luc Charland Date: Wed, 19 Sep 2012 09:18:00 -0400 Subject: [PATCH 1/4] Fixed bug 1929: Notifications about Modifications Notifications about Modifications don't show the Calendar name. When an email notification is selected by the user, the calendar name from which the event was changed is added to the email. Needs to be translated. --- .../Appointments/English.lproj/Localizable.strings | 1 + SoObjects/Appointments/SOGoAptMailReceipt.h | 3 +++ SoObjects/Appointments/SOGoAptMailReceipt.m | 12 ++++++++++++ SoObjects/Appointments/SOGoCalendarComponent.m | 5 ++++- UI/Templates/Appointments/SOGoAptMailReceipt.wox | 2 ++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings index 9bce92a0a..75f6d88bd 100644 --- a/SoObjects/Appointments/English.lproj/Localizable.strings +++ b/SoObjects/Appointments/English.lproj/Localizable.strings @@ -16,6 +16,7 @@ vtodo_class2 = "(Confidential task)"; "The following attendees(s) were removed:" = "The following attendee(s) were removed:"; /* IMIP messages */ +"calendar_label" = "Calendar:"; "startDate_label" = "Start:"; "endDate_label" = "End:"; "due_label" = "Due Date:"; diff --git a/SoObjects/Appointments/SOGoAptMailReceipt.h b/SoObjects/Appointments/SOGoAptMailReceipt.h index c5c909635..ffc1efe93 100644 --- a/SoObjects/Appointments/SOGoAptMailReceipt.h +++ b/SoObjects/Appointments/SOGoAptMailReceipt.h @@ -40,6 +40,7 @@ NSArray *updatedAttendees; iCalPerson *currentRecipient; SOGoEventOperation operation; + NSString *calendarName; } - (void) setOriginator: (NSString *) newOriginator; @@ -47,8 +48,10 @@ - (void) setDeletedAttendees: (NSArray *) theAttendees; - (void) setUpdatedAttendees: (NSArray *) theAttendees; - (void) setOperation: (SOGoEventOperation) theOperation; +- (void) setCalendarName: (NSString *) theCalendarName; - (NSString *) aptSummary; +- (NSString *) calendarName; @end diff --git a/SoObjects/Appointments/SOGoAptMailReceipt.m b/SoObjects/Appointments/SOGoAptMailReceipt.m index 1431b218d..5aa4295eb 100644 --- a/SoObjects/Appointments/SOGoAptMailReceipt.m +++ b/SoObjects/Appointments/SOGoAptMailReceipt.m @@ -64,6 +64,7 @@ static NSCharacterSet *wsSet = nil; addedAttendees = nil; deletedAttendees = nil; updatedAttendees = nil; + calendarName = nil; } return self; @@ -75,6 +76,7 @@ static NSCharacterSet *wsSet = nil; [addedAttendees release]; [deletedAttendees release]; [updatedAttendees release]; + [calendarName release]; [super dealloc]; } @@ -140,6 +142,16 @@ static NSCharacterSet *wsSet = nil; operation = theOperation; } +- (void) setCalendarName: (NSString *) theCalendarName +{ + ASSIGN (calendarName, theCalendarName); +} + +- (NSString *) calendarName +{ + return calendarName; +} + - (NSString *) aptSummary { NSString *s; diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 8163cda53..a33d5fb4c 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -982,7 +982,7 @@ updatedAttendees: (NSArray *) theUpdatedAttendees operation: (SOGoEventOperation) theOperation { - NSString *mailDate, *mailText, *fullSenderEmail, *senderEmail, *fullRecipientEmail, *recipientEmail; + NSString *calendarName, *mailDate, *mailText, *fullSenderEmail, *senderEmail, *fullRecipientEmail, *recipientEmail; NSDictionary *senderIdentity, *recipientIdentity; SOGoAptMailReceipt *page; NGMutableHashMap *headerMap; @@ -990,6 +990,8 @@ SOGoUser *currentUser; SOGoDomainDefaults *dd; + calendarName = [[self container] displayName]; + // We must handle three cases here: // - Receive a mail when I modify my calendar // - Receive a mail when someone else modifies my calendar @@ -1003,6 +1005,7 @@ [page setDeletedAttendees: theDeletedAttendees]; [page setUpdatedAttendees: theUpdatedAttendees]; [page setOperation: theOperation]; + [page setCalendarName: calendarName]; currentUser = [context activeUser]; senderIdentity = [currentUser primaryIdentity]; diff --git a/UI/Templates/Appointments/SOGoAptMailReceipt.wox b/UI/Templates/Appointments/SOGoAptMailReceipt.wox index c93a1dc3e..f574903c3 100644 --- a/UI/Templates/Appointments/SOGoAptMailReceipt.wox +++ b/UI/Templates/Appointments/SOGoAptMailReceipt.wox @@ -23,6 +23,8 @@ h1, dd, .dl-list dt { margin-left: 130px; }

+
+
From 49fafb498877139ff3e264460ec73e61aabdae09 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 19 Sep 2012 11:20:30 -0400 Subject: [PATCH 2/4] Scheduler: dynamic height for mini-calendar Fixes #1788. --- UI/WebServerResources/SchedulerUI.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 7c37cb07a..479476cd6 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -151,7 +151,6 @@ DIV#dateSelectorView #dateSelector { margin: 0px auto; - height: 13.5em; background-color: #fff; border-top: 1px solid #909090 !important; border-left: 1px solid #FFFFFF !important; @@ -193,9 +192,6 @@ DIV#dateSelectorView #dateSelector .dayOfWeek { color: #00f; } -TABLE#dateSelectorTable -{ padding: 2px; } - #dateSelector TABLE, #dateSelector TABLE TABLE { border-collapse: collapse; @@ -203,6 +199,9 @@ TABLE#dateSelectorTable margin: 0px auto; width: 100%; } +TABLE#dateSelectorTable +{ margin-bottom: 5px; } + TABLE#dateSelectorTable TD TABLE TD { width: 5px; /* temp hack */ } From bda87eba071811e8be0cb7cc20de4709b9a45937 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 19 Sep 2012 11:24:25 -0400 Subject: [PATCH 3/4] Attendees window: fixed autocompletion selection Fixed the keyboard arrows navigation within the popup menu of matching entries. --- UI/WebServerResources/UIxAttendeesEditor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index e0ce82be0..f0f9731b2 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -100,6 +100,7 @@ function onContactKeydown(event) { preventDefault(event); this.scrollLeft = 0; $(this).up('DIV').scrollLeft = 0; + attendeesEditor.selectedIndex = -1; if (this.confirmedValue) this.value = this.confirmedValue; this.hasfreebusy = false; From 85787e955903be62b5b066e7a81184be6e3065c9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 19 Sep 2012 11:26:54 -0400 Subject: [PATCH 4/4] Event editor: ellipsis overflow to attendees list --- UI/WebServerResources/UIxComponentEditor.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/UIxComponentEditor.css b/UI/WebServerResources/UIxComponentEditor.css index b7df83dc5..fd171a4e4 100644 --- a/UI/WebServerResources/UIxComponentEditor.css +++ b/UI/WebServerResources/UIxComponentEditor.css @@ -30,7 +30,9 @@ SPAN.content line-height: 2em; top: -.25em; left: 8em; - right: 1em; } + right: 1em; + text-overflow: ellipsis; + overflow: hidden; } SPAN.content > INPUT.textField, LABEL#commentArea textarea