rnsrk/boehler_advanced_search
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove theme wrapper to avoid redudent

Browse source
This commit is contained in:
Kyle Huynh 2023-02-09 16:13:53 -05:00
parent 03d05ca2c2
commit e632b96314
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
css/advanced_search.form.css
View file

@ -35,3 +35,7 @@ input.islandora-advanced-search-form__reset,
input.islandora-advanced-search-form__search { input.islandora-advanced-search-form__search {
display: inline-block; display: inline-block;
} }
.form-wrapper select {
margin-bottom: 1.125rem;
}

9
src/Form/AdvancedSearchForm.php
View file

@ -297,6 +297,7 @@ class AdvancedSearchForm extends FormBase {
self::OR_OP => $this->t('or'), self::OR_OP => $this->t('or'),
], ],
'#default_value' => $conjunction, '#default_value' => $conjunction,
'#theme_wrappers' => []
], ],
self::SEARCH_FORM_FIELD => [ self::SEARCH_FORM_FIELD => [
'#type' => 'select', '#type' => 'select',
@ -305,6 +306,7 @@ class AdvancedSearchForm extends FormBase {
], ],
'#options' => $options, '#options' => $options,
'#default_value' => $term_value[self::SEARCH_FORM_FIELD], '#default_value' => $term_value[self::SEARCH_FORM_FIELD],
'#theme_wrappers' => []
], ],
self::INCLUDE_FORM_FIELD => [ self::INCLUDE_FORM_FIELD => [
'#type' => 'select', '#type' => 'select',
@ -323,6 +325,7 @@ class AdvancedSearchForm extends FormBase {
':input[name="terms[' . $i . '][' . self::CONJUNCTION_FORM_FIELD . ']"]' => ['value' => self::AND_OP], ':input[name="terms[' . $i . '][' . self::CONJUNCTION_FORM_FIELD . ']"]' => ['value' => self::AND_OP],
], ],
], ],
'#theme_wrappers' => []
], ],
// Just markup to show when 'include' is not alterable due to the // Just markup to show when 'include' is not alterable due to the
// selected 'conjunction'. Hide for the first term. // selected 'conjunction'. Hide for the first term.
@ -334,9 +337,10 @@ class AdvancedSearchForm extends FormBase {
':input[name="terms[' . $i . '][' . self::CONJUNCTION_FORM_FIELD . ']"]' => ['value' => self::OR_OP], ':input[name="terms[' . $i . '][' . self::CONJUNCTION_FORM_FIELD . ']"]' => ['value' => self::OR_OP],
], ],
], ],
'content' => [ /*'content' => [
'#markup' => $this->t('is'), '#markup' => $this->t('is'),
], ],*/
'#theme_wrappers' => []
], ],
self::VALUE_FORM_FIELD => [ self::VALUE_FORM_FIELD => [
'#type' => 'textfield', '#type' => 'textfield',
@ -344,6 +348,7 @@ class AdvancedSearchForm extends FormBase {
'aria-label' => $this->t("Enter a search term") 'aria-label' => $this->t("Enter a search term")
], ],
'#default_value' => $term_value[self::VALUE_FORM_FIELD], '#default_value' => $term_value[self::VALUE_FORM_FIELD],
'#theme_wrappers' => []
], ],
'actions' => [ 'actions' => [
'#type' => 'container', '#type' => 'container',