diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index a3ed418c4557eaf4256b5529b5a1dc75ad820d1a..68fc46e69e8b2f7f19de12dff1fda95220ecbfe4 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2567,7 +2567,7 @@ function install_display_requirements($install_state, $requirements) { */ function _install_configure_form($form, &$form_state, &$install_state) { $form['site_information'] = array( - '#type' => 'details', + '#type' => 'fieldgroup', '#title' => t('Site information'), ); $form['site_information']['site_name'] = array( @@ -2584,11 +2584,11 @@ function _install_configure_form($form, &$form_state, &$install_state) { '#required' => TRUE, '#weight' => -15, ); + $form['admin_account'] = array( - '#type' => 'details', + '#type' => 'fieldgroup', '#title' => t('Site maintenance account'), ); - $form['admin_account']['account']['#tree'] = TRUE; $form['admin_account']['account']['name'] = array('#type' => 'textfield', '#title' => t('Username'), @@ -2598,7 +2598,6 @@ function _install_configure_form($form, &$form_state, &$install_state) { '#weight' => -10, '#attributes' => array('class' => array('username')), ); - $form['admin_account']['account']['mail'] = array( '#type' => 'email', '#title' => t('E-mail address'), @@ -2613,10 +2612,9 @@ function _install_configure_form($form, &$form_state, &$install_state) { ); $form['regional_settings'] = array( - '#type' => 'details', + '#type' => 'fieldgroup', '#title' => t('Regional settings'), ); - $countries = \Drupal::service('country_manager')->getList(); $form['regional_settings']['site_default_country'] = array( '#type' => 'select', @@ -2627,7 +2625,6 @@ function _install_configure_form($form, &$form_state, &$install_state) { '#description' => t('Select the default country for the site.'), '#weight' => 0, ); - $form['regional_settings']['date_default_timezone'] = array( '#type' => 'select', '#title' => t('Default time zone'), @@ -2639,7 +2636,7 @@ function _install_configure_form($form, &$form_state, &$install_state) { ); $form['update_notifications'] = array( - '#type' => 'details', + '#type' => 'fieldgroup', '#title' => t('Update notifications'), ); $form['update_notifications']['update_status_module'] = array( diff --git a/core/modules/system/css/system.module.css b/core/modules/system/css/system.module.css index fdf5ac2d7ad986e1fed3d4cff5d65720476dcfda..3227d506a8d4d5155454fefc301db387413d78f3 100644 --- a/core/modules/system/css/system.module.css +++ b/core/modules/system/css/system.module.css @@ -26,6 +26,14 @@ background-position: 0% center; } +/** + * Unboxed fieldsets for grouping form elements. + */ +.fieldgroup { + border-width: 0; + padding: 0; +} + /** * Collapsible details. * diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 95fd7e6550c1eccb3d5daf13c7cbbf8cb4a2471a..319ea5db02fbfe48e873150f69fc12251fe1a7c2 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -551,6 +551,9 @@ function system_element_info() { '#pre_render' => array('form_pre_render_group'), '#theme_wrappers' => array('fieldset'), ); + $types['fieldgroup'] = $types['fieldset'] + array( + '#attributes' => array('class' => array('fieldgroup')), + ); $types['details'] = array( '#collapsed' => FALSE, '#value' => NULL,