diff --git a/app/assets/images/select2/select2-spinner.gif b/app/assets/images/select2/select2-spinner.gif new file mode 100755 index 0000000..5b33f7e Binary files /dev/null and b/app/assets/images/select2/select2-spinner.gif differ diff --git a/app/assets/images/select2/select2.png b/app/assets/images/select2/select2.png new file mode 100755 index 0000000..1d804ff Binary files /dev/null and b/app/assets/images/select2/select2.png differ diff --git a/app/assets/images/select2/select2x2.png b/app/assets/images/select2/select2x2.png new file mode 100755 index 0000000..4bdd5c9 Binary files /dev/null and b/app/assets/images/select2/select2x2.png differ diff --git a/app/assets/javascripts/lib/items/items.js.erb b/app/assets/javascripts/lib/items/items.js.erb index e1fffd0..73f9345 100755 --- a/app/assets/javascripts/lib/items/items.js.erb +++ b/app/assets/javascripts/lib/items/items.js.erb @@ -200,12 +200,29 @@ var Items = function(){ if(data.layouts.length){ layouts_list.parent().find("label.control-label").text("Layout type:"); var controlDiv = $("
"), - select = $(""); + select = $(""), + do_select = false; $.each(data.layouts,function(i,layout){ - select.append(""); + if(typeof layout.length == "number"){ + select.append(""); + }else if(typeof layout.length == "undefined"){ + do_select = true; + select.append(""); + } }) controlDiv.html(select); layouts_list.html(controlDiv); + if(do_select){ + select.select2({ + formatResult: function(el){ + var $element = $(el.element), + image = $element.data("image"); + return "