Commit 84fad8a0 authored by alexpott's avatar alexpott

Issue #2358037 by davidhernandez, jhodgdon, lauriii: Add search form block Twig template file

parent 10a80c84
......@@ -114,7 +114,6 @@ function search_theme() {
function search_preprocess_block(&$variables) {
if ($variables['plugin_id'] == 'search_form_block') {
$variables['attributes']['role'] = 'search';
$variables['attributes']['class'][] = 'container-inline';
}
}
......
......@@ -112,10 +112,6 @@ function bartik_preprocess_block(&$variables) {
if ($variables['plugin_id'] == 'system_branding_block') {
$variables['attributes']['class'][] = 'clearfix';
}
// Add a container-inline class to keep consistent visual styles
if ($variables['plugin_id'] == 'search_form_block') {
$variables['content_attributes']['class'][] = 'container-inline';
}
}
/**
......
{% extends "@classy/block--search-form-block.html.twig" %}
{#
/**
* @file
* Bartik's theme implementation for a search form block. Extends Classy's
* search form block template.
*
* Available variables:
* - content: The content of this block.
* - content_attributes: A list of HTML attributes applied to the main content
* tag that appears in the template.
*
* @see template_preprocess_block()
* @see search_preprocess_block()
*
* @ingroup themeable
*/
#}
{% block content %}
<div{{ content_attributes.addClass('content', 'container-inline') }}>
{{ parent() }}
</div>
{% endblock %}
{#
/**
* @file
* Default theme override for the search form block.
*
* Available variables:
* - plugin_id: The ID of the block implementation.
* - label: The configured label of the block if visible.
* - configuration: A list of the block's configuration values, including:
* - label: The configured label for the block.
* - label_display: The display settings for the label.
* - module: The module that provided this block plugin.
* - cache: The cache settings.
* - Block plugin specific settings will also be stored here.
* - block - The full block entity, including:
* - label_hidden: The hidden block title value if the block was
* configured to hide the title ('label' is empty in this case).
* - module: The module that generated the block.
* - delta: An ID for the block, unique within each module.
* - region: The block region embedding the current block.
* - content: The content of this block.
* - attributes: A list HTML attributes populated by modules, intended to
* be added to the main container tag of this template. Includes:
* - id: A valid HTML ID and guaranteed unique.
* - title_attributes: Same as attributes, except applied to the main title
* tag that appears in the template.
* - title_prefix: Additional output populated by modules, intended to be
* displayed in front of the main title tag that appears in the template.
* - title_suffix: Additional output populated by modules, intended to be
* displayed after the main title tag that appears in the template.
*
* @see template_preprocess_block()
* @see search_preprocess_block()
*
* @ingroup themeable
*/
#}
{%
set classes = [
'block',
'block-search',
'container-inline',
]
%}
<div{{ attributes.addClass(classes) }}>
{{ title_prefix }}
{% if label %}
<h2{{ title_attributes }}>{{ label }}</h2>
{% endif %}
{{ title_suffix }}
{% block content %}
{{ content }}
{% endblock %}
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment