From 6df4c213d339608d3bec557bfef09c3d8f92b206 Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sat, 2 Oct 2004 22:56:43 +0000
Subject: [PATCH] more UI work

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@343 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/Mailer/ChangeLog             |   4 +++
 SOGo/UI/Mailer/GNUmakefile           |   2 ++
 SOGo/UI/Mailer/Images/lori_32x32.png | Bin 0 -> 2132 bytes
 SOGo/UI/Mailer/UIxMailListView.m     |  27 ++++++++++++++++-
 SOGo/UI/Mailer/UIxMailListView.wox   |  14 +++++++--
 SOGo/UI/Mailer/UIxMailMainFrame.wox  |  26 +++++++++++-----
 SOGo/UI/Mailer/Version               |   2 +-
 SOGo/UI/Mailer/mailer.css            |  16 ++++++----
 SOGo/UI/Mailer/mailer.js             |  43 +++++++++++++++++++++++++++
 SOGo/UI/Mailer/product.plist         |   5 +++-
 10 files changed, 121 insertions(+), 18 deletions(-)
 create mode 100644 SOGo/UI/Mailer/Images/lori_32x32.png
 create mode 100644 SOGo/UI/Mailer/mailer.js

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index ac900420..9c25d33e 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-03  Helge Hess  <helge.hess@opengroupware.org>
+
+	* UIxMailMainFrame.wox: made toolbar floating (v0.9.10)
+
 2004-10-02  Helge Hess  <helge.hess@opengroupware.org>
 
 	* more work on UI (v0.9.9)
diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index 8b621200..792eb63c 100644
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -41,12 +41,14 @@ MailerUI_RESOURCE_FILES += \
 MailerUI_RESOURCE_FILES += \
 	uix.css			\
 	mailer.css		\
