commit 0a9e2eedbc391d0d4730ac23c67d2add77623262 Author: Joel Pittet Date: Fri Apr 19 18:30:18 2013 -0700 cleanup and doc updates diff --git a/core/modules/views/views_ui/templates/views-ui-rearrange-filter-form.html.twig b/core/modules/views/views_ui/templates/views-ui-rearrange-filter-form.html.twig index 083a8c1..7f2ada2 100644 --- a/core/modules/views/views_ui/templates/views-ui-rearrange-filter-form.html.twig +++ b/core/modules/views/views_ui/templates/views-ui-rearrange-filter-form.html.twig @@ -1,11 +1,11 @@ {# /** * @file - * Default theme implementation for views ui rearrange filter form. + * Default theme implementation for Views UI rearrange filter form. * * Available variables: * - override: @todo. - * - grouping: A boolean for if there is more than one group. + * - grouping: A flag whether or not there is more than one group. * - filter_groups_operator: @todo. * - filter_groups_group: @todo. * - ungroupable_table: @todo. diff --git a/core/modules/views/views_ui/views_ui.theme.inc b/core/modules/views/views_ui/views_ui.theme.inc index 3aae41c..4f9c732 100644 --- a/core/modules/views/views_ui/views_ui.theme.inc +++ b/core/modules/views/views_ui/views_ui.theme.inc @@ -273,8 +273,16 @@ function template_preprocess_views_ui_rearrange_filter_form(&$vars) { 'rowspan' => max(array(2, count($contents) 1)), ); // Title. - $row[] = array('class' => array('group', 'group-title'), 'data' => '' . $form['#group_options'][$group_id] . '', 'colspan' => 4); - $rows[] = array('class' => array('views-group-title'), 'data' => $row, 'id' => 'views-group-title-' . $group_id); + $row[] = array( + 'class' => array('group', 'group-title'), + 'data' => '' . $form['#group_options'][$group_id] . '', + 'colspan' => 4, + ); + $rows[] = array( + 'class' => array('views-group-title'), + 'data' => $row, + 'id' => 'views-group-title-' . $group_id, + ); // Row which will only appear if the group has nothing in it. $row = array(); @@ -286,14 +294,27 @@ function template_preprocess_views_ui_rearrange_filter_form(&$vars) { if (!empty($form['remove_groups'][$group_id]['#type']) && $form['remove_groups'][$group_id]['#type'] == 'submit') { $form['remove_groups'][$group_id]['#attributes']['class'][] = 'js-hide'; } - $row[] = array('colspan' => 5, 'data' => $instructions . $form['remove_groups'][$group_id]); - $rows[] = array('class' => array("group-message", "group-$group_id-message", $class), 'data' => $row, 'id' => 'views-group-' . $group_id); + $row[] = array( + 'colspan' => 5, + 'data' => array( + $instructions, + $form['remove_groups'][$group_id], + ); + $rows[] = array( + 'class' => array( + 'group-message', + 'group-' . $group_id . '-message', + $class, + ), + 'data' => $row, + 'id' => 'views-group-' . $group_id, + ); } foreach ($contents as $id) { if (isset($form['filters'][$id]['name'])) { $row = array(); - $row[]['data'] = $form['filters'][$id]['name']; + $row[]['data'] = $form['filters'][$id]['name']; $form['filters'][$id]['weight']['#attributes']['class'] = array('weight'); $row[]['data'] = $form['filters'][$id]['weight']; $form['filters'][$id]['group']['#attributes']['class'] = array('views-group-select views-group-select-' . $group_id); @@ -341,7 +362,7 @@ function template_preprocess_views_ui_rearrange_filter_form(&$vars) { $variables['grouping'] = $grouping; if ($grouping) { - $variables['filter_groups_operator'] = $form['filter_groups']['operator']; + $variables['filter_groups_operator'] = $form['filter_groups']['operator']; } else { // @todo find out what type these are to move the #title to the template.