diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Form/MigrateDrupalUpgradeForm.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Form/MigrateDrupalUpgradeForm.php index 3898241..18173f3 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Form/MigrateDrupalUpgradeForm.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Form/MigrateDrupalUpgradeForm.php @@ -33,7 +33,14 @@ public function getFormId() { public function credentialStep() { $form['#title'] = $this->t('Upgrade step 1: Source site information'); - $form['site_address'] = array( + $form['files'] = array( + '#type' => 'details', + '#title' => t('Files'), + '#open' => TRUE, + '#weight' => 2, + ); + + $form['files']['site_address'] = array( '#type' => 'textfield', '#title' => $this->t('Source site address'), '#description' => $this->t('Enter the address of your current Drupal ' . @@ -41,7 +48,7 @@ public function credentialStep() { 'retrieve any public files from the site.'), ); - $form['private_file_directory'] = array( + $form['files']['private_file_directory'] = array( '#type' => 'textfield', '#title' => $this->t('Private file directory'), '#description' => $this->t('If you have private files on your current ' . @@ -51,7 +58,14 @@ public function credentialStep() { 'or "http://private.example.com/legacy_files/private") here.'), ); - $form['database_description'] = array( + $form['database'] = array( + '#type' => 'details', + '#title' => t('Database'), + '#open' => TRUE, + '#weight' => 1, + ); + + $form['database']['database_description'] = array( '#markup' => $this->t('Enter the database credentials for the legacy Drupal ' . 'site you are upgrading into this Drupal 8 instance:'), ); @@ -65,27 +79,27 @@ public function credentialStep() { $drivers = drupal_get_database_types(); $drivers_keys = array_keys($drivers); - $form['driver'] = array( + $form['database']['driver'] = array( '#type' => 'radios', '#title' => t('Database type'), '#required' => TRUE, '#default_value' => !empty($database['driver']) ? $database['driver'] : current($drivers_keys), ); if (count($drivers) == 1) { - $form['driver']['#disabled'] = TRUE; + $form['database']['driver']['#disabled'] = TRUE; } // Add driver specific configuration options. foreach ($drivers as $key => $driver) { - $form['driver']['#options'][$key] = $driver->name(); + $form['database']['driver']['#options'][$key] = $driver->name(); - $form['settings'][$key] = $driver->getFormOptions($database); - $form['settings'][$key]['#prefix'] = '

' . + $form['database']['settings'][$key] = $driver->getFormOptions($database); + $form['database']['settings'][$key]['#prefix'] = '

' . $this->t('@driver_name settings', array('@driver_name' => $driver->name())) . '

'; - $form['settings'][$key]['#type'] = 'container'; - $form['settings'][$key]['#tree'] = TRUE; - $form['settings'][$key]['advanced_options']['#parents'] = array($key); - $form['settings'][$key]['#states'] = array( + $form['database']['settings'][$key]['#type'] = 'container'; + $form['database']['settings'][$key]['#tree'] = TRUE; + $form['database']['settings'][$key]['advanced_options']['#parents'] = array($key); + $form['database']['settings'][$key]['#states'] = array( 'visible' => array( ':input[name=driver]' => array('value' => $key), )