diff --git a/config/optional/block.block.oe_whitelabel_search_form.yml b/config/optional/block.block.oe_whitelabel_search_form.yml
index 3360d7d26c9fd8905709c3433d577ddadd1b93b5..1bc6559652417cf1cd2197149c5267c69d00bfa3 100644
--- a/config/optional/block.block.oe_whitelabel_search_form.yml
+++ b/config/optional/block.block.oe_whitelabel_search_form.yml
@@ -21,6 +21,10 @@ settings:
region: navigation_right
input:
name: text
+ label: Search
+ placeholder: Search
+ button:
+ label: ''
view_options:
enable_autocomplete: false
id: null
diff --git a/modules/oe_whitelabel_search/config/schema/oe_whitelabel_search.schema.yml b/modules/oe_whitelabel_search/config/schema/oe_whitelabel_search.schema.yml
index 52977cb28ca19eb31e1d651a4cae0810fe103c24..bd15d2761ca79622fb4a94cf739eedef7c9c61f5 100644
--- a/modules/oe_whitelabel_search/config/schema/oe_whitelabel_search.schema.yml
+++ b/modules/oe_whitelabel_search/config/schema/oe_whitelabel_search.schema.yml
@@ -19,6 +19,19 @@ block.settings.whitelabel_search_block:
name:
type: string
label: Name
+ label:
+ type: string
+ label: Label
+ placeholder:
+ type: string
+ label: Placeholder
+ button:
+ type: mapping
+ label: Button
+ mapping:
+ label:
+ type: string
+ label: Button label
view_options:
type: mapping
label: View Options
diff --git a/modules/oe_whitelabel_search/src/Form/SearchForm.php b/modules/oe_whitelabel_search/src/Form/SearchForm.php
index a134b5f8e7214e34ca76d12893a1a6357d18c9dd..833a25defe0f1820dfdf9351e6bbad2b3ac70178 100644
--- a/modules/oe_whitelabel_search/src/Form/SearchForm.php
+++ b/modules/oe_whitelabel_search/src/Form/SearchForm.php
@@ -59,7 +59,7 @@ class SearchForm extends FormBase {
$form['search_input'] = [
'#type' => 'textfield',
- '#title' => $this->t('Search'),
+ '#title' => $config['input']['label'],
'#title_display' => 'invisible',
'#size' => 20,
'#margin_class' => 'mb-0',
@@ -67,12 +67,16 @@ class SearchForm extends FormBase {
'#region' => $config['form']['region'],
'#default_value' => $input_value,
'#required' => TRUE,
+ '#attributes' => [
+ 'placeholder' => $config['input']['placeholder'],
+ ],
];
$form['submit'] = [
'#type' => 'submit',
'#form_id' => $this->getFormId(),
'#region' => $config['form']['region'],
+ '#value' => $config['button']['label'],
];
if (!$config['view_options']['enable_autocomplete']) {
diff --git a/modules/oe_whitelabel_search/src/Plugin/Block/SearchBlock.php b/modules/oe_whitelabel_search/src/Plugin/Block/SearchBlock.php
index 3074eeff7b6515c613da4e3162988ac3c9e928d5..54d98bda62fc2ec6ff3194ce9c17c08665b719c6 100644
--- a/modules/oe_whitelabel_search/src/Plugin/Block/SearchBlock.php
+++ b/modules/oe_whitelabel_search/src/Plugin/Block/SearchBlock.php
@@ -97,6 +97,11 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
],
'input' => [
'name' => '',
+ 'label' => '',
+ 'placeholder' => $this->t('Search'),
+ ],
+ 'button' => [
+ 'label' => '',
],
'view_options' => [
'enable_autocomplete' => FALSE,
@@ -134,7 +139,32 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
'#default_value' => $config['input']['name'],
'#required' => TRUE,
];
-
+ $form['input']['input_label'] = [
+ '#type' => 'textfield',
+ '#title' => $this->t('Input Label'),
+ '#description' => $this->t('A label text for the search input.'),
+ '#default_value' => $config['input']['label'],
+ '#required' => TRUE,
+ ];
+ $form['input']['input_placeholder'] = [
+ '#type' => 'textfield',
+ '#title' => $this->t('Input placeholder text'),
+ '#description' => $this->t('The placeholder that will be shown inside the input field.'),
+ '#default_value' => $config['input']['placeholder'],
+ ];
+ $form['button'] = [
+ '#type' => 'details',
+ '#title' => $this->t('Button Field Settings'),
+ '#open' => TRUE,
+ '#tree' => TRUE,
+ '#description' => $this->t('Fill in the settings of the Button field.'),
+ ];
+ $form['button']['button_label'] = [
+ '#type' => 'textfield',
+ '#title' => $this->t('Button label'),
+ '#description' => $this->t('A label text for the button input.'),
+ '#default_value' => $config['button']['label'],
+ ];
$form['enable_autocomplete'] = [
'#type' => 'checkbox',
'#title' => $this->t('Enable autocomplete'),
@@ -192,6 +222,12 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
$input = $values['input'];
$this->setConfigurationValue('input', [
'name' => $input['input_name'],
+ 'label' => $input['input_label'],
+ 'placeholder' => $input['input_placeholder'],
+ ]);
+ $button = $values['button'];
+ $this->setConfigurationValue('button', [
+ 'label' => $button['button_label'],
]);
$this->setConfigurationValue('view_options', [
'id' => $form_state->getValue('view_id'),
diff --git a/modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php b/modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php
index af04f9a3c0fa8980c0a334d3b6f2e5295babb6cb..ce231446bb26bbe977acad1728541842c5dcc3e6 100644
--- a/modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php
+++ b/modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php
@@ -139,6 +139,11 @@ class SearchBlockTest extends KernelTestBase {
],
'input' => [
'name' => 'search_api_fulltext',
+ 'label' => 'Search',
+ 'placeholder' => 'Search',
+ ],
+ 'button' => [
+ 'label' => 'Search',
],
'view_options' => [
'enable_autocomplete' => TRUE,
diff --git a/templates/overrides/search/input--submit--header--oe-whitelabel-search-form.html.twig b/templates/overrides/search/input--submit--header--oe-whitelabel-search-form.html.twig
index 62184e18bc7f9c2791e86a7b1c6ac50759603c4a..59b9bb60508a8c7c4c4150b8b14c90970dd4b404 100644
--- a/templates/overrides/search/input--submit--header--oe-whitelabel-search-form.html.twig
+++ b/templates/overrides/search/input--submit--header--oe-whitelabel-search-form.html.twig
@@ -6,10 +6,11 @@
* @see ./core/modules/system/templates/input.html.twig
*/
#}
-{% set label %}
- <span class="d-none d-lg-inline-block">{{ 'Search'|t }}</span>
-{% endset %}
-
+{% if element['#value'] is not empty %}
+ {% set label %}
+ <span class="d-none d-lg-inline-block">{{ element['#value']|t }}</span>
+ {% endset %}
+{% endif %}
{{ pattern('button', {
'variant': 'primary',
'icon': 'search',
diff --git a/templates/overrides/search/input--submit--navigation-right--oe-whitelabel-search-form.html.twig b/templates/overrides/search/input--submit--navigation-right--oe-whitelabel-search-form.html.twig
index a1f8858348fc7dac3d7dcdce2304a91770d45a74..eab8b9ce0f6b863db18fc34f9cdbf6640b7d798a 100644
--- a/templates/overrides/search/input--submit--navigation-right--oe-whitelabel-search-form.html.twig
+++ b/templates/overrides/search/input--submit--navigation-right--oe-whitelabel-search-form.html.twig
@@ -6,8 +6,14 @@
* @see ./core/modules/system/templates/input.html.twig
*/
#}
+{% if element['#value'] is not empty %}
+ {% set label %}
+ <span class="d-none d-lg-inline-block">{{ element['#value']|t }}</span>
+ {% endset %}
+{% endif %}
{{ pattern('button', {
'variant': 'light',
+ 'label': label,
'icon': 'search',
'type': 'submit',
'icon_position': 'before',