diff options
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/addressbook/edit.inc | 13 | ||||
| -rw-r--r-- | program/steps/addressbook/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/addressbook/show.inc | 19 | ||||
| -rw-r--r-- | skins/default/addressbook.css | 7 |
5 files changed, 29 insertions, 13 deletions
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 59e396f2b..66f47f0dc 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -279,6 +279,7 @@ $labels['addcontact'] = 'Add new contact'; $labels['editcontact'] = 'Edit contact'; $labels['contacts'] = 'Contacts'; $labels['contactproperties'] = 'Contact properties'; +$labels['personalinfo'] = 'Personal information'; $labels['edit'] = 'Edit'; $labels['cancel'] = 'Cancel'; 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), ), ), ); diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css index 6e07281f7..ca92cd503 100644 --- a/skins/default/addressbook.css +++ b/skins/default/addressbook.css @@ -311,6 +311,11 @@ fieldset.contactfieldgroup { border: 0; margin: 0.5em 0; + padding: 0.2em 2px; +} + +fieldset.contactfieldgroupmulti +{ padding: 0.5em 2px; } @@ -322,7 +327,7 @@ fieldset.contactfieldgroup legend .contactfieldgroup .row { position: relative; - margin-bottom: 0.4em; + margin: 0.2em 0; } .contactfieldgroup .contactfieldlabel |