From 20bbc04411a79b83eccfffe603fbbe5a8699de8a Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 5 Oct 2004 21:05:49 +0000
Subject: [PATCH] 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
---
 SOGo/UI/Mailer/ChangeLog                      |   8 ++++
 SOGo/UI/Mailer/GNUmakefile                    |   1 +
 SOGo/UI/Mailer/Images/title_attachment.png    | Bin 0 -> 322 bytes
 SOGo/UI/Mailer/Images/title_config.png        | Bin 0 -> 140 bytes
 SOGo/UI/Mailer/Images/title_junk.png          | Bin 0 -> 352 bytes
 SOGo/UI/Mailer/Images/title_read_14x14.png    | Bin 0 -> 297 bytes
 .../UI/Mailer/Images/title_sortdown_12x12.png | Bin 0 -> 148 bytes
 SOGo/UI/Mailer/Images/title_thread.png        | Bin 0 -> 415 bytes
 SOGo/UI/Mailer/UIxMailEditor.wox              |  14 ++++---
 SOGo/UI/Mailer/UIxMailListView.m              |   8 ++--
 SOGo/UI/Mailer/UIxMailListView.wox            |  35 +++++++++++++++---
 SOGo/UI/Mailer/Version                        |   2 +-
 SOGo/UI/Mailer/mailer.css                     |  19 ++++++++++
 SOGo/UI/Mailer/product.plist                  |   7 ++++
 14 files changed, 79 insertions(+), 15 deletions(-)
 create mode 100644 SOGo/UI/Mailer/Images/title_attachment.png
 create mode 100644 SOGo/UI/Mailer/Images/title_config.png
 create mode 100644 SOGo/UI/Mailer/Images/title_junk.png
 create mode 100644 SOGo/UI/Mailer/Images/title_read_14x14.png
 create mode 100644 SOGo/UI/Mailer/Images/title_sortdown_12x12.png
 create mode 100644 SOGo/UI/Mailer/Images/title_thread.png

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index e1539f59..e0696174 100644
--- 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 6c2c8cc4..444a7330 100644
--- 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
index 0000000000000000000000000000000000000000..d8af1b02f8111f6cbe5780644c8eb0c1c89b8729
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq000gE000gM0ssI2kSe-{0003ANkl<Zc-mt;
zeQYlSaexJl|LpmT+WNL@H*PR6FlcFNwlr2rN{B<Gn9!7#RW>LqE9~CBZuj<eiVAY&
zRSj?{Ml=VQS-TwBzm1KJje&vT*RNkTj$WsZ?m;)TqkAF)1H=FS{~_u+x+k)+vHk!5
zAFcqQbnW_0$i|~_vA7ivAVDd5U@<Z>{`&Rn|NsAtjEp#yGBPs${_|T)Q$4q!{6E8g
zZEcNTzkVZYKq!@z5I=n6_~ibMRckjeFffFN1|B+cOj=43u7Ei$IUd5|<>l$>oh&OW
z>*eXHqpf-P=*h0`2{~CQsw&D@qG0>3z4I0<dGh2L0|SGsjC4{$jE9>O&e*~O03SMD
U1bzfkrvLx|07*qoM6N<$f-{1TdH?_b

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/Images/title_config.png b/SOGo/UI/Mailer/Images/title_config.png
new file mode 100644
index 0000000000000000000000000000000000000000..34e76e068f64a293a5d06925d31b881fa1ef23fd
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3!JaOTAr-fhZEAD$nF|{_8#5f5
zg2Xsdv!3>Nv)*adnc=i7?A(c*lHiLj8>5_>R!(VUDDqI=9JxWN;aOM*n;S=~PP-bD
m`3yn-BTB#f8-hM5i!sEn){1s(>#+qI&*16m=d#Wzp$P!;M=a9-

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/Images/title_junk.png b/SOGo/UI/Mailer/Images/title_junk.png
new file mode 100644
index 0000000000000000000000000000000000000000..b62fec9ab62b4f67f4b0c5a8695b1a8d8dc94f51
GIT binary patch
literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000gE000gM0ssI2kSe-{0003eNkl<Zc-mt;
zeQYlSae#?|XuyKZ*|uZX(&ek~-G9Wuz@Vfk7abMu<?ez-X>(imp~J`Wa?%~_tQi;>
z4jei<Y4VJ7=PuS%7Na;|>-Jp-4<GyW`;V}Y5HBw;FE6jJx5u(2bB-K6zHP@Y6s3!n
ztSrpSY^txUtZhDa{1ik`NI)PvGiCA8RVYdyK6-3#Z*6aDg{IoU&icW_M<`1F|NjqR
zV5&wBEO|M(Lx+xHsy=x5n7o`UM4UM-Ii7)mfrEp6+KhQVUhW(m><kPH3i7f_iV8LL
zt!K`hOHWNuQ&mQo>g(-cW@;1>o3d@kuCL#|fBp9T>(?)=tSq)RmfoIj5H*a*5xaTo
yj-|_2-+%Ckk&#hBUN$Bw%*V?eF3U)hGynkEw0rbY95f{W0000<MNUMnLSTaYyq$&s

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/Images/title_read_14x14.png b/SOGo/UI/Mailer/Images/title_read_14x14.png
new file mode 100644
index 0000000000000000000000000000000000000000..31fc9c3e8895eabd7f1641b94057c873447d53ee
GIT binary patch
literal 297
zcmV+^0oMMBP)<h;3K|Lk000e1NJLTq000gE000gM0ssI2kSe-{0002+Nkl<Zc-mt;
zeQYlSae#?|XfP<0?%ci4-o<y%-UD#a|NsAI<&`*l1YWv)4MpjssWXEEeEKF$|MT|`
zMD)tF>z_V-DK5y&FRna${vt$>@$|91zyJJZWnqnuPh)0ge)sOZrlz`so%P$d?^sw^
zX3bsr`}d#zo>nsxBPIq0238hU1_lNPd+Wb{|4yCQ_4Vu5=`-hDx_ou=wAno!O}W`=
zO)XvM-s0!ylaiJc6cn^DH!Us7Wnp2KlarB`mHGMeCj$cm3tU}fM97H~XB}L8<z!_h
v^>v7fibREnghV8;va(f{=0n{&piuw-Kge33^OJ{K00000NkvXXu0mjfa_ETV

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/Images/title_sortdown_12x12.png b/SOGo/UI/Mailer/Images/title_sortdown_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a77d1eefa08729e071e549c55a2d46822200edb
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1SD^YpWXnZqCH(4Ln>}1+tlXhGb<iA;=rQd
zCCJ?pwWWqR?B$LV3@u72iW~+TOOg^2EQ)L74_T#TS~RRU@KUYAFhWL7T(aSf(GJ51
sACUT4hA+Av=sBCUH8wU*%u?iI@ckt%wwJ{z7-$WHr>mdKI;Vst0P7bn1poj5

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/Images/title_thread.png b/SOGo/UI/Mailer/Images/title_thread.png
new file mode 100644
index 0000000000000000000000000000000000000000..8762589ecb16f51ce4097b025fb8716bec544282
GIT binary patch
literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq000gE000gM0ssI2kSe-{0004INkl<Zc-mt;
zeQYlSaexKRx_ke@!o@4jo;&~U-3JB+24NvVBO`<O*a&4s1&9Jhh^e#ZEnK{Gm6wOB
zr@M=?iXsC8!`(agx9!-yednI|n26-WSg5HRw`^OzcGHsiGvwrC;g;y@>FDd}M1=>Z
zW)_HwiTHVYGBGeP%$>iqs=N?c9UREZ%T<&W%$>J{fq{XEfq~)W%U9;6#<+ZAW@_~E
z)oZ9yVPT;Q7q8$_x_93p8EHwV(%7i5){fp+uU})TyLjnJ-^A%f`PmE%49scC@wz%%
z&z`?%>+Jvj{fC5@C_g_RMBT>C+v*zION(=zo$L{T#lXOD;o_wQi<V!!eD&M6@5u?#
zX(<V|PTrII+YR*f(4)XWUvEOM9s>iz_Fa3YO`j7L75eATA4LTPxB@0j_j$TG>u76+
zMJBPav7I<|1}@H=mK=|%+QrG9kB|4pt=s?qGuYW$p+qb(004YWfsWV%F(3c{002ov
JPDHLkV1gki%!dE~

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/UIxMailEditor.wox b/SOGo/UI/Mailer/UIxMailEditor.wox
index a422928b..8d56b524 100644
--- 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 c9602911..a3d0ed69 100644
--- 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 b597ada1..a732baa9 100644
--- 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 a281cca1..8b283eb3 100644
--- 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 5283a744..8af0f0d4 100644
--- 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 38b59e2f..03b969e6 100644
--- 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",
-- 
2.39.5