Add newlines between organization, department, jobtitle (#1488028)

release-0.6
thomascube 13 years ago
parent f2ff370215
commit 31737295b8

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Add newlines between organization, department, jobtitle (#1488028)
- Recalculate date when replying to a message and localize the cite header (#1487675) - Recalculate date when replying to a message and localize the cite header (#1487675)
- Fix XSS vulnerability in UI messages (#1488030) - Fix XSS vulnerability in UI messages (#1488030)
- Fix handling of email addresses with quoted local part (#1487939) - Fix handling of email addresses with quoted local part (#1487939)

@ -95,9 +95,9 @@ function rcmail_contact_edithead($attrib)
'suffix' => array('size' => $i_size), 'suffix' => array('size' => $i_size),
'name' => array('size' => 2*$i_size), 'name' => array('size' => 2*$i_size),
'nickname' => array('size' => 2*$i_size), 'nickname' => array('size' => 2*$i_size),
'company' => array('size' => $i_size), 'organization' => array('size' => 2*$i_size),
'department' => array('size' => $i_size), 'department' => array('size' => 2*$i_size),
'jobtitle' => array('size' => $i_size), 'jobtitle' => array('size' => 2*$i_size),
) )
) )
); );

@ -32,8 +32,8 @@ $CONTACT_COLTYPES = array(
'suffix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'), 'suffix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'),
'nickname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('nickname'), 'category' => 'main'), 'nickname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('nickname'), 'category' => 'main'),
'jobtitle' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('jobtitle'), 'category' => 'main'), 'jobtitle' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('jobtitle'), 'category' => 'main'),
'organization' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('organization'), 'category' => 'main'), 'organization' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('organization'), 'category' => 'main'),
'department' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('department'), 'category' => 'main'), 'department' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('department'), 'category' => 'main'),
'gender' => array('type' => 'select', 'limit' => 1, 'label' => rcube_label('gender'), 'options' => array('male' => rcube_label('male'), 'female' => rcube_label('female')), 'category' => 'personal'), 'gender' => array('type' => 'select', 'limit' => 1, 'label' => rcube_label('gender'), 'options' => array('male' => rcube_label('male'), 'female' => rcube_label('female')), 'category' => 'personal'),
'maidenname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('maidenname'), 'category' => 'personal'), 'maidenname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('maidenname'), 'category' => 'personal'),
'phone' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'), 'phone' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
@ -441,7 +441,9 @@ function rcmail_contact_form($form, $record, $attrib = null)
'names' => array('prefix','firstname','middlename','surname','suffix'), 'names' => array('prefix','firstname','middlename','surname','suffix'),
'displayname' => array('name'), 'displayname' => array('name'),
'nickname' => array('nickname'), 'nickname' => array('nickname'),
'jobnames' => array('organization','department','jobtitle'), 'organization' => array('organization'),
'department' => array('department'),
'jobtitle' => array('jobtitle'),
); );
foreach ($field_blocks as $blockname => $colnames) { foreach ($field_blocks as $blockname => $colnames) {
$fields = ''; $fields = '';

@ -267,8 +267,7 @@ body.iframe,
} }
#contacthead .names input, #contacthead .names input,
#contacthead .addnames input, #contacthead .addnames input
#contacthead .jobnames input
{ {
width: 180px; width: 180px;
} }

Loading…
Cancel
Save