+	mailer.js		\
 
 MailerUI_RESOURCE_FILES += \
 	screenshots/*.png	\
 	Images/tbtv_*.gif	\
 	Images/icon_*.gif	\
 	Images/tbtb_*.png	\
+	Images/lori_32x32.png	\
 
 MailerUI_LOCALIZED_RESOURCE_FILES += \
 	default.strings
diff --git a/SOGo/UI/Mailer/Images/lori_32x32.png b/SOGo/UI/Mailer/Images/lori_32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3889a73d88a40ff1f8991a831c9970439898ccb8
GIT binary patch
literal 2132
zcmV-a2&?yrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt007wo
zLe@{A00009a7bBm001mY001mY0i`{bsQ>@~By>esbW?9;ba!ELWdKoiX=7_tX>Da7
zHZC<TF(4>SVPhaqQy^F=081nI$^ZZW2XskIMF-Rh0u~_}%#;`C000NGNkl<Zc%1E4
zYm8K98Gg?F%*@Wt{jxJVyUbo#=yKT$R7wLap-s0U8nsj;w1Cy7#MW3zybD^Qsas5K
zY(**lsAytJt=f<nQd6)oO<R@*NVCGSyR$cTXK!=eIdjg;oH@Q{2rW>SmTE92zR8*0
z^PO|P_xYahd7t+K{>#DrCnxjye3AME3%X$#<BFn8e3WmPYYhs5AXin{TRDzv5=5ca
zZm;$V0&mrIT}URAvot=g=GD<cp)jav>PWFzoV)aG%c4d1D0%gHEw5~wnwmQHu>ep4
zfo0i%Ac`)l)#~Lr-p8;^gy)6D<#PEBMOB;34;hBhL{Xez8N5y4j%CuBql%J?wY9fD
z)89YvC7;*(*;s7wZ#N8J-j^AMb9+3itrqJyv$@=-=$_a%K%mTL;CVjnu-jju|Bt4#
z*<TYgy3ga@*x%p(`o{(!%d*embZ!y^aYLb4Y%A-!%K%tPEM5Js35JqFk|fOpl+WiS
zzu!NYn3-OcPN%1@HUGRKB<lV33!>lP1Yv((RkvuG)=Vq4Q*wbG^A{5WI{oN6hy|0O
zihfK+%;!W1k5nq<YHn`k;}a7{KQaUL_4S*IdbvB9OfBGft}^MBD+O|S9Y$G)#4|LB
zQ2|gQB=j9PNruD9p=<)AF-a8jq?3+#Jbw1-T>RAo(T0ZI(=)R_GU;@?U9XcMYqQyG
zgGs3wC0ebfmawu#!sDL_<F1uK*di`KEn{#ng}?k`9D5IqAdys1?XW>47P515mioHL
zHUjXS>uy0uXXg{Kq2WEjK;Q_<`WIwbO6L@1BY}}k0A}(s{rvo44}Q_zhSs)b$d($g
zWj9#C4NsjPx33T3+uH-k&t`D^WC{!~(AJc}3xa1Zn>|2tm9Gh4+4AKNo;rQz>BeYu
z|3Lrw2dW(o4^eoSgk&ccDzvLAC4a<$haYV~VayLzaX@E1C<#s!U;}4Zz}j43G~ljJ
zThM?s4*xw1i!33h<*R5v_S2Rq9{>;x)-)$lsiQ>G@6Vk(`xSF+K{Wd8`1nK{DZ28a
zq8hk&rG%e;KL91>fiC$V*!*DV;;aG4{xDcs##8%V!J?1@R?doLw`p)`D*p6F5^j#{
zMUwtXf*!sc0BipE{Qjr?KJTfap`o4Ty(G&H65t(VGL@G|SCC1E-8-tmCRpf<jVQIj
z;Hv<O2SUwCz}1Ey{_<VCI#dtuozEZ_FOgu}*mi#z9X2=4ue+Q5ZA;4^NZ>2301%Bv
z*UTnnSErK6t(vM<=poexsO%i%h82S;8w`RT4s}rxO2PmY1`LL+)E&!^j-?2CduP$x
zH;Q_fIfaNl2YUcFgWK+#L(k5yqH5h5Z0PC={<yRAWv|y;_Z|S*V%<rWd2n)avhUKM
zC`r7T+;li%A<hfpq|3%s>YQauG_Hdw(MFdGC~H~z;$39oy$IBVaPaxxROYCvGO**Z
z9vo`l3})?8V964oy&d<pw@13#+MalS3k)MPI55zCIW5^tW|oo{%u*CZq0erUPmfP)
zD4VZSQlpqA5IHb~Gz@hHNS;M*;!UjU+6;%sM>7~0g@#D42OXa$#=QYx^=j%=Es&a<
zu{99b60E7|tN_r<`eCZ`nacr`N~J`#-5w+BB?ViOR#`kgnJVJUX}b5ZDCH+fl?mwD
z42)bH#nC>j|3o!<jy#D6AO970eQh(mY!16@4J4pEP$-ajXsB2wU8}09gj>S3TPjsx
zwp6<Emjf_s)#vxMrqh{Qc~OX`5{ai+!Lt2yOcA$#(G4S&M@h?rGws(Xprqy?mI_$E
zG>=H;Rczgn!`pjCakn){I<Q{!=&31Sd>j}Zg*-NfH!h5`C#NP4a#tt66jTXmD*cC8
zQsMOU)DM;|xyAnGJFztpn+>b(t%f$4hF(m;pcOKuEVSGVEjEMj@&bB}#j*Q^Njxf&
zZe$W`o>rfj1t_rz03#!K=fVZycqX%N-fl>FnWlv;uhF4mtzIld$Uw3UO)W=a1LxMh
z_`N!8xZeq5D34^iK$T!t12rPnKq)BVkB?2`)-f`zf`(_E0f<o&y~P4*m7wlK0EW?>
z$tJ!vH|JsJ13=qgl!}GD^oMo1+^fkEv$27`jlMwm&!5{nibr-0L!nZ1FRX$yU@=SA
zbQ%&V2Swu1AhOsLw&8G`R{hpnz=;#U$&<jDGqe>GNJvtpJzw`sNZt@@ZEbDRw8G+4
zD)}<?dM%wwyciCJVki5JrO&-I=^8wrV}e!#z93m0uahG(m>J8X(38gEY7wWX7x<=9
zaLm!EO;IW=kQ8ws6n^cW$;3+^dLXge?e1tp<AKqU;azkde9uOyKgdp(dqt_t-6@Dt
zhr?2;Ul^7}pOZ`S95XP~SDN^)p?+Orbj!$a23wT(TYx#qCz}^;?>*o5!iVLrL`^8v
z+Su6GMdmawV<Z`p0((V!@9ON_eWKZ8?DIJd_2Mz2a&-rTgH{`Lts4n)L>mG4!1>{N
zK}p=dTi!VFlaSjOHBWJr{1jasOP6lBq2&Kge7Swep(n#m<19JG5G5y8_T9APW~^vx
z-1)PR(|C^KjC<PJ_TJRwW<)}v+aIW}IbR#Dedwkq|9|{X#J>Q?BUv>>{1EN{0000<
KMNUMnLSTXsn*2xr

literal 0
HcmV?d00001

diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index 3b256fea..f048f55a 100644
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -51,7 +51,6 @@
   [self->sortedUIDs release]; self->sortedUIDs = nil;
   [self->messages   release]; self->messages = nil;
   [self->message    release]; self->message  = nil;
-  [self logWithFormat:@"SLEEP"];
   [super sleep];
 }
 
@@ -205,6 +204,32 @@
 	     [self messageUidString]];
 }
 
+/* JavaScript */
+
+- (NSString *)msgRowID {
+  return [@"row_" stringByAppendingString:[self messageUidString]];
+}
+- (NSString *)msgDivID {
+  return [@"div_" stringByAppendingString:[self messageUidString]];
+}
+
+- (NSString *)clickedMsgJS {
+  return [NSString stringWithFormat:@"clickedUid(this, '%@')", 
+		     [self messageUidString]];
+}
+- (NSString *)dblClickedMsgJS {
+  return [NSString stringWithFormat:@"doubleClickedUid(this, '%@')", 
+		     [self messageUidString]];
+}
+- (NSString *)highlightRowJS {
+  return [NSString stringWithFormat:@"highlightUid(this, '%@')", 
+		     [self messageUidString]];
+}
+- (NSString *)lowlightRowJS {
+  return [NSString stringWithFormat:@"lowlightUid(this, '%@')", 
+		     [self messageUidString]];
+}
+
 /* actions */
 
 - (id)defaultAction {
diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index bed43b2b..5c8c2c02 100644
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -72,19 +72,27 @@
         </tr>
         
         <var:foreach list="messages" item="message">
-          <tr class="tableview">
+          <tr class="tableview" var:id="msgRowID">
             <td>
               <var:if condition="isMessageRead">
-                <div class="mailer_readmailsubject">
+                <div class="mailer_readmailsubject" var:id="msgDivID"
+                     var:onclick="clickedMsgJS"
+                     var:ondblclick="dblClickedMsgJS"
+                >
+                    <var:string value="message.envelope.subject"
+                                formatter="context.mailSubjectFormatter"/>
+<!--
                   <a var:href="messageViewURL" var:target="messageViewTarget">
                     <var:string value="message.envelope.subject"
                                 formatter="context.mailSubjectFormatter"/>
                   </a>
+-->
                 </div>
               </var:if>
               <var:if condition="isMessageRead" const:negate="YES">
                 <div class="mailer_unreadmailsubject">
-                  <a var:href="messageViewURL" var:target="messageViewTarget">
+                  <a var:href="messageViewURL" var:target="messageViewTarget"
+                     var:onclick="messageViewJS">
                     <var:string value="message.envelope.subject"
                                 formatter="context.mailSubjectFormatter"/>
                   </a>
diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.wox b/SOGo/UI/Mailer/UIxMailMainFrame.wox
index 100339b9..df7670cf 100644
--- a/SOGo/UI/Mailer/UIxMailMainFrame.wox
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.wox
@@ -9,22 +9,25 @@
     <title>
       <var:string value="title"/>
     </title>
+    
     <meta name="description" content="SOGo Web Interface"/>
     <meta name="author" content="SKYRIX Software AG"/>
     <meta name="robots" content="stop"/>
+    
+    <script rsrc:src="mailer.js" />
+    
     <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
     <link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
     <link href="mailto:info@skyrix.com" rev="made"/>
   </head>
 
   <body>
-    <table border="0" width="100%" cellspacing="0" cellpadding="2">
+    <table border="0" width="100%" cellspacing="0" cellpadding="2"
+           style="position: fixed; height: 48px; z-index: 100;"
+    >
+      <!-- this table is required for right alignment -->
       <tr>
         <td valign="top" class="vertframerow">
-<!--
-          Toolbar - different for the pages<br />
-          Mail:
--->
           <table border="0">
             <tr>
               <td class="tb_icon"
@@ -66,10 +69,19 @@
           </table>
         </td>
         <td align="right" width="80" class="vertframerow">
-          <!-- right: Thunderbird/OGo Icon? -->
-          SOGo
+          <table border="0">
+            <tr>
+              <td class="tb_icon" style="width: 36px; padding-right: 8px;"
+                  ><div class="tbicon_logo"> </div></td>
+            </tr>
+          </table>
         </td>
       </tr>
+    </table>
+    <div style="height: 58px; clear: both;"> </div> <!-- consume toolbar -->
+    
+    <table border="0" width="100%" cellspacing="0" cellpadding="2"
+    >
       <tr class="vertframerow">
         <td width="100%" valign="top" class="vertframerow" colspan="2">
           <var:if condition="hideFolderTree">
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 81be7eb6..317960a7 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10
diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 29cfbfa6..6a0d63e0 100644
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -102,26 +102,32 @@
   padding-right: 16px;
 }
 
