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

some work on mailer contacts


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

diff --git a/SOGo/UI/MailerContacts/ChangeLog b/SOGo/UI/MailerContacts/ChangeLog
index e16ebd0c..f2b137b2 100644
--- a/SOGo/UI/MailerContacts/ChangeLog
+++ b/SOGo/UI/MailerContacts/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-15  Helge Hess  <helge.hess@opengroupware.org>
+
+	* UIxMailContactEditor.m: added object title (v0.9.3)
+
 2005-02-14  Helge Hess  <helge.hess@opengroupware.org>
 
 	* work on contact editor (v0.9.2)
diff --git a/SOGo/UI/MailerContacts/UIxMailContactEditor.m b/SOGo/UI/MailerContacts/UIxMailContactEditor.m
index 30f3f11e..e241cd09 100644
--- a/SOGo/UI/MailerContacts/UIxMailContactEditor.m
+++ b/SOGo/UI/MailerContacts/UIxMailContactEditor.m
@@ -31,8 +31,24 @@
 
 @implementation UIxMailContactEditor
 
+/* title */
+
+- (NSString *)objectTitle {
+  NSString *l, *f;
+  
+  l = [self valueForKeyPath:@"snapshot.sn"];
+  f = [self valueForKeyPath:@"snapshot.givenName"];
+  if ([f length] == 0) return l;
+  if ([l length] == 0) return f;
+  return [[l stringByAppendingString:@", "] stringByAppendingString:f];
+}
 - (NSString *)panelTitle {
-  return [self labelForKey:@"Edit Contact"];
+  NSString *s;
+  
+  s = [self labelForKey:@"Edit Contact"];
+  s = [s stringByAppendingString:@": "];
+  s = [s stringByAppendingString:[self objectTitle]];
+  return s;
 }
 
 @end /* UIxMailContactEditor */
diff --git a/SOGo/UI/MailerContacts/UIxMailContactList.wox b/SOGo/UI/MailerContacts/UIxMailContactList.wox
index b86f4605..e49a72fc 100644
--- a/SOGo/UI/MailerContacts/UIxMailContactList.wox
+++ b/SOGo/UI/MailerContacts/UIxMailContactList.wox
@@ -84,15 +84,10 @@
 
         <!-- actual table contents -->
         <var:foreach list="contactInfos" item="contact">
-          <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>
+          <tr class="tableview" var:id="contact.cName"
+              onclick="openContact(this, this.id)"
+          >
+            <td><var:string value="contact.sn"              /></td>
             <td><var:string value="contact.givenname"       /></td>
             <td><var:string value="contact.mail"            /></td>
             <td><var:string value="contact.telephonenumber" /></td>
diff --git a/SOGo/UI/MailerContacts/Version b/SOGo/UI/MailerContacts/Version
index ed045adf..81d0f5a4 100644
--- a/SOGo/UI/MailerContacts/Version
+++ b/SOGo/UI/MailerContacts/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=3
diff --git a/SOGo/UI/MailerContacts/mailercontacts.js b/SOGo/UI/MailerContacts/mailercontacts.js
index 70c00672..48863a0d 100644
--- a/SOGo/UI/MailerContacts/mailercontacts.js
+++ b/SOGo/UI/MailerContacts/mailercontacts.js
@@ -21,8 +21,11 @@
 /* JavaScript code for SOGo MailerUI contacts */
 
 function openContact(sender, addruid) {
-  window.open(addruid + "/tb.edit", 'SOGo_addr_' + addruid,
-	   'width=540,height=320,resizable=1,scrollbars=1,toolbar=0,' +
-	   'location=0,directories=0,status=0,menubar=0,copyhistory=0')
+  var w;
+  
+  w = window.open(addruid + "/tb.edit", 'SOGo_addr_' + addruid,
+		  'width=540,height=320,resizable=1,scrollbars=1,toolbar=0,' +
+		  'location=0,directories=0,status=0,menubar=0,copyhistory=0');
+  w.focus();
   return false;
 }