merge of '65d93d27a238a5e86f0c7bc9fd3cbc658d5ee681'

and '7fdf5019b42b8f7abfe4265a47d3175189493e24'

Monotone-Parent: 65d93d27a238a5e86f0c7bc9fd3cbc658d5ee681
Monotone-Parent: 7fdf5019b42b8f7abfe4265a47d3175189493e24
Monotone-Revision: 087438694b433e2d312278234d9a1776d302326f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-08-07T09:32:44
Monotone-Branch: ca.inverse.sogo

UI/PreferencesUI/French.lproj/Localizable.strings

@@ -98,7 +98,7 @@
 "composemessagestype_html" = "HTML";
 "composemessagestype_text" = "Texte";
 
-"composeMessageChanged" = "Changer la composition des messages nécessite d'enregistrer immédiatement vos préférences. Voulez-vous continuez?";
+"composeMessageChanged" = "Changer la composition des messages nécessite d'enregistrer immédiatement vos préférences.\nVoulez-vous continuez?";
 
 /* Additional Parameters */
 "Additional Parameters" = "Paramètres supplémentaires";

UI/Templates/SchedulerUI/UIxAppointmentEditor.wox

@@ -13,6 +13,10 @@
   var:component="event"
   var:saveURL="saveURL">
 
+      <label id="attendeesLabel"><var:string label:value="Attendees:"
+	  /><span class="content"
+	  ><a href="#" id="attendeesHref"><!-- space --></a></span></label>
+      <hr />
   <var:if condition="eventIsReadOnly" const:negate="YES">
   <div class="menu" id="attendeesMenu">
     <ul>

UI/Templates/SchedulerUI/UIxComponentEditor.wox

@@ -68,10 +68,6 @@
 	      item="item" string="itemOrganizerText"
 	      var:selection="organizerIdentity"/>
 	  </span></label></var:if>-->
-      <label id="attendeesLabel"><var:string label:value="Attendees:"
-	  /><span class="content"
-	  ><a href="#" id="attendeesHref"><!-- space --></a></span></label>
-      <hr />
       <var:component-content />
       <hr />
       <label><var:string label:value="Repeat:" />
@@ -231,6 +227,7 @@
     </label>-->
   </var:if>
     </div>
+    <var:if condition="hasAttendees">
     <div id="attendeesDiv">
       <label class="title"><var:string label:value="Attendees:" />
         <span class="content headerContent">
@@ -241,6 +238,7 @@
         </div></span>
       </label>
     </div>
+    </var:if>
     <var:if condition="hasComment">
       <div id="descriptionDiv">
         <label class="title"><var:string label:value="Description:" />
@@ -253,11 +251,8 @@
         </label>
     </div>
   </var:if>
-  <!--
-  <label id="attendeesLabel"><var:string label:value="Attendees:"
-	  /><span class="content"
-    ><a href="#" id="attendeesHref"</a></span></label>x-->
-     <input type="hidden" name="attach" id="attach" var:value="attach"/>
+
+      <input type="hidden" name="attach" id="attach" var:value="attach"/>
       <input type="hidden" name="privacy" id="privacy"
 	var:value="privacy"/>
       <input type="hidden" name="attendeesNames" id="attendeesNames"

UI/WebServerResources/UIxMailEditor.css

@@ -151,10 +151,13 @@ UL#attachments LI
 UL#attachments LI IMG
 { vertical-align: bottom; }
 
-#pageContent TEXTAREA
+#pageContent TEXTAREA,
+#cke_text
 { position: absolute;
-  left: 0em;
-  right: 0em;
-  bottom: 0em;
-  top: 999em;
-  width: 99%; }
+  left: 0;
+  right: 0;
+  bottom: 0;
+  /*top: 999em;*/ }
+
+#pageContent TEXTAREA
+{ width: 99%; }

UI/WebServerResources/UIxMailEditor.js

@@ -676,11 +676,12 @@ function onWindowResize(event) {
     var attachmentsarea = $("attachmentsArea");
     var attachmentswidth = 0;
     if (attachmentsarea.style.display) {
+        // Resize attachments list
         attachmentswidth = attachmentsarea.getWidth();
         fromfield = $(document).getElementsByClassName('headerField', headerarea)[0];
         var height = headerarea.getHeight() - fromfield.getHeight() - 10;
         if (Prototype.Browser.IE)
-            $("attachments").setStyle({ height: (height-9) + 'px' });
+            $("attachments").setStyle({ height: (height - 13) + 'px' });
         else
             $("attachments").setStyle({ height: height + 'px' });
     }
@@ -706,23 +707,22 @@ function onWindowResize(event) {
     if (composeMode == "html") {
         var editor = $('cke_text');
         if (editor == null) {
-            setTimeout ('onWindowResize ()', 100);
+            onWindowResize.defer();
             return;
         }
+        var ck_top = $("cke_top_text");
+        var ck_bottom = $("cke_bottom_text");
         var content = $("cke_contents_text");
-        var height = Math.floor(window.height() - editor.offsetTop);
-
-        content.height = (height-60) + "px";
-        content.style.height = (height-60) + "px";
-
+        var top = hr.offsetTop;
+        var height = Math.floor(window.height() - top - ck_top.getHeight() - ck_bottom.getHeight());
+        
         if (Prototype.Browser.IE) {
             editor.style.width = '';
             editor.style.height = '';
-            height += 3;
-        }
-        else {
-            content.setStyle({ 'top': hr.offsetTop + 'px' });
         }
+
+        editor.setStyle({ top: (top + 2) + 'px' });
+        content.setStyle({ height: height + 'px' });
     }
     else
         textarea.rows = Math.floor((window.height() - textarea.offsetTop) / rowheight);