Changeset fbeb4689 in github

Timestamp:

Jan 21, 2011 12:41:05 PM (2 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ede1744

Parents:

26e76df

Message:

Better grouping of contact information

Files:

• program/localization/en_US/labels.inc (modified) (1 diff)
• program/steps/addressbook/edit.inc (modified) (1 diff)
• program/steps/addressbook/func.inc (modified) (1 diff)
• program/steps/addressbook/show.inc (modified) (1 diff)
• skins/default/addressbook.css (modified) (2 diffs)

program/localization/en_US/labels.inc

@@ -280 +280 @@
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
 
 $labels['edit']   = 'Edit';

program/steps/addressbook/edit.inc

@@ -96 +96 @@
             '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),

program/steps/addressbook/func.inc

@@ -498 +498 @@
                 
                 // 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);

program/steps/addressbook/show.inc

@@ -94 +94 @@
             '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),
             ),
         ),

skins/default/addressbook.css

@@ -312 +312 @@
         border: 0;
         margin: 0.5em 0;
+        padding: 0.2em 2px;
+}
+
+fieldset.contactfieldgroupmulti
+{
         padding: 0.5em 2px;
 }
@@ -323 +328 @@
 {
         position: relative;
-        margin-bottom: 0.4em;
+        margin: 0.2em 0;
 }