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

git-svn-id: https://svn.roundcube.net/trunk@5041 208e9e7b-5314-0410-a742-e7e81cd9613c

4 files changed, 10 insertions, 8 deletions

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index c59cbab81..73d57fc91 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add newlines between organization, department, jobtitle (#1488028)
 - Recalculate date when replying to a message and localize the cite header (#1487675)
 - Fix XSS vulnerability in UI messages (#1488030)
 - Fix handling of email addresses with quoted local part (#1487939)
diff --git a/roundcubemail/program/steps/addressbook/edit.inc b/roundcubemail/program/steps/addressbook/edit.inc
index 0ad977d1a..49915f5ab 100644
--- a/roundcubemail/program/steps/addressbook/edit.inc
+++ b/roundcubemail/program/steps/addressbook/edit.inc
@@ -95,9 +95,9 @@ function rcmail_contact_edithead($attrib)
                 'suffix' => array('size' => $i_size),
                 'name' => array('size' => 2*$i_size),
                 'nickname' => array('size' => 2*$i_size),
-                'company' => array('size' => $i_size),
-                'department' => array('size' => $i_size),
-                'jobtitle' => array('size' => $i_size),
+                'organization' => array('size' => 2*$i_size),
+                'department' => array('size' => 2*$i_size),
+                'jobtitle' => array('size' => 2*$i_size),
             )
         )
     );
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc
index 4de463710..287ce2952 100644
--- a/roundcubemail/program/steps/addressbook/func.inc
+++ b/roundcubemail/program/steps/addressbook/func.inc
@@ -32,8 +32,8 @@ $CONTACT_COLTYPES = array(
   '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'),
   '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'),
-  'department'   => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('department'), 'category' => 'main'),
+  'organization' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('organization'), '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'),
   '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'),
@@ -441,7 +441,9 @@ function rcmail_contact_form($form, $record, $attrib = null)
                 'names'    => array('prefix','firstname','middlename','surname','suffix'),
                 'displayname' => array('name'),
                 'nickname' => array('nickname'),
-                'jobnames' => array('organization','department','jobtitle'),
+                'organization' => array('organization'),
+                'department' => array('department'),
+                'jobtitle' => array('jobtitle'),
             );
             foreach ($field_blocks as $blockname => $colnames) {
                 $fields = '';
diff --git a/roundcubemail/skins/default/addressbook.css b/roundcubemail/skins/default/addressbook.css
index 69b913e84..f3b52c806 100644
--- a/roundcubemail/skins/default/addressbook.css
+++ b/roundcubemail/skins/default/addressbook.css
@@ -267,8 +267,7 @@ body.iframe,
 }
 
 #contacthead .names input,
-#contacthead .addnames input,
-#contacthead .jobnames input
+#contacthead .addnames input
 {
 	width: 180px;
 }