summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2012-12-15 02:39:15 (GMT)
committerDries2012-12-15 02:39:15 (GMT)
commitff8202a71c4cb1b5071f3ff549c6a9b16d1c0149 (patch)
treeead74fdae6c462dfd19a5ba678c7e02aeaea4e74
parentfec72c22245dec2e00223f92e395b6202351eb90 (diff)
Issue #1832872 by dead_arm, Hydra, tim.plunkett, dawehner: Add visual emphasis on search box/filtering.
-rw-r--r--core/modules/views/views_ui/admin.inc15
-rw-r--r--core/modules/views/views_ui/css/views-admin.css2
-rw-r--r--core/modules/views/views_ui/js/views-admin.js2
3 files changed, 10 insertions, 9 deletions
diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index 5f2eca3..c2775e4 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -1213,6 +1213,7 @@ function views_ui_add_item_form($form, &$form_state) {
$type = $form_state['type'];
$form = array(
+ 'override' => array(),
'options' => array(
'#theme_wrappers' => array('container'),
'#attributes' => array('class' => array('scroll')),
@@ -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']);
if (!empty($options)) {
- $form['options']['controls'] = array(
+ $form['override']['controls'] = array(
'#theme_wrappers' => array('container'),
'#id' => 'views-filterable-options-controls',
'#attributes' => array('class' => array('container-inline')),
);
- $form['options']['controls']['options_search'] = array(
+ $form['override']['controls']['options_search'] = array(
'#type' => 'textfield',
'#title' => t('Search'),
);
$groups = array('all' => t('- All -'));
- $form['options']['controls']['group'] = array(
+ $form['override']['controls']['group'] = array(
'#type' => 'select',
- '#title' => t('Filter'),
+ '#title' => t('Type'),
'#options' => array(),
);
@@ -1306,10 +1307,10 @@ function views_ui_add_item_form($form, &$form_state) {
'#states' => array(
'visible' => array(
array(
- ':input[name="group"]' => array('value' => 'all'),
+ ':input[name="override[controls][group]"]' => array('value' => 'all'),
),
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) {
}
}
- $form['options']['controls']['group']['#options'] = $groups;
+ $form['override']['controls']['group']['#options'] = $groups;
}
else {
$form['options']['markup'] = array(
diff --git a/core/modules/views/views_ui/css/views-admin.css b/core/modules/views/views_ui/css/views-admin.css
index de14ac6..b0bb08f 100644
--- a/core/modules/views/views_ui/css/views-admin.css
+++ b/core/modules/views/views_ui/css/views-admin.css
@@ -280,7 +280,7 @@
}
.views-ui-dialog #views-filterable-options-controls {
- display: block;
+ display: inline;
}
/* Don't let the messages overwhelm the modal */
diff --git a/core/modules/views/views_ui/js/views-admin.js b/core/modules/views/views_ui/js/views-admin.js
index c5a3fc0..763471e 100644
--- a/core/modules/views/views_ui/js/views-admin.js
+++ b/core/modules/views/views_ui/js/views-admin.js
@@ -345,7 +345,7 @@ Drupal.viewsUi.OptionsSearch = function ($form) {
this.$form = $form;
// 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));
// 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.