From 575ca49b2c5474ea8c1327cc592eca48d4dca1f4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 7 Jan 2010 20:00:07 +0000 Subject: [PATCH 1/5] Reindent Monotone-Parent: 0a5ce5307756135e2de40ddd71c96dce6f3f4e52 Monotone-Revision: 18bcde63a97bfd2933b370687c939865d8c21d61 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-01-07T20:00:07 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/UIxOccurenceDialog.js | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/UI/WebServerResources/UIxOccurenceDialog.js b/UI/WebServerResources/UIxOccurenceDialog.js index d62e9a670..1dc281fc1 100644 --- a/UI/WebServerResources/UIxOccurenceDialog.js +++ b/UI/WebServerResources/UIxOccurenceDialog.js @@ -1,42 +1,42 @@ /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ function onCancelButtonClick(event) { - window.close(); + window.close(); } function onThisButtonClick(event) { - if (action == 'edit') - window.opener.performEventEdition(calendarFolder, componentName, - recurrenceName); - else if (action == 'delete') - window.opener.performEventDeletion(calendarFolder, componentName, - recurrenceName); - else - window.alert("Invalid action: " + action); + if (action == 'edit') + window.opener.performEventEdition(calendarFolder, componentName, + recurrenceName); + else if (action == 'delete') + window.opener.performEventDeletion(calendarFolder, componentName, + recurrenceName); + else + window.alert("Invalid action: " + action); - window.close(); + window.close(); } function onAllButtonClick(event) { - if (action == 'edit') - window.opener.performEventEdition(calendarFolder, componentName); - else if (action == 'delete') - window.opener.performEventDeletion(calendarFolder, componentName); - else - window.alert("Invalid action: " + action); + if (action == 'edit') + window.opener.performEventEdition(calendarFolder, componentName); + else if (action == 'delete') + window.opener.performEventDeletion(calendarFolder, componentName); + else + window.alert("Invalid action: " + action); - window.close(); + window.close(); } function onOccurenceDialogLoad() { - var thisButton = $("thisButton"); - thisButton.observe("click", onThisButtonClick); + var thisButton = $("thisButton"); + thisButton.observe("click", onThisButtonClick); - var allButton = $("allButton"); - allButton.observe("click", onAllButtonClick); + var allButton = $("allButton"); + allButton.observe("click", onAllButtonClick); - var cancelButton = $("cancelButton"); - cancelButton.observe("click", onCancelButtonClick); + var cancelButton = $("cancelButton"); + cancelButton.observe("click", onCancelButtonClick); } document.observe("dom:loaded", onOccurenceDialogLoad); From cade28b75c1dfc7b98b5a791d23812a395c3dfd0 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Mon, 11 Jan 2010 18:38:44 +0000 Subject: [PATCH 2/5] See ChangeLog Monotone-Parent: 32e14dc57c4f6d9a43de5dfdf3c298091cbf84ea Monotone-Revision: 761144933c016dd4448ac0614c3937621750bda6 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-01-11T18:38:44 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/Contacts/UIxContactFolderActions.m | 22 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b48dc1a9..86637bd88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-11 Ludovic Marcotte + + * UI/Contacts/UIxContactFolderActions.m (-importVcardData:): + We now support multiple vCards in the same file during + the import process + 2010-01-08 Ludovic Marcotte * SoObjects/SOGo/LDAPSource.{h,m} - bindFields is now diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m index 94a47e541..c8081fd5c 100644 --- a/UI/Contacts/UIxContactFolderActions.m +++ b/UI/Contacts/UIxContactFolderActions.m @@ -194,13 +194,27 @@ - (int) importVcardData: (NSString *) vcardData { - NGVCard *card; + NSArray *allCards; int rc; rc = 0; - card = [NGVCard parseSingleFromSource: vcardData]; - if ([self importVcard: card]) - rc = 1; + allCards = [NGVCard parseFromSource: vcardData]; + + if (allCards && [allCards count]) + { + int i; + + for (i = 0; i < [allCards count]; i++) + { + if (![self importVcard: [allCards objectAtIndex: i]]) + { + rc = 0; + break; + } + else + rc++; + } + } return rc; } From 304a332d04f29847cbf8b3a7895546c8f730200b Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 12 Jan 2010 19:43:47 +0000 Subject: [PATCH 3/5] See ChangeLog Monotone-Parent: 761144933c016dd4448ac0614c3937621750bda6 Monotone-Revision: e963d0d35abbc798444e616c5532ac4a7461c63a Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-01-12T19:43:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 +++++++++ ...SOGo Mozilla Thunderbird Configuration.odt | Bin 21128 -> 21064 bytes SoObjects/SOGo/NSString+Utilities.m | 1 + 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 86637bd88..6525eaff1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-01-12 Ludovic Marcotte + + * SoObjects/SOGo/NSString+Utilities.m + We retain the autoreleased strings static variable + to avoir random issues with the -fromCSSIdentifier method + + * Updated the Moz guide for the updateLink part of + the updates.php script. + 2010-01-11 Ludovic Marcotte * UI/Contacts/UIxContactFolderActions.m (-importVcardData:): diff --git a/Documentation/SOGo Mozilla Thunderbird Configuration.odt b/Documentation/SOGo Mozilla Thunderbird Configuration.odt index 4ba568f9752b83e6e66da3e74e425012b922a291..c4bfccd67f24d3981992247eea0395df91fd49f9 100644 GIT binary patch delta 17345 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 I Date: Wed, 13 Jan 2010 05:14:36 +0000 Subject: [PATCH 4/5] See ChangeLog Monotone-Parent: e01a6cf59f2ee75d0b39a067e4bb3dc8f01bc380 Monotone-Revision: e87a7d4ca04131da133962a5f2c5afdff4ef8f48 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-01-13T05:14:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/WebServerResources/ContactsUI.css | 5 +++++ UI/WebServerResources/ContactsUI.js | 25 ++++++++++++------------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6525eaff1..fcfef5009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-13 Francis Lachapelle + + * UI/WebServerResources/ContactsUI.js (-fixSearchFieldPosition): + replaced this function by the equivalent CSS definition. + (-initContacts): initialized import buttons even for "popup" mode. + 2010-01-12 Ludovic Marcotte * SoObjects/SOGo/NSString+Utilities.m diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index 400fbe8bc..18f102d79 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/UI/WebServerResources/ContactsUI.css @@ -319,6 +319,11 @@ BODY.popup DIV#rightDragHandle BODY.popup DIV#contactView { top: 10em; } +BODY.popup DIV#filterPanel +{ position: relative; + top: 7px; +} + DIV.contactSelection { z-index: 10; diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 7fbfec507..bedf35647 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -1150,29 +1150,28 @@ function onDocumentKeydown(event) { } } -function fixSearchFieldPosition () { +/*function fixSearchFieldPosition () { var panel = $("filterPanel"); if (panel) { panel.style.position = "relative"; panel.style.top = "7px"; } -} + }*/ function initContacts(event) { if ($(document.body).hasClassName("popup")) { configureSelectionButtons(); - fixSearchFieldPosition (); - } - else { - // Addressbook import form - $("uploadCancel").observe("click", hideContactsImport); - $("uploadOK").observe("click", hideImportResults); - - if (Prototype.Browser.Gecko) - Event.observe(document, "keypress", onDocumentKeydown); // for FF2 - else - Event.observe(document, "keydown", onDocumentKeydown); } + + // Addressbook import form + $("uploadCancel").observe("click", hideContactsImport); + $("uploadOK").observe("click", hideImportResults); + + if (Prototype.Browser.Gecko) + Event.observe(document, "keypress", onDocumentKeydown); // for FF2 + else + Event.observe(document, "keydown", onDocumentKeydown); + configureAbToolbar(); configureAddressBooks(); updateAddressBooksMenus(); From ec9697d1791b5bbe306602508191f4eb5c18364d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 14 Jan 2010 15:26:10 +0000 Subject: [PATCH 5/5] Minor CSS/JS fix in Calendar module. Monotone-Parent: e87a7d4ca04131da133962a5f2c5afdff4ef8f48 Monotone-Revision: 6970e7a89b13f1353d770e663717021a53350856 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-01-14T15:26:10 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.css | 2 +- UI/WebServerResources/UIxAppointmentEditor.js | 3 ++- UI/WebServerResources/UIxComponentEditor.js | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index c3b125971..5465def7e 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -300,7 +300,7 @@ DIV#eventDialog P DIV#eventDialog SPAN.label { color: #444; } -DIV#eventDialog p#description +DIV#eventDialog P#description { margin-top: 1em; } ._unfocused#dateSelector TD._selected, diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js index 9dd539c08..7d457d400 100644 --- a/UI/WebServerResources/UIxAppointmentEditor.js +++ b/UI/WebServerResources/UIxAppointmentEditor.js @@ -303,7 +303,8 @@ function refreshAttendeesRO () { var attendeesLabel = $("attendeesLabel"); var attendeesDiv = $("attendeesDiv"); - attendeesLabel.setStyle({ display: "block" }); + if (attendeesLabel) + attendeesLabel.setStyle({display: "block"}); attendeesDiv.setStyle({display: "block"}); // Register "click" event on each attendee's email diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js index e8e24e864..f3bc1ffbd 100644 --- a/UI/WebServerResources/UIxComponentEditor.js +++ b/UI/WebServerResources/UIxComponentEditor.js @@ -193,9 +193,6 @@ function onComponentEditorLoad(event) { tmp = $("cancelButton"); if (tmp) tmp.observe ("click", onCancelButtonClick); - - if (tmp) - window.resizeTo(430,540); } function onSummaryChange (e) {