Issue #1852104 by sun, nod_, Cottser, swentel: #type details: Remove #collapsible property.

core/includes/form.inc

@@ -1710,10 +1710,9 @@ function form_error(&$element, $message = '') {
  *   can also be used to set additional properties or implement special logic
  *   other than adding child elements: for example, for the 'details' element
  *   type, one of the functions in this array is form_process_details(), which
- *   adds the attributes and JavaScript needed to make the details collapsible
- *   if the #collapsible property is set. The #process functions are called in
- *   preorder traversal, meaning they are called for the parent element first,
- *   then for the child elements.
+ *   adds the attributes and JavaScript needed to make the details work in older
+ *   browsers. The #process functions are called in preorder traversal, meaning
+ *   they are called for the parent element first, then for the child elements.
  * - $element['#after_build']: An array of functions called after form_builder()
  *   is done with its processing of the element. These are called in postorder
  *   traversal, meaning they are called for the child elements first, then for
@@ -2817,8 +2816,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, #collapsed, #collapsible,
- *     #description, #id, #title, #value.
+ *     Properties used: #attributes, #children, #collapsed, #description, #id,
+ *     #title, #value.
  *
  * @ingroup themeable
  */
@@ -2863,8 +2862,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, #collapsed, #collapsible,
- *     #description, #id, #title, #value.
+ *     Properties used: #attributes, #children, #collapsed, #description, #id,
+ *     #title, #value.
  *
  * @ingroup themeable
  */
@@ -3972,10 +3971,7 @@ function form_pre_render_details($element) {
   }
 
   // Collapsible details.
-  if (!empty($element['#collapsible'])) {
-    $element['#attached']['library'][] = array('system', 'drupal.collapse');
-    $element['#attributes']['class'][] = 'collapsible';
-  }
+  $element['#attached']['library'][] = array('system', 'drupal.collapse');
   if (empty($element['#collapsed'])) {
     $element['#attributes']['open'] = 'open';
   }

core/includes/install.core.inc

@@ -2189,7 +2189,6 @@ function _install_configure_form($form, &$form_state, &$install_state) {
   $form['site_information'] = array(
     '#type' => 'details',
     '#title' => st('Site information'),
-    '#collapsible' => FALSE,
   );
   $form['site_information']['site_name'] = array(
     '#type' => 'textfield',
@@ -2208,7 +2207,6 @@ function _install_configure_form($form, &$form_state, &$install_state) {
   $form['admin_account'] = array(
     '#type' => 'details',
     '#title' => st('Site maintenance account'),
-    '#collapsible' => FALSE,
   );
 
   $form['admin_account']['account']['#tree'] = TRUE;
@@ -2237,7 +2235,6 @@ function _install_configure_form($form, &$form_state, &$install_state) {
   $form['server_settings'] = array(
     '#type' => 'details',
     '#title' => st('Server settings'),
-    '#collapsible' => FALSE,
   );
 
   $countries = country_get_list();
@@ -2264,7 +2261,6 @@ function _install_configure_form($form, &$form_state, &$install_state) {
   $form['update_notifications'] = array(
     '#type' => 'details',
     '#title' => st('Update notifications'),
-    '#collapsible' => FALSE,
   );
   $form['update_notifications']['update_status_module'] = array(
     '#type' => 'checkboxes',

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

@@ -234,7 +234,6 @@ public function getFormOptions($database) {
     $form['advanced_options'] = array(
       '#type' => 'details',
       '#title' => st('Advanced options'),
-      '#collapsible' => TRUE,
       '#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,7 +408,6 @@ public function getSettingsForm() {
     $form['advanced'] = array(
       '#type' => 'details',
       '#title' => t('Advanced settings'),
-      '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
     $form['advanced']['hostname'] = array(

core/misc/collapse.js

@@ -174,7 +174,7 @@ Drupal.behaviors.collapse = {
     if (isDetailsSupported) {
       return;
     }
-    var $collapsibleDetails = $(context).find('details.collapsible').once('collapse');
+    var $collapsibleDetails = $(context).find('details').once('collapse');
     if ($collapsibleDetails.length) {
       for (var i = 0; i < $collapsibleDetails.length; i++) {
         CollapsibleDetails.instances.push(new CollapsibleDetails($collapsibleDetails[i], settings.collapsibleDetails));

core/misc/vertical-tabs.js

@@ -44,7 +44,7 @@ Drupal.behaviors.verticalTabs = {
         });
         tab_list.append(vertical_tab.item);
         $this
-          .removeClass('collapsible collapsed')
+          .removeClass('collapsed')
           .attr('open', true)
           .addClass('vertical-tabs-pane')
           .data('verticalTab', vertical_tab);

core/modules/aggregator/aggregator.admin.inc

@@ -413,7 +413,6 @@ function aggregator_admin_form($form, $form_state) {
       '#type' => 'details',
       '#title' => t('Basic configuration'),
       '#description' => t('For most aggregation tasks, the default settings are fine.'),
-      '#collapsible' => TRUE,
       '#collapsed' => FALSE,
       );
     $form['basic_conf'] += $basic_conf;

core/modules/aggregator/aggregator.processor.inc

@@ -94,13 +94,12 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
     $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
     $period[AGGREGATOR_CLEAR_NEVER] = t('Never');
 
-    // Only wrap into a collapsible details if there is a basic configuration.
+    // Only wrap into details if there is a basic configuration.
     if (isset($form['basic_conf'])) {
       $form['modules']['aggregator'] = array(
         '#type' => 'details',
         '#title' => t('Default processor settings'),
         '#description' => $info['description'],
-        '#collapsible' => TRUE,
         '#collapsed' => !in_array('aggregator', $aggregator_processors),
       );
     }

core/modules/book/book.module

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

core/modules/book/book.pages.inc

@@ -145,8 +145,6 @@ function book_outline_form($form, &$form_state, Node $node) {
   $form['#id'] = 'book-outline';
   _book_add_form_elements($form, $form_state, $node);
 
-  $form['book']['#collapsible'] = FALSE;
-
   $form['update'] = array(
     '#type' => 'submit',
     '#value' => $node->book['original_bid'] ? t('Update book outline') : t('Add to book outline'),

core/modules/comment/comment.module

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

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

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

core/modules/contact/contact.module

@@ -335,7 +335,6 @@ function contact_form_user_profile_form_alter(&$form, &$form_state) {
     '#type' => 'details',
     '#title' => t('Contact settings'),
     '#weight' => 5,
-    '#collapsible' => TRUE,
   );
   $account = $form_state['controller']->getEntity($form_state);
   $account_data = drupal_container()->get('user.data')->get('contact', $account->id(), 'enabled');

core/modules/dblog/dblog.admin.inc

@@ -320,7 +320,6 @@ function dblog_filter_form($form) {
   $form['filters'] = array(
     '#type' => 'details',
     '#title' => t('Filter log messages'),
-    '#collapsible' => TRUE,
     '#collapsed' => empty($_SESSION['dblog_overview_filter']),
   );
   foreach ($filters as $key => $filter) {
@@ -398,7 +397,6 @@ 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.'),
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
   $form['dblog_clear']['clear'] = array(

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

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

core/modules/field_ui/field_ui.admin.inc

@@ -933,7 +933,6 @@ function field_ui_default_value_widget($field, $instance, &$form, &$form_state)
   $element = array(
     '#type' => 'details',
     '#title' => t('Default value'),
-    '#collapsible' => FALSE,
     '#tree' => TRUE,
     '#description' => t('The default value for this field, used when creating new content.'),
     // Stick to an empty 'parents' on this form in order not to breaks widgets

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

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

core/modules/language/language.admin.inc

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

core/modules/locale/locale.bulk.inc

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

core/modules/locale/locale.pages.inc

@@ -169,7 +169,6 @@ function locale_translate_filter_form($form, &$form_state) {
   $form['filters'] = array(
     '#type' => 'details',
     '#title' => t('Filter translatable strings'),
-    '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
   foreach ($filters as $key => $filter) {

core/modules/menu/menu.module

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

core/modules/node/content_types.inc

@@ -158,7 +158,6 @@ function node_type_form($form, &$form_state, $type = NULL) {
   $form['submission'] = array(
     '#type' => 'details',
     '#title' => t('Submission form settings'),
-    '#collapsible' => TRUE,
     '#group' => 'additional_settings',
   );
   $form['submission']['title_label'] = array(
@@ -193,7 +192,6 @@ function node_type_form($form, &$form_state, $type = NULL) {
   $form['workflow'] = array(
     '#type' => 'details',
     '#title' => t('Publishing options'),
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
   );
@@ -212,7 +210,6 @@ function node_type_form($form, &$form_state, $type = NULL) {
     $form['language'] = array(
       '#type' => 'details',
       '#title' => t('Language settings'),
-      '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#group' => 'additional_settings',
     );
@@ -232,7 +229,6 @@ function node_type_form($form, &$form_state, $type = NULL) {
   $form['display'] = array(
     '#type' => 'details',
     '#title' => t('Display settings'),
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
   );

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

@@ -199,7 +199,6 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
       '#type' => 'details',
       '#access' => user_access('administer nodes'),
       '#title' => t('Authoring information'),
-      '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#group' => 'advanced',
       '#attributes' => array(
@@ -240,7 +239,6 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
       '#type' => 'details',
       '#access' => user_access('administer nodes'),
       '#title' => t('Promotion options'),
-      '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#group' => 'advanced',
       '#attributes' => array(

core/modules/node/node.module

@@ -2016,7 +2016,6 @@ function node_form_block_form_alter(&$form, &$form_state) {
   $form['visibility']['node_type'] = array(
     '#type' => 'details',
     '#title' => t('Content types'),
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'visibility',
     '#weight' => 5,
@@ -2346,7 +2345,6 @@ function node_form_search_form_alter(&$form, $form_state) {
     $form['advanced'] = array(
       '#type' => 'details',
       '#title' => t('Advanced search'),
-      '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#attributes' => array('class' => array('search-advanced')),
     );

core/modules/overlay/overlay.module

@@ -92,7 +92,6 @@ function overlay_form_user_profile_form_alter(&$form, &$form_state) {
       '#type' => 'details',
       '#title' => t('Administrative overlay'),
       '#weight' => 4,
-      '#collapsible' => TRUE,
     );
     $form['overlay_control']['overlay'] = array(
       '#type' => 'checkbox',

core/modules/path/path.module

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

core/modules/simpletest/simpletest.pages.inc

@@ -242,7 +242,6 @@ function simpletest_result_form($form, &$form_state, $test_id) {
       '#type' => 'details',
       '#title' => $info['name'],
       '#description' => $info['description'],
-      '#collapsible' => TRUE,
     );
     $form['result']['results'][$group]['summary'] = $summary;
     $group_summary = &$form['result']['results'][$group]['summary'];
@@ -455,7 +454,6 @@ function simpletest_settings_form($form, &$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.'),
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
   $form['httpauth']['simpletest_httpauth_method'] = array(

core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php

@@ -250,11 +250,8 @@ function testDrupalRenderFormElements() {
     $element = array(
       '#type' => 'details',
       '#title' => $this->randomName(),
-      '#collapsible' => TRUE,
     );
-    $this->assertRenderedElement($element, '//details[contains(@class, :class)]', array(
-      ':class' => 'collapsible',
-    ));
+    $this->assertRenderedElement($element, '//details');
 
     $element['item'] = array(
       '#type' => 'item',

core/modules/system/system.admin.inc

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

core/modules/system/system.module

@@ -548,7 +548,6 @@ function system_element_info() {
     '#theme_wrappers' => array('fieldset'),
   );
   $types['details'] = array(
-    '#collapsible' => FALSE,
     '#collapsed' => FALSE,
     '#value' => NULL,
     '#process' => array('form_process_group', 'ajax_process_form'),
@@ -1353,9 +1352,9 @@ function system_library_info() {
     ),
   );
 
-  // Drupal's collapsible details.
+  // Collapsible details.
   $libraries['drupal.collapse'] = array(
-    'title' => 'Drupal collapsible details',
+    'title' => 'Collapsible details',
     'version' => VERSION,
     'js' => array(
       'core/misc/collapse.js' => array('group' => JS_DEFAULT),
@@ -2611,7 +2610,6 @@ function system_user_timezone(&$form, &$form_state) {
     '#type' => 'details',
     '#title' => t('Locale settings'),
     '#weight' => 6,
-    '#collapsible' => TRUE,
   );
   $form['timezone']['timezone'] = array(
     '#type' => 'select',

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

@@ -13,7 +13,6 @@ function design_test_form_details($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Collapsible details',
     '#description' => 'Details description',
-    '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#states' => array(
       'collapsed' => array(
@@ -26,7 +25,6 @@ function design_test_form_details($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Collapsed details',
     '#description' => 'Details description',
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
   $form['collapsed']['textfield'] = array(
@@ -48,35 +46,30 @@ function design_test_form_details($form, &$form_state) {
     '#type' => 'details',
     '#title' => 'Details',
     '#description' => 'Details description',
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
   $form['collapsed2']['collapsible'] = array(
     '#type' => 'details',
     '#title' => 'Collapsible details',
     '#description' => 'Details description',
-    '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
   $form['collapsed2']['collapsed'] = array(
     '#type' => 'details',
     '#title' => 'Collapsed details',
     '#description' => 'Details description',
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
   $form['collapsed2']['regular'] = array(
     '#type' => 'details',
     '#title' => 'Details',
     '#description' => 'Details description',
-    '#collapsible' => FALSE,
   );
 
   $form['regular'] = array(
     '#type' => 'details',
     '#title' => 'Details',
     '#description' => 'Details description',
-    '#collapsible' => FALSE,
   );
 
   #$form['#attributes'] = array('class' => array('search-form'));

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

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

core/modules/system/tests/modules/form_test/form_test.module

@@ -824,7 +824,6 @@ function _form_test_vertical_tabs_form($form, &$form_state) {
   $form['tab1'] = array(
     '#type' => 'details',
     '#title' => t('Tab 1'),
-    '#collapsible' => TRUE,
     '#group' => 'vertical_tabs',
     '#access' => user_access('access vertical_tab_test tabs')
   );
@@ -835,7 +834,6 @@ function _form_test_vertical_tabs_form($form, &$form_state) {
   $form['tab2'] = array(
     '#type' => 'details',
     '#title' => t('Tab 2'),
-    '#collapsible' => TRUE,
     '#group' => 'vertical_tabs',
     '#access' => user_access('access vertical_tab_test tabs')
   );

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

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

core/modules/translation/translation.module

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

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

@@ -156,7 +156,6 @@ 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)),
-        '#collapsible' => TRUE,
         '#collapsed' => TRUE,
         '#tree' => TRUE,
         '#weight' => -100,
@@ -225,7 +224,6 @@ public function entityFormAlter(array &$form, array &$form_state, EntityInterfac
       $form['translation'] = array(
         '#type' => 'details',
         '#title' => t('Translation'),
-        '#collapsible' => TRUE,
         '#collapsed' => TRUE,
         '#tree' => TRUE,
         '#weight' => 10,

core/modules/user/user.admin.inc

@@ -400,7 +400,6 @@ function user_admin_settings($form, &$form_state) {
   $form['email_admin_created'] = array(
     '#type' => 'details',
     '#title' => t('Welcome (new user created by administrator)'),
-    '#collapsible' => TRUE,
     '#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',
@@ -421,7 +420,6 @@ function user_admin_settings($form, &$form_state) {
   $form['email_pending_approval'] = array(
     '#type' => 'details',
     '#title' => t('Welcome (awaiting approval)'),
-    '#collapsible' => TRUE,
     '#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',
@@ -442,7 +440,6 @@ function user_admin_settings($form, &$form_state) {
   $form['email_pending_approval_admin'] = array(
     '#type' => 'details',
     '#title' => t('Admin (user awaiting approval)'),
-    '#collapsible' => TRUE,
     '#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',
@@ -463,7 +460,6 @@ function user_admin_settings($form, &$form_state) {
   $form['email_no_approval_required'] = array(
     '#type' => 'details',
     '#title' => t('Welcome (no approval required)'),
-    '#collapsible' => TRUE,
     '#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',
@@ -484,7 +480,6 @@ function user_admin_settings($form, &$form_state) {
   $form['email_password_reset'] = array(
     '#type' => 'details',
     '#title' => t('Password recovery'),
-    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#description' => t('Edit the e-mail messages sent to users who request a new password.') . ' ' . $email_token_help,
     '#group' => 'email',
@@ -506,7 +501,6 @@ function user_admin_settings($form, &$form_state) {