Skip to content

Update filter dropdown button to Bootstrap 3 #2277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mshibuya merged 1 commit into from
Jun 24, 2015
Merged

Update filter dropdown button to Bootstrap 3 #2277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/assets/javascripts/rails_admin/ra.filtering-select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
return { label: $(this).text(), value: this.value };
}).toArray();
}
var filtering_select = $('<div class="input-append filtering-select" style="float:left"></div>')
var filtering_select = $('<div class="input-group filtering-select col-sm-2" style="float:left"></div>')
var input = this.input = $('<input type="text">')
.val(value)
.addClass("form-control ra-filtering-select-input")
Expand Down Expand Up @@ -98,8 +98,7 @@
.appendTo(ul);
};

// replace with dropdown button once ready in twitter-bootstrap
var button = this.button = $('<label class="add-on ui-button ui-widget ui-state-default ui-corner-all ui-button-icon-only" title="Show All Items" role="button"><span class="ui-button-icon-primary ui-icon ui-icon-triangle-1-s"></span><span class="ui-button-text">&nbsp;</span></label>')
var button = this.button = $('<span class="input-group-btn"><label class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Show All Items" role="button"><span class="caret"></span><span class="ui-button-text">&nbsp;</span></label></span>')
.click(function() {
// close if already visible
if (input.autocomplete("widget").is(":visible")) {
Expand Down
⚡