From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 5 Oct 2004 16:20:51 +0000 (+0000)
Subject: started editor, added sorting in tableview, added onclick
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecb38bac072580b69497b2fd139a6d1383ada68e;p=scalable-opengroupware.org

started editor, added sorting in tableview, added onclick


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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index befb6164..3ee09841 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,15 @@
 2004-10-05  Helge Hess  <helge.hess@opengroupware.org>
 
+	* v0.9.23
+
+	* product.plist: fixed addressbook label
+	
+	* UIxMailToolbar: added support for 'onclick' event handlers
+	
+	* UIxMailEditor: started editor
+
+	* UIxMailListView.m: added sorting to table view
+
 	* v0.9.22
 
 	* UIxMailToolbar.wox: added support for 'target' links
diff --git a/SOGo/UI/Mailer/UIxMailEditor.wox b/SOGo/UI/Mailer/UIxMailEditor.wox
index 5ae767bc..a422928b 100644
--- a/SOGo/UI/Mailer/UIxMailEditor.wox
+++ b/SOGo/UI/Mailer/UIxMailEditor.wox
@@ -10,6 +10,39 @@
   title="name"
   const:hideFolderTree="1"
 >
+  <div id="compose_fromline">
+    From: abc
+  </div>
+
+  <div id="compose_toselection">
+    [repetition]<br />
+    <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>
+      </tr>
+    </table>
+  </div>
+
+  <div id="compose_subject">
+    Subject:
+    <input name="subject" type="text" style="width: 80%;"/>
+  </div>
+
+  <!-- separate line -->
+  <textarea style="width:100%;" name="content" />
+
   <h4>Mail Compose</h4>
   <!-- a rsrc:href="tbird_073_compose.png">screenshot</a -->
   <img rsrc:src="tbird_073_compose.png" alt="screenshot" />
diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index 99736d0c..1a15d327 100644
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -101,8 +101,13 @@
   NSString *sort;
   
   sort = [[[self context] request] formValueForKey:@"sort"];
+  [self logWithFormat:@"sort by: %@", sort];
+
+  // TODO: reversed sorts
   
-  return @"SUBJECT";
+  if ([sort length] == 0)
+    sort = @"SUBJECT";
+  return [sort uppercaseString];
 }
 
 - (NSRange)fetchRange {
diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index 2554e226..84a4dd4f 100644
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -12,8 +12,8 @@
   <div class="titlediv">
     <a rsrc:href="tbird_073_mailwelcome.png">View:</a>, <!-- TODO ;-) -->
     <select name="viewfilter">    <!-- var:popup? -->
-     <option value="all"   >All</option>
-     <option value="unread">Unread</option>
+      <option value="all"   >All</option>
+      <option value="unread">Unread</option>
     </select>
 
     Subject or Sender contains:
diff --git a/SOGo/UI/Mailer/UIxMailToolbar.wox b/SOGo/UI/Mailer/UIxMailToolbar.wox
index a625a2d4..09e715d8 100644
--- a/SOGo/UI/Mailer/UIxMailToolbar.wox
+++ b/SOGo/UI/Mailer/UIxMailToolbar.wox
@@ -12,7 +12,8 @@
       <var:foreach list="toolbarGroup" item="buttonInfo">
         <td class="tb_icon"
             ><a var:href="buttonInfo.link" var:target="buttonInfo.target"
-		var:class="buttonInfo.cssClass"></a></td>
+		var:class="buttonInfo.cssClass"
+                var:onclick="buttonInfo.onclick"></a></td>
       </var:foreach>
       <td class="tb_spacer"> </td>
     </var:foreach>
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 78237daf..8a19b3e3 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=22
+SUBMINOR_VERSION:=23
diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 1c95da26..5283a744 100644
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -291,3 +291,6 @@ img.mailer_imagecontent {
 }
 pre.mailer_plaincontent { 
 }
+
+/* compose */
+
diff --git a/SOGo/UI/Mailer/mailer.js b/SOGo/UI/Mailer/mailer.js
index 0edc186d..6236aa3d 100644
--- a/SOGo/UI/Mailer/mailer.js
+++ b/SOGo/UI/Mailer/mailer.js
@@ -19,7 +19,7 @@
 function clickedUid(sender, msguid) {
   var urlstr;
   
-  urlstr = msguid + "/view?noframe=1&markread=1";
+  urlstr = msguid + "/view?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")
@@ -41,3 +41,13 @@ function lowlightUid(sender, msguid) {
   // row.className="mailer_readmailsubject";
   return true;
 }
+
+function clickedCompose(sender) {
+  var urlstr;
+  
+  urlstr = "compose";
+  window.open(urlstr, "SOGo_compose",
+	      "width=680,height=480,resizable=1,scrollbars=1,toolbar=0," +
+	      "location=0,directories=0,status=0,menubar=0,copyhistory=0");
+  return false; /* stop following the link */
+}
diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index 7c2732e4..38b59e2f 100644
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -70,12 +70,13 @@
                 cssClass = "tbicon_getmail"; label = "Get Mail";
               },
               {
-                link  = "compose"; target = "_blank";
+                link     = "#"; // "compose"; // target = "_blank";
+                onclick  = "clickedCompose(this);return false;";
                 cssClass = "tbicon_compose"; label = "Write";
               },
               {
                 link  = "addressbook"; target = "addressbook";
-                cssClass = "tbicon_addressbook"; label = "Write";
+                cssClass = "tbicon_addressbook"; label = "Addressbook";
               }
             ),
             ( /* second group */
@@ -137,18 +138,12 @@
           protectedBy = "View";
           value = ( /* the toolbar groups */
             ( /* first group */
-              {
-                link  = "getMail";
-                cssClass = "tbicon_getmail"; label = "Get Mail";
-              },
-              {
-                link  = "compose"; target = "_blank";
-                cssClass = "tbicon_compose"; label = "Write";
-              },
-              {
-                link  = "addressbook"; target = "addressbook";
-                cssClass = "tbicon_addressbook"; label = "Write";
-              }
+              { link  = "getMail";
+                cssClass = "tbicon_getmail"; label = "Get Mail"; },
+              { link  = "compose"; target = "_blank";
+                cssClass = "tbicon_compose"; label = "Write"; },
+              { link  = "addressbook"; target = "addressbook";
+                cssClass = "tbicon_addressbook"; label = "Addressbook"; }
             ),
             ( /* second group */
               { link = "#"; 
@@ -205,10 +200,10 @@
           protectedBy = "View";
           value = ( /* the toolbar groups */
             ( /* first group */
-              {
-                link  = "getMail";
-                cssClass = "tbicon_getmail"; label = "Get Mail";
-              },
+              { link  = "getMail";
+                cssClass = "tbicon_getmail"; label = "Get Mail"; },
+              { link  = "addressbook"; target = "addressbook";
+                cssClass = "tbicon_addressbook"; label = "Addressbook"; }
             )
           );
         };
@@ -227,10 +222,10 @@
           protectedBy = "View";
           value = ( /* the toolbar groups */
             ( /* first group */
-              {
-                link  = "getMail";
-                cssClass = "tbicon_getmail"; label = "Get Mail";
-              },
+              { link  = "getMail";
+                cssClass = "tbicon_getmail"; label = "Get Mail"; },
+              { link  = "addressbook"; target = "addressbook";
+                cssClass = "tbicon_addressbook"; label = "Addressbook"; }
             )
           );
         };