From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sat, 2 Oct 2004 22:56:43 +0000 (+0000)
Subject: more UI work
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6df4c213d339608d3bec557bfef09c3d8f92b206;p=scalable-opengroupware.org

more UI work


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

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 00000000..3889a73d
Binary files /dev/null and b/SOGo/UI/Mailer/Images/lori_32x32.png differ
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",