-td.tb_icon {
+.tb_icon {
   text-align: center;
 }
-td.tb_label {
-  font-size:   9pt;
+.tb_label {
+  font-size:   11px;
   font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
   color:       #000000;
   text-align:  center;
 }
-td.tb_spacer { 
+.tb_spacer { 
   width: 16px;
 }
 
-td.tb_icon a {
+.tb_icon a {
   width:   30px;
   height:  30px;
   margin:  0px auto;
   display: block;
 }
 
+.tbicon_logo {
+  background-image: url(lori_32x32.png);
+  width:  32px;
+  height: 32px;
+}
+
 .tbicon_getmail     { background-image: url(tbtb_getmail.png);     }
 .tbicon_compose     { background-image: url(tbtb_compose.png);     }
 .tbicon_addressbook { background-image: url(tbtb_addressbook.png); }
diff --git a/SOGo/UI/Mailer/mailer.js b/SOGo/UI/Mailer/mailer.js
new file mode 100644
index 00000000..0edc186d
--- /dev/null
+++ b/SOGo/UI/Mailer/mailer.js
@@ -0,0 +1,43 @@
+/* JavaScript for SOGo Mailer */
+
+/*
+  window.open('url to open','window name','attribute1,attribute2')
+  window.open('http://www.pageresource.com/jscript/jex5.htm','mywindow',
+              'width=400,height=200')
+
+  width,height
+  resizable=yes or no
+  scrollbars=yes or no
+  toolbar=yes or no
+  location=yes or no
+  directories=yes or no
+  status=yes or no
+  menubar=yes or no
+  copyhistory=yes or no
+*/
+
+function clickedUid(sender, msguid) {
+  var urlstr;
+  
+  urlstr = msguid + "/view?noframe=1&markread=1";
+  window.open(urlstr, "SOGo_msg_" + msguid,
+	      "width=680,height=480,resizable=1,scrollbars=1,toolbar=0," +
+	      "location=0,directories=0,status=0,menubar=0,copyhistory=0")
+  return true;
+}
+function doubleClickedUid(sender, msguid) {
+  alert("DOUBLE Clicked " + msguid);
+
+  return false;
+}
+
+function highlightUid(sender, msguid) {
+  // var row = document.getElementById(msguid);
+  // row.className="mailer_readmailsubject_high";
+  return true;
+}
+function lowlightUid(sender, msguid) {
+  // var row = document.getElementById(msguid);
+  // row.className="mailer_readmailsubject";
+  return true;
+}
diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index 6ce95d4a..01e2f9a5 100644
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -4,7 +4,10 @@
   publicResources = (
     "uix.css",
     "mailer.css",
-
+    "mailer.js",
+    
+    "lori_32x32.png",
+    
     "tbtv_account_17x17.gif",
     "tbtv_drafts_17x17.gif",
     "tbtv_inbox_17x17.gif",
-- 
2.39.5