Skip to content
Snippets Groups Projects
Commit 1f95122a authored by Martin Leblanc's avatar Martin Leblanc Committed by Kevin Paxman
Browse files

ISTWCMS-4729: additional changes to form text and aria status as per liam

parent f14ad2f1
No related branches found
No related tags found
1 merge request!239ISTWCMS 4729 ebremner search form
...@@ -43,6 +43,7 @@ class UwSearchForm extends FormBase { ...@@ -43,6 +43,7 @@ class UwSearchForm extends FormBase {
'uw-input--checkboxform', 'uw-input--checkboxform',
], ],
'aria-hidden' => 'true', 'aria-hidden' => 'true',
'tabindex' => '-1',
], ],
'#theme_wrappers' => [], '#theme_wrappers' => [],
]; ];
...@@ -54,13 +55,12 @@ class UwSearchForm extends FormBase { ...@@ -54,13 +55,12 @@ class UwSearchForm extends FormBase {
// label. // label.
$form['label'] = [ $form['label'] = [
'#theme' => 'form_element_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', '#title_display' => 'after',
'#required' => FALSE, '#required' => FALSE,
'#id' => 'edit-opentray', '#id' => 'edit-opentray',
'#attributes' => [ '#attributes' => [
'class' => ['uw-search--checkboxlabel'], 'class' => ['uw-search--checkboxlabel'],
'aria-hidden' => 'true',
], ],
]; ];
...@@ -72,7 +72,7 @@ class UwSearchForm extends FormBase { ...@@ -72,7 +72,7 @@ class UwSearchForm extends FormBase {
], ],
'#id' => 'uw-search', '#id' => 'uw-search',
'#placeholder' => $this->t('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', '#title_display' => 'invisible',
'#label' => [ '#label' => [
'#theme' => 'form_element_label', '#theme' => 'form_element_label',
...@@ -80,7 +80,6 @@ class UwSearchForm extends FormBase { ...@@ -80,7 +80,6 @@ class UwSearchForm extends FormBase {
'#id' => 'uw-search', '#id' => 'uw-search',
'#attributes' => [ '#attributes' => [
'class' => ['uw-search--hidelabel'], 'class' => ['uw-search--hidelabel'],
'aria-hidden' => 'true',
], ],
], ],
]; ];
...@@ -99,14 +98,13 @@ class UwSearchForm extends FormBase { ...@@ -99,14 +98,13 @@ class UwSearchForm extends FormBase {
'inurl:' . $url => $this->t('On this site'), 'inurl:' . $url => $this->t('On this site'),
], ],
'#title_display' => 'invisible', '#title_display' => 'invisible',
'#title' => $this->t('Select Label'), '#title' => $this->t('Search Location'),
'#label' => [ '#label' => [
'#theme' => 'form_element_label', '#theme' => 'form_element_label',
'#required' => FALSE, '#required' => FALSE,
'#id' => 'uw-select-site', '#id' => 'uw-select-site',
'#attributes' => [ '#attributes' => [
'class' => ['uw-search--hidelabel'], 'class' => ['uw-search--hidelabel'],
'aria-hidden' => 'true',
], ],
], ],
]; ];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment