commit e56b3b0c310df375aceabdbcee0d8740ca8c8a0c Author: Joel Pittet Date: Fri Apr 19 18:00:27 2013 -0700 doc cleanup, revert is defined and -> and remove drupal_render() calls diff --git a/core/modules/views/templates/views-exposed-form.html.twig b/core/modules/views/templates/views-exposed-form.html.twig index 74b4d94..78b85ac 100644 --- a/core/modules/views/templates/views-exposed-form.html.twig +++ b/core/modules/views/templates/views-exposed-form.html.twig @@ -1,27 +1,28 @@ {# /** * @file - * Default theme implementation of a views exposed form. + * Default theme implementation of a Views exposed form. * * Available variables: - * - widgets: An array of exposed form widgets. Each widget contains: - * - label: The sanitized label of the widget, or NULL. + * - widgets: A list of exposed form widgets. Each widget contains: + * - label: The sanitized label of the widget. * - id: The id of the widget, or an empty string. - * - operator: The rendered select element for the operator widget, - * or NULL. - * - description: The sanitized description of the widget, or NULL. - * - widget: The rendered widget itself. - * - sort_by: If defined, the rendered select element to sort the view. - * - sort_order: If 'sort_by' is defined, the rendered select element - * with the ASC, DESC options to define order. - * - items_per_page: If defined, a rendered select element for the available - * items per page. - * - offset: If defined, a textfield to define the offset of the view. - * - reset_button: If defined, a button to reset the exposed filter applied. + * - operator: The select element for the operator widget. + * - description: The sanitized description of the widget. + * - widget: The widget itself. + * - index: the widget's row index. + * - sort_by: An optional select element to sort the View by fields. + * - sort_order: An optional select element with ascending or + * descending order options. + * - items_per_page: An optional select element for the available items per page. + * - offset: An optional textfield to define the offset of the View. + * - reset_button: An optional button to reset the exposed filter applied. * - button: The submit button for the form. * + * @see template_preprocess() + * @see template_preprocess_views_exposed_form() + * * @ingroup themeable - * @ingroup views_templates */ #} {% if q is not empty %} @@ -33,8 +34,8 @@ {% endif %}
- {% for widget in widgets %} -
+ {% for index, widget in widgets %} +
{% if widget.label %}
{% endfor %} - {% if sort_by is defined %} + {% if sort_by %}
{{ sort_by }}
@@ -63,12 +64,12 @@ {{ sort_order }}
{% endif %} - {% if items_per_page is defined %} + {% if items_per_page %}
{{ items_per_page }}
{% endif %} - {% if offset is defined %} + {% if offset %}
{{ offset }}
@@ -76,7 +77,7 @@
{{ button }}
- {% if reset_button is defined %} + {% if reset_button %}
{{ reset_button }}
diff --git a/core/modules/views/templates/views-mini-pager.html.twig b/core/modules/views/templates/views-mini-pager.html.twig new file mode 100644 index 0000000..f268881 --- /dev/null +++ b/core/modules/views/templates/views-mini-pager.html.twig @@ -0,0 +1,16 @@ +{# +/** + * @file + * Default theme implementation for a Views mini-pager. + * + * Available variables: + * - items: A list of pager elements. + * - pager: A themed list of pager elements. + * + * @see template_preprocess() + * @see template_preprocess_views_mini_pager() + * + * @ingroup themeable + */ +#} +{{ pager }} diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index 02953d1..b841fe6 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -940,74 +940,75 @@ function template_preprocess_views_view_row_rss(&$vars) { * * Default template: views-exposed-form.html.twig. * - * @param array $variables + * @param array $vars * An associative array containing: * - form: A render element representing the form. */ -function template_preprocess_views_exposed_form(&$variables) { - $form = &$variables['form']; +function template_preprocess_views_exposed_form(&$vars) { + $form = &$vars['form']; // Put all single checkboxes together in the last spot. - $checkboxes = ''; + $checkboxes = array(); if (!empty($form['q'])) { - $variables['q'] = drupal_render($form['q']); + $vars['q'] = $form['q']; } - $variables['widgets'] = array(); + $vars['widgets'] = array(); foreach ($form['#info'] as $id => $info) { // Set aside checkboxes. if (isset($form[$info['value']]['#type']) && $form[$info['value']]['#type'] == 'checkbox') { - $checkboxes .= drupal_render($form[$info['value']]); + $checkboxes[] = $form[$info['value']]; continue; } $widget = new stdClass(); // set up defaults so that there's always something there. - $widget->label = $widget->operator = $widget->widget = $widget->description = NULL; + $widget->label = $widget->operator = $widget->widget = $widget->description = ''; $widget->id = isset($form[$info['value']]['#id']) ? $form[$info['value']]['#id'] : ''; - + debug($form[$info['value']]['#id']); + debug($widget->id); if (!empty($info['label'])) { $widget->label = check_plain($info['label']); } - if (!empty($info['operator'])) { - $widget->operator = drupal_render($form[$info['operator']]); + if (!empty($info['operator']) && isset($form[$info['operator']])) { + $widget->operator = $form[$info['operator']]; } - $widget->widget = drupal_render($form[$info['value']]); + $widget->widget = $form[$info['value']]; if (!empty($info['description'])) { $widget->description = check_plain($info['description']); } - $variables['widgets'][$id] = $widget; + $vars['widgets'][$id] = $widget; } // Wrap up all the checkboxes we set aside into a widget. - if ($checkboxes) { + if (!empty($checkboxes)) { $widget = new stdClass(); // set up defaults so that there's always something there. - $widget->label = $widget->operator = $widget->widget = NULL; + $widget->label = $widget->operator = $widget->widget = ''; $widget->id = 'checkboxes'; $widget->widget = $checkboxes; - $variables['widgets']['checkboxes'] = $widget; + $vars['widgets']['checkboxes'] = $widget; } if (isset($form['sort_by'])) { - $variables['sort_by'] = drupal_render($form['sort_by']); - $variables['sort_order'] = drupal_render($form['sort_order']); + $vars['sort_by'] = $form['sort_by']; + $vars['sort_order'] = $form['sort_order']; } if (isset($form['items_per_page'])) { - $variables['items_per_page'] = drupal_render($form['items_per_page']); + $vars['items_per_page'] = $form['items_per_page']; } if (isset($form['offset'])) { - $variables['offset'] = drupal_render($form['offset']); + $vars['offset'] = $form['offset']; } if (isset($form['reset'])) { - $variables['reset_button'] = drupal_render($form['reset']); + $vars['reset_button'] = $form['reset']; } // This includes the submit button. - $variables['button'] = drupal_render_children($form); + $vars['button'] = drupal_render_children($form); } /**