From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 11 Oct 2004 20:06:38 +0000 (+0000)
Subject: work on mailer ui
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c9e3462795737911a0b3a60f24313dca2dd7850;p=scalable-opengroupware.org

work on mailer ui


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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 191c64c5..ec090689 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,12 @@
 2004-10-11  Helge Hess  <helge.hess@opengroupware.org>
 
+	* v0.9.30
+
+	* UIxMailEditor.wox: moved recipient selection to an own component
+	  (UIxMailToSelection)
+
+	* UIxMailMainFrame.wox: fixed script link
+
 	* v0.9.29
 
 	* product.plist: trigger UIxMailEditorAction for compose instead of
diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index bea9bcb5..4378a58f 100644
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -25,8 +25,10 @@ MailerUI_OBJC_FILES += \
 	UIxMailAccountView.m	\
 	UIxMailListView.m	\
 	UIxMailView.m		\
+	\
 	UIxMailEditor.m		\
 	UIxMailEditorAction.m	\
+	UIxMailToSelection.m	\
 	\
 	UIxMailPartViewer.m		\
 	UIxMailPartTextViewer.m		\
@@ -47,7 +49,9 @@ MailerUI_RESOURCE_FILES += \
 	UIxMailAccountView.wox	\
 	UIxMailListView.wox	\
 	UIxMailView.wox		\
+	\
 	UIxMailEditor.wox	\
+	UIxMailToSelection.wox	\
 	\
 	UIxMailPartTextViewer.wox	\
 	UIxMailPartMixedViewer.wox	\
diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index f509e069..47812e03 100644
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -48,4 +48,4 @@
 #endif
 }
 
-@end
+@end /* UIxMailEditor */
diff --git a/SOGo/UI/Mailer/UIxMailEditor.wox b/SOGo/UI/Mailer/UIxMailEditor.wox
index 8d56b524..f5c758c5 100644
--- a/SOGo/UI/Mailer/UIxMailEditor.wox
+++ b/SOGo/UI/Mailer/UIxMailEditor.wox
@@ -10,45 +10,39 @@
   title="name"
   const:hideFolderTree="1"
 >
+ <div id="compose_panel">
+<!-- we don't support multiple accounts ...
   <div id="compose_fromline">
     From:
