core/includes/form.inc | 17 +++++++++++++++++ core/modules/block/block.admin.inc | 2 +- core/modules/block/block.module | 4 ++-- core/modules/block/lib/Drupal/block/BlockBase.php | 3 +++ core/modules/menu/menu.module | 2 ++ .../lib/Drupal/menu_link/MenuLinkFormController.php | 11 ++++++++++- core/modules/system/system.module | 1 + 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/core/includes/form.inc b/core/includes/form.inc index 95470f9..9ec05e5 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -2649,6 +2649,23 @@ function _form_options_flatten($array) { } /** + * Process simplified form wrappers for overlay. + */ +function form_process_simplified_form($element) { + if (!empty($element['#simplified']) && module_invoke('overlay', 'get_mode') == 'child') { + $element['advanced_fields_start'] = array( + '#markup' => '
' . t('Advanced settings') . '
', + '#weight' => 1, + ); + $element['advanced_fields_end'] = array( + '#markup' => '
', + '#weight' => 100, + ); + } + return $element; +} + +/** * Processes a select list form element. * * This process callback is mandatory for select fields, since all user agents diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc index e5e8d76..de0b656 100644 --- a/core/modules/block/block.admin.inc +++ b/core/modules/block/block.admin.inc @@ -78,7 +78,7 @@ function block_admin_edit(Block $entity) { } // Get the block subject for the page title. - drupal_set_title(t("Configure %label block in %theme", array('%label' => $entity->label(), '%theme' => $theme_title)), PASS_THROUGH); + drupal_set_title(t("Edit %label block in %theme", array('%label' => $entity->label(), '%theme' => $theme_title)), PASS_THROUGH); return entity_get_form($entity); } diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 8bf4aae..7458746 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -129,14 +129,14 @@ function block_menu() { 'file' => 'block.admin.inc', ); $items['admin/structure/block/manage/%block'] = array( - 'title' => 'Configure block', + 'title' => 'Edit block', 'page callback' => 'block_admin_edit', 'page arguments' => array(4), 'access arguments' => array('administer blocks'), 'file' => 'block.admin.inc', ); $items['admin/structure/block/manage/%block/configure'] = array( - 'title' => 'Configure block', + 'title' => 'Edit block', 'type' => MENU_DEFAULT_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, ); diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php index 9e5bf6c..36a3f43 100644 --- a/core/modules/block/lib/Drupal/block/BlockBase.php +++ b/core/modules/block/lib/Drupal/block/BlockBase.php @@ -233,6 +233,8 @@ public function form($form, &$form_state) { '#type' => 'value', '#value' => $definition['module'], ); + // Make form simplified if in contextual administration. + $form['#simplified'] = TRUE; $form['label'] = array( '#type' => 'textfield', @@ -262,6 +264,7 @@ public function form($form, &$form_state) { '#default_value' => $entity->get('region'), '#empty_value' => BLOCK_REGION_NONE, '#options' => system_region_list($entity->get('theme'), REGIONS_VISIBLE), + '#weight' => 5, ); // Visibility settings. diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 44723dd..3adcaaf 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -117,6 +117,8 @@ function menu_menu() { 'page arguments' => array(4), 'access arguments' => array('administer menu'), 'file' => 'menu.admin.inc', + 'type' => MENU_LOCAL_TASK, + 'context' => MENU_CONTEXT_INLINE, ); $items['admin/structure/menu/manage/%menu/edit'] = array( 'title' => 'Edit menu', diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php index 9506602..4e7a02f 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php @@ -19,6 +19,9 @@ class MenuLinkFormController extends EntityFormController { * Overrides EntityFormController::form(). */ public function form(array $form, array &$form_state, EntityInterface $menu_link) { + // Make form simplified if in contextual administration. + $form['#simplified'] = TRUE; + // Since menu_link_load() no longer returns a translated and access checked // item, do it here instead. _menu_link_translate($menu_link); @@ -36,7 +39,7 @@ public function form(array $form, array &$form_state, EntityInterface $menu_link $form['link_title'] = array( '#type' => 'textfield', - '#title' => t('Menu link title'), + '#title' => t('Title'), '#default_value' => $menu_link->link_title, '#description' => t('The text to be used for this link in the menu.'), '#required' => TRUE, @@ -80,18 +83,21 @@ public function form(array $form, array &$form_state, EntityInterface $menu_link '#default_value' => isset($menu_link->options['attributes']['title']) ? $menu_link->options['attributes']['title'] : '', '#rows' => 1, '#description' => t('Shown when hovering over the menu link.'), + '#weight' => 5, ); $form['enabled'] = array( '#type' => 'checkbox', '#title' => t('Enabled'), '#default_value' => !$menu_link->hidden, '#description' => t('Menu links that are not enabled will not be listed in any menu.'), + '#weight' => 6, ); $form['expanded'] = array( '#type' => 'checkbox', '#title' => t('Show as expanded'), '#default_value' => $menu_link->expanded, '#description' => t('If selected and this menu link has children, the menu will always appear expanded.'), + '#weight' => 7, ); // Generate a list of possible parents (not including this link or descendants). @@ -107,6 +113,7 @@ public function form(array $form, array &$form_state, EntityInterface $menu_link '#options' => $options, '#description' => t('The maximum depth for a link and all its children is fixed at !maxdepth. Some menu links may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)), '#attributes' => array('class' => array('menu-title-select')), + '#weight' => 8, ); // Get number of items in menu so the weight selector is sized appropriately. @@ -119,6 +126,7 @@ public function form(array $form, array &$form_state, EntityInterface $menu_link '#delta' => max($delta, 50), '#default_value' => $menu_link->weight, '#description' => t('Optional. In the menu, the heavier links will sink and the lighter links will be positioned nearer the top.'), + '#weight' => 8, ); $form['langcode'] = array( @@ -138,6 +146,7 @@ protected function actions(array $form, array &$form_state) { $element = parent::actions($form, $form_state); $element['submit']['#button_type'] = 'primary'; $element['delete']['#access'] = $this->getEntity($form_state)->module == 'menu'; + $element['#weight'] = 101; return $element; } diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 72ceea5..9a23ae3 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -254,6 +254,7 @@ function system_element_info() { $types['form'] = array( '#method' => 'post', '#action' => request_uri(), + '#process' => array('form_process_simplified_form'), '#theme_wrappers' => array('form'), ); $types['page'] = array(