Merge branch 'dev-elastic' of github.com:roundcube/roundcubemail into dev-elastic

program/steps/addressbook/search.inc

@@ -256,7 +256,8 @@ function rcmail_contact_search_form($attrib)
 {
     global $RCMAIL, $CONTACT_COLTYPES;
 
-    $i_size = $attrib['size'] ?: 30;
+    $i_size       = $attrib['size'] ?: 30;
+    $short_labels = rcube_utils::get_boolean($attrib['short-legend-labels']);
 
     $form = array(
         'main' => array(
@@ -265,7 +266,7 @@ function rcmail_contact_search_form($attrib)
             ),
         ),
         'personal' => array(
-            'name'    => $RCMAIL->gettext('personalinfo'),
+            'name'    => $RCMAIL->gettext($short_labels ? 'personal' : 'personalinfo'),
             'content' => array(
             ),
         ),

program/steps/settings/func.inc

@@ -936,8 +936,8 @@ function rcmail_user_prefs($current = null)
 
                 $blocks['main']['options']['default_font'] = array(
                     'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultfont'))),
-                    'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
-                        $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
+                    'content' => html::div('input-group', $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
+                        $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1)))
                 );
             }