commit eb5ff38416a6f5808939052d26cffe57a4318244 Author: Joel Pittet Date: Tue Apr 23 23:12:30 2013 -0700 remove pieces that shouldn't have been there diff --git a/core/modules/views/views_ui/templates/views-ui-expose-filter-form.html.twig b/core/modules/views/views_ui/templates/views-ui-expose-filter-form.html.twig index 2c5fd20..d1300de 100644 --- a/core/modules/views/views_ui/templates/views-ui-expose-filter-form.html.twig +++ b/core/modules/views/views_ui/templates/views-ui-expose-filter-form.html.twig @@ -4,20 +4,18 @@ * Default theme implementation for expose filter form. * * Available variables: - * - form_description: @todo. - * - expose_button: @todo. + * - form_description: The filter's description. + * - expose_button: The button to toggle the expose filter form. * - group_button: @todo. - * - required: @todo. - * - label: @todo. - * - description: @todo. + * - required: A checkbox to require this filter or not. + * - label: A filter label input field. + * - description: A filter description field. * - operator: @todo. * - value: @todo. * - use_operator: @todo. - * - widget: @todo. - * - label: @todo. - * - description: @todo. * - has_left_column: @todo. * - children: Child elements of the form that still need to be printed. + * - more: @todo. * * @see template_preprocess() * @see template_preprocess_views_ui_expose_filter_form() @@ -39,6 +37,7 @@ {% if operator %} {{ operator }} {% endif %} + {% if value %} {{ value }} {% endif %} @@ -49,14 +48,6 @@ {% endif %} -
- {% if widget %} - {{ widget }} - {% endif %} - {{ label }} - {{ description }} -
- {% if has_left_column %}
{{ children }} diff --git a/core/modules/views/views_ui/views_ui.theme.inc b/core/modules/views/views_ui/views_ui.theme.inc index 0563f68..305e572 100644 --- a/core/modules/views/views_ui/views_ui.theme.inc +++ b/core/modules/views/views_ui/views_ui.theme.inc @@ -103,14 +103,6 @@ function template_preprocess_views_ui_expose_filter_form(&$variables) { unset($form['description']); $variables['operator'] = $form['operator']; - $variables['value'] = $form['value']; - unset($form['operator']); - unset($form['value']); - - if (isset($form['use_operator'])) { - $variables['use_operator'] = $form['use_operator']; - unset($form['use_operator']); - } // Only output the right column markup if there's a left column to begin with. if (!empty($form['operator']['#type'])) { @@ -119,6 +111,15 @@ function template_preprocess_views_ui_expose_filter_form(&$variables) { else { $variables['has_left_column'] = FALSE; } + unset($form['operator']); + + $variables['value'] = $form['value']; + unset($form['value']); + + if (isset($form['use_operator'])) { + $variables['use_operator'] = $form['use_operator']; + unset($form['use_operator']); + } $variables['more'] = $form['more']; unset($form['more']);