diff --git a/Gemfile b/Gemfile index a3f8513..8c80b52 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,5 @@ group :assets do gem "savon", "~> 2.0" gem "uglifier", ">= 1.0.3" gem "gemsurance" - gem "select2-rails" - + gem "chosen-rails" end diff --git a/Gemfile.lock b/Gemfile.lock index 74ccdbf..174f125 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,6 +52,12 @@ GEM sass (>= 3.2.0) thor builder (3.0.4) + chosen-rails (1.1.0) + coffee-rails (>= 3.2) + compass-rails (>= 1.1.2) + railties (>= 3.0) + sass-rails (>= 3.2) + chunky_png (1.3.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -59,6 +65,12 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + compass (0.12.2) + chunky_png (~> 1.2) + fssm (>= 0.2.7) + sass (~> 3.1) + compass-rails (1.1.3) + compass (>= 0.12.2) devise (3.2.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -70,6 +82,7 @@ GEM fastercsv (1.5.5) formtastic (2.2.1) actionpack (>= 3.0) + fssm (0.2.10) gemsurance (0.1.4) bundler (~> 1.2) git (~> 1.2) @@ -157,8 +170,6 @@ GEM nokogiri (>= 1.4.0) nori (~> 2.3.0) wasabi (~> 3.2.2) - select2-rails (3.5.2) - thor (~> 0.14) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -188,6 +199,7 @@ PLATFORMS DEPENDENCIES activeadmin + chosen-rails coffee-rails (~> 3.2.1) gemsurance gyoku (~> 1.0) @@ -197,6 +209,5 @@ DEPENDENCIES rails_config sass-rails (~> 3.2.3) savon (~> 2.0) - select2-rails sqlite3 uglifier (>= 1.0.3) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 89adab4..00b3df6 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,5 +12,5 @@ // //= require jquery //= require jquery_ujs +//= require chosen.jquery //= require_tree . -//= require select2 diff --git a/app/assets/javascripts/list_entry.js.coffee b/app/assets/javascripts/list_entry.js.coffee index 577ce7b..3280b55 100644 --- a/app/assets/javascripts/list_entry.js.coffee +++ b/app/assets/javascripts/list_entry.js.coffee @@ -1,5 +1,5 @@ $ -> - $("#list_entry_localeze_categories").select2 maximumSelectionSize: 3 + $("#list_entry_localeze_categories").chosen max_selected_options: 3 elem = $("#chars") $("#list_entry_Phone").mask "(999) 999-9999" $("#list_entry_altnumber").mask "(999) 999-9999" @@ -8,16 +8,15 @@ $ -> $("#set_MF").click all_MF $("#set_clear").click clear_times $.each [ - "sunday" - "monday" - "tuesday" - "wednesday" - "thursday" - "friday" - "saturday" + "sun" + "mon" + "tues" + "wednes" + "thurs" + "fri" + "satur" ], (i, day) -> - $("#hours_" + day + "_close").insertAfter "#hours_" + day + "_open" - return + $("#hours_#{day}day_close").insertAfter "#hours_#{day}_open" $("#hours_sunday_close").after "   [Apply To All]" $("#hours_monday_close").after "   [Set Monday-Friday]" @@ -26,20 +25,10 @@ $ -> $("#set_clear").click clear_times $("#how").click -> $(".how").toggle() - return - $("#payment_types_commadelimited_0").click clear_payment_types - $("#payment_types_commadelimited_1").click check_payment_types - $("#payment_types_commadelimited_2").click check_payment_types - $("#payment_types_commadelimited_3").click check_payment_types - $("#payment_types_commadelimited_4").click check_payment_types - $("#payment_types_commadelimited_5").click check_payment_types - $("#payment_types_commadelimited_6").click check_payment_types - $("#payment_types_commadelimited_7").click check_payment_types - $("#payment_types_commadelimited_8").click check_payment_types - $("#payment_types_commadelimited_9").click check_payment_types + for i in [0..9] + $("#payment_types_commadelimited_#{i}").click clear_payment_types $("#open247").click open247 - return open247 = -> if $(this).is(":checked") @@ -57,24 +46,17 @@ open247 = -> clear_payment_types = -> unchecked = true - i = 1 - - while i <= 9 - $("#payment_types_commadelimited_" + i).prop "checked", "" - i++ + for i in [1...9] + $("#payment_types_commadelimited_#{i}").prop "checked", "" return check_payment_types = -> unchecked = true - i = 1 - - while i <= 9 - if $("#payment_types_commadelimited_" + i).is(":checked") + for i in [1...9] + if $("#payment_types_commadelimited_#{i}").is(":checked") $("#payment_types_commadelimited_0").prop "checked", "" unchecked = false - i++ $("#payment_types_commadelimited_0").prop "checked", "checked" if unchecked - return all_days_same = -> open_time = $("#hours_sunday_open").val() @@ -94,5 +76,4 @@ clear_times = -> open_time = "" close_time = "" $("select[id*=day_open]").val open_time - $("select[id*=day_close]").val close_time - return \ No newline at end of file + $("select[id*=day_close]").val close_time \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5edb950..001ba5d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,6 +9,6 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require chosen *= require_tree . - *= require select2 */ diff --git a/app/views/list_entries/new.html.erb b/app/views/list_entries/new.html.erb index e4936c6..d86b44a 100644 --- a/app/views/list_entries/new.html.erb +++ b/app/views/list_entries/new.html.erb @@ -97,7 +97,7 @@
<%= f.label :localeze_categories, "Localeze Categories", {class: "control-label"} %>
- <%= f.collection_select(:localeze_categories , LocalezeCategory.find(:all), :id , :name, {}, { :multiple => true, :size => 3 }) %> + <%= f.collection_select(:localeze_categories , LocalezeCategory.find(:all), :id , :name, {}, { :multiple => true, :size => 3, class: 'fuckingworkdick' }) %>