added sort icons, more work on editor, compose div classes, use JS onclick's

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@363 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index e1539f59d90a8fe2bf6b749c8a3e005e10f14f44..e069617401deeb55743d842cde43b70024034aba 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,13 @@
 2004-10-05  Helge Hess  <helge.hess@opengroupware.org>
 
+       * v0.9.25
+
+       * UIxMailListView.m: added sort icons
+
+       * UIxMailEditor.m: more work on editor
+
+       * mailer.css: added compose div classes
+
        * UIxMailListView: removed href for JavaScript onclick links (v0.9.24)
 
        * v0.9.23

diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index 6c2c8cc476b231b93a8e2f92146231a419be8c2a..444a73306c01684124762d58baf387ed48ab3329 100644 (file)
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -65,6 +65,7 @@ MailerUI_RESOURCE_FILES += \
        Images/tbtb_*.png       \
        Images/message-mail*.png\
        Images/lori_32x32.png   \
+       Images/title_*.png      \
 
 MailerUI_LOCALIZED_RESOURCE_FILES += \
        default.strings

diff --git a/SOGo/UI/Mailer/Images/title_attachment.png b/SOGo/UI/Mailer/Images/title_attachment.png
new file mode 100644 (file)
index 0000000..d8af1b0
Binary files /dev/null and b/SOGo/UI/Mailer/Images/title_attachment.png differ

diff --git a/SOGo/UI/Mailer/Images/title_config.png b/SOGo/UI/Mailer/Images/title_config.png
new file mode 100644 (file)
index 0000000..34e76e0
Binary files /dev/null and b/SOGo/UI/Mailer/Images/title_config.png differ

diff --git a/SOGo/UI/Mailer/Images/title_junk.png b/SOGo/UI/Mailer/Images/title_junk.png
new file mode 100644 (file)
index 0000000..b62fec9
Binary files /dev/null and b/SOGo/UI/Mailer/Images/title_junk.png differ

diff --git a/SOGo/UI/Mailer/Images/title_read_14x14.png b/SOGo/UI/Mailer/Images/title_read_14x14.png
new file mode 100644 (file)
index 0000000..31fc9c3
Binary files /dev/null and b/SOGo/UI/Mailer/Images/title_read_14x14.png differ

diff --git a/SOGo/UI/Mailer/Images/title_sortdown_12x12.png b/SOGo/UI/Mailer/Images/title_sortdown_12x12.png
new file mode 100644 (file)
index 0000000..1a77d1e
Binary files /dev/null and b/SOGo/UI/Mailer/Images/title_sortdown_12x12.png differ

diff --git a/SOGo/UI/Mailer/Images/title_thread.png b/SOGo/UI/Mailer/Images/title_thread.png
new file mode 100644 (file)
index 0000000..8762589
Binary files /dev/null and b/SOGo/UI/Mailer/Images/title_thread.png differ

diff --git a/SOGo/UI/Mailer/UIxMailEditor.wox b/SOGo/UI/Mailer/UIxMailEditor.wox
index a422928bd1b2ec01638a439dad7cf4a3ff747a51..8d56b524bad08d418534ee941075bff68285541d 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditor.wox
+++ b/SOGo/UI/Mailer/UIxMailEditor.wox
@@ -11,7 +11,11 @@
   const:hideFolderTree="1"
 >
   <div id="compose_fromline">
-    From: abc
+    From:
+    <!-- always a popup on Thunderbird -->
+    <select name="totype_00" style="width: 90%;">
+      <option value="to" selected="selected">xxx@yyy.com</option>
+    </select>
   </div>
 
   <div id="compose_toselection">
@@ -41,10 +45,10 @@
   </div>
 
   <!-- separate line -->
-  <textarea style="width:100%;" name="content" />
+  <div id="compose_text">
+    <textarea style="width:100%;" name="content" />
+  </div>
 
-  <h4>Mail Compose</h4>
   <!-- a rsrc:href="tbird_073_compose.png">screenshot</a -->
   <img rsrc:src="tbird_073_compose.png" alt="screenshot" />
-
-</var:component>
\ No newline at end of file
+</var:component>

diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index c96029112e8fb4ceada32ffda9b2e4859f248c22..a3d0ed6982bf617f295e94110543f1ff50d425ea 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -97,16 +97,18 @@
   return nil;
 }
 
