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

This reverts commit c4e52bb6.

Revert "Issue #1892182 by nod_: #type details: Rename #collapsed to #open."
This reverts commit c4e52bb6.
687af784 · alexpott · e03cac18 · 687af784 · 687af784 · 687af784
Commit 687af784 authored May 29, 2013 by alexpott
--- a/core/includes/form.inc
+++ b/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';
  }


--- a/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/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,
    );

--- a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
+++ b/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',

--- a/core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php
+++ b/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;
    }

--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
+++ b/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),
      );
    }


--- a/core/modules/aggregator/tests/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
+++ b/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(

--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
+++ b/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'),

--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php
+++ b/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',
      );


--- a/core/modules/block/lib/Drupal/block/BlockFormController.php
+++ b/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,
    );

--- a/core/modules/book/book.module
+++ b/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'),

--- a/core/modules/comment/comment.module
+++ b/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'),

--- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php
+++ b/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,
      );
    }


--- a/core/modules/dblog/dblog.admin.inc
+++ b/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',

--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/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,
    );


--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/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.

--- a/core/modules/language/language.admin.inc
+++ b/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(

--- a/core/modules/locale/locale.bulk.inc
+++ b/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(

--- a/core/modules/locale/locale.pages.inc
+++ b/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.

--- a/core/modules/menu/menu.module
+++ b/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')),
    ),

--- a/core/modules/node/content_types.inc
+++ b/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(