Branch for SOGo v1.3.10

Monotone-Parent: 1e8c7259f7ef4e643e8c4d7691e6d7b69faa65c3
Monotone-Revision: 01554e46f2d289111d615a3006a1b61ad6f76320

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-11-01T18:46:51

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,5 +170,10 @@ DIV#attendeesMenu .delegated .statusIcon
 DIV#attendeesMenu .no-partstat .statusIcon
 { background-position: -60px 0px; }
 
-DIV#attendeesMenu .delegate
+DIV#attendeesMenu.fakeTextArea .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?excludeGroups=1&search="
+                      + "Contacts/allContactSearch?search="
                       + encodeURIComponent(input.value));
         triggerAjaxRequest(urlstr, performSearchCallback, input);
     }

UI/WebServerResources/UIxMailEditor.css

@@ -169,3 +169,12 @@ 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,8 +405,7 @@ function initMailEditor() {
                                'BulletedList', '-', 'Link', 'Unlink', 'Image', 
                                'JustifyLeft','JustifyCenter','JustifyRight',
                                'JustifyBlock','Font','FontSize','-','TextColor',
-                               'BGColor','-','SpellChecker']
-                             ],
+                               'BGColor','-','SpellChecker']],
                              language : localeCode,
 			     scayt_sLang : localeCode
                           }
@@ -578,6 +577,8 @@ 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