From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 14 Feb 2005 22:41:47 +0000 (+0000)
Subject: work on mail contacts editor
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a2b97456afdcb0df42976e83459f492690db321;p=scalable-opengroupware.org

work on mail contacts editor


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

diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog
index 0ca1d311..27a4beb2 100644
--- a/SOGo/UI/Contacts/ChangeLog
+++ b/SOGo/UI/Contacts/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-14  Helge Hess  <helge.hess@opengroupware.org>
 
+	* UIxContactEditor.m: moved header file to own file (v0.9.21)
+
 	* UIxContactsListView.m: added ability in code to sort descending if
 	  the desc=1 query parameter is set (v0.9.20)
 
diff --git a/SOGo/UI/Contacts/UIxContactEditor.h b/SOGo/UI/Contacts/UIxContactEditor.h
new file mode 100644
index 00000000..535b297d
--- /dev/null
+++ b/SOGo/UI/Contacts/UIxContactEditor.h
@@ -0,0 +1,33 @@
+/*
+  Copyright (C) 2004-2005 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.
+*/
+
+#include <SOGoUI/UIxComponent.h>
+
+@class NSMutableDictionary;
+
+@interface UIxContactEditor : UIxComponent
+{
+  NSString *contentString;
+  NSString *errorText;
+  NSMutableDictionary *snapshot; /* contains the values for editing */
+}
+
+@end
diff --git a/SOGo/UI/Contacts/UIxContactEditor.m b/SOGo/UI/Contacts/UIxContactEditor.m
index 9127ad2b..674141f6 100644
--- a/SOGo/UI/Contacts/UIxContactEditor.m
+++ b/SOGo/UI/Contacts/UIxContactEditor.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2004 SKYRIX Software AG
+  Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.
 
@@ -18,22 +18,8 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
-
-
-#include <SOGoUI/UIxComponent.h>
-
-@class NSMutableDictionary;
-
-@interface UIxContactEditor : UIxComponent
-{
-  NSString *contentString;
-  NSString *errorText;
-  NSMutableDictionary *snapshot; /* contains the values for editing */
-}
-
-@end
 
+#include "UIxContactEditor.h"
 #include <Contacts/SOGoContactObject.h>
 #include <Contacts/SOGoContactFolder.h>
 #include "common.h"
diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version
index da289815..7bdce601 100644
--- a/SOGo/UI/Contacts/Version
+++ b/SOGo/UI/Contacts/Version
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
-SUBMINOR_VERSION:=20
+SUBMINOR_VERSION:=21
 
 # v0.9.18 requires NGExtensions v4.5.136
 # v0.9.16 requires libSOGoUI    v0.9.16
diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 0119aa6f..9bcebc59 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,9 +1,11 @@
 2005-02-14  Helge Hess  <helge.hess@opengroupware.org>
 
-	* UIxMailTree.m: always stop tree on user folder (v0.9.108)
+	* mailer.js: use 'tb.view' instead of 'view' to show a page (v0.9.109)
 
+	* UIxMailTree.m: always stop tree on user folder (v0.9.108)
+	
 	* v0.9.107
-
+	
 	* product.plist: mapped 'namespaced' "tb.view" SOPE method to the same
 	  methods like "view". This allows us to use "tb.view" inside the
 	  mailer without clashing with other UIs on top of the same SoObjects
diff --git a/SOGo/UI/Mailer/UIxSieveEditor.wox b/SOGo/UI/Mailer/UIxSieveEditor.wox
index d3d7fcfa..56f4f502 100644
--- a/SOGo/UI/Mailer/UIxSieveEditor.wox
+++ b/SOGo/UI/Mailer/UIxSieveEditor.wox
@@ -10,24 +10,24 @@
   title="panelTitle"
   const:hideFolderTree="1"
 >
- <div id="compose_panel">
-  <div id="compose_subject">
-    <table border="0" width="100%">
-      <tr>
-        <td class="compose_label" width="15%">
-          <!-- TODO: localize -->
-          Scriptname:
-        </td>
-        <td width="85%"><input name="scriptName" 
-                               id="compose_subject_input" type="text" 
-			       var:value="scriptName" /></td>
-      </tr>
-    </table>
+  <div id="compose_panel">
+    <div id="compose_subject">
+      <table border="0" width="100%">
+        <tr>
+          <td class="compose_label" width="15%">
+            <!-- TODO: localize -->
+            <var:string label:value="Scriptname"/>:
+          </td>
+          <td width="85%"><input name="scriptName" 
+                                 id="compose_subject_input" type="text" 
+  			       var:value="scriptName" /></td>
+        </tr>
+      </table>
+    </div>
+  
+    <!-- separator line -->
+    <div id="compose_text">
+      <textarea name="scriptContent" var:value="scriptText" />
+    </div>
   </div>
