From 6d4fe349f4a49ec782b7610d2cd64482c4b5f59f Mon Sep 17 00:00:00 2001 From: wolfgang Date: Tue, 10 Apr 2007 13:58:04 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1043 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 5 ++++ UI/Contacts/UIxContactsListView.m | 5 ++++ UI/MailPartViewers/UIxMailPartHTMLViewer.m | 1 + .../English.lproj/Localizable.strings | 9 ++++++++ UI/Scheduler/French.lproj/Localizable.strings | 11 +++++++-- UI/WebServerResources/MailerUI.js | 23 ++++++++----------- UI/WebServerResources/SchedulerUI.js | 8 +++---- UI/WebServerResources/generic.css | 2 +- 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49f303d4..3169fec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-04 Wolfgang Sourdeau + + * UI/Contacts/UIxContactsListView.m ([UIxContactsListView + -selectorComponentClass]): restored method. + 2007-04-03 Wolfgang Sourdeau * UI/Scheduler/UIxCalTasksListView.m ([UIxCalTasksListView diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m index 41f27e89..fc56f202 100644 --- a/UI/Contacts/UIxContactsListView.m +++ b/UI/Contacts/UIxContactsListView.m @@ -81,6 +81,11 @@ return self; } +- (NSString *) selectorComponentClass +{ + return selectorComponentClass; +} + - (id ) deleteAction { id result; diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index 3fd047fe..4226e640 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -21,6 +21,7 @@ */ #import +#import #import #import #import diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 4d51efad..bf4f1a7f 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -85,6 +85,9 @@ /* Button Titles */ +"Add..." = "Add..."; +"Remove" = "Remove"; + "new" = "New"; "printview" = "Print View"; "edit" = "Edit"; @@ -366,5 +369,11 @@ validate_endbeforestart = "Enddate is before startdate!"; "Previous hour" = "Previous hour"; "Next hour" = "Next hour"; +/* apt list */ +"Title" = "Title"; +"Start" = "Start"; +"End" = "End"; +"Location" = "Location"; + "closeThisWindowMessage" = "Thank you! You may now close this window."; "Multicolumn Day View" = "Multicolumn Day View"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index b7175644..c8b343ac 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -85,6 +85,9 @@ /* Button Titles */ +"Add..." = "Ajouter..."; +"Remove" = "Enlever"; + "new" = "Nouveau"; "printview" = "Version imprimable"; "edit" = "Éditer"; @@ -98,7 +101,6 @@ "show_rejected_apts" = "Afficher les rendez-vous refusés"; "hide_rejected_apts" = "Cacher les rendez-vous refusés"; - /* Schedule */ "Schedule" = "Suivi de rendez-vous"; @@ -177,7 +179,6 @@ "Invalid iCal data!" = "Données iCal non valides ..."; "Could not create iCal data!" = "Les données iCal n'ont pu être crées ..."; - /* Searching */ "view_all" = "Tous"; @@ -368,5 +369,11 @@ validate_endbeforestart = "La date de fin est avant la date de début !"; "Previous hour" = "Heure précédente"; "Next hour" = "Prochaine heure"; +/* apt list */ +"Title" = "Titre"; +"Start" = "Début"; +"End" = "Fin"; +"Location" = "Lieu"; + "closeThisWindowMessage" = "Merci! Vous pouvez maintenant fermer cette fenêtre."; "Multicolumn Day View" = "Multicolonne"; diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 47d933db..831cef80 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -745,20 +745,17 @@ function newEmailTo(sender) { function expandUpperTree(node) { var currentNode = node.parentNode; - while (currentNode.className != "dtree") - { - if (currentNode.className == 'clip') - { - var id = currentNode.getAttribute("id"); - var number = parseInt(id.substr(2)); - if (number > 0) - { - var cn = d.aNodes[number]; - d.nodeStatus(1, number, cn._ls); - } - } + while (currentNode.className != "dtree") { + if (currentNode.className == 'clip') { + var id = currentNode.getAttribute("id"); + var number = parseInt(id.substr(2)); + if (number > 0) { + var cn = d.aNodes[number]; + d.nodeStatus(1, number, cn._ls); + } + } currentNode = currentNode.parentNode; - } + } } function initMailboxSelection(mailboxName) { diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 53bd748b..fec8322a 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -39,7 +39,7 @@ function newEvent(sender, type) { if (params.length > 0) urlstr += "?" + params.join("&"); - window.open(urlstr, "", "width=490,height=600,resizable=0"); + window.open(urlstr, "", "width=490,height=470,resizable=0"); return false; /* stop following the link */ } @@ -53,7 +53,7 @@ function _editEventId(id, owner) { var urlstr = urlBase + id + "/edit"; var win = window.open(urlstr, "SOGo_edit_" + id, - "width=490,height=600,resizable=0"); + "width=490,height=470,resizable=0"); win.focus(); } @@ -1062,15 +1062,13 @@ function appendCalendar(folderName, folder) { colorBox.style.backgroundColor = color + ";"; } li.appendChild(colorBox); - li.appendChild(document.createTextNode(folderName)); + li.appendChild(document.createTextNode(" " + folderName)); calendarList.appendChild(li); var contactId = folder.split(":")[0]; var styles = document.getElementsByTagName("style"); styles[0].innerHTML += ('.ownerIs' + contactId + ' {' - + ' color: ' - + color + ';' + ' background-color: ' + color + ' !important; }'); diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index 4e9f5408..b40cf6c5 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -620,7 +620,7 @@ DIV.tabsContainer > UL LI.active DIV.tabsContainer > UL LI.active { z-index: 5; background: #d4d0c8; - border-bottom: 1px solid none; + border-bottom: 1px none #fff; padding-top: 2px; padding-bottom: 3px; margin-top: -3px; } -- 2.39.5