From fbeb46890421b11736794f52ce96018d77f37595 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 21 Jan 2011 17:41:05 +0000
Subject: Better grouping of contact information

---
 program/steps/addressbook/edit.inc | 13 +++++++++----
 program/steps/addressbook/func.inc |  2 +-
 program/steps/addressbook/show.inc | 19 ++++++++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'program/steps')

diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 747e12a3f..004267961 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -95,15 +95,20 @@ function rcmail_contact_editform($attrib)
         'info' => array(
             'name'    => rcube_label('contactproperties'),
             'content' => array(
-                'gender' => array('visible' => false),
-                'maidenname' => array('size' => $i_size),
                 'email' => array('size' => $i_size, 'visible' => true),
                 'phone' => array('size' => $i_size, 'visible' => true),
                 'address' => array('visible' => true),
-                'birthday' => array('size' => 12),
-                'anniversary' => array('size' => $i_size),
                 'website' => array('size' => $i_size),
                 'im' => array('size' => $i_size),
+            ),
+        ),
+        'personal' => array(
+            'name'    => rcube_label('personalinfo'),
+            'content' => array(
+                'gender' => array('visible' => true),
+                'maidenname' => array('size' => $i_size),
+                'birthday' => array('visible' => true),
+                'anniversary' => array('size' => $i_size),
                 'manager' => array('size' => $i_size),
                 'assistant' => array('size' => $i_size),
                 'spouse' => array('size' => $i_size),
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index e9b3dc8f2..900d4a8d5 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -497,7 +497,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
                 }
                 
                 // wrap rows in fieldgroup container
-                $content .= html::tag('fieldset', array('class' => 'contactfieldgroup contactcontroller' . $col, 'style' => ($rows ? null : 'display:none')),
+                $content .= html::tag('fieldset', array('class' => 'contactfieldgroup ' . ($colprop['subtypes'] ? 'contactfieldgroupmulti ' : '') . 'contactcontroller' . $col, 'style' => ($rows ? null : 'display:none')),
                   ($colprop['subtypes'] ? html::tag('legend', null, Q($colprop['label'])) : ' ') .
                   $rows);
             }
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index eb26450e6..4823707b2 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -93,18 +93,23 @@ function rcmail_contact_details($attrib)
         'info' => array(
             'name'    => rcube_label('contactproperties'),
             'content' => array(
-              'gender' => array('size' => $i_size),
-              'maidenname' => array('size' => $i_size),
               'email' => array('size' => $i_size, 'render_func' => 'rcmail_render_email_value'),
               'phone' => array('size' => $i_size),
               'address' => array(),
-              'birthday' => array('size' => $i_size),
-              'anniversary' => array('size' => $i_size),
               'website' => array('size' => $i_size, 'render_func' => 'rcmail_render_url_value'),
               'im' => array('size' => $i_size),
-              'manager' => array('size' => $i_size),
-              'assistant' => array('size' => $i_size),
-              'spouse' => array('size' => $i_size),
+            ),
+        ),
+        'personal' => array(
+            'name'    => rcube_label('personalinfo'),
+            'content' => array(
+                'gender' => array('size' => $i_size),
+                'maidenname' => array('size' => $i_size),
+                'birthday' => array('size' => $i_size),
+                'anniversary' => array('size' => $i_size),
+                'manager' => array('size' => $i_size),
+                'assistant' => array('size' => $i_size),
+                'spouse' => array('size' => $i_size),
             ),
         ),
     );
-- 
cgit v1.2.3