From 1f95122a7de545b192fdc362df35d5e371c3ffdf Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Tue, 17 May 2022 12:22:19 -0400
Subject: [PATCH] ISTWCMS-4729: additional changes to form text and aria status
as per liam
---
src/Form/UwSearchForm.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/Form/UwSearchForm.php b/src/Form/UwSearchForm.php
index 18cc7752..dde69aa5 100644
--- a/src/Form/UwSearchForm.php
+++ b/src/Form/UwSearchForm.php
@@ -43,6 +43,7 @@ class UwSearchForm extends FormBase {
'uw-input--checkboxform',
],
'aria-hidden' => 'true',
+ 'tabindex' => '-1',
],
'#theme_wrappers' => [],
];
@@ -54,13 +55,12 @@ class UwSearchForm extends FormBase {
// label.
$form['label'] = [
'#theme' => 'form_element_label',
- '#title' => $this->t('<span class="uw-search--checkboxlabel__labeltext">Open Search </span>'),
+ '#title' => $this->t('<span class="uw-search--checkboxlabel__labeltext">Open Search Location </span>'),
'#title_display' => 'after',
'#required' => FALSE,
'#id' => 'edit-opentray',
'#attributes' => [
'class' => ['uw-search--checkboxlabel'],
- 'aria-hidden' => 'true',
],
];
@@ -72,7 +72,7 @@ class UwSearchForm extends FormBase {
],
'#id' => 'uw-search',
'#placeholder' => $this->t('Search'),
- '#title' => $this->t('<span class="uw-search--labeltext">Search Text </span>'),
+ '#title' => $this->t('<span class="uw-search--labeltext">Search for </span>'),
'#title_display' => 'invisible',
'#label' => [
'#theme' => 'form_element_label',
@@ -80,7 +80,6 @@ class UwSearchForm extends FormBase {
'#id' => 'uw-search',
'#attributes' => [
'class' => ['uw-search--hidelabel'],
- 'aria-hidden' => 'true',
],
],
];
@@ -99,14 +98,13 @@ class UwSearchForm extends FormBase {
'inurl:' . $url => $this->t('On this site'),
],
'#title_display' => 'invisible',
- '#title' => $this->t('Select Label'),
+ '#title' => $this->t('Search Location'),
'#label' => [
'#theme' => 'form_element_label',
'#required' => FALSE,
'#id' => 'uw-select-site',
'#attributes' => [
'class' => ['uw-search--hidelabel'],
- 'aria-hidden' => 'true',
],
],
];
--
GitLab