-
-  <!-- separator line -->
-  <div id="compose_text">
-    <textarea name="scriptContent" var:value="scriptText" />
-  </div>
- </div>
 </var:component>
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index d70070fe..86b9dc03 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=108
+SUBMINOR_VERSION:=109
 
 # v0.9.100 requires libNGMime        v4.5.213
 # v0.9.99  requires libNGMime        v4.5.212
diff --git a/SOGo/UI/Mailer/mailer.js b/SOGo/UI/Mailer/mailer.js
index 0a4f06cc..c7b2711e 100644
--- a/SOGo/UI/Mailer/mailer.js
+++ b/SOGo/UI/Mailer/mailer.js
@@ -23,7 +23,7 @@ function openMessageWindow(sender, msguid, url) {
 
 function clickedUid(sender, msguid) {
   resetSelection(window);
-  openMessageWindow(sender, msguid, msguid + "/view");
+  openMessageWindow(sender, msguid, msguid + "/tb.view");
   return true;
 }
 function doubleClickedUid(sender, msguid) {
diff --git a/SOGo/UI/MailerContacts/ChangeLog b/SOGo/UI/MailerContacts/ChangeLog
index 083d2403..e16ebd0c 100644
--- a/SOGo/UI/MailerContacts/ChangeLog
+++ b/SOGo/UI/MailerContacts/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-14  Helge Hess  <helge.hess@opengroupware.org>
 
+	* work on contact editor (v0.9.2)
+
 	* UIxMailContactList.wox: use sortable mail header component from 
 	  MailerUI (need to copy some images until the resource lookup in SOPE
 	  is improved to properly span multiple products)
diff --git a/SOGo/UI/MailerContacts/GNUmakefile b/SOGo/UI/MailerContacts/GNUmakefile
index c9645e7e..705ded19 100644
--- a/SOGo/UI/MailerContacts/GNUmakefile
+++ b/SOGo/UI/MailerContacts/GNUmakefile
@@ -11,7 +11,8 @@ MailerContactsUI_LANGUAGES = English French
 MailerContactsUI_OBJC_FILES += \
 	MailerContactsUIProduct.m	\
 	\
-	UIxMailContactList.m
+	UIxMailContactList.m	\
+	UIxMailContactEditor.m	\
 
 MailerContactsUI_RESOURCE_FILES += \
 	Version			\
@@ -19,7 +20,10 @@ MailerContactsUI_RESOURCE_FILES += \
 
 MailerContactsUI_RESOURCE_FILES += \
 	UIxMailContactList.wox	\
-	\
+	UIxMailContactEditor.wox\
+
+MailerContactsUI_RESOURCE_FILES += \
+	mailercontacts.js	\
 	Images/title_*
 
 MailerContactsUI_LOCALIZED_RESOURCE_FILES +=
diff --git a/SOGo/UI/MailerContacts/UIxMailContactEditor.m b/SOGo/UI/MailerContacts/UIxMailContactEditor.m
new file mode 100644
index 00000000..30f3f11e
--- /dev/null
+++ b/SOGo/UI/MailerContacts/UIxMailContactEditor.m
@@ -0,0 +1,38 @@
+/*
+  Copyright (C) 2005 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.
+*/
+
+#include <UI/Contacts/UIxContactEditor.h>
+
+@interface UIxMailContactEditor : UIxContactEditor
+{
+}
+
+@end
+
+#include "common.h"
+
+@implementation UIxMailContactEditor
+
+- (NSString *)panelTitle {
+  return [self labelForKey:@"Edit Contact"];
+}
+
+@end /* UIxMailContactEditor */
diff --git a/SOGo/UI/MailerContacts/UIxMailContactEditor.wox b/SOGo/UI/MailerContacts/UIxMailContactEditor.wox
new file mode 100644
index 00000000..f0f0773d
--- /dev/null
+++ b/SOGo/UI/MailerContacts/UIxMailContactEditor.wox
@@ -0,0 +1,181 @@
+<?xml version='1.0' standalone='yes'?>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxMailMainFrame"
+  title="panelTitle"
+  const:hideFolderTree="1"
+>
+  <style>
+td.ce_label {
+  font-size:      11px;
+  text-align:     left;
+  vertical-align: top;
+  width:          60pt;
+}
+td.ce_field {
+  vertical-align: top;
+}
+td.ce_field input {
+  font-size: 10px;
+  width:     100%;
+}
+td.ce_field textarea {
+  font-size: 10px;
+  width:     100%;
+}
+
+div.ce_group {
+/*
+  border-top-color:    white;
+  border-top-width:    1;
+  border-top-style:    solid;
+  border-bottom-color: #808080;
+  border-bottom-width: 1;
+  border-bottom-style: solid;
+*/
+}
+
+div.ce_group table {
+  border-width: 0px;
+  width:        100%;
+}
+
+table.ce_vertgroup {
+  border-width: 0px;
+  width:        100%;
+}
+table.ce_vertgroup td.ce_twocolcell {
+  width:          50%;
+  vertical-align: top;
+}
+  </style>
+
+  <div id="compose_panel">
+<table class="ce_vertgroup" cellpadding="0" cellspacing="0">
+ <tr>
+  <td class="ce_twocolcell">
+
+    <div id="contacteditor_common" class="ce_group">
+      <table>
+        <tr>
+          <td class="ce_label"><var:string label:value="Lastname"/>:</td>
+          <td class="ce_field">
+            <input type="text" name="sn" id="sn"
+                   var:value="snapshot.sn" />
+	  </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="Firstname"/>:</td>
+          <td class="ce_field">
+            <input type="text" name="givenName" id="givenName"
+                   var:value="snapshot.givenName" />
+	  </td>
+        </tr>
+      </table>
+    </div>
+
+    <div id="contacteditor_phone" class="ce_group">
+      <table>
+        <tr>
+          <td class="ce_label"><var:string label:value="OfficePhone" />:</td>
+          <td class="ce_field">
+            <input type="text" name="telephoneNumber" id="telephoneNumber"
+                   var:value="snapshot.telephoneNumber" />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="HomePhone" />:</td>
+          <td class="ce_field">
+            <input type="text"
+                   name="homeTelephoneNumber" id="homeTelephoneNumber"
+                   var:value="snapshot.homeTelephoneNumber" />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="MobilePhone" />:</td>
+          <td class="ce_field">
+                  <!-- pamela.schema defines this as 'mobile',
+                       NOT 'mobileTelephoneNumber'
+                  -->
+                  <input type="text"
+                         name="mobile"
+                         id="mobile"
+                         var:value="snapshot.mobile"
+                  />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="Fax" />:</td>
+          <td class="ce_field">
+            <input type="text"
+                   name="facsimileTelephoneNumber"
+                   id="facsimileTelephoneNumber"
+                   var:value="snapshot.facsimileTelephoneNumber" />
+          </td>
+        </tr>
+      </table>
+    </div>
+  </td>
+  <td class="ce_twocolcell">
+    <div id="contacteditor_address" class="ce_group">
+          <table border="0" cellpadding="2" cellspacing="0" class="editsec">
+        <tr>
+          <td class="ce_label"><var:string label:value="Postal" />:</td>
+          <td class="ce_field">
+            <textarea name="postalAddress" id="postalAddress"
+                      rows="3" cols="60" wrap="physical"
+                      var:value="snapshot.postalAddress" />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="Home" />:</td>
+          <td class="ce_field">
+            <textarea name="homePostalAddress" id="homePostalAddress"
+                      rows="3" cols="60" wrap="physical"
+                      var:value="snapshot.homePostalAddress" />
+          </td>
+        </tr>
+      </table>
+    </div>
+  </td>
+ </tr>
+</table>
+
+    <div id="contacteditor_extended" class="ce_group">
+          <table border="0" cellpadding="2" cellspacing="0" class="editsec">
+        <tr>
+          <td class="ce_label"><var:string label:value="EMail" />:</td>
+          <td class="ce_field">
+            <input type="text" name="mail" id="email" 
+                   var:value="snapshot.mail" />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="Unit" />:</td>
+          <td class="ce_field">
+            <input type="text" name="departmentNumber" id="departmentNumber"
+                   var:value="snapshot.departmentNumber" />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="Location" />:</td>
+          <td class="ce_field">
+            <input type="text" name="l" id="l" var:value="snapshot.l" />
+          </td>
+        </tr>
+        <tr>
+          <td class="ce_label"><var:string label:value="URL" />:</td>
+          <td class="ce_field">
+            <input type="text" name="labeledURI" 
+                   var:value="snapshot.labeledURI" />
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</var:component>
diff --git a/SOGo/UI/MailerContacts/UIxMailContactList.m b/SOGo/UI/MailerContacts/UIxMailContactList.m
index b0799e86..16e65637 100644
--- a/SOGo/UI/MailerContacts/UIxMailContactList.m
+++ b/SOGo/UI/MailerContacts/UIxMailContactList.m
@@ -33,4 +33,18 @@
 
 @implementation UIxMailContactList
 
+/* title */
+
+- (NSString *)objectTitle {
+  return [[self clientObject] nameInContainer];
+}
+- (NSString *)panelTitle {
+  NSString *s;
+  
+  s = [self labelForKey:@"View Contacts Folder"];
+  s = [s stringByAppendingString:@": "];
+  s = [s stringByAppendingString:[self objectTitle]];
+  return s;
+}
+
 @end /* UIxMailContactList */
diff --git a/SOGo/UI/MailerContacts/UIxMailContactList.wox b/SOGo/UI/MailerContacts/UIxMailContactList.wox
index b360b20e..b86f4605 100644
--- a/SOGo/UI/MailerContacts/UIxMailContactList.wox
+++ b/SOGo/UI/MailerContacts/UIxMailContactList.wox
@@ -21,6 +21,9 @@
                                var:queryDictionary="queryParameters"
 -->
 
+  <script language="JavaScript" rsrc:src="mailercontacts.js">
+  </script>
+
   <table class="titletable" cellspacing="0" cellpadding="0">
     <tr>
       <td class="titlecell">
@@ -81,9 +84,14 @@
 
         <!-- actual table contents -->
         <var:foreach list="contactInfos" item="contact">
-          <tr class="tableview">
+          <tr class="tableview" var:id="contact.cName">
             <td class="mailer_listcell_regular">
+<!--
               <a var:href="contact.cName"><var:string value="contact.sn" /></a>
+-->
+              <a var:href="#" 
+                 onclick="openContact(this, this.parentNode.parentNode.id); return false"
+                 ><var:string value="contact.sn" /></a>
             </td>
             <td><var:string value="contact.givenname"       /></td>
             <td><var:string value="contact.mail"            /></td>
diff --git a/SOGo/UI/MailerContacts/Version b/SOGo/UI/MailerContacts/Version
index 93f90d16..ed045adf 100644
--- a/SOGo/UI/MailerContacts/Version
+++ b/SOGo/UI/MailerContacts/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=1
+SUBMINOR_VERSION:=2
diff --git a/SOGo/UI/MailerContacts/mailercontacts.js b/SOGo/UI/MailerContacts/mailercontacts.js
new file mode 100644
index 00000000..6377858a
--- /dev/null
+++ b/SOGo/UI/MailerContacts/mailercontacts.js
@@ -0,0 +1,8 @@
+//
+
+function openContact(sender, addruid) {
+  window.open(addruid + "/tb.edit", 'SOGo_addr_' + addruid,
+	   'width=640,height=480,resizable=1,scrollbars=1,toolbar=0,' +
+	   'location=0,directories=0,status=0,menubar=0,copyhistory=0')
+  return false;
+}
diff --git a/SOGo/UI/MailerContacts/product.plist b/SOGo/UI/MailerContacts/product.plist
index 66de93cf..bf580387 100644
--- a/SOGo/UI/MailerContacts/product.plist
+++ b/SOGo/UI/MailerContacts/product.plist
@@ -4,6 +4,7 @@
   publicResources = (
     "title_sortdown_12x12.png",
     "title_sortup_12x12.png",
+    "mailercontacts.js"
   );
 
   factories = {
@@ -17,7 +18,7 @@
           value = ( /* the toolbar groups */
             ( /* first group */
               {
-                link  = "getMail";
+                link  = "#"; // no-op
                 cssClass = "tbicon_getmail"; label = "Get Mail";
               },
               {
@@ -25,6 +26,10 @@
                 // onclick  = "clickedCompose(this);return false;";
                 cssClass = "tbicon_compose"; label = "New Contact";
               },
+/* enable if we actually can do that
+              { link  = "tb.compose"; target = "_blank";
+                cssClass = "tbicon_compose"; label = "Write"; },
+*/
             ),
           );
         };
@@ -34,6 +39,35 @@
           protectedBy = "View";
           pageName    = "UIxMailContactList"; 
         };
+        "tb.compose" = {
+          protectedBy = "View";
+          actionClass = "UIxMailEditorAction"; 
+          actionName  = "compose";
+        };
+      };
+    };
+
+    SOGoContactObject = {
+      slots = {
+        toolbar = {
+          protectedBy = "View";
+          value = ( /* the toolbar groups */
+            ( /* first group */
+              { link  = "#"; 
+                onclick  = "clickedEditorSave(this);return false;";
+                cssClass = "tbicon_save"; label = "Save"; },
+              { link = "#"; 
+                onclick  = "clickedEditorDelete(this);return false;";
+                cssClass = "tbicon_delete"; label = "Delete"; },
+            )
+          );
+        };
+      };
+      methods = {
+        "tb.edit" = { 
+          protectedBy = "View";
+          pageName    = "UIxMailContactEditor"; 
+        };
       };
     };
   };