-    <!-- always a popup on Thunderbird -->
+    [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">
-    [repetition]<br />
+    <var:component className="UIxMailToSelection"
+                   recipients="recipients" />
+  </div>
+
+  <div id="compose_subject">
     <table border="0" width="100%">
-    <!-- TODO: make repetition -->
-    <!-- TODO: form field needs to have an index -->
       <tr>
-        <td width="20%">
-          <!-- var:popup? -->
-          <select name="totype_00" style="width: 100%;">
-            <option value="to" >To:</option>
-            <option value="cc" >CC:</option>
-            <option value="bcc">BCC:</option>
-          </select>
-        </td>
-        <td width="80%">
-          <input name="email_00" type="text" style="width: 100%;"/>
+        <td class="compose_label" width="15%">
+          <a rsrc:href="tbird_073_compose.png">Subject:</a>
         </td>
+        <td width="85%"><input name="subject" 
+                               id="compose_subject_input" type="text" /></td>
       </tr>
     </table>
   </div>
 
-  <div id="compose_subject">
-    Subject:
-    <input name="subject" type="text" style="width: 80%;"/>
-  </div>
-
-  <!-- separate line -->
+  <!-- separator line -->
   <div id="compose_text">
-    <textarea style="width:100%;" name="content" />
+    <textarea name="content" />
   </div>
 
-  <!-- a rsrc:href="tbird_073_compose.png">screenshot</a -->
-  <img rsrc:src="tbird_073_compose.png" alt="screenshot" />
+  <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
+ </div>
 </var:component>
diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.wox b/SOGo/UI/Mailer/UIxMailMainFrame.wox
index 108b1021..ccd85102 100644
--- a/SOGo/UI/Mailer/UIxMailMainFrame.wox
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.wox
@@ -14,7 +14,7 @@
     <meta name="author" content="SKYRIX Software AG"/>
     <meta name="robots" content="stop"/>
     
-    <script rsrc:src="mailer.js" />
+    <script rsrc:src="mailer.js"> </script>
     
     <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
     <link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
diff --git a/SOGo/UI/Mailer/UIxMailToSelection.m b/SOGo/UI/Mailer/UIxMailToSelection.m
new file mode 100644
index 00000000..feecc73b
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailToSelection.m
@@ -0,0 +1,63 @@
+/*
+  Copyright (C) 2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id$
+
+#include <SOGoUI/UIxComponent.h>
+
+@interface UIxMailToSelection : UIxComponent
+{
+  unsigned currentFieldRowIndex;
+}
+
+@end
+
+#include "common.h"
+
+@implementation UIxMailToSelection
+
+/* accessors */
+
+- (void)setCurrentFieldRowIndex:(unsigned)_idx {
+  self->currentFieldRowIndex = _idx;
+}
+- (unsigned)currentFieldRowIndex {
+  return self->currentFieldRowIndex;
+}
+
+- (NSString *)typeFormName {
+  unsigned char buf[16];
+  sprintf(buf, "type_%d", [self currentFieldRowIndex]);
+  return [NSString stringWithCString:buf];
+}
+- (NSString *)mailFormName {
+  unsigned char buf[16];
+  sprintf(buf, "email_%d", [self currentFieldRowIndex]);
+  return [NSString stringWithCString:buf];
+}
+
+- (NSArray *)dummyList {
+  static NSArray *d = nil;
+  if (d == nil)
+    d = [[NSArray alloc] initWithObjects:@"0", @"1", @"2", nil];
+  return d;
+}
+
+@end /* UIxMailToSelection */
diff --git a/SOGo/UI/Mailer/UIxMailToSelection.wox b/SOGo/UI/Mailer/UIxMailToSelection.wox
new file mode 100644
index 00000000..51fd233b
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailToSelection.wox
@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="yes"?>
+<table
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  xmlns:so="http://www.skyrix.com/od/so-lookup"
+  border="0" width="100%"
+>
+  <var:foreach list="dummyList" item="currentFieldRowIndex">
+    <tr>
+      <td width="15%">
+        <select var:name="typeFormName" style="width: 100%;">
+          <option value="to" ><var:string label:value="To"/>:</option>
+          <option value="cc" ><var:string label:value="CC"/>:</option>
+          <option value="bcc"><var:string label:value="BCC"/>:</option>
+        </select>
+      </td>
+      <td width="85%">
+        <input var:name="mailFormName" type="text" style="width: 100%;"/>
+      </td>
+    </tr>
+  </var:foreach>
+</table>
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 3631f8fc..d5906740 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=29
+SUBMINOR_VERSION:=30
diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 07824347..81f56581 100644
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -138,9 +138,9 @@
 .tbicon_junk        { background-image: url(tbtb_trash.png);       }
 .tbicon_print       { background-image: url(tbtb_print.png);       }
 .tbicon_stop        { background-image: url(tbtb_deletedoc.png);   }
-
-/* TODO: add proper compose icons! */
-.tbicon_send        { background-image: url(tbtb_compose.png);   }
+.tbicon_send        { background-image: url(tbtb_compose_send_30x30.png);   }
+.tbicon_attach      { background-image: url(tbtb_compose_attach_30x30.png); }
+.tbicon_save        { background-image: url(tbtb_compose_file_30x30.png);   }
 
 /* mail tableview */
 
@@ -295,7 +295,7 @@ div.mailer_mailcontent {
   padding:          8px;
 }
 
-img.mailer_imagecontent { 
+img.mailer_imagecontent {
   border: 0px;
 }
 pre.mailer_plaincontent { 
@@ -303,15 +303,43 @@ pre.mailer_plaincontent {
 
 /* compose */
 
-div.compose_fromline { 
-  width: 98%;
+div#compose_panel div {
+  padding: 2px;
+}
+
+div#compose_fromline {
+}
+div#compose_toselection { 
+}
+div#compose_subject { 
+  border-bottom-color: #808080;
+  border-bottom-width: 1;
+  border-bottom-style: solid;
+}
+div#compose_text { 
+  border-top-color:    white;
+  border-top-width:    1;
+  border-top-style:    solid;
+}
+
+div#compose_toselection select { 
+  font-size: 10px;
 }
-div.compose_toselection { 
-  width: 98%;
+div#compose_toselection input { 
+  font-size: 10px;
 }
-div.compose_subject { 
-  width: 98%;
+
+input#compose_subject_input {
+  font-size: 10px;
+  width:     100%;
+}
+
+.compose_label { 
+  font-size:  11px;
+  text-align: left;
 }
-div.compose_text { 
-  width: 98%;
+
+div#compose_text textarea { 
+  width:  100%;
+  height: 280px;
 }
diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index 7c42053c..9c3382c3 100644
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -311,6 +311,10 @@
                 label = "Send"; },
               { link  = "contacts"; target = "addressbook";
                 cssClass = "tbicon_addressbook"; label = "Contacts"; },
+              { link  = "attach"; 
+                cssClass = "tbicon_attach"; label = "Attach"; },
+              { link  = "save"; 
+                cssClass = "tbicon_save"; label = "Save"; },
             )
           );
         };