Bis.

Monotone-Parent: a46f694fb88b061ebf1cde5157986657756d6f5c
Monotone-Revision: dc7f4b5bfd6f1e20c6244c01ec2af24c5f5baba3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-11-03T11:55:37
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/SchedulerUI.js

@@ -2683,7 +2683,7 @@ function appendCalendar(folderName, folderPath) {
     if (!owner)
         owner = UserLogin;
 
-    log ("append name: " + folderName + "; path: " + folderPath + "; owner: " + owner);
+    //log ("append name: " + folderName + "; path: " + folderPath + "; owner: " + owner);
 
     if ($(folderPath))
         showAlertDialog(_("You have already subscribed to that folder!"));

UI/WebServerResources/UIxAppointmentEditor.css

@@ -170,10 +170,5 @@ DIV#attendeesMenu .delegated .statusIcon
 DIV#attendeesMenu .no-partstat .statusIcon
 { background-position: -60px 0px; }
 
-DIV#attendeesMenu.fakeTextArea .delegate
+DIV#attendeesMenu .delegate
 { padding-left: 16px !important; }
-
-DIV#attendeesMenu .delegate SPAN
-{ float: left;
-  width: 8px;
-  border: 1px; }

UI/WebServerResources/UIxAttendeesEditor.js

@@ -179,7 +179,7 @@ function performSearch(input) {
     // Perform address completion
     if (!input.value.blank()) {
         var urlstr = (UserFolderURL
-                      + "Contacts/allContactSearch?search="
+                      + "Contacts/allContactSearch?excludeGroups=1&search="
                       + encodeURIComponent(input.value));
         triggerAjaxRequest(urlstr, performSearchCallback, input);
     }

UI/WebServerResources/UIxMailEditor.css

@@ -169,12 +169,3 @@ UL#attachments LI IMG
 TEXTAREA#text
 { display: none;
   background: #fff; }
-
-blockquote[type=cite] {
-  display: block;
-  margin: 1em 0px;
-  -moz-padding-start: 1em;
-  -moz-border-start: solid;
-  border-color: blue;
-  border-width: thin;
-}

UI/WebServerResources/UIxMailEditor.js

@@ -405,7 +405,8 @@ function initMailEditor() {
                                'BulletedList', '-', 'Link', 'Unlink', 'Image', 
                                'JustifyLeft','JustifyCenter','JustifyRight',
                                'JustifyBlock','Font','FontSize','-','TextColor',
-                               'BGColor','-','SpellChecker']],
+                               'BGColor','-','SpellChecker']
+                             ],
                              language : localeCode,
 			     scayt_sLang : localeCode
                           }
@@ -577,8 +578,6 @@ function onWindowResize(event) {
         attachmentswidth = attachmentsarea.getWidth();
         fromfield = $(document).getElementsByClassName('headerField', headerarea)[0];
         var height = headerarea.getHeight() - fromfield.getHeight() - subjectfield.getHeight() - 10;
-//         var height = headerarea.getHeight() - 20;
-//         alert ("height = " + height + "px");
         if (Prototype.Browser.IE)
             $("attachments").setStyle({ height: (height - 13) + 'px' });
         else