- Patch #40813: Taxonomy forms should be in a fieldset.

3 files changed, 8 insertions, 7 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 05515fe13..a57ffa2b2 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -414,6 +414,7 @@ function _element_info($type, $refresh = null) {
  */
 function theme_select($element) {
   $select = '';
+  $size = $element['#size'] ? ' size="' . $element['#size'] . '"' : '';
   foreach ($element['#options'] as $key => $choice) {
     if (is_array($choice)) {
       $select .= '<optgroup label="'. $key .'">';
@@ -426,7 +427,7 @@ function theme_select($element) {
       $select .= '<option value="'. $key .'"'. (is_array($element['#value']) ? (in_array($key, $element['#value']) ? ' selected="selected"' : '') : ($element['#value'] == $key ? ' selected="selected"' : '')) .'>'. check_plain($choice) .'</option>';
     }
   }
-  return theme('form_element', $element['#title'], '<select name="'. $element['#name'] .''. ($element['#multiple'] ? '[]' : '') .'"'. ($element['#multiple'] ? ' multiple="multiple" ' : '') . drupal_attributes($element['#attributes']) .' id="' . $element['#id'] .'">'. $select .'</select>', $element['#description'], $element['#id'], $element['#required'], form_get_error($element));
+  return theme('form_element', $element['#title'], '<select name="'. $element['#name'] .''. ($element['#multiple'] ? '[]' : '') .'"'. ($element['#multiple'] ? ' multiple="multiple" ' : '') . drupal_attributes($element['#attributes']) .' id="' . $element['#id'] .'" '. $size .'>'. $select .'</select>', $element['#description'], $element['#id'], $element['#required'], form_get_error($element));
 }
 
 /**
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index f2e07199f..97a069488 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -533,11 +533,11 @@ function taxonomy_form_alter($form_id, &$form) {
       else {
         $ntterms = isset($node->taxonomy) ? $terms : array_keys($terms);
         $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, $ntterms, $help, 'taxonomy');
+        $form['taxonomy'][$vocabulary->vid]['#weight'] = $vocabulary->weight;
       }
     }
     if (isset($form['taxonomy'])) {
-      $form['taxonomy']['#tree'] = TRUE;
-      $form['taxonomy']['#weight'] = $vocabulary->weight;
+      $form['taxonomy'] = array_merge($form['taxonomy'], array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3));
     }
   }
 }
@@ -914,7 +914,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti
       $value = $tree[0]->tid;
     }
   }
-  return array('#type' => 'select', '#title' => $title, '#default_value' => $value, '#options' => $options, '#description' => $description, '#multiple' => $multiple, '#size' => $multiple ? 'size="'. min(12, count($options)) .'"' : 0, '#weight' => -15, '#theme' => 'taxonomy_term_select');
+  return array('#type' => 'select', '#title' => $title, '#default_value' => $value, '#options' => $options, '#description' => $description, '#multiple' => $multiple, '#size' => $multiple ? min(9, count($options)) : 0, '#weight' => -15, '#theme' => 'taxonomy_term_select');
 }
 
 function theme_taxonomy_term_select($element) {
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index f2e07199f..97a069488 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -533,11 +533,11 @@ function taxonomy_form_alter($form_id, &$form) {
       else {
         $ntterms = isset($node->taxonomy) ? $terms : array_keys($terms);
         $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, $ntterms, $help, 'taxonomy');
+        $form['taxonomy'][$vocabulary->vid]['#weight'] = $vocabulary->weight;
       }
     }
     if (isset($form['taxonomy'])) {
-      $form['taxonomy']['#tree'] = TRUE;
-      $form['taxonomy']['#weight'] = $vocabulary->weight;
+      $form['taxonomy'] = array_merge($form['taxonomy'], array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3));
     }
   }
 }
@@ -914,7 +914,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti
       $value = $tree[0]->tid;
     }
   }
-  return array('#type' => 'select', '#title' => $title, '#default_value' => $value, '#options' => $options, '#description' => $description, '#multiple' => $multiple, '#size' => $multiple ? 'size="'. min(12, count($options)) .'"' : 0, '#weight' => -15, '#theme' => 'taxonomy_term_select');
+  return array('#type' => 'select', '#title' => $title, '#default_value' => $value, '#options' => $options, '#description' => $description, '#multiple' => $multiple, '#size' => $multiple ? min(9, count($options)) : 0, '#weight' => -15, '#theme' => 'taxonomy_term_select');
 }
 
 function theme_taxonomy_term_select($element) {