spree_core 0.60.6 → 0.70.RC1
Sign up to get free protection for your applications and to get access to all the features.
- data/{public → app/assets}/images/admin/bg/active-tab.png +0 -0
- data/{public → app/assets}/images/admin/bg/admin_tab_back.png +0 -0
- data/{public → app/assets}/images/admin/bg/admin_tab_selected_back.png +0 -0
- data/{public → app/assets}/images/admin/bg/content-back-blue.png +0 -0
- data/{public → app/assets}/images/admin/bg/content-back-green.png +0 -0
- data/{public → app/assets}/images/admin/bg/content-back.png +0 -0
- data/{public → app/assets}/images/admin/bg/flash-error.png +0 -0
- data/{public → app/assets}/images/admin/bg/flash-notice.png +0 -0
- data/{public → app/assets}/images/admin/bg/green-stripes.gif +0 -0
- data/{public → app/assets}/images/admin/bg/green-stripes.png +0 -0
- data/{public → app/assets}/images/admin/bg/grid_header_back.png +0 -0
- data/{public → app/assets}/images/admin/bg/grid_header_back_green.png +0 -0
- data/{public → app/assets}/images/admin/bg/header-bg.png +0 -0
- data/{public → app/assets}/images/admin/bg/header.png +0 -0
- data/{public → app/assets}/images/admin/bg/header_bg.jpg +0 -0
- data/{public → app/assets}/images/admin/bg/menu-current.png +0 -0
- data/{public → app/assets}/images/admin/bg/red-stripes.gif +0 -0
- data/{public → app/assets}/images/admin/bg/red-stripes.png +0 -0
- data/{public → app/assets}/images/admin/bg/spree_50.png +0 -0
- data/{public → app/assets}/images/admin/bg/subnav-divider.png +0 -0
- data/{public → app/assets}/images/admin/bg/subnav.png +0 -0
- data/{public → app/assets}/images/admin/bg/tab-back.png +0 -0
- data/{public → app/assets}/images/admin/buttons/blue/left_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/blue/right_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/drag-handle-green.png +0 -0
- data/{public → app/assets}/images/admin/buttons/green/left_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/green/right_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/left_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/left_01_small.png +0 -0
- data/{public → app/assets}/images/admin/buttons/orange/left_03.png +0 -0
- data/{public → app/assets}/images/admin/buttons/orange/right_03.png +0 -0
- data/{public → app/assets}/images/admin/buttons/right_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/right_01_small.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/1.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/10.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/2.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/3.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/4.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/5.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/6.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/7.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/8.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/9.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/1.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/10.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/11.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/2.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/3.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/4.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/5.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/6.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/7.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/8.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/9.png +0 -0
- data/{public → app/assets}/images/admin/icons/accept.png +0 -0
- data/{public → app/assets}/images/admin/icons/add.gif +0 -0
- data/{public → app/assets}/images/admin/icons/add.png +0 -0
- data/{public → app/assets}/images/admin/icons/arrow-down.gif +0 -0
- data/{public → app/assets}/images/admin/icons/cross.png +0 -0
- data/{public → app/assets}/images/admin/icons/delete.gif +0 -0
- data/{public → app/assets}/images/admin/icons/delete.png +0 -0
- data/{public → app/assets}/images/admin/icons/drag.gif +0 -0
- data/{public → app/assets}/images/admin/icons/edit.gif +0 -0
- data/{public → app/assets}/images/admin/icons/edit.png +0 -0
- data/{public → app/assets}/images/admin/icons/email.png +0 -0
- data/{public → app/assets}/images/admin/icons/error.png +0 -0
- data/{public → app/assets}/images/admin/icons/exclamation.png +0 -0
- data/{public → app/assets}/images/admin/icons/feed.png +0 -0
- data/{public → app/assets}/images/admin/icons/pdf.png +0 -0
- data/{public → app/assets}/images/admin/icons/reorder.gif +0 -0
- data/{public → app/assets}/images/admin/icons/search.gif +0 -0
- data/{public → app/assets}/images/admin/icons/send-email.png +0 -0
- data/{public → app/assets}/images/admin/icons/stop.png +0 -0
- data/app/assets/images/admin/icons/switch.png +0 -0
- data/{public → app/assets}/images/admin/icons/tick.png +0 -0
- data/{public → app/assets}/images/admin/icons/up.gif +0 -0
- data/{public → app/assets}/images/admin/icons/xls.png +0 -0
- data/{public/images → app/assets/images/admin}/progress.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/amex_cid.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/creditcard.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/discover_cid.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/master_cid.jpg +0 -0
- data/{public/images → app/assets/images/creditcards}/visa_cid.gif +0 -0
- data/{public → app/assets}/images/favicon.ico +0 -0
- data/{public/images → app/assets/images/icons}/add-to-cart.png +0 -0
- data/{public/images → app/assets/images/icons}/checkout.png +0 -0
- data/app/assets/images/icons/delete.png +0 -0
- data/{public/images → app/assets/images/icons}/update.png +0 -0
- data/app/assets/images/noimage/mini.png +0 -0
- data/app/assets/images/noimage/product.png +0 -0
- data/app/assets/images/noimage/small.png +0 -0
- data/{public → app/assets}/images/spinner.gif +0 -0
- data/{public → app/assets}/javascripts/admin/address_states.js +4 -4
- data/{public/javascripts/admin.js → app/assets/javascripts/admin/admin.js.erb} +90 -93
- data/app/assets/javascripts/admin/calculator.js +15 -0
- data/{public → app/assets}/javascripts/admin/checkouts/edit.js +13 -13
- data/app/assets/javascripts/admin/gateway.js +13 -0
- data/app/assets/javascripts/admin/images/index.js +10 -0
- data/app/assets/javascripts/admin/images/new.js +5 -0
- data/app/assets/javascripts/admin/nested-attribute.js +23 -0
- data/app/assets/javascripts/admin/orders/edit.js +15 -0
- data/app/assets/javascripts/admin/orders/edit_form.js +16 -0
- data/{public → app/assets}/javascripts/admin/payments/new.js +0 -0
- data/app/assets/javascripts/admin/products.js +23 -0
- data/app/assets/javascripts/admin/spree_core.js +10 -0
- data/app/assets/javascripts/admin/taxonomy.js +206 -0
- data/app/assets/javascripts/admin/underscore-min.js +26 -0
- data/app/assets/javascripts/admin/zone.js +44 -0
- data/app/assets/javascripts/store/cart.js +11 -0
- data/app/assets/javascripts/store/checkout.js +77 -0
- data/app/assets/javascripts/store/product.js +49 -0
- data/app/assets/javascripts/store/spree_core.js +6 -0
- data/{public/stylesheets/admin/admin-forms.css → app/assets/stylesheets/admin/admin-form.css.erb} +27 -16
- data/{public → app/assets}/stylesheets/admin/admin-reset.css +0 -0
- data/{public/stylesheets/admin/admin-tables.css → app/assets/stylesheets/admin/admin-tables.css.erb} +3 -2
- data/{public → app/assets}/stylesheets/admin/admin-typography.css +2 -2
- data/{public/stylesheets/admin/admin.css → app/assets/stylesheets/admin/admin.css.erb} +22 -46
- data/{public/stylesheets/admin/autocomplete.css → app/assets/stylesheets/admin/edit_checkouts.css} +6 -7
- data/{public → app/assets}/stylesheets/admin/grids.css +107 -107
- data/app/assets/stylesheets/admin/spree_core.css +16 -0
- data/{public → app/assets}/stylesheets/admin/token-input.css +0 -0
- data/app/assets/stylesheets/store/reset.css +175 -0
- data/app/assets/stylesheets/store/screen.css +122 -0
- data/app/assets/stylesheets/store/spree_core.css +5 -0
- data/app/controllers/admin/base_controller.rb +3 -32
- data/app/controllers/admin/general_settings_controller.rb +14 -15
- data/app/controllers/admin/line_items_controller.rb +1 -1
- data/app/controllers/admin/mail_methods_controller.rb +13 -0
- data/app/controllers/admin/option_types_controller.rb +1 -2
- data/app/controllers/admin/orders_controller.rb +9 -8
- data/app/controllers/admin/product_groups_controller.rb +1 -2
- data/app/controllers/admin/products_controller.rb +4 -6
- data/app/controllers/admin/prototypes_controller.rb +1 -0
- data/app/controllers/admin/resource_controller.rb +7 -1
- data/app/controllers/admin/shipments_controller.rb +1 -1
- data/app/controllers/admin/states_controller.rb +1 -1
- data/app/controllers/admin/tax_categories_controller.rb +6 -0
- data/app/controllers/admin/taxons_controller.rb +0 -9
- data/app/controllers/admin/users_controller.rb +9 -5
- data/app/controllers/admin/variants_controller.rb +22 -0
- data/app/controllers/admin/zones_controller.rb +1 -1
- data/app/controllers/checkout_controller.rb +6 -0
- data/app/controllers/content_controller.rb +1 -1
- data/app/controllers/home_controller.rb +10 -0
- data/app/controllers/orders_controller.rb +11 -7
- data/app/controllers/products_controller.rb +0 -1
- data/app/helpers/admin/base_helper.rb +4 -8
- data/app/helpers/admin/navigation_helper.rb +9 -2
- data/app/helpers/checkout_helper.rb +7 -3
- data/app/helpers/hook_helper.rb +5 -15
- data/app/helpers/products_helper.rb +4 -0
- data/app/helpers/spree/base_helper.rb +55 -12
- data/app/helpers/taxons_helper.rb +0 -16
- data/app/mailers/test_mailer.rb +10 -0
- data/app/models/activator.rb +27 -0
- data/app/models/adjustment.rb +32 -12
- data/app/models/app_configuration.rb +7 -6
- data/app/models/calculator/vat.rb +27 -43
- data/app/models/creditcard.rb +23 -34
- data/app/models/gateway.rb +1 -0
- data/app/models/image.rb +7 -2
- data/app/models/order.rb +30 -17
- data/app/models/payment.rb +5 -11
- data/app/models/payment_method.rb +0 -4
- data/app/models/payment_method/check.rb +0 -4
- data/app/models/product.rb +22 -9
- data/app/models/product_group.rb +4 -8
- data/app/models/product_scope.rb +1 -1
- data/app/models/shipment.rb +1 -6
- data/app/models/tax_category.rb +6 -0
- data/app/models/tax_rate.rb +10 -0
- data/app/models/taxon.rb +3 -3
- data/app/models/zone.rb +4 -4
- data/app/views/admin/adjustments/_adjustments_table.html.erb +3 -3
- data/app/views/admin/adjustments/edit.html.erb +1 -1
- data/app/views/admin/adjustments/new.html.erb +1 -1
- data/app/views/admin/configurations/index.html.erb +54 -56
- data/app/views/admin/general_settings/edit.html.erb +13 -38
- data/app/views/admin/general_settings/show.html.erb +13 -23
- data/app/views/admin/images/_form.html.erb +4 -4
- data/app/views/admin/images/edit.html.erb +4 -4
- data/app/views/admin/images/index.html.erb +7 -21
- data/app/views/admin/images/new.html.erb +8 -18
- data/app/views/admin/inventory_settings/edit.html.erb +3 -3
- data/app/views/admin/inventory_units/adjust.html.erb +2 -2
- data/app/views/admin/line_items/create.js.erb +4 -0
- data/app/views/admin/mail_methods/_form.html.erb +3 -6
- data/app/views/admin/mail_methods/edit.html.erb +3 -3
- data/app/views/admin/mail_methods/index.html.erb +17 -21
- data/app/views/admin/mail_methods/new.html.erb +3 -3
- data/app/views/admin/option_types/_available.html.erb +5 -4
- data/app/views/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/admin/option_types/_selected.html.erb +6 -6
- data/app/views/admin/option_types/edit.html.erb +4 -4
- data/app/views/admin/option_types/index.html.erb +6 -6
- data/app/views/admin/option_types/{new.erb → new.html.erb} +1 -1
- data/app/views/admin/option_types/new.js.erb +2 -0
- data/app/views/admin/option_types/selected.html.erb +1 -1
- data/app/views/admin/orders/_add_product.html.erb +4 -4
- data/app/views/admin/orders/_form.html.erb +31 -42
- data/app/views/admin/orders/_line_item.html.erb +10 -15
- data/app/views/admin/orders/_user_form.html.erb +11 -6
- data/app/views/admin/orders/edit.html.erb +12 -16
- data/app/views/admin/orders/history.html.erb +3 -3
- data/app/views/admin/orders/index.html.erb +33 -45
- data/app/views/admin/orders/new.html.erb +5 -6
- data/app/views/admin/orders/show.html.erb +7 -9
- data/app/views/admin/orders/user.html.erb +2 -7
- data/app/views/admin/payment_methods/_form.html.erb +8 -8
- data/app/views/admin/payment_methods/edit.html.erb +1 -1
- data/app/views/admin/payment_methods/index.html.erb +19 -28
- data/app/views/admin/payment_methods/new.html.erb +2 -2
- data/app/views/admin/payments/_form.html.erb +1 -1
- data/app/views/admin/payments/_list.html.erb +2 -2
- data/app/views/admin/payments/_transaction_list.html.erb +3 -3
- data/app/views/admin/payments/credit.html.erb +1 -1
- data/app/views/admin/payments/index.html.erb +1 -1
- data/app/views/admin/payments/new.html.erb +2 -2
- data/app/views/admin/payments/show.html.erb +1 -1
- data/app/views/admin/payments/source_forms/_gateway.html.erb +6 -6
- data/app/views/admin/payments/source_views/_gateway.html.erb +1 -1
- data/app/views/admin/product_groups/_preview.html.erb +8 -8
- data/app/views/admin/product_groups/_product_scope.html.erb +5 -5
- data/app/views/admin/product_groups/edit.html.erb +6 -9
- data/app/views/admin/product_groups/index.html.erb +6 -6
- data/app/views/admin/product_groups/new.html.erb +2 -2
- data/app/views/admin/product_groups/show.html.erb +4 -4
- data/app/views/admin/product_groups/update.js.erb +5 -1
- data/app/views/admin/product_properties/_product_property_fields.html.erb +1 -1
- data/app/views/admin/product_properties/index.html.erb +11 -11
- data/app/views/admin/products/_form.html.erb +75 -72
- data/app/views/admin/products/_option_types.html.erb +34 -34
- data/app/views/admin/products/_properties_form.erb +2 -2
- data/app/views/admin/products/edit.html.erb +2 -3
- data/app/views/admin/products/index.html.erb +25 -34
- data/app/views/admin/products/{new.erb → new.html.erb} +4 -5
- data/app/views/admin/products/new.js.erb +3 -0
- data/app/views/admin/properties/_form.html.erb +13 -10
- data/app/views/admin/properties/edit.html.erb +1 -1
- data/app/views/admin/properties/index.html.erb +5 -5
- data/app/views/admin/properties/{new.erb → new.html.erb} +2 -2
- data/app/views/admin/properties/new.js.erb +2 -0
- data/app/views/admin/prototypes/_form.html.erb +18 -18
- data/app/views/admin/prototypes/_prototypes.html.erb +22 -0
- data/app/views/admin/prototypes/available.js.erb +2 -0
- data/app/views/admin/prototypes/edit.html.erb +1 -1
- data/app/views/admin/prototypes/index.html.erb +6 -6
- data/app/views/admin/prototypes/{new.erb → new.html.erb} +2 -2
- data/app/views/admin/prototypes/new.js.erb +2 -0
- data/app/views/admin/reports/index.html.erb +2 -2
- data/app/views/admin/reports/sales_total.html.erb +1 -1
- data/app/views/admin/return_authorizations/_form.html.erb +2 -2
- data/app/views/admin/return_authorizations/edit.html.erb +4 -4
- data/app/views/admin/return_authorizations/index.html.erb +5 -5
- data/app/views/admin/return_authorizations/new.html.erb +2 -2
- data/app/views/admin/shared/_address.html.erb +1 -1
- data/app/views/admin/shared/_address_form.html.erb +3 -4
- data/app/views/admin/shared/_calculator_fields.html.erb +3 -3
- data/app/views/admin/shared/_configuration_menu.html.erb +13 -14
- data/app/views/admin/shared/_destroy.js.erb +1 -1
- data/app/views/admin/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_group_from_products_form.html.erb +1 -1
- data/app/views/admin/shared/_head.html.erb +26 -0
- data/app/views/admin/shared/_new_adjustment_button.html.erb +4 -4
- data/app/views/admin/shared/_new_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_order_details.html.erb +0 -1
- data/app/views/admin/shared/_order_tabs.html.erb +42 -47
- data/app/views/admin/shared/_product_sub_menu.html.erb +6 -8
- data/app/views/admin/shared/_product_tabs.html.erb +19 -23
- data/app/views/admin/shared/_report_criteria.html.erb +2 -2
- data/app/views/admin/shared/_show_resource_links.html.erb +2 -2
- data/app/views/admin/shared/_tabs.html.erb +1 -1
- data/app/views/admin/shipments/_form.html.erb +37 -41
- data/app/views/admin/shipments/edit.html.erb +13 -15
- data/app/views/admin/shipments/index.html.erb +21 -30
- data/app/views/admin/shipments/new.html.erb +6 -6
- data/app/views/admin/shipping_categories/_form.html.erb +2 -2
- data/app/views/admin/shipping_categories/edit.html.erb +1 -1
- data/app/views/admin/shipping_categories/index.html.erb +5 -5
- data/app/views/admin/shipping_categories/new.html.erb +1 -1
- data/app/views/admin/shipping_methods/_form.html.erb +4 -5
- data/app/views/admin/shipping_methods/edit.html.erb +7 -7
- data/app/views/admin/shipping_methods/index.html.erb +13 -22
- data/app/views/admin/shipping_methods/new.html.erb +7 -7
- data/app/views/admin/states/_state_list.html.erb +6 -6
- data/app/views/admin/states/edit.html.erb +1 -1
- data/app/views/admin/states/index.html.erb +3 -3
- data/app/views/admin/states/{new.erb → new.html.erb} +1 -1
- data/app/views/admin/states/new.js.erb +2 -0
- data/app/views/admin/tax_categories/index.html.erb +7 -7
- data/app/views/admin/tax_categories/new.html.erb +1 -1
- data/app/views/admin/tax_rates/_form.html.erb +5 -5
- data/app/views/admin/tax_rates/edit.html.erb +1 -1
- data/app/views/admin/tax_rates/index.html.erb +5 -5
- data/app/views/admin/tax_rates/new.html.erb +1 -1
- data/app/views/admin/tax_settings/edit.html.erb +10 -4
- data/app/views/admin/tax_settings/show.html.erb +8 -4
- data/app/views/admin/taxonomies/_form.html.erb +2 -2
- data/app/views/admin/taxonomies/_js_head.html.erb +0 -1
- data/app/views/admin/taxonomies/_list.html.erb +3 -3
- data/app/views/admin/taxonomies/edit.erb +2 -2
- data/app/views/admin/taxonomies/index.html.erb +4 -4
- data/app/views/admin/taxonomies/new.html.erb +2 -2
- data/app/views/admin/taxons/_form.html.erb +2 -2
- data/app/views/admin/taxons/_taxon_table.html.erb +10 -10
- data/app/views/admin/taxons/available.js.erb +7 -14
- data/app/views/admin/taxons/edit.html.erb +2 -2
- data/app/views/admin/taxons/selected.html.erb +9 -9
- data/app/views/admin/trackers/_form.html.erb +7 -6
- data/app/views/admin/trackers/edit.html.erb +1 -1
- data/app/views/admin/trackers/index.html.erb +8 -13
- data/app/views/admin/trackers/new.html.erb +1 -1
- data/app/views/admin/users/_form.html.erb +13 -14
- data/app/views/admin/users/edit.html.erb +7 -7
- data/app/views/admin/users/index.html.erb +20 -34
- data/app/views/admin/users/new.html.erb +7 -7
- data/app/views/admin/users/show.html.erb +2 -2
- data/app/views/admin/variants/_form.html.erb +6 -6
- data/app/views/admin/variants/edit.html.erb +3 -3
- data/app/views/admin/variants/index.html.erb +6 -6
- data/app/views/admin/variants/new.html.erb +8 -0
- data/app/views/admin/variants/new.js.erb +2 -0
- data/app/views/admin/zones/_country_member.html.erb +1 -1
- data/app/views/admin/zones/_form.html.erb +1 -1
- data/app/views/admin/zones/_member_type.html.erb +2 -2
- data/app/views/admin/zones/_state_member.html.erb +2 -2
- data/app/views/admin/zones/_zone_member.html.erb +2 -2
- data/app/views/admin/zones/edit.html.erb +1 -1
- data/app/views/admin/zones/index.html.erb +8 -9
- data/app/views/admin/zones/new.html.erb +1 -1
- data/app/views/checkout/_address.html.erb +125 -134
- data/app/views/checkout/_confirm.html.erb +2 -2
- data/app/views/checkout/_delivery.html.erb +8 -4
- data/app/views/checkout/_payment.html.erb +7 -7
- data/app/views/checkout/_summary.html.erb +6 -5
- data/app/views/checkout/edit.html.erb +6 -8
- data/app/views/checkout/payment/_gateway.html.erb +5 -5
- data/app/views/checkout/registration.html.erb +3 -3
- data/app/views/content/cvv.html.erb +5 -5
- data/app/views/home/index.html.erb +10 -0
- data/app/views/layouts/admin.html.erb +16 -23
- data/app/views/layouts/spree_application.html.erb +30 -44
- data/app/views/orders/_form.html.erb +8 -10
- data/app/views/orders/_line_item.html.erb +17 -32
- data/app/views/orders/edit.html.erb +20 -18
- data/app/views/orders/show.html.erb +2 -2
- data/app/views/products/_cart_form.html.erb +42 -47
- data/app/views/products/_properties.html.erb +5 -4
- data/app/views/products/_taxons.html.erb +10 -12
- data/app/views/products/_thumbnails.html.erb +14 -35
- data/app/views/products/index.html.erb +6 -9
- data/app/views/products/show.html.erb +18 -23
- data/app/views/shared/_error_messages.html.erb +1 -1
- data/app/views/shared/_filters.html.erb +1 -1
- data/app/views/shared/_head.html.erb +3 -6
- data/app/views/shared/_nav_bar.html.erb +3 -2
- data/app/views/shared/_order_details.html.erb +31 -41
- data/app/views/shared/_products.html.erb +10 -16
- data/app/views/shared/_store_menu.html.erb +2 -2
- data/app/views/shared/_taxonomies.html.erb +3 -14
- data/app/views/taxons/_taxon.html.erb +1 -1
- data/app/views/taxons/show.html.erb +6 -6
- data/app/views/test_mailer/test_email.text.erb +4 -0
- data/config/initializers/deprecation_checker.rb +7 -0
- data/config/initializers/disable_paperclip_log.rb +2 -0
- data/config/initializers/form_builder.rb +0 -4
- data/config/initializers/sprockets_precompile_patch.rb +16 -0
- data/config/initializers/workarounds_for_ruby19.rb +1 -1
- data/config/locales/en.yml +55 -24
- data/config/routes.rb +9 -8
- data/db/default/roles.yml +1 -3
- data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +9 -0
- data/db/migrate/20110329141434_create_activators.rb +21 -0
- data/db/migrate/20110418151136_eligible_for_adjustments.rb +9 -0
- data/db/seeds.rb +4 -2
- data/lib/custom_fixtures.rb +64 -3
- data/lib/generators/spree/dummy/dummy_generator.rb +105 -0
- data/lib/generators/spree/dummy/templates/cucumber/cucumber.rb +38 -0
- data/lib/generators/spree/dummy/templates/rails/application.rb +10 -0
- data/lib/generators/spree/dummy/templates/rails/boot.rb +6 -0
- data/lib/generators/spree/dummy/templates/rails/database.yml +30 -0
- data/lib/generators/spree/dummy/templates/rails/routes.rb +3 -0
- data/lib/generators/spree/sandbox/sandbox_generator.rb +27 -0
- data/lib/generators/spree/site/site_generator.rb +79 -0
- data/lib/generators/spree/site/templates/app/assets/javascripts/admin/all.js +16 -0
- data/lib/generators/spree/site/templates/app/assets/javascripts/store/all.js +16 -0
- data/lib/generators/spree/site/templates/app/assets/stylesheets/admin/all.css +17 -0
- data/lib/generators/spree/site/templates/app/assets/stylesheets/store/all.css +17 -0
- data/lib/scopes.rb +1 -1
- data/lib/spree/calculated_adjustments.rb +8 -3
- data/lib/spree/search/base.rb +1 -5
- data/lib/spree_base.rb +12 -0
- data/lib/spree_core.rb +9 -6
- data/lib/spree_core/ext/active_record.rb +1 -1
- data/lib/spree_core/preferences/model_hooks.rb +7 -3
- data/lib/spree_core/railtie.rb +19 -3
- data/lib/spree_core/testing_support/common_rake.rb +12 -0
- data/lib/spree_core/testing_support/factories/activator_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/adjustment_factory.rb +1 -0
- data/lib/spree_core/testing_support/factories/calculator_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/order_factory.rb +7 -6
- data/lib/spree_core/testing_support/factories/product_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/user_factory.rb +14 -10
- data/lib/spree_core/testing_support/factories/zone_factory.rb +1 -1
- data/lib/spree_core/theme_support.rb +0 -3
- data/lib/spree_core/theme_support/hook_listener.rb +112 -35
- data/lib/spree_core/version.rb +1 -1
- data/lib/subclass_registration.rb +21 -0
- data/lib/tasks/assets.rake +58 -0
- data/lib/tasks/core.rake +18 -11
- data/lib/tasks/install.rake +4 -12
- data/{public → vendor/assets}/images/datepicker/cal.gif +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/help.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/important.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/info.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/title.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.css +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.js +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.spree.css +0 -0
- data/{public → vendor/assets}/javascripts/jquery.autocomplete.min.js +0 -0
- data/vendor/assets/javascripts/jquery.cookie.js +41 -0
- data/{public → vendor/assets}/javascripts/jquery.delayedobserver.js +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/jquery.jstree.js +4544 -3510
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/bg.jpg +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/d.png +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/dot_for_ie.gif +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/style.css +2 -1
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/throbber.gif +0 -0
- data/vendor/assets/javascripts/jquery.tokeninput.js +860 -0
- data/vendor/assets/javascripts/jquery.validate/additional-methods.min.js +28 -0
- data/vendor/assets/javascripts/jquery.validate/jquery.validate.min.js +51 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ar.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_bg.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ca.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_cn.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_cs.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_da.js +20 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_de.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_el.js +24 -0
- data/{public/javascripts → vendor/assets/javascripts/jquery.validate}/localization/messages_es.js +22 -23
- data/vendor/assets/javascripts/jquery.validate/localization/messages_fa.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_fi.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_fr.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ge.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_he.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_hu.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_it.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ja.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_kk.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_lt.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_lv.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_nl.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_no.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_pl.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ptbr.js +30 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ptpt.js +23 -0
- data/{public/javascripts → vendor/assets/javascripts/jquery.validate}/localization/messages_ro.js +22 -23
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ru.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_se.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_si.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_sk.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_sr.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_th.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_tr.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_tw.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ua.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_vi.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/methods_de.js +12 -0
- data/vendor/assets/javascripts/jquery.validate/localization/methods_nl.js +9 -0
- data/vendor/assets/javascripts/jquery.validate/localization/methods_pt.js +9 -0
- data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +357 -0
- metadata +358 -462
- data/app/models/spree/alert.rb +0 -13
- data/app/stylesheets/_buttons.less +0 -80
- data/app/stylesheets/_cart.less +0 -24
- data/app/stylesheets/_checkout.less +0 -76
- data/app/stylesheets/_checkout_progress.less +0 -62
- data/app/stylesheets/_colors.less +0 -16
- data/app/stylesheets/_forms.less +0 -50
- data/app/stylesheets/_layout.less +0 -77
- data/app/stylesheets/_messages.less +0 -32
- data/app/stylesheets/_mixins.less +0 -71
- data/app/stylesheets/_navigation.less +0 -130
- data/app/stylesheets/_prices.less +0 -18
- data/app/stylesheets/_product_details.less +0 -56
- data/app/stylesheets/_product_lists.less +0 -66
- data/app/stylesheets/_registration.less +0 -24
- data/app/stylesheets/_reset.less +0 -69
- data/app/stylesheets/_typography.less +0 -158
- data/app/stylesheets/screen.less +0 -13
- data/app/views/admin/extensions/index.html.erb +0 -23
- data/app/views/admin/product_scopes/_form.html.erb +0 -106
- data/app/views/admin/prototypes/available.html.erb +0 -22
- data/app/views/admin/shared/_alert.html.erb +0 -6
- data/app/views/admin/variants/new.erb +0 -11
- data/app/views/shared/_additional_field.html.erb +0 -7
- data/app/views/shared/_admin_head.html.erb +0 -34
- data/app/views/shared/_basic_layout.html.erb +0 -44
- data/app/views/shared/_edit_resource_links.html.erb +0 -1
- data/app/views/shared/_footer.html.erb +0 -13
- data/app/views/shared/_method_error_message.html.erb +0 -4
- data/app/views/shared/_new_resource_links.html.erb +0 -1
- data/app/views/shared/_show_resource_links.html.erb +0 -3
- data/app/views/shared/_test_hook.html.erb +0 -1
- data/config/initializers/load_unobtrusive_date_picker.rb +0 -8
- data/db/migrate/20101026184833_migrate_adjustments.rb +0 -9
- data/lib/generators/spree_core/upgrade_generator.rb +0 -23
- data/lib/generators/templates/config/initializers/%file_name%.rb.tt +0 -1
- data/lib/generators/templates/config/locales/%current_locale%.yml.tt +0 -2
- data/lib/generators/templates/config/routes.rb +0 -3
- data/lib/spree_core/theme_support/hook.rb +0 -51
- data/lib/spree_core/theme_support/hook_modifier.rb +0 -35
- data/lib/spree_core/theme_support/more_patches.rb +0 -118
- data/lib/tasks/common.rb +0 -30
- data/lib/tasks/themes.rake +0 -34
- data/public/images/admin/tabs/off-left.png +0 -0
- data/public/images/admin/tabs/off-right.png +0 -0
- data/public/images/admin/tabs/on-left.png +0 -0
- data/public/images/admin/tabs/on-right.png +0 -0
- data/public/images/ajax_loader.gif +0 -0
- data/public/images/bg-button-hover.png +0 -0
- data/public/images/bg-button-pressed.png +0 -0
- data/public/images/bg-button.gif +0 -0
- data/public/images/bg-button.png +0 -0
- data/public/images/blue/left_01.png +0 -0
- data/public/images/blue/right_01.png +0 -0
- data/public/images/body-back.png +0 -0
- data/public/images/bottom_shine.png +0 -0
- data/public/images/breadcrumb.gif +0 -0
- data/public/images/button-dark-hover.png +0 -0
- data/public/images/button-dark.png +0 -0
- data/public/images/buttons/bg-button-hover.png +0 -0
- data/public/images/buttons/bg-button-pressed.png +0 -0
- data/public/images/buttons/bg-button.gif +0 -0
- data/public/images/buttons/bg-button.png +0 -0
- data/public/images/buttons/blue/left_01.png +0 -0
- data/public/images/buttons/blue/right_01.png +0 -0
- data/public/images/buttons/button-dark-hover.png +0 -0
- data/public/images/buttons/button-dark.png +0 -0
- data/public/images/buttons/drag-handle-green.png +0 -0
- data/public/images/buttons/green/left_01.png +0 -0
- data/public/images/buttons/green/right_01.png +0 -0
- data/public/images/buttons/left_01.png +0 -0
- data/public/images/buttons/left_01_small.png +0 -0
- data/public/images/buttons/orange/left_03.png +0 -0
- data/public/images/buttons/orange/right_03.png +0 -0
- data/public/images/buttons/right_01.png +0 -0
- data/public/images/buttons/right_01_small.png +0 -0
- data/public/images/buttons/sxsw-ribbon-v1.png +0 -0
- data/public/images/buttons/top-shine.png +0 -0
- data/public/images/calendar_date_select/calendar.gif +0 -0
- data/public/images/cart-empty.png +0 -0
- data/public/images/cart-empty_x32.png +0 -0
- data/public/images/cart-full.png +0 -0
- data/public/images/cart-full_x32.png +0 -0
- data/public/images/datepicker/backstripes.gif +0 -0
- data/public/images/datepicker/bg_header.jpg +0 -0
- data/public/images/datepicker/bullet1.gif +0 -0
- data/public/images/datepicker/bullet2.gif +0 -0
- data/public/images/datepicker/gradient-e5e5e5-ffffff.gif +0 -0
- data/public/images/drag-handle-green.png +0 -0
- data/public/images/green/left_01.png +0 -0
- data/public/images/green/right_01.png +0 -0
- data/public/images/grid.png +0 -0
- data/public/images/left_01.png +0 -0
- data/public/images/left_01_small.png +0 -0
- data/public/images/menu-current.png +0 -0
- data/public/images/menu-hover.png +0 -0
- data/public/images/noimage/mini.jpg +0 -0
- data/public/images/noimage/product.jpg +0 -0
- data/public/images/noimage/small.jpg +0 -0
- data/public/images/openid-inputicon.gif +0 -0
- data/public/images/orange/left_03.png +0 -0
- data/public/images/orange/right_03.png +0 -0
- data/public/images/reorder.jpg +0 -0
- data/public/images/right_01.png +0 -0
- data/public/images/right_01_small.png +0 -0
- data/public/images/separator.png +0 -0
- data/public/images/shadow-top.png +0 -0
- data/public/images/shadow_top.png +0 -0
- data/public/images/spree.jpg +0 -0
- data/public/images/spree/progress.gif +0 -0
- data/public/images/spree/spinner.gif +0 -0
- data/public/images/spree/spree.jpg +0 -0
- data/public/images/step-progress/completed-completed.gif +0 -0
- data/public/images/step-progress/completed-current.gif +0 -0
- data/public/images/step-progress/completed-first.gif +0 -0
- data/public/images/step-progress/current-first.gif +0 -0
- data/public/images/step-progress/current-incomplete.gif +0 -0
- data/public/images/step-progress/current-right.gif +0 -0
- data/public/images/step-progress/incomplete-incomplete.gif +0 -0
- data/public/images/step-progress/incomplete-right.gif +0 -0
- data/public/images/steps/1.png +0 -0
- data/public/images/steps/1_small.png +0 -0
- data/public/images/steps/2.png +0 -0
- data/public/images/steps/2_small.png +0 -0
- data/public/images/steps/3.png +0 -0
- data/public/images/steps/3_small.png +0 -0
- data/public/images/steps/4.png +0 -0
- data/public/images/steps/4_small.png +0 -0
- data/public/images/steps/5.png +0 -0
- data/public/images/steps/5_small.png +0 -0
- data/public/images/steps/6.png +0 -0
- data/public/images/steps/6_small.png +0 -0
- data/public/images/sxsw-ribbon-v1.png +0 -0
- data/public/images/tab_bottom.gif +0 -0
- data/public/images/tile-header.png +0 -0
- data/public/images/tile-slider.png +0 -0
- data/public/images/top-shine.png +0 -0
- data/public/images/tree-nav-icons/bullet.gif +0 -0
- data/public/images/tree-nav-icons/minus.gif +0 -0
- data/public/images/tree-nav-icons/plus.gif +0 -0
- data/public/images/tree-nav-icons/treeview-loading.gif +0 -0
- data/public/images/tree-nav-icons/treeview-sprite.gif +0 -0
- data/public/images/wrapper-back-2.png +0 -0
- data/public/images/wrapper-back.png +0 -0
- data/public/images/yui-menubaritem_submenuindicator.png +0 -0
- data/public/images/yui-menubaritem_submenuindicator_disabled.png +0 -0
- data/public/images/yui-menuitem_checkbox.png +0 -0
- data/public/images/yui-menuitem_checkbox_disabled.png +0 -0
- data/public/images/yui-menuitem_submenuindicator.png +0 -0
- data/public/images/yui-menuitem_submenuindicator_disabled.png +0 -0
- data/public/images/yui-sprite.png +0 -0
- data/public/javascripts/additional-methods.js +0 -236
- data/public/javascripts/admin/orders/edit.js +0 -23
- data/public/javascripts/admin/orders/edit_form.js +0 -16
- data/public/javascripts/admin/unobtrusive_handlers.js +0 -43
- data/public/javascripts/application.js +0 -12
- data/public/javascripts/calculator.js +0 -15
- data/public/javascripts/checkout.js +0 -75
- data/public/javascripts/datepicker.js +0 -1445
- data/public/javascripts/gateway.js +0 -13
- data/public/javascripts/jquery-1.4.2.min.js +0 -154
- data/public/javascripts/jquery-ui.js +0 -188
- data/public/javascripts/jquery.cookie.js +0 -96
- data/public/javascripts/jquery.suggest.js +0 -276
- data/public/javascripts/jquery.template.js +0 -255
- data/public/javascripts/jquery.tokeninput.js +0 -618
- data/public/javascripts/jquery.validate.min.js +0 -16
- data/public/javascripts/lang/af.js +0 -40
- data/public/javascripts/lang/ar.js +0 -50
- data/public/javascripts/lang/de.js +0 -40
- data/public/javascripts/lang/du.js +0 -40
- data/public/javascripts/lang/en.js +0 -42
- data/public/javascripts/lang/es.js +0 -41
- data/public/javascripts/lang/fi.js +0 -40
- data/public/javascripts/lang/fr.js +0 -44
- data/public/javascripts/lang/gr.js +0 -40
- data/public/javascripts/lang/he.js +0 -49
- data/public/javascripts/lang/it.js +0 -13
- data/public/javascripts/lang/nl.js +0 -40
- data/public/javascripts/lang/no.js +0 -40
- data/public/javascripts/lang/pt.js +0 -50
- data/public/javascripts/lang/ro.js +0 -40
- data/public/javascripts/lang/ru.js +0 -40
- data/public/javascripts/lang/sp.js +0 -40
- data/public/javascripts/lang/sv.js +0 -41
- data/public/javascripts/lang/ua.js +0 -40
- data/public/javascripts/localization/messages_cn.js +0 -24
- data/public/javascripts/localization/messages_cs.js +0 -23
- data/public/javascripts/localization/messages_da.js +0 -21
- data/public/javascripts/localization/messages_de.js +0 -21
- data/public/javascripts/localization/messages_fr.js +0 -23
- data/public/javascripts/localization/messages_hu.js +0 -21
- data/public/javascripts/localization/messages_it.js +0 -26
- data/public/javascripts/localization/messages_kk.js +0 -23
- data/public/javascripts/localization/messages_nl.js +0 -23
- data/public/javascripts/localization/messages_no.js +0 -23
- data/public/javascripts/localization/messages_pl.js +0 -23
- data/public/javascripts/localization/messages_ptbr.js +0 -30
- data/public/javascripts/localization/messages_ru.js +0 -23
- data/public/javascripts/localization/messages_se.js +0 -23
- data/public/javascripts/localization/messages_sk.js +0 -21
- data/public/javascripts/localization/messages_tr.js +0 -24
- data/public/javascripts/localization/messages_tw.js +0 -24
- data/public/javascripts/localization/messages_ua.js +0 -24
- data/public/javascripts/nested-attribute.js +0 -26
- data/public/javascripts/open_id.js +0 -15
- data/public/javascripts/product.js +0 -49
- data/public/javascripts/rails.js +0 -127
- data/public/javascripts/taxonomy.js +0 -201
- data/public/javascripts/zone.js +0 -39
- data/public/stylesheets/admin/dashboard.css +0 -143
- data/public/stylesheets/admin/edit_checkouts.css +0 -57
- data/public/stylesheets/admin/reset-fonts-grids-2-6-0.css +0 -7
- data/public/stylesheets/admin/yui-includes.css +0 -14
- data/public/stylesheets/datepicker.css +0 -263
- data/public/stylesheets/jquery.autocomplete.css +0 -48
- data/public/stylesheets/screen.css +0 -916
data/public/javascripts/rails.js
DELETED
@@ -1,127 +0,0 @@
|
|
1
|
-
jQuery(function ($) {
|
2
|
-
var csrf_token = $('meta[name=csrf-token]').attr('content'),
|
3
|
-
csrf_param = $('meta[name=csrf-param]').attr('content');
|
4
|
-
|
5
|
-
$.fn.extend({
|
6
|
-
/**
|
7
|
-
* Triggers a custom event on an element and returns the event result
|
8
|
-
* this is used to get around not being able to ensure callbacks are placed
|
9
|
-
* at the end of the chain.
|
10
|
-
*
|
11
|
-
* TODO: deprecate with jQuery 1.4.2 release, in favor of subscribing to our
|
12
|
-
* own events and placing ourselves at the end of the chain.
|
13
|
-
*/
|
14
|
-
triggerAndReturn: function (name, data) {
|
15
|
-
var event = new $.Event(name);
|
16
|
-
this.trigger(event, data);
|
17
|
-
|
18
|
-
return event.result !== false;
|
19
|
-
},
|
20
|
-
|
21
|
-
/**
|
22
|
-
* Handles execution of remote calls firing overridable events along the way
|
23
|
-
*/
|
24
|
-
callRemote: function () {
|
25
|
-
var el = this,
|
26
|
-
method = el.attr('method') || el.attr('data-method') || 'GET',
|
27
|
-
url = el.attr('action') || el.attr('href'),
|
28
|
-
dataType = el.attr('data-type') || 'script';
|
29
|
-
|
30
|
-
if (url === undefined) {
|
31
|
-
throw "No URL specified for remote call (action or href must be present).";
|
32
|
-
} else {
|
33
|
-
if (el.triggerAndReturn('ajax:before')) {
|
34
|
-
var data = el.is('form') ? el.serializeArray() : [];
|
35
|
-
$.ajax({
|
36
|
-
url: url,
|
37
|
-
data: data,
|
38
|
-
dataType: dataType,
|
39
|
-
type: method.toUpperCase(),
|
40
|
-
beforeSend: function (xhr) {
|
41
|
-
el.trigger('ajax:loading', xhr);
|
42
|
-
},
|
43
|
-
success: function (data, status, xhr) {
|
44
|
-
el.trigger('ajax:success', [data, status, xhr]);
|
45
|
-
},
|
46
|
-
complete: function (xhr) {
|
47
|
-
el.trigger('ajax:complete', xhr);
|
48
|
-
},
|
49
|
-
error: function (xhr, status, error) {
|
50
|
-
el.trigger('ajax:failure', [xhr, status, error]);
|
51
|
-
}
|
52
|
-
});
|
53
|
-
}
|
54
|
-
|
55
|
-
el.trigger('ajax:after');
|
56
|
-
}
|
57
|
-
}
|
58
|
-
});
|
59
|
-
|
60
|
-
/**
|
61
|
-
* confirmation handler
|
62
|
-
*/
|
63
|
-
$('a[data-confirm],input[data-confirm]').live('click', function () {
|
64
|
-
var el = $(this);
|
65
|
-
if (el.triggerAndReturn('confirm')) {
|
66
|
-
if (!confirm(el.attr('data-confirm'))) {
|
67
|
-
return false;
|
68
|
-
}
|
69
|
-
}
|
70
|
-
});
|
71
|
-
|
72
|
-
|
73
|
-
/**
|
74
|
-
* remote handlers
|
75
|
-
*/
|
76
|
-
$('form[data-remote]').live('submit', function (e) {
|
77
|
-
$(this).callRemote();
|
78
|
-
e.preventDefault();
|
79
|
-
});
|
80
|
-
|
81
|
-
$('a[data-remote],input[data-remote]').live('click', function (e) {
|
82
|
-
$(this).callRemote();
|
83
|
-
e.preventDefault();
|
84
|
-
});
|
85
|
-
|
86
|
-
$('a[data-method]:not([data-remote])').live('click', function (e){
|
87
|
-
var link = $(this),
|
88
|
-
href = link.attr('href'),
|
89
|
-
method = link.attr('data-method'),
|
90
|
-
form = $('<form method="post" action="'+href+'"></form>'),
|
91
|
-
metadata_input = '<input name="_method" value="'+method+'" type="hidden" />';
|
92
|
-
|
93
|
-
if (csrf_param != null && csrf_token != null) {
|
94
|
-
metadata_input += '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />';
|
95
|
-
}
|
96
|
-
|
97
|
-
form.hide()
|
98
|
-
.append(metadata_input)
|
99
|
-
.appendTo('body');
|
100
|
-
|
101
|
-
e.preventDefault();
|
102
|
-
form.submit();
|
103
|
-
});
|
104
|
-
|
105
|
-
/**
|
106
|
-
* disable-with handlers
|
107
|
-
*/
|
108
|
-
var disable_with_input_selector = 'input[data-disable-with]';
|
109
|
-
var disable_with_form_selector = 'form[data-remote]:has(' + disable_with_input_selector + ')';
|
110
|
-
|
111
|
-
$(disable_with_form_selector).live('ajax:before', function () {
|
112
|
-
$(this).find(disable_with_input_selector).each(function () {
|
113
|
-
var input = $(this);
|
114
|
-
input.data('enable-with', input.val())
|
115
|
-
.attr('value', input.attr('data-disable-with'))
|
116
|
-
.attr('disabled', 'disabled');
|
117
|
-
});
|
118
|
-
});
|
119
|
-
|
120
|
-
$(disable_with_form_selector).live('ajax:complete', function () {
|
121
|
-
$(this).find(disable_with_input_selector).each(function () {
|
122
|
-
var input = $(this);
|
123
|
-
input.removeAttr('disabled')
|
124
|
-
.val(input.data('enable-with'));
|
125
|
-
});
|
126
|
-
});
|
127
|
-
});
|
@@ -1,201 +0,0 @@
|
|
1
|
-
var base_url = "/admin/taxonomies/" + taxonomy_id + "/taxons/";
|
2
|
-
var child_url = "/admin/taxonomies/" + taxonomy_id + "/get_children.json"
|
3
|
-
var is_cut = false;
|
4
|
-
var last_rollback = null;
|
5
|
-
|
6
|
-
var handle_ajax_error = function(XMLHttpRequest, textStatus, errorThrown){
|
7
|
-
jQuery.jstree.rollback(last_rollback);
|
8
|
-
jQuery("#ajax_error").show().html("<strong>" + server_error + "</strong><br/>" + taxonomy_tree_error);
|
9
|
-
};
|
10
|
-
|
11
|
-
//var handle_move = function(li, target, droppped, tree, rb) {
|
12
|
-
var handle_move = function(e, data) {
|
13
|
-
last_rollback = data.rlbk;
|
14
|
-
var position = data.rslt.cp;
|
15
|
-
var node = data.rslt.o;
|
16
|
-
var new_parent = data.rslt.np;
|
17
|
-
|
18
|
-
jQuery.ajax({
|
19
|
-
type: "POST",
|
20
|
-
dataType: "json",
|
21
|
-
url: base_url + node.attr("id"),
|
22
|
-
data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
|
23
|
-
error: handle_ajax_error
|
24
|
-
});
|
25
|
-
|
26
|
-
return true
|
27
|
-
};
|
28
|
-
|
29
|
-
var handle_create = function(e, data) {
|
30
|
-
last_rollback = data.rlbk;
|
31
|
-
var node = data.rslt.obj;
|
32
|
-
var name = data.rslt.name;
|
33
|
-
var position = data.rslt.position;
|
34
|
-
var new_parent = data.rslt.parent;
|
35
|
-
|
36
|
-
jQuery.ajax({
|
37
|
-
type: "POST",
|
38
|
-
dataType: "json",
|
39
|
-
url: base_url,
|
40
|
-
data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
|
41
|
-
error: handle_ajax_error,
|
42
|
-
success: function(data,result) {
|
43
|
-
node.attr('id', data.taxon.id);
|
44
|
-
}
|
45
|
-
});
|
46
|
-
|
47
|
-
};
|
48
|
-
|
49
|
-
var handle_rename = function(e, data) {
|
50
|
-
last_rollback = data.rlbk;
|
51
|
-
var node = data.rslt.obj;
|
52
|
-
var name = data.rslt.new_name;
|
53
|
-
|
54
|
-
jQuery.ajax({
|
55
|
-
type: "POST",
|
56
|
-
dataType: "json",
|
57
|
-
url: base_url + node.attr("id"),
|
58
|
-
data: ({_method: "put", "taxon[name]": name, authenticity_token: AUTH_TOKEN}),
|
59
|
-
error: handle_ajax_error
|
60
|
-
});
|
61
|
-
};
|
62
|
-
|
63
|
-
var handle_delete = function(e, data){
|
64
|
-
last_rollback = data.rlbk;
|
65
|
-
var node = data.rslt.obj;
|
66
|
-
|
67
|
-
jConfirm('Are you sure you want to delete this taxon?', 'Confirm Taxon Deletion', function(r) {
|
68
|
-
if(r){
|
69
|
-
jQuery.ajax({
|
70
|
-
type: "POST",
|
71
|
-
dataType: "json",
|
72
|
-
url: base_url + node.attr("id"),
|
73
|
-
data: ({_method: "delete", authenticity_token: AUTH_TOKEN}),
|
74
|
-
error: handle_ajax_error
|
75
|
-
});
|
76
|
-
}else{
|
77
|
-
jQuery.jstree.rollback(last_rollback);
|
78
|
-
last_rollback = null;
|
79
|
-
}
|
80
|
-
});
|
81
|
-
|
82
|
-
};
|
83
|
-
|
84
|
-
jQuery(document).ready(function(){
|
85
|
-
var conf = {
|
86
|
-
json_data : {
|
87
|
-
"data" : initial,
|
88
|
-
"ajax" : {
|
89
|
-
"url" : child_url,
|
90
|
-
"data" : function (n) {
|
91
|
-
return { parent_id : n.attr ? n.attr("id") : 0 };
|
92
|
-
}
|
93
|
-
}
|
94
|
-
},
|
95
|
-
"themes" : {
|
96
|
-
"theme" : "apple",
|
97
|
-
"url" : "/javascripts/jsTree/themes/apple/style.css"
|
98
|
-
},
|
99
|
-
"strings" : {
|
100
|
-
"new_node" : new_taxon,
|
101
|
-
"loading" : loading + "..."
|
102
|
-
},
|
103
|
-
"crrm" : {
|
104
|
-
"move" : {
|
105
|
-
"check_move" : function (m) {
|
106
|
-
var position = m.cp;
|
107
|
-
var node = m.o;
|
108
|
-
var new_parent = m.np;
|
109
|
-
|
110
|
-
if(!new_parent) return false; //no parent
|
111
|
-
|
112
|
-
if(node.attr("rel")=="root") return false; //can't drag root
|
113
|
-
|
114
|
-
if(new_parent.attr("id")=="taxonomy_tree" && position==0) return false; // can't drop before root
|
115
|
-
|
116
|
-
return true;
|
117
|
-
|
118
|
-
}
|
119
|
-
}
|
120
|
-
},
|
121
|
-
"contextmenu" : {
|
122
|
-
"items" : function(obj) {
|
123
|
-
var id_of_node = obj.attr("id");
|
124
|
-
var type_of_node = obj.attr("rel");
|
125
|
-
var menu = {};
|
126
|
-
if(type_of_node == "root") {
|
127
|
-
menu = {
|
128
|
-
"create" : {
|
129
|
-
"label" : "Create",
|
130
|
-
"action" : function (obj) { this.create(obj); }
|
131
|
-
},
|
132
|
-
"paste" : {
|
133
|
-
"separator_before" : true,
|
134
|
-
"label" : "Paste",
|
135
|
-
"action" : function (obj) { is_cut = false; this.paste(obj); },
|
136
|
-
"_disabled" : is_cut == false
|
137
|
-
},
|
138
|
-
"edit" : {
|
139
|
-
"separator_before" : true,
|
140
|
-
"label" : "Edit",
|
141
|
-
"action" : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
|
142
|
-
}
|
143
|
-
}
|
144
|
-
} else {
|
145
|
-
menu = {
|
146
|
-
"create" : {
|
147
|
-
"label" : "Create",
|
148
|
-
"action" : function (obj) { this.create(obj); }
|
149
|
-
},
|
150
|
-
"rename" : {
|
151
|
-
"label" : "Rename",
|
152
|
-
"action" : function (obj) { this.rename(obj); }
|
153
|
-
},
|
154
|
-
"remove" : {
|
155
|
-
"label" : "Remove",
|
156
|
-
"action" : function (obj) { this.remove(obj); }
|
157
|
-
},
|
158
|
-
"cut" : {
|
159
|
-
"separator_before" : true,
|
160
|
-
"label" : "Cut",
|
161
|
-
"action" : function (obj) { is_cut = true; this.cut(obj); }
|
162
|
-
},
|
163
|
-
"paste" : {
|
164
|
-
"label" : "Paste",
|
165
|
-
"action" : function (obj) { is_cut = false; this.paste(obj); },
|
166
|
-
"_disabled" : is_cut == false
|
167
|
-
},
|
168
|
-
"edit" : {
|
169
|
-
"separator_before" : true,
|
170
|
-
"label" : "Edit",
|
171
|
-
"action" : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
|
172
|
-
}
|
173
|
-
}
|
174
|
-
}
|
175
|
-
return menu;
|
176
|
-
}
|
177
|
-
},
|
178
|
-
|
179
|
-
"plugins" : [ "themes", "json_data", "dnd", "crrm", "contextmenu"]
|
180
|
-
}
|
181
|
-
|
182
|
-
jQuery("#taxonomy_tree").jstree(conf)
|
183
|
-
.bind("move_node.jstree", handle_move)
|
184
|
-
.bind("remove.jstree", handle_delete)
|
185
|
-
.bind("create.jstree", handle_create)
|
186
|
-
.bind("rename.jstree", handle_rename);
|
187
|
-
|
188
|
-
jQuery("#taxonomy_tree").delegate("a", "dblclick", function (e) {
|
189
|
-
jQuery("#taxonomy_tree").jstree("rename", this)
|
190
|
-
});
|
191
|
-
|
192
|
-
|
193
|
-
jQuery(document).keypress(function(e){
|
194
|
-
//surpress form submit on enter/return
|
195
|
-
if (e.keyCode == 13){
|
196
|
-
e.preventDefault();
|
197
|
-
}
|
198
|
-
});
|
199
|
-
});
|
200
|
-
|
201
|
-
|
data/public/javascripts/zone.js
DELETED
@@ -1,39 +0,0 @@
|
|
1
|
-
$j(function() {
|
2
|
-
if ($j('#country_based').attr('checked')) {
|
3
|
-
show_country();
|
4
|
-
} else if ($j('#state_based').attr('checked')) {
|
5
|
-
show_state();
|
6
|
-
} else {
|
7
|
-
show_zone();
|
8
|
-
}
|
9
|
-
$j('#country_based').click(function() { show_country();} );
|
10
|
-
$j('#state_based').click(function() { show_state();} );
|
11
|
-
$j('#zone_based').click(function() { show_zone();} );
|
12
|
-
})
|
13
|
-
|
14
|
-
var show_country = function() {
|
15
|
-
$j('#state_members :input').each(function() { $(this).attr('disabled','disabled'); })
|
16
|
-
$j('#state_members').hide();
|
17
|
-
$j('#zone_members :input').each(function() { $(this).attr('disabled','disabled'); })
|
18
|
-
$j('#zone_members').hide();
|
19
|
-
$j('#country_members :input').each(function() { $(this).removeAttr('disabled'); })
|
20
|
-
$j('#country_members').show();
|
21
|
-
};
|
22
|
-
|
23
|
-
var show_state = function() {
|
24
|
-
$j('#country_members :input').each(function() { $(this).attr('disabled','disabled'); })
|
25
|
-
$j('#country_members').hide();
|
26
|
-
$j('#zone_members :input').each(function() { $(this).attr('disabled','disabled'); })
|
27
|
-
$j('#zone_members').hide();
|
28
|
-
$j('#state_members :input').each(function() { $(this).removeAttr('disabled'); })
|
29
|
-
$j('#state_members').show();
|
30
|
-
};
|
31
|
-
|
32
|
-
var show_zone = function() {
|
33
|
-
$j('#state_members :input').each(function() { $(this).attr('disabled','disabled'); })
|
34
|
-
$j('#state_members').hide();
|
35
|
-
$j('#country_members :input').each(function() { $(this).attr('disabled','disabled'); })
|
36
|
-
$j('#country_members').hide();
|
37
|
-
$j('#zone_members :input').each(function() { $(this).removeAttr('disabled'); })
|
38
|
-
$j('#zone_members').show();
|
39
|
-
};
|
@@ -1,143 +0,0 @@
|
|
1
|
-
.dashboard h2{
|
2
|
-
padding-bottom:5px;
|
3
|
-
color: #476D9B;
|
4
|
-
clear:both;
|
5
|
-
}
|
6
|
-
|
7
|
-
.dashboard_left{
|
8
|
-
width:25%;
|
9
|
-
float:left;
|
10
|
-
}
|
11
|
-
|
12
|
-
.dashboard_main{
|
13
|
-
width:55%;
|
14
|
-
float:left;
|
15
|
-
}
|
16
|
-
|
17
|
-
.dashboard_main #orders_by_day_options{
|
18
|
-
background-color:#0095DA;
|
19
|
-
-moz-border-radius-bottomleft:10px;
|
20
|
-
-moz-border-radius-bottomright:10px;
|
21
|
-
-moz-border-radius-topleft:10px;
|
22
|
-
-moz-border-radius-topright:10px;
|
23
|
-
-webkit-border-bottom-left-radius: 10px 10px;
|
24
|
-
-webkit-border-bottom-right-radius: 10px 10px;
|
25
|
-
-webkit-border-top-left-radius: 10px 10px;
|
26
|
-
-webkit-border-top-right-radius: 10px 10px;
|
27
|
-
color:#fff;
|
28
|
-
margin-top:10px;
|
29
|
-
padding:5px;
|
30
|
-
text-align:center;
|
31
|
-
}
|
32
|
-
|
33
|
-
#order_by_day_title{
|
34
|
-
padding-bottom:5px;
|
35
|
-
color: #476D9B;
|
36
|
-
clear:both;
|
37
|
-
}
|
38
|
-
|
39
|
-
#order_totals{
|
40
|
-
background:#154E8C url(../../images/admin/bg/admin_tab_back.png) repeat-x scroll left top;
|
41
|
-
-moz-border-radius-bottomleft:10px;
|
42
|
-
-moz-border-radius-bottomright:10px;
|
43
|
-
-moz-border-radius-topleft:10px;
|
44
|
-
-moz-border-radius-topright:10px;
|
45
|
-
-webkit-border-bottom-left-radius: 10px 10px;
|
46
|
-
-webkit-border-bottom-right-radius: 10px 10px;
|
47
|
-
-webkit-border-top-left-radius: 10px 10px;
|
48
|
-
-webkit-border-top-right-radius: 10px 10px;
|
49
|
-
color:#fff;
|
50
|
-
height:62px;
|
51
|
-
padding:0 10px;
|
52
|
-
margin-bottom:20px;
|
53
|
-
}
|
54
|
-
|
55
|
-
#order_totals hr{
|
56
|
-
background-color:#fff;
|
57
|
-
clear:none;
|
58
|
-
float:left;
|
59
|
-
height:80%;
|
60
|
-
margin-top:6px;
|
61
|
-
width:3px;
|
62
|
-
}
|
63
|
-
|
64
|
-
#order_totals .spacer{
|
65
|
-
padding: 0px 10px;
|
66
|
-
font-size: 50px;
|
67
|
-
line-height: 60px;
|
68
|
-
color: #476D9B;
|
69
|
-
}
|
70
|
-
|
71
|
-
#order_totals p{
|
72
|
-
float:left;
|
73
|
-
font-size:420%;
|
74
|
-
font-weight:bold;
|
75
|
-
line-height:60px;
|
76
|
-
margin:0 5px 0 0;
|
77
|
-
}
|
78
|
-
|
79
|
-
#order_totals label{
|
80
|
-
font-size:200%;
|
81
|
-
line-height:50px;
|
82
|
-
}
|
83
|
-
|
84
|
-
#order_totals span{
|
85
|
-
display:block;
|
86
|
-
font-size:90%;
|
87
|
-
font-weight:bold;
|
88
|
-
margin-top: -10px;
|
89
|
-
}
|
90
|
-
|
91
|
-
.dashboard_main #orders_by_day_options label{
|
92
|
-
padding: 0px 10px;
|
93
|
-
}
|
94
|
-
|
95
|
-
.dashboard_right{
|
96
|
-
width:20%;
|
97
|
-
float:left;
|
98
|
-
}
|
99
|
-
|
100
|
-
.dashboard table th{
|
101
|
-
background-color: #0095DA;
|
102
|
-
color: #fff;
|
103
|
-
}
|
104
|
-
|
105
|
-
.dashboard_small_wrapper{
|
106
|
-
padding: 0px 20px 0px 0px;
|
107
|
-
}
|
108
|
-
|
109
|
-
.dashboard_main_wrapper{
|
110
|
-
padding: 0px 30px 10px 30px;
|
111
|
-
margin-left: auto;
|
112
|
-
margin-right: auto;
|
113
|
-
}
|
114
|
-
|
115
|
-
#pie_legend{
|
116
|
-
width:50%;
|
117
|
-
float:left;
|
118
|
-
font-size: 80%;
|
119
|
-
}
|
120
|
-
|
121
|
-
#pie_legend span{
|
122
|
-
line-height:15px;
|
123
|
-
width:15px;
|
124
|
-
float:left;
|
125
|
-
}
|
126
|
-
|
127
|
-
#pie_legend label{
|
128
|
-
margin-left:5px;
|
129
|
-
float:left;
|
130
|
-
}
|
131
|
-
|
132
|
-
#pie_legend div{
|
133
|
-
clear:both;
|
134
|
-
text-align:right;
|
135
|
-
}
|
136
|
-
|
137
|
-
.text-right{
|
138
|
-
text-align:right;
|
139
|
-
}
|
140
|
-
|
141
|
-
.jqplot-table-legend{
|
142
|
-
width:60px;
|
143
|
-
}
|