Revert "Issue #1892182 by nod_: #type details: Rename #collapsed to #open."

This reverts commit c4e52bb6.

core/includes/form.inc

@@ -2859,8 +2859,8 @@ function form_get_options($element, $key) {
  * @param $variables
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
- *     Properties used: #attributes, #children, #description, #id, #title,
- *     #value.
+ *     Properties used: #attributes, #children, #collapsed, #description, #id,
+ *     #title, #value.
  *
  * @ingroup themeable
  */
@@ -2905,8 +2905,8 @@ function theme_fieldset($variables) {
  * @param $variables
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
- *     Properties used: #attributes, #children, #description, #id, #title,
- *     #value.
+ *     Properties used: #attributes, #children, #collapsed, #description, #id,
+ *     #title, #value.
  *
  * @ingroup themeable
  */
@@ -2923,7 +2923,7 @@ function theme_details($variables) {
     if (!empty($element['#attributes']['id'])) {
       $summary_attributes['aria-controls'] = $element['#attributes']['id'];
     }
-    $summary_attributes['aria-expanded'] = !empty($element['#attributes']['open']);
+    $summary_attributes['aria-expanded'] = empty($element['#attributes']['open']) ? FALSE : TRUE;
     $summary_attributes['aria-pressed'] = $summary_attributes['aria-expanded'];
     $output .= '<summary' . $summary_attributes . '>' . $element['#title'] . '</summary>';
   }
@@ -3930,7 +3930,7 @@ function form_pre_render_details($element) {
 
   // Collapsible details.
   $element['#attached']['library'][] = array('system', 'drupal.collapse');
-  if (!empty($element['#open'])) {
+  if (empty($element['#collapsed'])) {
     $element['#attributes']['open'] = 'open';
   }
 

core/lib/Drupal/Core/Database/Install/Tasks.php

@@ -233,6 +233,7 @@ public function getFormOptions($database) {
     $form['advanced_options'] = array(
       '#type' => 'details',
       '#title' => st('Advanced options'),
+      '#collapsed' => TRUE,
       '#description' => st("These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings or check with your hosting provider."),
       '#weight' => 10,
     );

core/lib/Drupal/Core/FileTransfer/FileTransfer.php

@@ -408,6 +408,7 @@ public function getSettingsForm() {
     $form['advanced'] = array(
       '#type' => 'details',
       '#title' => t('Advanced settings'),
+      '#collapsed' => TRUE,
     );
     $form['advanced']['hostname'] = array(
       '#type' => 'textfield',

core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php

@@ -131,7 +131,7 @@ public function buildForm(array $form, array &$form_state) {
         '#type' => 'details',
         '#title' => t('Basic configuration'),
         '#description' => t('For most aggregation tasks, the default settings are fine.'),
-        '#open' => TRUE,
+        '#collapsed' => FALSE,
       );
       $form['basic_conf'] += $basic_conf;
     }

core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php

@@ -45,7 +45,7 @@ public function settingsForm(array $form, array &$form_state) {
         '#type' => 'details',
         '#title' => t('Default processor settings'),
         '#description' => $info['description'],
-        '#open' => in_array($info['id'], $processors),
+        '#collapsed' => !in_array($info['id'], $processors),
       );
     }
 

core/modules/aggregator/tests/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php

@@ -38,7 +38,7 @@ public function settingsForm(array $form, array &$form_state) {
       '#type' => 'details',
       '#title' => t('Test processor settings'),
       '#description' => $info['description'],
-      '#open' => in_array($info['id'], $processors),
+      '#collapsed' => !in_array($info['id'], $processors),
     );
     // Add some dummy settings to verify settingsForm is called.
     $form['processors'][$info['id']]['dummy_length'] = array(

core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php

@@ -94,7 +94,7 @@ public function form(array $form, array &$form_state) {
       '#title' => t('Revision information'),
       '#collapsible' => TRUE,
       // Collapsed by default when "Create new revision" is unchecked.
-      '#open' => $block->isNewRevision(),
+      '#collapsed' => !$block->isNewRevision(),
       '#group' => 'advanced',
       '#attributes' => array(
         'class' => array('custom-block-form-revision-information'),

core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php

@@ -56,6 +56,8 @@ public function form(array $form, array &$form_state) {
       $form['language'] = array(
         '#type' => 'details',
         '#title' => t('Language settings'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
         '#group' => 'additional_settings',
       );
 

core/modules/block/lib/Drupal/block/BlockFormController.php

@@ -58,6 +58,7 @@ public function form(array $form, array &$form_state) {
     $form['visibility']['path'] = array(
       '#type' => 'details',
       '#title' => t('Pages'),
+      '#collapsed' => TRUE,
       '#group' => 'visibility',
       '#weight' => 0,
     );
@@ -120,6 +121,7 @@ public function form(array $form, array &$form_state) {
       $form['visibility']['language'] = array(
         '#type' => 'details',
         '#title' => t('Languages'),
+        '#collapsed' => TRUE,
         '#group' => 'visibility',
         '#weight' => 5,
       );
@@ -152,6 +154,7 @@ public function form(array $form, array &$form_state) {
     $form['visibility']['role'] = array(
       '#type' => 'details',
       '#title' => t('Roles'),
+      '#collapsed' => TRUE,
       '#group' => 'visibility',
       '#weight' => 10,
     );

core/modules/book/book.module

@@ -416,6 +416,7 @@ function _book_add_form_elements(&$form, &$form_state, EntityInterface $node) {
     '#type' => 'details',
     '#title' => t('Book outline'),
     '#weight' => 10,
+    '#collapsed' => TRUE,
     '#group' => 'advanced',
     '#attributes' => array(
       'class' => array('book-outline-form'),

core/modules/comment/comment.module

@@ -993,6 +993,7 @@ function comment_form_node_type_form_alter(&$form, $form_state) {
     $form['comment'] = array(
       '#type' => 'details',
       '#title' => t('Comment settings'),
+      '#collapsed' => TRUE,
       '#group' => 'additional_settings',
       '#attributes' => array(
         'class' => array('comment-node-type-settings-form'),
@@ -1098,6 +1099,7 @@ function comment_form_node_form_alter(&$form, $form_state) {
     '#type' => 'details',
     '#access' => user_access('administer comments'),
     '#title' => t('Comment settings'),
+    '#collapsed' => TRUE,
     '#group' => 'advanced',
     '#attributes' => array(
       'class' => array('comment-node-settings-form'),

core/modules/comment/lib/Drupal/comment/CommentFormController.php

@@ -54,6 +54,7 @@ public function form(array $form, array &$form_state) {
       $form['author'] += array(
         '#type' => 'details',
         '#title' => t('Administration'),
+        '#collapsed' => TRUE,
       );
     }
 

core/modules/dblog/dblog.admin.inc

@@ -230,7 +230,7 @@ function dblog_filter_form($form) {
   $form['filters'] = array(
     '#type' => 'details',
     '#title' => t('Filter log messages'),
-    '#open' => !empty($_SESSION['dblog_overview_filter']),
+    '#collapsed' => empty($_SESSION['dblog_overview_filter']),
   );
   foreach ($filters as $key => $filter) {
     $form['filters']['status'][$key] = array(
@@ -307,6 +307,7 @@ function dblog_clear_log_form($form) {
     '#type' => 'details',
     '#title' => t('Clear log messages'),
     '#description' => t('This will permanently remove the log messages from the database.'),
+    '#collapsed' => TRUE,
   );
   $form['dblog_clear']['clear'] = array(
     '#type' => 'submit',

core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php

@@ -460,6 +460,7 @@ function multiple_options_form(&$form, &$form_state) {
     $form['multiple_field_settings'] = array(
       '#type' => 'details',
       '#title' => t('Multiple field settings'),
+      '#collapsed' => TRUE,
       '#weight' => 5,
     );
 

core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php

@@ -352,6 +352,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
         $form['modes'] = array(
           '#type' => 'details',
           '#title' => t('Custom display settings'),
+          '#collapsed' => TRUE,
         );
         // Collect options and default values for the 'Custom display settings'
         // checkboxes.

core/modules/language/language.admin.inc

@@ -617,6 +617,7 @@ function language_negotiation_configure_browser_form($form, &$form_state) {
   $form['new_mapping'] = array(
     '#type' => 'details',
     '#title' => t('Add a new mapping'),
+    '#collapsed' => TRUE,
     '#tree' => TRUE,
   );
   $form['new_mapping']['browser_langcode'] = array(

core/modules/locale/locale.bulk.inc

@@ -177,6 +177,7 @@ function locale_translate_export_form($form, &$form_state) {
     $form['content_options'] = array(
       '#type' => 'details',
       '#title' => t('Export options'),
+      '#collapsed' => TRUE,
       '#tree' => TRUE,
       '#states' => array(
         'invisible' => array(

core/modules/locale/locale.pages.inc

@@ -170,7 +170,7 @@ function locale_translate_filter_form($form, &$form_state) {
   $form['filters'] = array(
     '#type' => 'details',
     '#title' => t('Filter translatable strings'),
-    '#open' => TRUE,
+    '#collapsed' => FALSE,
   );
   foreach ($filters as $key => $filter) {
     // Special case for 'string' filter.

core/modules/menu/menu.module

@@ -569,7 +569,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
     '#type' => 'details',
     '#title' => t('Menu settings'),
     '#access' => user_access('administer menu'),
-    '#open' => !empty($link['link_title']),
+    '#collapsed' => !$link['link_title'],
     '#group' => 'advanced',
     '#attached' => array(
       'library' => array(array('menu', 'drupal.menu')),
@@ -669,6 +669,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
   $form['menu'] = array(
     '#type' => 'details',
     '#title' => t('Menu settings'),
+    '#collapsed' => TRUE,
     '#attached' => array(
       'library' => array(array('menu', 'drupal.menu.admin')),
     ),

core/modules/node/content_types.inc

@@ -192,6 +192,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
   $form['workflow'] = array(
     '#type' => 'details',
     '#title' => t('Publishing options'),
+    '#collapsed' => TRUE,
     '#group' => 'additional_settings',
   );
   $form['workflow']['node_options'] = array('#type' => 'checkboxes',
@@ -209,6 +210,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
     $form['language'] = array(
       '#type' => 'details',
       '#title' => t('Language settings'),
+      '#collapsed' => TRUE,
       '#group' => 'additional_settings',
     );
 
@@ -227,6 +229,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
   $form['display'] = array(
     '#type' => 'details',
     '#title' => t('Display settings'),
+    '#collapsed' => TRUE,
     '#group' => 'additional_settings',
   );
   $form['display']['node_submitted'] = array(

core/modules/node/lib/Drupal/node/NodeFormController.php

@@ -125,7 +125,7 @@ public function form(array $form, array &$form_state) {
       '#group' => 'advanced',
       '#title' => t('Revision information'),
       // Collapsed by default when "Create new revision" is unchecked.
-      '#open' => $node->isNewRevision(),
+      '#collapsed' => !$node->isNewRevision(),
       '#attributes' => array(
         'class' => array('node-form-revision-information'),
       ),
@@ -161,6 +161,7 @@ public function form(array $form, array &$form_state) {
       '#type' => 'details',
       '#access' => user_access('administer nodes'),
       '#title' => t('Authoring information'),
+      '#collapsed' => TRUE,
       '#group' => 'advanced',
       '#attributes' => array(
         'class' => array('node-form-author'),
@@ -199,6 +200,7 @@ public function form(array $form, array &$form_state) {
       '#type' => 'details',
       '#access' => user_access('administer nodes'),
       '#title' => t('Promotion options'),
+      '#collapsed' => TRUE,
       '#group' => 'advanced',
       '#attributes' => array(
         'class' => array('node-form-options'),

core/modules/node/node.module

@@ -1969,6 +1969,7 @@ function node_form_block_form_alter(&$form, &$form_state) {
   $form['visibility']['node_type'] = array(
     '#type' => 'details',
     '#title' => t('Content types'),
+    '#collapsed' => TRUE,
     '#group' => 'visibility',
     '#weight' => 5,
   );
@@ -2248,6 +2249,7 @@ function node_form_search_form_alter(&$form, $form_state) {
     $form['advanced'] = array(
       '#type' => 'details',
       '#title' => t('Advanced search'),
+      '#collapsed' => TRUE,
       '#attributes' => array('class' => array('search-advanced')),
     );
     $form['advanced']['keywords-fieldset'] = array(
@@ -2308,9 +2310,10 @@ function node_form_search_form_alter(&$form, $form_state) {
     }
     if (count($language_options) > 1) {
       $form['advanced']['lang-fieldset'] = array(
-        '#type' => 'details',
+        '#type' => 'fieldset',
         '#title' => t('Languages'),
-        '#open' => TRUE,
+        '#collapsible' => FALSE,
+        '#collapsed' => FALSE,
       );
       $form['advanced']['lang-fieldset']['language'] = array(
         '#type' => 'checkboxes',

core/modules/path/path.module

@@ -119,7 +119,7 @@ function path_form_node_form_alter(&$form, $form_state) {
   $form['path'] = array(
     '#type' => 'details',
     '#title' => t('URL path settings'),
-    '#open' => !empty($path['alias']),
+    '#collapsed' => empty($path['alias']),
     '#group' => 'advanced',
     '#attributes' => array(
       'class' => array('path-form'),

core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php

@@ -169,7 +169,7 @@ public function buildForm(array $form, array &$form_state, $test_id = NULL) {
 
       // Set summary information.
       $group_summary['#ok'] = $group_summary['#fail'] + $group_summary['#exception'] == 0;
-      $form['result']['results'][$group]['#open'] = !$group_summary['#ok'];
+      $form['result']['results'][$group]['#collapsed'] = $group_summary['#ok'];
 
       // Store test group (class) as for use in filter.
       $filter[$group_summary['#ok'] ? 'pass' : 'fail'][] = $group;

core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php

@@ -46,6 +46,7 @@ public function buildForm(array $form, array &$form_state) {
       '#type' => 'details',
       '#title' => t('HTTP authentication'),
       '#description' => t('HTTP auth settings to be used by the SimpleTest browser during testing. Useful when the site requires basic HTTP authentication.'),
+      '#collapsed' => TRUE,
     );
     $form['httpauth']['simpletest_httpauth_method'] = array(
       '#type' => 'select',

core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestTestForm.php

@@ -41,6 +41,10 @@ public function buildForm(array $form, array &$form_state) {
     $form_state['storage']['PHPUnit'] = $groups['PHPUnit'];
 
     foreach ($groups as $group => $tests) {
+      $form['tests']['table'][$group] = array(
+        '#collapsed' => TRUE,
+      );
+
       foreach ($tests as $class => $info) {
         $form['tests']['table'][$group][$class] = array(
           '#type' => 'checkbox',

core/modules/simpletest/simpletest.theme.inc

@@ -46,8 +46,8 @@ function theme_simpletest_test_table($variables) {
 
     // Select the right "expand"/"collapse" image, depending on whether the
     // category is expanded (at least one test selected) or not.
-    $open = !empty($element['#open']);
-    $image_index = $open ? 1 : 0;
+    $collapsed = !empty($element['#collapsed']);
+    $image_index = $collapsed ? 0 : 1;
 
     // Place-holder for checkboxes to select group of tests.
     $row[] = array('id' => $test_class, 'class' => array('simpletest-select-all'));
@@ -107,7 +107,7 @@ function theme_simpletest_test_table($variables) {
         'class' => array('simpletest-test-description'),
       );
 
-      $rows[] = array('data' => $row, 'class' => array($test_class . '-test', ($open ? '' : 'js-hide')));
+      $rows[] = array('data' => $row, 'class' => array($test_class . '-test', ($collapsed ? 'js-hide' : '')));
     }
     $js['simpletest-test-group-' . $test_class] = $current_js;
     unset($table[$key]);

core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php

@@ -80,10 +80,10 @@ public function buildForm(array $form, array &$form_state) {
       $definition = $toolkit->getDefinition();
       $form['image_toolkit']['#options'][$id] = $definition['title'];
       $form['image_toolkit_settings'][$id] = array(
-        '#type' => 'details',
+        '#type' => 'fieldset',
         '#title' => t('@toolkit settings', array('@toolkit' => $definition['title'])),
         '#collapsible' => TRUE,
-        '#open' => ($id == $current_toolkit),
+        '#collapsed' => ($id == $current_toolkit) ? FALSE : TRUE,
         '#tree' => TRUE,
       );
       $form['image_toolkit_settings'][$id] += $toolkit->settingsForm();

core/modules/system/system.admin.inc

@@ -912,7 +912,6 @@ function system_modules($form, $form_state = array()) {
       '#type' => 'details',
       '#title' => t($package),
       '#theme' => 'system_modules_details',
-      '#open' => TRUE,
       '#header' => array(
         array('data' => t('<span class="element-invisible">Enabled</span>'), 'class' => array('checkbox')),
         array('data' => t('Name'), 'class' => array('name')),

core/modules/system/system.module

@@ -555,7 +555,7 @@ function system_element_info() {
     '#theme_wrappers' => array('fieldset'),
   );
   $types['details'] = array(
-    '#open' => FALSE,
+    '#collapsed' => FALSE,
     '#value' => NULL,
     '#process' => array('form_process_group', 'ajax_process_form'),
     '#pre_render' => array('form_pre_render_details', 'form_pre_render_group'),

core/modules/system/tests/modules/design_test/form/details.inc

@@ -13,7 +13,7 @@ function design_test_form_details($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Collapsible details',
     '#description' => 'Details description',
-    '#open' => TRUE,
+    '#collapsed' => FALSE,
     '#states' => array(
       'collapsed' => array(
         ':input[name="states-trigger"]' => array('checked' => TRUE),
@@ -25,6 +25,7 @@ function design_test_form_details($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Collapsed details',
     '#description' => 'Details description',
+    '#collapsed' => TRUE,
   );
   $form['collapsed']['textfield'] = array(
     '#type' => 'textfield',
@@ -45,17 +46,19 @@ function design_test_form_details($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Details',
     '#description' => 'Details description',
+    '#collapsed' => TRUE,
   );
   $form['collapsed2']['collapsible'] = array(
     '#type' => 'details',
     '#title' => 'Collapsible details',
     '#description' => 'Details description',
-    '#open' => TRUE,
+    '#collapsed' => FALSE,
   );
   $form['collapsed2']['collapsed'] = array(
     '#type' => 'details',
     '#title' => 'Collapsed details',
     '#description' => 'Details description',
+    '#collapsed' => TRUE,
   );
   $form['collapsed2']['regular'] = array(
     '#type' => 'details',

core/modules/system/tests/modules/design_test/form/fieldset.inc

@@ -19,7 +19,7 @@ function design_test_form_fieldset($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Collapsible details',
     '#description' => 'Details description',
-    '#open' => TRUE,
+    '#collapsed' => FALSE,
   );
   $form['collapsible']['fieldset'] = array(
     '#type' => 'fieldset',
@@ -40,6 +40,7 @@ function design_test_form_fieldset($form, &$form_state) {
 
   $form['collapsed'] = $form['collapsible'];
   $form['collapsed']['#title'] = 'Collapsed details';
+  $form['collapsed']['#collapsed'] = TRUE;
 
   $form['nested'] = $form['regular'];
   $form['nested']['#title'] = 'Parent fieldset';

core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php

@@ -54,7 +54,7 @@ public function form(array $form, array &$form_state) {
     $form['relations'] = array(
       '#type' => 'details',
       '#title' => t('Relations'),
-      '#open' => ($vocabulary->hierarchy == TAXONOMY_HIERARCHY_MULTIPLE),
+      '#collapsed' => ($vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE),
       '#weight' => 10,
     );
 

core/modules/translation/translation.module

@@ -216,7 +216,7 @@ function translation_form_node_form_alter(&$form, &$form_state) {
         '#type' => 'details',
         '#title' => t('Translation settings'),
         '#access' => translation_user_can_translate_node($node),
-        '#open' => $node->translate,
+        '#collapsed' => !$node->translate,
         '#tree' => TRUE,
         '#weight' => 30,
       );

core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php

@@ -157,6 +157,7 @@ public function entityFormAlter(array &$form, array &$form_state, EntityInterfac
       $form['source_langcode'] = array(
         '#type' => 'details',
         '#title' => t('Source language: @language', array('@language' => $languages[$source_langcode]->name)),
+        '#collapsed' => TRUE,
         '#tree' => TRUE,
         '#weight' => -100,
         '#multilingual' => TRUE,
@@ -224,6 +225,7 @@ public function entityFormAlter(array &$form, array &$form_state, EntityInterfac
       $form['translation_entity'] = array(
         '#type' => 'details',
         '#title' => t('Translation'),
+        '#collapsed' => TRUE,
         '#tree' => TRUE,
         '#weight' => 10,
         '#access' => $this->getTranslationAccess($entity, $source_langcode ? 'create' : 'update'),

core/modules/user/lib/Drupal/user/AccountSettingsForm.php

@@ -182,7 +182,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_admin_created'] = array(
       '#type' => 'details',
       '#title' => t('Welcome (new user created by administrator)'),
-      '#open' => ($config->get('register') == USER_REGISTER_ADMINISTRATORS_ONLY),
+      '#collapsed' => ($config->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY),
       '#description' => t('Edit the welcome e-mail messages sent to new member accounts created by an administrator.') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -202,7 +202,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_pending_approval'] = array(
       '#type' => 'details',
       '#title' => t('Welcome (awaiting approval)'),
-      '#open' => ($config->get('register') == USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL),
+      '#collapsed' => ($config->get('register') != USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL),
       '#description' => t('Edit the welcome e-mail messages sent to new members upon registering, when administrative approval is required.') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -222,7 +222,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_pending_approval_admin'] = array(
       '#type' => 'details',
       '#title' => t('Admin (user awaiting approval)'),
-      '#open' => ($config->get('register') == USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL),
+      '#collapsed' => ($config->get('register') != USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL),
       '#description' => t('Edit the e-mail notifying the site administrator that there are new members awaiting administrative approval.') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -242,7 +242,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_no_approval_required'] = array(
       '#type' => 'details',
       '#title' => t('Welcome (no approval required)'),
-      '#open' => ($config->get('register') == USER_REGISTER_VISITORS),
+      '#collapsed' => ($config->get('register') != USER_REGISTER_VISITORS),
       '#description' => t('Edit the welcome e-mail messages sent to new members upon registering, when no administrator approval is required.') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -262,6 +262,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_password_reset'] = array(
       '#type' => 'details',
       '#title' => t('Password recovery'),
+      '#collapsed' => TRUE,
       '#description' => t('Edit the e-mail messages sent to users who request a new password.') . ' ' . $email_token_help,
       '#group' => 'email',
       '#weight' => 10,
@@ -282,6 +283,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_activated'] = array(
       '#type' => 'details',
       '#title' => t('Account activation'),
+      '#collapsed' => TRUE,
       '#description' => t('Enable and edit e-mail messages sent to users upon account activation (when an administrator activates an account of a user who has already registered, on a site where administrative approval is required).') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -315,6 +317,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_blocked'] = array(
       '#type' => 'details',
       '#title' => t('Account blocked'),
+      '#collapsed' => TRUE,
       '#description' => t('Enable and edit e-mail messages sent to users when their accounts are blocked.') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -348,6 +351,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_cancel_confirm'] = array(
       '#type' => 'details',
       '#title' => t('Account cancellation confirmation'),
+      '#collapsed' => TRUE,
       '#description' => t('Edit the e-mail messages sent to users when they attempt to cancel their accounts.') . ' ' . $email_token_help,
       '#group' => 'email',
     );
@@ -367,6 +371,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['email_canceled'] = array(