From 4ed45c91be0a9aeda918599caf7d6e013dce20b3 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 19 Oct 2006 16:22:59 +0000
Subject: [PATCH] Monotone-Parent: 6f2175ef7aaf3aa5ed992e4e0b51ddf722d4a07f
 Monotone-Revision: 55f77640b542c95c5474e9ca98f187feac125c7e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-19T16:22:59
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/MailerUI/UIxMailEditor.wox      | 18 +++++++++---------
 UI/Templates/MailerUI/UIxMailToSelection.wox |  2 +-
 UI/WebServerResources/UIxMailEditor.css      | 17 ++++++-----------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 9ff34a5bc..01945e49d 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -29,18 +29,18 @@
       <div>
         <var:component className="UIxMailToSelection"
           to="to" cc="cc" bcc="bcc" />
-        <div class="addressListElement" id="subjectRow"
-          ><span class="headerField"><var:string label:value="Subject" />:</span
-            ><span class="headerInput"
-            ><input name="subject"
-              type="text"
-              class="textField"
-              var:value="subject"
-              /></span></div></div></div><
       </div>
+      <div class="addressListElement" id="subjectRow"
+        ><span class="headerField"><var:string label:value="Subject"
+            />:</span
+          ><span class="headerInput"
+          ><input name="subject"
+            type="text"
+            class="textField"
+            var:value="subject"
+            /></span></div>
     </div>
     <!-- separator line -->
     <textarea name="content" var:value="text" />
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
-  </div>
   </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailToSelection.wox b/UI/Templates/MailerUI/UIxMailToSelection.wox
index 6d323a208..4a1ecbdcd 100644
--- a/UI/Templates/MailerUI/UIxMailToSelection.wox
+++ b/UI/Templates/MailerUI/UIxMailToSelection.wox
@@ -53,7 +53,7 @@
     <a href="#" onclick="checkAddresses();">check addresses</a>
   </var:if>-->
     </div>
-    <span id="addr_addresses" style="visibility: hidden;"><var:foreach list="addressLists" item="addressList"><var:foreach list="addressList" item="address"><span var:id="address" /></var:foreach></var:foreach>
+    <span id="addr_addresses" style="display: none; visibility: hidden;"><var:foreach list="addressLists" item="addressList"><var:foreach list="addressList" item="address"><span var:id="address" /></var:foreach></var:foreach>
     </span>
   </container>
 
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index d83757026..7f088b807 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -17,6 +17,7 @@ TABLE#compose_label
 DIV#addressList
 {
   height: 8em;
+  margin-bottom: .25em;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -29,7 +30,8 @@ DIV.addressListElement
 SPAN.headerField
 { display: block;
   float: left;
-  width: 8em;
+  line-height: 1.8em;
+  width: 5em;
   text-align: right; }
 
 SPAN.headerInput > INPUT
@@ -37,7 +39,7 @@ SPAN.headerInput > INPUT
   padding-left: 24px;
   background-image: url('/SOGo.woa/WebServerResources/abcard.gif');
   background-repeat: no-repeat;
-  background-position: left middle;
+  background-position: 2px center;
   margin-right: -9em; }
 
 DIV#subjectRow INPUT
@@ -55,12 +57,10 @@ div#compose_internetmarker {
 }
 
 div#headerArea
-{ border-top: 2px solid #fffffb;
-  border-left: 2px solid #fffffb;
+{ border-top: 1px solid #fffffb;
+  border-left: 1px solid #fffffb;
   border-right: 2px solid #888;
   border-bottom: 2px solid #888;
-  -moz-border-top-colors: -moz-buttonhoverface transparent;
-  -moz-border-left-colors: -moz-buttonhoverface transparent;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent; }
 
@@ -74,11 +74,6 @@ div#attachmentsArea
   padding-left: 5px;
   border-left: 1px solid #888; }
 
-SPAN.headerField
-{ line-height: 1.8em;
-  width: 5em;
-  text-align: right; }
-
 div#compose_attachments_list
 {
   width: 100%;