git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1043 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 49f303d4af34ed2ff9b4731e7897ce098db65219..3169fec90f83055aab65c38f4dbd8f5fe4445c30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * UI/Contacts/UIxContactsListView.m ([UIxContactsListView
+       -selectorComponentClass]): restored method.
+
 2007-04-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * UI/Scheduler/UIxCalTasksListView.m ([UIxCalTasksListView

diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m
index 41f27e89da9e7a5ce1c40a357c24dbea126c53e8..fc56f202dbbfaa66241e7f422b61f89cced24b38 100644 (file)
--- a/UI/Contacts/UIxContactsListView.m
+++ b/UI/Contacts/UIxContactsListView.m
@@ -81,6 +81,11 @@
   return self;
 }
 
+- (NSString *) selectorComponentClass
+{
+  return selectorComponentClass;
+}
+
 - (id <WOActionResults>) deleteAction
 {
   id <WOActionResults> result;

diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 3fd047fe740fc6fb24138e19645ca89491a988a5..4226e64000bd1218d05103d5679c913b7fc3ad58 100644 (file)
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
 #import <SaxObjC/SaxAttributes.h>
 #import <SaxObjC/SaxContentHandler.h>
 #import <SaxObjC/SaxLexicalHandler.h>

diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 4d51efadb7258767afaca11577e96f35d0454076..bf4f1a7f627d2e3c8ff7b621546343db98aa21dd 100644 (file)
--- 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 b7175644486c8502db27accc9c5f8dd3a0f89224..c8b343ac0156c885fbb66482e077596d2b139aa7 100644 (file)
--- 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 47d933dbcd0c52859b8a9abdbaa9c7a3131ee926..831cef806119addce5a4570c3c74847ef0e250d4 100644 (file)
--- 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 53bd748be8012dafe9e9a3897ba94d2fb4ef3e1c..fec8322affcdc813e55b0bdf5c2a1ca17100e127 100644 (file)
--- 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 4e9f54087fc37965f006107ecdddcef3ddcca0a9..b40cf6c52aac79ead32158e6879ea4e37f7dfd92 100644 (file)
--- 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; }