Minor filter style adjustments

flask_admin/static/js/filters.js

@@ -62,21 +62,18 @@ var AdminFilters = function(element, filters_element, operations, options, types
 
             $(options[optId]).each(function() {
                 $field.append($('<option/>')
-                    .val(this[0]).text(this[1]))
-                    .appendTo($el);
+                    .val(this[0]).text(this[1]));
             });
 
-            $field.select2();
+            $el.append($('<td/>').append($field));
+            $field.select2({width: 'resolve'});
         } else
         {
             $field = $('<input type="text" class="filter-val" />')
                         .attr('name', 'flt' + lastCount + '_' + optId);
+            $el.append($('<td/>').append($field));
         }
 
-        $el.append(
-                $('<td/>').append($field)
-            );
-
         if (optId in types) {
             $field.attr('data-role', types[optId]);
             faForm.applyStyle($field, types[optId]);

flask_admin/templates/admin/model/layout.html

@@ -55,7 +55,7 @@
     <div class="clearfix"></div>
 {% endmacro %}
 
-{% macro search_form(input_class="search-query span2") %}
+{% macro search_form(input_class="span2") %}
 <form method="GET" action="{{ return_url }}" class="search-form">
     {% if sort_column is not none %}
     <input type="hidden" name="sort" value="{{ sort_column }}"></input>
@@ -63,13 +63,17 @@
     {% if sort_desc %}
     <input type="hidden" name="desc" value="{{ sort_desc }}"></input>
     {% endif %}
+    {% if search %}
     <div class="input-append">
-        <input type="text" name="search" value="{{ search or '' }}" class="{{ input_class }}" placeholder="{{ _gettext('Search') }}"></input>
-        {% if search %}
+            <input type="text" name="search" value="{{ search }}" class="{{ input_class }}" placeholder="{{ _gettext('Search') }}"></input>
             <a href="{{ clear_search_url }}" class="clear add-on">
                 <i class="icon-remove"></i>
             </a>
-        {% endif %}
     </div>
+    {% else %}
+    <div>
+        <input type="text" name="search" value="" class="{{ input_class }}" placeholder="{{ _gettext('Search') }}"></input>
+    </div>
+    {% endif %}
 </form>
 {% endmacro %}