diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 22ac058..360ee6b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,4 +15,11 @@ //= require twitter/bootstrap //= require maskedinput //= require chosen-jquery +//= require handlebars +//= require ember +//= require ember-data +//= require_self +//= require listpush //= require_tree . + +ListPushApp = Ember.Application.create(); diff --git a/app/assets/javascripts/list_entry.js.coffee b/app/assets/javascripts/list_entry.js.coffee index 8070537..00ba888 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").chosen max_selected_options: 3 + $("#list_entry_localeze_categories").chosen max_selected_options: 3, placeholder_text_multiple: "Select up to Three" $("#how").click -> $(".how").toggle() elem = $("#chars") @@ -28,22 +28,8 @@ $ -> $("#payment_types_commadelimited_#{i}").click clear_payment_types $("#list_entry_Phone").mask "(999) 999-9999" - $("#list_entry_altnumber").mask "(999) 999-9999" - $("#list_entry_fax").mask "(999) 999-9999" - -open247 = -> - if $(this).is(":checked") - $("select[id*=day_open]").prop "disabled", "disabled" - $("select[id*=day_close]").prop "disabled", "disabled" - $("#set_all").unbind "click" - $("#set_MF").unbind "click" - clear_times() - else - $("select[id*=day_open]").prop "disabled", "" - $("select[id*=day_close]").prop "disabled", "" - $("#set_all").click all_days_same - $("#set_MF").click all_MF - return + $("#list_entry_AltNumber").mask "(999) 999-9999" + $("#list_entry_Fax").mask "(999) 999-9999" clear_payment_types = -> unchecked = true diff --git a/app/assets/stylesheets/list_entry.css.scss b/app/assets/stylesheets/list_entry.css.scss index 93f179e..bc4f856 100644 --- a/app/assets/stylesheets/list_entry.css.scss +++ b/app/assets/stylesheets/list_entry.css.scss @@ -2,6 +2,22 @@ html, body { height: 100%; } +.tab-content { + overflow: none ! important; +} + +.nav { + margin-bottom: 0px ! important; +} + +.how { + margin-bottom: 3px ! important; +} + +.chosen-container-multi { + width: 314px ! important; +} + .required label:before { content: "* "; color: #f00; @@ -20,7 +36,6 @@ input[type="text"] { } .controls select { - width: 300px; height: 1.8em; } diff --git a/app/views/layouts/listpush.html.erb b/app/views/layouts/listpush.html.erb deleted file mode 100644 index b58882b..0000000 --- a/app/views/layouts/listpush.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - - - - Add a Listing - - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - <%= yield %> -

<%= notice %>

-

<%= alert %>

- - \ No newline at end of file diff --git a/app/views/list_entries/new.html.erb b/app/views/list_entries/new.html.erb index 879e446..346eb2a 100644 --- a/app/views/list_entries/new.html.erb +++ b/app/views/list_entries/new.html.erb @@ -33,6 +33,14 @@ +
+ <%= f.label :localeze_categories, "Localeze Categories", {class: "control-label"} %> +
+ <%= f.collection_select(:localeze_categories , LocalezeCategory.find(:all), :id , :name, {}, { :multiple => true, :size => 3, class: 'fuckingworkdick' }) %> +
+
+ +
<%= f.label :City, {class: "control-label"} %>
@@ -94,12 +102,7 @@
-
- <%= f.label :localeze_categories, "Localeze Categories", {class: "control-label"} %> -
- <%= f.collection_select(:localeze_categories , LocalezeCategory.find(:all), :id , :name, {}, { :multiple => true, :size => 3, class: 'fuckingworkdick' }) %> -
-
+
<%= f.label :CreditCards, {class: "control-label"} %> @@ -142,7 +145,6 @@ <%= select( "hours_saturday", "open", hours_hash) %> <%= select( "hours_saturday", "close", hours_hash) %>
-
<% end %> @@ -156,7 +158,7 @@