2 files changed, 17 insertions, 4 deletions
diff --git a/modules/system/system.css b/modules/system/system.css
index abd34d249..1032618ff 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -320,11 +320,19 @@ html.js fieldset.collapsed * {
 }
 html.js fieldset.collapsed legend {
   display: block;
+  overflow: hidden;
 }
 html.js fieldset.collapsible legend a {
+  display: inline;
   padding-left: 15px; /* LTR */
   background: url(../../misc/menu-expanded.png) 5px 75% no-repeat; /* LTR */
 }
+html.js fieldset.collapsible legend span.summary {
+  display: inline;
+  font-size: 0.9em;
+  color: #999;
+  margin-left: 0.5em;
+}
 html.js fieldset.collapsed legend a {
   background-image: url(../../misc/menu-collapsed.png); /* LTR */
   background-position: 5px 50%; /* LTR */
@@ -339,9 +347,6 @@ html.js fieldset.collapsed legend a {
 html.js fieldset.collapsible {
   position: relative;
 }
-html.js fieldset.collapsible legend a {
-  display: block;
-}
 /* Avoid jumping around due to margins collapsing into collapsible fieldset border */
 html.js fieldset.collapsible .fieldset-wrapper {
   overflow: auto;
diff --git a/modules/system/system.module b/modules/system/system.module
index 528d6c300..5a1297c1f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -381,6 +381,7 @@ function system_elements() {
     '#theme' => 'file',
     '#theme_wrapper' => 'form_element',
   );
+
   $type['tableselect'] = array(
     '#input' => TRUE,
     '#js_select' => TRUE,
@@ -419,10 +420,17 @@ function system_elements() {
     '#collapsible' => FALSE,
     '#collapsed' => FALSE,
     '#value' => NULL,
-    '#process' => array('form_process_ahah'),
+    '#process' => array('form_process_fieldset', 'form_process_ahah'),
+    '#pre_render' => array('form_pre_render_fieldset'),
     '#theme_wrapper' => 'fieldset',
   );
 
+  $type['vertical_tabs'] = array(
+    '#theme_wrapper' => 'vertical_tabs',
+    '#default_tab' => '',
+    '#process' => array('form_process_vertical_tabs'),
+  );
+
   $type['token'] = array(
     '#input' => TRUE,
     '#theme' => array('hidden'),