Commit ff8202a7 authored by Dries's avatar Dries
Browse files

Issue #1832872 by dead_arm, Hydra, tim.plunkett, dawehner: Add visual emphasis...

Issue #1832872 by dead_arm, Hydra, tim.plunkett, dawehner: Add visual emphasis on search box/filtering.
parent fec72c22
...@@ -1213,6 +1213,7 @@ function views_ui_add_item_form($form, &$form_state) { ...@@ -1213,6 +1213,7 @@ function views_ui_add_item_form($form, &$form_state) {
$type = $form_state['type']; $type = $form_state['type'];
$form = array( $form = array(
'override' => array(),
'options' => array( 'options' => array(
'#theme_wrappers' => array('container'), '#theme_wrappers' => array('container'),
'#attributes' => array('class' => array('scroll')), '#attributes' => array('class' => array('scroll')),
...@@ -1244,20 +1245,20 @@ function views_ui_add_item_form($form, &$form_state) { ...@@ -1244,20 +1245,20 @@ function views_ui_add_item_form($form, &$form_state) {
$options = views_fetch_fields(array_keys($base_tables), $type, $display->useGroupBy(), $form_state['type']); $options = views_fetch_fields(array_keys($base_tables), $type, $display->useGroupBy(), $form_state['type']);
if (!empty($options)) { if (!empty($options)) {
$form['options']['controls'] = array( $form['override']['controls'] = array(
'#theme_wrappers' => array('container'), '#theme_wrappers' => array('container'),
'#id' => 'views-filterable-options-controls', '#id' => 'views-filterable-options-controls',
'#attributes' => array('class' => array('container-inline')), '#attributes' => array('class' => array('container-inline')),
); );
$form['options']['controls']['options_search'] = array( $form['override']['controls']['options_search'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Search'), '#title' => t('Search'),
); );
$groups = array('all' => t('- All -')); $groups = array('all' => t('- All -'));
$form['options']['controls']['group'] = array( $form['override']['controls']['group'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Filter'), '#title' => t('Type'),
'#options' => array(), '#options' => array(),
); );
...@@ -1306,10 +1307,10 @@ function views_ui_add_item_form($form, &$form_state) { ...@@ -1306,10 +1307,10 @@ function views_ui_add_item_form($form, &$form_state) {
'#states' => array( '#states' => array(
'visible' => array( 'visible' => array(
array( array(
':input[name="group"]' => array('value' => 'all'), ':input[name="override[controls][group]"]' => array('value' => 'all'),
), ),
array( array(
':input[name="group"]' => array('value' => $group), ':input[name="override[controls][group]"]' => array('value' => $group),
), ),
) )
) )
...@@ -1318,7 +1319,7 @@ function views_ui_add_item_form($form, &$form_state) { ...@@ -1318,7 +1319,7 @@ function views_ui_add_item_form($form, &$form_state) {
} }
} }
$form['options']['controls']['group']['#options'] = $groups; $form['override']['controls']['group']['#options'] = $groups;
} }
else { else {
$form['options']['markup'] = array( $form['options']['markup'] = array(
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
} }
.views-ui-dialog #views-filterable-options-controls { .views-ui-dialog #views-filterable-options-controls {
display: block; display: inline;
} }
/* Don't let the messages overwhelm the modal */ /* Don't let the messages overwhelm the modal */
......
...@@ -345,7 +345,7 @@ Drupal.viewsUi.OptionsSearch = function ($form) { ...@@ -345,7 +345,7 @@ Drupal.viewsUi.OptionsSearch = function ($form) {
this.$form = $form; this.$form = $form;
// Add a keyup handler to the search box. // Add a keyup handler to the search box.
this.$searchBox = this.$form.find('#edit-options-search'); this.$searchBox = this.$form.find('#edit-override-controls-options-search');
this.$searchBox.keyup(jQuery.proxy(this.handleKeyup, this)); this.$searchBox.keyup(jQuery.proxy(this.handleKeyup, this));
// Get a list of option labels and their corresponding divs and maintain it // Get a list of option labels and their corresponding divs and maintain it
// in memory, so we have as little overhead as possible at keyup time. // in memory, so we have as little overhead as possible at keyup time.
......
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