- Patch #182950: fieldset massaging for usability.

10 files changed, 20 insertions, 18 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 9dbfbe6c5..7055fbbd4 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -98,7 +98,7 @@ function drupal_get_breadcrumb() {
 
 /**
  * Add output to the head tag of the HTML page.
- * 
+ *
  * This function can be called as long the headers aren't sent.
  */
 function drupal_set_html_head($data = NULL) {
@@ -229,7 +229,7 @@ function drupal_query_string_encode($query, $exclude = array(), $parent = '') {
 
 /**
  * Prepare a destination query string for use in combination with drupal_goto().
- * 
+ *
  * Used to direct the user back to the referring page after completing a form.
  * By default the current URL is returned. If a destination exists in the
  * previous request, that destination is returned. As such, a destination can
@@ -357,7 +357,7 @@ function drupal_not_found() {
     drupal_set_title(t('Page not found'));
     $return = '';
   }
-  
+
   // To conserve CPU and bandwidth, omit the blocks.
   print theme('page', $return, FALSE);
 }
@@ -546,7 +546,7 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data =
 
 /**
  * Log errors as defined by administrator.
- * 
+ *
  * Error levels:
  * - 0 = Log errors to database.
  * - 1 = Log errors to database and to screen.
@@ -762,13 +762,13 @@ function t($string, $args = array(), $langcode = NULL) {
           // Escaped only.
           $args[$key] = check_plain($value);
           break;
-          
+
         case '%':
         default:
           // Escaped and placeholder.
           $args[$key] = theme('placeholder', $value);
           break;
-          
+
         case '!':
           // Pass-through.
       }
diff --git a/includes/menu.inc b/includes/menu.inc
index 6d1522c5d..60c120dfe 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -586,14 +586,14 @@ function menu_tree_output($tree) {
   $output = '';
   $items = array();
 
-  // Pull out just the menu items we are going to render so that we 
+  // Pull out just the menu items we are going to render so that we
   // get an accurate count for the first/last classes.
   foreach ($tree as $data) {
     if (!$data['link']['hidden']) {
       $items[] = $data;
     }
   }
-  
+
   $num_items = count($items);
   foreach ($items as $i => $data) {
     $extra_class = NULL;
diff --git a/modules/block/block.install b/modules/block/block.install
index 8c55d4f06..8b4cb65b1 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -133,7 +133,7 @@ function block_schema() {
     'fields' => array(
       'bid' => array(
         'type' => 'serial',
-	'unsigned' => TRUE,
+  'unsigned' => TRUE,
         'not null' => TRUE,
         'description' => t("The block's {block}.bid."),
       ),
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 478f19da3..9aded96d9 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -472,6 +472,7 @@ function comment_form_alter(&$form, $form_state, $form_id) {
       '#type' => 'fieldset',
       '#title' => t('Comment settings'),
       '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
     );
     $form['comment']['comment'] = array(
       '#type' => 'radios',
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index 112f5daa7..8b3309e46 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -178,7 +178,7 @@ function locale_schema() {
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-        'description' => t('Number of plural indexes in this language.'), 
+        'description' => t('Number of plural indexes in this language.'),
       ),
       'formula' => array(
         'type' => 'varchar',
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 3307372b0..f94992509 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -109,9 +109,9 @@ function node_type_form(&$form_state, $type = NULL) {
 
   $form['submission'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Submission form'),
+    '#title' => t('Submission form settings'),
     '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsed' => TRUE,
   );
   $form['submission']['title_label'] = array(
     '#title' => t('Title field label'),
@@ -147,8 +147,9 @@ function node_type_form(&$form_state, $type = NULL) {
   );
   $form['workflow'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Workflow'),
+    '#title' => t('Workflow settings'),
     '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['workflow']['node_options'] = array('#type' => 'checkboxes',
     '#title' => t('Default options'),
diff --git a/modules/node/node.module b/modules/node/node.module
index c3a60311d..bfe61462b 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1871,7 +1871,7 @@ function _node_access_join_sql($node_alias = 'n', $node_access_alias = 'na') {
  *   If the node_access table has been given an SQL alias other than the default
  *   "na", that must be passed here.
  * @param $account
- *   The user object for the user performing the operation. If omitted, the 
+ *   The user object for the user performing the operation. If omitted, the
  *   current user is used.
  * @return
  *   An SQL where clause.
@@ -1907,7 +1907,7 @@ function _node_access_where_sql($op = 'view', $node_access_alias = 'na', $accoun
  * @param $op
  *   The operation that the user is trying to perform.
  * @param $account
- *   The user object for the user performing the operation. If omitted, the 
+ *   The user object for the user performing the operation. If omitted, the
  *   current user is used.
  * @return
  *   An associative array in which the keys are realms, and the values are
diff --git a/modules/poll/poll.install b/modules/poll/poll.install
index 5bdcd2cab..d6f3de95c 100644
--- a/modules/poll/poll.install
+++ b/modules/poll/poll.install
@@ -89,7 +89,7 @@ function poll_schema() {
       ),
     'primary key' => array('chid'),
     );
-  
+
   $schema['poll_votes'] = array(
     'description' => t('Stores per-{users} votes for each {poll}.'),
     'fields' => array(
diff --git a/modules/statistics/statistics.install b/modules/statistics/statistics.install
index 25b208f46..5ed1dd993 100644
--- a/modules/statistics/statistics.install
+++ b/modules/statistics/statistics.install
@@ -88,7 +88,7 @@ function statistics_schema() {
         'description' => t('Hostname of user that visited the page.'),
       ),
       'uid' => array(
-        'type' => 'int', 
+        'type' => 'int',
         'unsigned' => TRUE,
         'not null' => FALSE,
         'default' => 0,
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index a40cedbb3..0000c0eee 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -99,7 +99,7 @@ function taxonomy_schema() {
     'indexes' => array(
       'nid' => array('nid'),
       'vid' => array('vid'),
-      'tid' => array('tid'),      
+      'tid' => array('tid'),
     ),
     'primary key' => array('vid', 'tid', 'nid'),
   );