+- (NSString *)defaultSortKey {
+  return @"DATE";
+}
 - (NSString *)imap4SortKey {
   NSString *sort;
   
   sort = [[[self context] request] formValueForKey:@"sort"];
-  [self logWithFormat:@"sort by: %@", sort];
-
+  
   // TODO: reversed sorts
   
   if ([sort length] == 0)
-    sort = @"SUBJECT";
+    sort = [self defaultSortKey];
   return [sort uppercaseString];
 }
 

diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index b597ada1332889d531895d819cf2489ecf94ddfe..a732baa9bdd213af9df47a6ff2895b32599354e1 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -28,22 +28,45 @@
          <!-- TODO: see AB for sorting -->
           
           <td class="tbtv_headercell" width="60%">
-           <a href="view" _sort="subject"><var:string label:value="Subject" /></a>
+           <a href="view" _sort="subject">
+              <var:string label:value="Subject" />
+              <var:if condition="imap4SortKey" const:value="SUBJECT">
+                <img rsrc:src="title_sortdown_12x12.png" 
+                     class="tbtv_sortcell" />
+              </var:if>
+            </a>
           </td>
           <td class="tbtv_headercell">
             <var:if condition="showToAddress" const:negate="YES">
-              <a href="view" _sort="from"><var:string label:value="From" /></a>
+              <a href="view" _sort="from">
+                <var:string label:value="From" />
+                <var:if condition="imap4SortKey" const:value="FROM">
+                  <img rsrc:src="title_sortdown_12x12.png" 
+                       class="tbtv_sortcell" />
+                </var:if>
+              </a>
             </var:if>
             <var:if condition="showToAddress">
-              <a href="view" _sort="to"><var:string label:value="To" /></a>
+              <a href="view" _sort="to">
+                <var:string label:value="To" />
+                <var:if condition="imap4SortKey" const:value="TO">
+                  <img rsrc:src="title_sortdown_12x12.png"
+                       class="tbtv_sortcell" />
+               </var:if>
+              </a>
             </var:if>
           </td>
           <td class="tbtv_headercell" width="17">
-            <!-- TODO: fix me, use the proper Thunderbird Icon -->
-            <img rsrc:src="icon_read.gif" />
+            <img rsrc:src="title_read_14x14.png" width="14" height="14" />
           </td>
           <td class="tbtv_headercell">
-            <a href="view" _sort="date"><var:string label:value="Date" /></a>
+            <a href="view" _sort="date">
+              <var:string label:value="Date" />
+              <var:if condition="imap4SortKey" const:value="DATE">
+                <img rsrc:src="title_sortdown_12x12.png"
+                     class="tbtv_sortcell"/>
+              </var:if>
+            </a>
           </td>
         </tr>
         <tr class="tableview">

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index a281cca1594d733d2ec92e26d77e63bf0f1045e6..8b283eb3b53cdd6a8e556ffea74b87430ca7e635 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=24
+SUBMINOR_VERSION:=25

diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 5283a744f7a7c1ad6c199ef7e32fc26c7385ab60..8af0f0d47f29c9a505f749ead3e50f8151776ed1 100644 (file)
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -191,6 +191,13 @@ td.tbtv_headercell a:hover {
   /* background-color: #C4C0B8; */
 }
 
+td.tbtv_headercell img.tbtv_sortcell { 
+  text-align: right;
+  border:     0px;
+  width:      12px;
+  height:     12px;
+}
+
 span.mailer_datefield { 
   white-space: nowrap;
 }
@@ -294,3 +301,15 @@ pre.mailer_plaincontent {
 
 /* compose */
 
+div.compose_fromline { 
+  width: 98%;
+}
+div.compose_toselection { 
+  width: 98%;
+}
+div.compose_subject { 
+  width: 98%;
+}
+div.compose_text { 
+  width: 98%;
+}

diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index 38b59e2f65f4935dd3ce0af9a25b80f6c8eee2f6..03b969e65a246fc45932dfa9069369f4907a6ff7 100644 (file)
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -47,6 +47,13 @@
     "icon_mark_unread.gif",
     "icon_read.gif",
     "icon_unread.gif",
+
+    "title_attachment.png",
+    "title_config.png",
+    "title_junk.png",
+    "title_read_14x14.png",
+    "title_thread.png",
+    "title_sortdown_12x12.png",
     
     "tbird_073_accountview.png",
     "tbird_073_compose.png",