diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php index b9d6218..a71bb6e 100644 --- a/core/modules/block/lib/Drupal/block/BlockListController.php +++ b/core/modules/block/lib/Drupal/block/BlockListController.php @@ -238,8 +238,8 @@ public function buildForm(array $form, array &$form_state) { '#type' => 'select', '#default_value' => $region, '#empty_value' => BLOCK_REGION_NONE, - '#title_display' => 'invisible', '#title' => t('Region for @block block', array('@block' => $info['admin_label'])), + '#title_display' => 'invisible', '#options' => $this->regions, '#attributes' => array( 'class' => array('block-region-select', 'block-region-' . $region), @@ -255,8 +255,8 @@ public function buildForm(array $form, array &$form_state) { '#type' => 'weight', '#default_value' => $info['weight'], '#delta' => $weight_delta, - '#title_display' => 'invisible', '#title' => t('Weight for @block block', array('@block' => $info['admin_label'])), + '#title_display' => 'invisible', '#attributes' => array( 'class' => array('block-weight', 'block-weight-' . $region), ), diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php index 410025b..d94d2e1 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php @@ -89,8 +89,8 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) { case 'comment': $style_form['row_options']['links'] = array( '#type' => 'select', - '#title_display' => 'invisible', '#title' => t('Should links be displayed below each comment'), + '#title_display' => 'invisible', '#options' => array( 1 => t('with links (allow users to reply to the comment, etc.)'), 0 => t('without links'), diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php index 83d6098..3acffdb 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php @@ -334,8 +334,8 @@ protected function buildOverviewTreeForm($tree, $delta) { '#type' => 'weight', '#delta' => $delta, '#default_value' => $item['weight'], - '#title_display' => 'invisible', '#title' => t('Weight for @title', array('@title' => $item['title'])), + '#title_display' => 'invisible', ); $form[$mlid]['mlid'] = array( '#type' => 'hidden', diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php index 33edd5d..ef04488 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php @@ -108,8 +108,8 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) { case 'teasers': $style_form['row_options']['links'] = array( '#type' => 'select', - '#title_display' => 'invisible', '#title' => t('Should links be displayed below each node'), + '#title_display' => 'invisible', '#options' => array( 1 => t('with links (allow users to add comments, etc.)'), 0 => t('without links'), @@ -118,8 +118,8 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) { ); $style_form['row_options']['comments'] = array( '#type' => 'select', - '#title_display' => 'invisible', '#title' => t('Should comments be displayed below each node'), + '#title_display' => 'invisible', '#options' => array( 1 => t('with comments'), 0 => t('without comments'), diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module index 57da935..915e35c 100644 --- a/core/modules/system/tests/modules/form_test/form_test.module +++ b/core/modules/system/tests/modules/form_test/form_test.module @@ -1047,21 +1047,21 @@ function form_label_test_form() { $form['form_checkboxes_title_attribute'] = array( '#type' => 'checkboxes', '#title' => 'Checkboxes test', + '#title_display' => 'attribute', '#options' => array( 'first-checkbox' => 'First checkbox', 'second-checkbox' => 'Second checkbox', ), - '#title_display' => 'attribute', '#required' => TRUE, ); $form['form_radios_title_attribute'] = array( '#type' => 'radios', '#title' => 'Radios test', + '#title_display' => 'attribute', '#options' => array( 'first-radio' => 'First radio', 'second-radio' => 'Second radio', ), - '#title_display' => 'attribute', '#required' => TRUE, ); diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc index bd8a2b5..c50cb1a 100644 --- a/core/modules/taxonomy/taxonomy.admin.inc +++ b/core/modules/taxonomy/taxonomy.admin.inc @@ -188,8 +188,8 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) { $form['terms'][$key]['weight'] = array( '#type' => 'weight', '#delta' => $delta, - '#title_display' => 'invisible', '#title' => t('Weight for added term'), + '#title_display' => 'invisible', '#default_value' => $term->weight->value, '#attributes' => array( 'class' => array('term-weight'), diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc index fddc393..4caec43 100644 --- a/core/modules/user/user.admin.inc +++ b/core/modules/user/user.admin.inc @@ -4,7 +4,6 @@ * @file * Admin page callback file for the user module. */ -use Drupal\Component\Utility\String; /** * Page callback: User administration page. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php index 1c66e49..943814a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php @@ -1018,9 +1018,9 @@ protected function buildExposedFiltersGroupForm(&$form, &$form_state) { ), 'operator' => $row['operator'], 'value' => $row['value'], + // No title is given here, since this input is never displayed. It is + // only triggered by JavaScript. 'remove' => array( - '#title' => t('Remove'), - '#title_display' => 'invisible', '#type' => 'checkbox', '#id' => 'views-removed-' . $item_id, '#attributes' => array('class' => array('views-remove-checkbox')), diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php index e352908..b5364d0 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php @@ -107,8 +107,8 @@ public function buildForm(array $form, array &$form_state) { '#type' => 'textfield', '#default_value' => ++$count, '#attributes' => array('class' => array('weight')), - '#title_display' => 'invisible', '#title' => t('Weight for @title', array('@title' => $name)), + '#title_display' => 'invisible', ); $form['fields'][$id]['removed'] = array(