spree 0.7.1 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of spree might be problematic. Click here for more details.
- data/CHANGELOG +44 -11
- data/CONTRIBUTORS +1 -1
- data/INSTALL +4 -5
- data/README.markdown +1 -34
- data/app/controllers/admin/base_controller.rb +6 -0
- data/app/controllers/admin/configurations_controller.rb +7 -1
- data/app/controllers/admin/creditcard_payments_controller.rb +6 -56
- data/app/controllers/admin/products_controller.rb +9 -0
- data/app/controllers/admin/prototypes_controller.rb +4 -8
- data/app/controllers/admin/shipments_controller.rb +37 -0
- data/{vendor/extensions/shipping/app → app}/controllers/admin/shipping_categories_controller.rb +1 -1
- data/{vendor/extensions/shipping/app → app}/controllers/admin/shipping_methods_controller.rb +1 -1
- data/app/controllers/admin/users_controller.rb +6 -3
- data/app/controllers/admin/zones_controller.rb +17 -36
- data/app/controllers/application.rb +74 -12
- data/app/controllers/content_controller.rb +4 -0
- data/app/controllers/orders_controller.rb +52 -26
- data/app/controllers/password_resets_controller.rb +44 -0
- data/app/controllers/spree/base_controller.rb +1 -1
- data/app/controllers/states_controller.rb +8 -10
- data/app/controllers/taxons_controller.rb +0 -6
- data/app/controllers/user_sessions_controller.rb +38 -0
- data/app/controllers/users_controller.rb +29 -14
- data/app/helpers/admin/base_helper.rb +127 -4
- data/app/helpers/admin/orders_helper.rb +1 -1
- data/{vendor/extensions/shipping/app → app}/helpers/admin/shipping_categories_helper.rb +0 -0
- data/{vendor/extensions/shipping/app → app}/helpers/admin/shipping_methods_helper.rb +0 -0
- data/app/helpers/admin/zones_helper.rb +4 -4
- data/app/helpers/application_helper.rb +0 -13
- data/app/helpers/orders_helper.rb +0 -11
- data/app/helpers/spree/base_helper.rb +51 -3
- data/app/helpers/taxons_helper.rb +13 -12
- data/app/models/address.rb +0 -1
- data/app/models/app_configuration.rb +4 -1
- data/app/models/country.rb +2 -2
- data/app/models/creditcard.rb +10 -6
- data/app/models/creditcard_payment.rb +1 -0
- data/app/models/image.rb +1 -1
- data/app/models/line_item.rb +2 -0
- data/app/models/option_type.rb +1 -0
- data/app/models/order.rb +51 -29
- data/app/models/order_mailer.rb +4 -4
- data/app/models/product.rb +27 -1
- data/app/models/product_property.rb +0 -1
- data/app/models/property.rb +3 -0
- data/app/models/prototype.rb +1 -0
- data/app/models/shipment.rb +13 -17
- data/app/models/tax_category.rb +1 -0
- data/app/models/user.rb +32 -117
- data/app/models/user_mailer.rb +11 -0
- data/app/models/user_session.rb +2 -0
- data/app/models/variant.rb +6 -2
- data/app/models/zone.rb +34 -18
- data/app/models/zone_member.rb +9 -3
- data/app/views/account/login.html.erb +2 -0
- data/app/views/admin/configurations/index.html.erb +1 -1
- data/app/views/admin/creditcard_payments/edit.html.erb +11 -9
- data/app/views/admin/creditcard_payments/new.html.erb +14 -27
- data/app/views/admin/general_settings/edit.html.erb +28 -11
- data/app/views/admin/general_settings/show.html.erb +29 -16
- data/app/views/admin/inventory_settings/edit.html.erb +20 -11
- data/app/views/admin/inventory_settings/show.html.erb +9 -11
- data/app/views/admin/mail_settings/edit.html.erb +109 -80
- data/app/views/admin/mail_settings/show.html.erb +55 -41
- data/app/views/admin/option_types/_form.html.erb +18 -22
- data/app/views/admin/option_types/_option_value.html.erb +1 -1
- data/app/views/admin/option_types/available.html.erb +26 -30
- data/app/views/admin/option_types/edit.html.erb +5 -2
- data/app/views/admin/option_types/index.html.erb +36 -35
- data/app/views/admin/option_types/new.html.erb +7 -4
- data/app/views/admin/option_types/selected.html.erb +28 -28
- data/app/views/admin/orders/index.html.erb +86 -112
- data/app/views/admin/orders/show.html.erb +31 -51
- data/app/views/admin/overview/index.html.erb +1 -1
- data/app/views/admin/payments/index.html.erb +14 -6
- data/app/views/admin/product_properties/_product_property.html.erb +1 -1
- data/app/views/admin/product_properties/index.html.erb +21 -16
- data/app/views/admin/products/_form.html.erb +79 -71
- data/app/views/admin/products/_images.html.erb +27 -30
- data/app/views/admin/products/_option_types.html.erb +2 -2
- data/app/views/admin/products/_properties_form.erb +7 -0
- data/app/views/admin/products/edit.html.erb +9 -6
- data/app/views/admin/products/index.html.erb +79 -67
- data/app/views/admin/products/new.html.erb +51 -5
- data/app/views/admin/properties/_form.html.erb +12 -14
- data/app/views/admin/properties/edit.html.erb +3 -2
- data/app/views/admin/properties/index.html.erb +26 -17
- data/app/views/admin/properties/new.html.erb +5 -3
- data/app/views/admin/prototypes/_form.html.erb +38 -15
- data/app/views/admin/prototypes/available.html.erb +7 -7
- data/app/views/admin/prototypes/edit.html.erb +2 -2
- data/app/views/admin/prototypes/index.html.erb +24 -16
- data/app/views/admin/prototypes/new.html.erb +4 -2
- data/app/views/admin/reports/index.html.erb +18 -23
- data/app/views/admin/reports/sales_total.html.erb +25 -26
- data/app/views/admin/shared/_additional_field.html.erb +5 -0
- data/app/views/admin/shared/_address.html.erb +13 -0
- data/app/views/admin/shared/_configuration_menu.html.erb +18 -0
- data/app/views/admin/shared/_edit_resource_links.html.erb +4 -0
- data/app/views/admin/shared/_form_address.html.erb +50 -0
- data/app/views/admin/shared/_new_resource_links.html.erb +4 -0
- data/app/views/admin/shared/_order_details.html.erb +36 -0
- data/{vendor/plugins/has_many_polymorphs/test/fixtures/eaters_foodstuffs.yml → app/views/admin/shared/_order_sub_menu.html.erb} +0 -0
- data/app/views/admin/shared/_order_tabs.html.erb +27 -0
- data/app/views/admin/shared/_product_sub_menu.html.erb +8 -0
- data/app/views/admin/shared/_product_tabs.html.erb +35 -0
- data/app/views/admin/shared/_report_criteria.html.erb +23 -0
- data/app/views/admin/shared/_show_resource_links.html.erb +5 -0
- data/app/views/admin/shipments/_details.html.erb +19 -0
- data/app/views/admin/shipments/_form.html.erb +21 -0
- data/app/views/admin/shipments/edit.html.erb +12 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipments/index.html.erb +8 -8
- data/app/views/admin/shipments/new.html.erb +14 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_categories/_form.html.erb +0 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_categories/edit.html.erb +1 -1
- data/app/views/admin/shipping_categories/index.html.erb +27 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_categories/new.html.erb +1 -1
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_methods/_form.html.erb +1 -1
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_methods/edit.html.erb +1 -1
- data/app/views/admin/shipping_methods/index.html.erb +34 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_methods/new.html.erb +1 -1
- data/app/views/admin/states/_form.html.erb +9 -10
- data/app/views/admin/states/_state_list.html.erb +10 -7
- data/app/views/admin/states/edit.html.erb +4 -2
- data/app/views/admin/states/index.html.erb +11 -4
- data/app/views/admin/states/new.html.erb +4 -2
- data/app/views/admin/tax_categories/_form.html.erb +9 -11
- data/app/views/admin/tax_categories/edit.html.erb +4 -2
- data/app/views/admin/tax_categories/index.html.erb +19 -9
- data/app/views/admin/tax_categories/new.html.erb +4 -2
- data/app/views/admin/tax_categories/show.html.erb +1 -0
- data/app/views/admin/taxonomies/_form.html.erb +5 -9
- data/app/views/admin/taxonomies/_list.html.erb +4 -4
- data/app/views/admin/taxonomies/_yui_head.html.erb +2 -16
- data/app/views/admin/taxonomies/edit.html.erb +13 -12
- data/app/views/admin/taxonomies/index.html.erb +11 -2
- data/app/views/admin/taxonomies/new.html.erb +7 -4
- data/app/views/admin/taxons/_taxon_table.html.erb +9 -9
- data/app/views/admin/taxons/available.js.erb +8 -8
- data/app/views/admin/taxons/selected.html.erb +10 -9
- data/app/views/admin/users/_form.html.erb +35 -36
- data/app/views/admin/users/edit.html.erb +3 -3
- data/app/views/admin/users/index.html.erb +45 -47
- data/app/views/admin/users/new.html.erb +5 -5
- data/app/views/admin/users/show.html.erb +8 -5
- data/app/views/admin/variants/_form.html.erb +36 -31
- data/app/views/admin/variants/edit.html.erb +5 -4
- data/app/views/admin/variants/index.html.erb +52 -50
- data/app/views/admin/variants/new.html.erb +3 -3
- data/app/views/admin/zones/_country_member.html.erb +5 -0
- data/app/views/admin/zones/_form.html.erb +26 -65
- data/app/views/admin/zones/_member_type.html.erb +15 -0
- data/app/views/admin/zones/_state_member.html.erb +5 -0
- data/app/views/admin/zones/_zone_member.html.erb +5 -0
- data/app/views/admin/zones/edit.html.erb +6 -4
- data/app/views/admin/zones/index.html.erb +18 -7
- data/app/views/admin/zones/new.html.erb +6 -4
- data/app/views/{checkout → content}/cvv.html.erb +0 -2
- data/app/views/layouts/admin.html.erb +75 -60
- data/app/views/layouts/application.html.erb +51 -75
- data/app/views/orders/_billing.html.erb +53 -0
- data/app/views/orders/_checkout_form.html.erb +14 -0
- data/app/views/{checkout/_confirm_order.erb → orders/_confirmation.html.erb} +3 -1
- data/app/views/orders/_form.html.erb +1 -2
- data/app/views/orders/_line_item.html.erb +15 -16
- data/app/views/orders/_payment.html.erb +30 -0
- data/app/views/orders/_registration.html.erb +60 -0
- data/app/views/orders/_shipping.html.erb +54 -0
- data/app/views/orders/_shipping_method.html.erb +10 -0
- data/app/views/orders/checkout.html.erb +15 -0
- data/app/views/orders/edit.html.erb +20 -20
- data/app/views/orders/new.html.erb +9 -8
- data/app/views/orders/show.html.erb +2 -4
- data/app/views/password_resets/edit.html.erb +12 -0
- data/app/views/password_resets/new.html.erb +11 -0
- data/app/views/products/_cart_form.html.erb +46 -0
- data/app/views/products/_properties.html.erb +8 -0
- data/app/views/products/_thumbnails.html.erb +27 -5
- data/app/views/products/index.html.erb +3 -8
- data/app/views/products/show.html.erb +23 -68
- data/app/views/shared/_footer.html.erb +8 -3
- data/app/views/shared/_login.html.erb +17 -16
- data/app/views/shared/_login_bar.html.erb +6 -0
- data/app/views/shared/_new_resource_links.html.erb +1 -1
- data/app/views/shared/_order_details.html.erb +8 -8
- data/app/views/shared/_products.html.erb +21 -17
- data/app/views/shared/_store_menu.html.erb +2 -5
- data/app/views/shared/_taxonomies.html.erb +8 -5
- data/app/views/states/index.js.erb +1 -10
- data/app/views/taxons/_taxon.html.erb +2 -3
- data/app/views/taxons/show.html.erb +10 -6
- data/app/views/user_mailer/password_reset_instructions.erb +9 -0
- data/app/views/{account → user_sessions}/authorization_failure.html.erb +0 -0
- data/app/views/user_sessions/new.html.erb +6 -0
- data/app/views/users/_form.html.erb +16 -23
- data/app/views/users/new.html.erb +11 -19
- data/config/boot.rb +1 -1
- data/config/database.yml +5 -5
- data/config/database.yml.example +2 -2
- data/config/environment.rb +11 -24
- data/config/initializers/backtrace_silencers.rb +7 -0
- data/config/initializers/compass.rb +8 -0
- data/config/initializers/inflections.rb +10 -0
- data/config/initializers/mime_types.rb +0 -3
- data/config/initializers/new_rails_defaults.rb +19 -0
- data/config/initializers/session_store.rb +15 -0
- data/config/locales/de.yml +57 -2
- data/config/locales/de_rails.yml +27 -7
- data/config/locales/en-GB.yml +59 -4
- data/config/locales/en-GB_rails.yml +6 -6
- data/config/locales/en-US.yml +60 -5
- data/config/locales/en-US_rails.yml +80 -39
- data/config/locales/es.yml +318 -263
- data/config/locales/es_rails.yml +26 -8
- data/config/locales/fr-FR.yml +55 -0
- data/config/locales/fr-FR_rails.yml +51 -43
- data/config/locales/it.yml +57 -2
- data/config/locales/it_rails.yml +60 -18
- data/config/locales/nb-NO.yml +67 -469
- data/config/locales/nl-BE.yml +522 -0
- data/config/locales/nl-BE_rails.yml +155 -0
- data/config/locales/pl.yml +57 -2
- data/config/locales/pt-BR.yml +272 -217
- data/config/locales/pt-BR_rails.yml +132 -98
- data/config/locales/pt-PT.yml +56 -1
- data/config/locales/pt-PT_rails.yml +25 -4
- data/config/locales/ru-RU.yml +56 -1
- data/config/locales/ru-RU_rails.yml +156 -110
- data/config/routes.rb +17 -8
- data/config/spree_permissions.yml +8 -5
- data/{vendor/extensions/shipping/db → db}/migrate/20081003211336_create_shipping_methods.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081003233427_create_shipping_categories.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081015001711_create_shipments.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081023134446_add_product_dimensions.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081205155619_add_shipped_at_property.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081221201510_create_shipping_addresses.rb +0 -0
- data/db/migrate/20090302221152_give_all_users_user_role.rb +1 -0
- data/db/migrate/20090320113300_authlogic_changes.rb +24 -0
- data/db/migrate/20090324164010_create_option_types_prototypes.rb +12 -0
- data/db/migrate/20090401120636_meta_data_fields_for_products.rb +11 -0
- data/db/migrate/20090401203712_remove_hmp_stuff_in_zones.rb +12 -0
- data/db/migrate/{20080706233224_create_eu_vat_zone.rb → 20090401223217_create_eu_vat_zone_again.rb} +8 -3
- data/db/migrate/20090402002244_add_user_login.rb +17 -0
- data/db/migrate/20090402161055_add_order_token.rb +13 -0
- data/db/migrate/20090402200317_add_email_to_order.rb +19 -0
- data/db/migrate/20090406174645_refactor_addresses.rb +53 -0
- data/db/migrate/20090420021303_remove_viewable_id_from_products.rb +10 -0
- data/db/migrate/20090427000000_upgrade_taxons.rb +14 -0
- data/db/sample/addresses.yml +24 -14
- data/db/sample/creditcards.yml +2 -1
- data/db/sample/orders.yml +4 -1
- data/db/sample/products.yml +9 -9
- data/{vendor/extensions/shipping/db → db}/sample/shipments.yml +2 -1
- data/{vendor/extensions/shipping/db → db}/sample/shipping_categories.yml +0 -0
- data/{vendor/extensions/shipping/db → db}/sample/shipping_methods.yml +0 -0
- data/db/sample/users.yml +2 -1
- data/db/sample/zone_members.yml +16 -0
- data/{vendor/extensions/shipping/db → db}/sample/zones.yml +0 -0
- data/lib/easy_role_requirement_system.rb +32 -1
- data/lib/generators/generator_base_extension.rb +2 -2
- data/lib/generators/instance/instance_generator.rb +13 -9
- data/lib/generators/instance/templates/session_store.rb +15 -0
- data/lib/plugins/extension_patches/lib/fixture_loading_extension.rb +3 -1
- data/lib/plugins/monkey_patches/init.rb +1 -0
- data/lib/plugins/monkey_patches/lib/monkey_patches.rb +59 -0
- data/{vendor/plugins/calendar_date_select → lib/plugins/option_tags_with_disable}/MIT-LICENSE +20 -20
- data/lib/plugins/option_tags_with_disable/README.rdoc +35 -0
- data/lib/plugins/option_tags_with_disable/Rakefile +23 -0
- data/lib/plugins/option_tags_with_disable/init.rb +1 -0
- data/lib/plugins/option_tags_with_disable/lib/option_tags_will_disable.rb +85 -0
- data/lib/plugins/option_tags_with_disable/test/option_tags_will_disable_test.rb +72 -0
- data/lib/plugins/option_tags_with_disable/test/test_helper.rb +8 -0
- data/lib/role_requirement_system.rb +2 -2
- data/lib/spree.rb +2 -2
- data/lib/spree/checkout.rb +74 -0
- data/lib/spree/initializer.rb +0 -1
- data/lib/spree/setup.rb +2 -1
- data/{vendor/extensions/shipping/lib → lib}/spree/shipping_error.rb +0 -0
- data/lib/tasks/database.rake +2 -0
- data/lib/tasks/release.rake +8 -6
- data/lib/tasks/upgrade.rake +3 -0
- data/public/assets/products/1009/large/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/mini/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/original/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/product/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/small/IMG_3408.jpg +0 -0
- data/public/images/add-to-cart.png +0 -0
- data/public/images/admin/bg/active-tab.png +0 -0
- data/public/images/admin/bg/admin_tab_back.png +0 -0
- data/public/images/admin/bg/admin_tab_selected_back.png +0 -0
- data/public/images/admin/bg/content-back-blue.png +0 -0
- data/public/images/admin/bg/content-back-green.png +0 -0
- data/public/images/admin/bg/content-back.png +0 -0
- data/public/images/admin/bg/flash-error.png +0 -0
- data/public/images/admin/bg/flash-notice.png +0 -0
- data/public/images/admin/bg/green-stripes.gif +0 -0
- data/public/images/admin/bg/green-stripes.png +0 -0
- data/public/images/admin/bg/grid_header_back.png +0 -0
- data/public/images/admin/bg/grid_header_back_green.png +0 -0
- data/public/images/admin/bg/header-bg.png +0 -0
- data/public/images/admin/bg/header_bg.jpg +0 -0
- data/public/images/admin/bg/menu-current.png +0 -0
- data/public/images/admin/bg/red-stripes.gif +0 -0
- data/public/images/admin/bg/red-stripes.png +0 -0
- data/public/images/admin/bg/spree_50.png +0 -0
- data/public/images/admin/bg/subnav-divider.png +0 -0
- data/public/images/admin/bg/subnav.png +0 -0
- data/public/images/admin/bg/tab-back.png +0 -0
- data/public/images/admin/buttons/blue/left_01.png +0 -0
- data/public/images/admin/buttons/blue/right_01.png +0 -0
- data/public/images/admin/buttons/drag-handle-green.png +0 -0
- data/public/images/admin/buttons/green/left_01.png +0 -0
- data/public/images/admin/buttons/green/right_01.png +0 -0
- data/public/images/admin/buttons/left_01.png +0 -0
- data/public/images/admin/buttons/left_01_small.png +0 -0
- data/public/images/admin/buttons/orange/left_03.png +0 -0
- data/public/images/admin/buttons/orange/right_03.png +0 -0
- data/public/images/admin/buttons/right_01.png +0 -0
- data/public/images/admin/buttons/right_01_small.png +0 -0
- data/public/images/admin/icons/16x16/1.png +0 -0
- data/public/images/admin/icons/16x16/10.png +0 -0
- data/public/images/admin/icons/16x16/2.png +0 -0
- data/public/images/admin/icons/16x16/3.png +0 -0
- data/public/images/admin/icons/16x16/4.png +0 -0
- data/public/images/admin/icons/16x16/5.png +0 -0
- data/public/images/admin/icons/16x16/6.png +0 -0
- data/public/images/admin/icons/16x16/7.png +0 -0
- data/public/images/admin/icons/16x16/8.png +0 -0
- data/public/images/admin/icons/16x16/9.png +0 -0
- data/public/images/admin/icons/32x32/1.png +0 -0
- data/public/images/admin/icons/32x32/10.png +0 -0
- data/public/images/admin/icons/32x32/11.png +0 -0
- data/public/images/admin/icons/32x32/2.png +0 -0
- data/public/images/admin/icons/32x32/3.png +0 -0
- data/public/images/admin/icons/32x32/4.png +0 -0
- data/public/images/admin/icons/32x32/5.png +0 -0
- data/public/images/admin/icons/32x32/6.png +0 -0
- data/public/images/admin/icons/32x32/7.png +0 -0
- data/public/images/admin/icons/32x32/8.png +0 -0
- data/public/images/admin/icons/32x32/9.png +0 -0
- data/public/images/admin/icons/accept.png +0 -0
- data/public/images/admin/icons/add.gif +0 -0
- data/public/images/admin/icons/add.png +0 -0
- data/public/images/admin/icons/arrow-down.gif +0 -0
- data/public/images/admin/icons/cross.png +0 -0
- data/public/images/admin/icons/delete.gif +0 -0
- data/public/images/admin/icons/delete.png +0 -0
- data/public/images/admin/icons/drag.gif +0 -0
- data/public/images/admin/icons/edit.gif +0 -0
- data/public/images/admin/icons/edit.png +0 -0
- data/public/images/admin/icons/email.png +0 -0
- data/public/images/admin/icons/error.png +0 -0
- data/public/images/admin/icons/exclamation.png +0 -0
- data/public/images/admin/icons/feed.png +0 -0
- data/public/images/admin/icons/pdf.png +0 -0
- data/public/images/admin/icons/reorder.gif +0 -0
- data/public/images/admin/icons/search.gif +0 -0
- data/public/images/admin/icons/send-email.png +0 -0
- data/public/images/admin/icons/stop.png +0 -0
- data/public/images/admin/icons/tick.png +0 -0
- data/public/images/admin/icons/up.gif +0 -0
- data/public/images/admin/icons/xls.png +0 -0
- 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/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/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/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/checkout.png +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/orange/left_03.png +0 -0
- data/public/images/orange/right_03.png +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/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/top-shine.png +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/update.png +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/checkout.js +191 -55
- data/public/javascripts/nested-attribute.js +25 -0
- data/public/javascripts/spree-yui.js +1 -1
- data/public/javascripts/yui-includes.js +57 -0
- data/public/javascripts/zone.js +48 -0
- data/public/stylesheets/admin/admin-forms.css +159 -0
- data/public/stylesheets/admin/admin-reset.css +67 -0
- data/public/stylesheets/admin/admin-tables.css +31 -0
- data/public/stylesheets/admin/admin-typography.css +117 -0
- data/public/stylesheets/admin/admin.css +426 -0
- data/public/stylesheets/admin/david-admin.css +210 -0
- data/public/stylesheets/admin/grids.css +314 -0
- data/public/stylesheets/admin/reset-fonts-grids-2-6-0.css +7 -0
- data/public/stylesheets/admin/yui-includes.css +14 -0
- data/public/stylesheets/compiled/ie.css +25 -0
- data/public/stylesheets/compiled/print.css +62 -0
- data/public/stylesheets/compiled/screen.css +1615 -0
- data/public/stylesheets/sass/ie.sass +3 -0
- data/public/stylesheets/sass/print.sass +3 -0
- data/public/stylesheets/sass/screen.sass +565 -0
- data/{vendor/extensions/shipping/spec/controllers → spec/controllers/admin}/shipments_controller_spec.rb +3 -3
- data/{vendor/extensions/shipping/spec → spec}/controllers/admin/shipping_categories_controller_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/controllers/admin/shipping_methods_controller_spec.rb +0 -0
- data/spec/controllers/countries_controller_spec.rb +3 -3
- data/spec/controllers/orders_controller_spec.rb +11 -9
- data/spec/controllers/states_controller_spec.rb +3 -3
- data/spec/helpers/spree/base_helper_spec.rb +5 -5
- data/spec/lib/easy_role_requirement_system_spec.rb +2 -2
- data/spec/models/address_spec.rb +3 -3
- data/spec/models/order_spec.rb +43 -1
- data/spec/models/product_property_spec.rb +0 -7
- data/spec/models/product_spec.rb +1 -1
- data/{vendor/extensions/shipping/spec → spec}/models/shipment_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/models/shipping_category_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/models/shipping_method_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/models/shipping_order_spec.rb +13 -6
- data/spec/models/tax_category_spec.rb +1 -1
- data/spec/models/zone_spec.rb +46 -42
- data/vendor/extensions/localization/app/views/shared/_language_bar.html.erb +8 -10
- data/vendor/extensions/localization/localization_extension.rb +2 -2
- data/vendor/extensions/payment_gateway/app/views/admin/gateway_configurations/_form.html.erb +5 -4
- data/vendor/extensions/payment_gateway/app/views/admin/gateway_configurations/edit.html.erb +4 -2
- data/vendor/extensions/payment_gateway/app/views/admin/gateway_option_values/_options.html.erb +4 -4
- data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb +2 -2
- data/vendor/extensions/tax_calculator/app/controllers/admin/tax_settings_controller.rb +13 -0
- data/vendor/extensions/tax_calculator/app/views/admin/tax_rates/index.html.erb +27 -25
- data/vendor/extensions/tax_calculator/app/views/admin/tax_settings/edit.html.erb +17 -0
- data/vendor/extensions/tax_calculator/app/views/admin/tax_settings/show.html.erb +14 -0
- data/vendor/extensions/tax_calculator/config/locales/en-US.yml +2 -0
- data/vendor/extensions/tax_calculator/config/routes.rb +1 -0
- data/vendor/extensions/tax_calculator/lib/spree/vat_calculator.rb +3 -8
- data/vendor/extensions/tax_calculator/tax_calculator_extension.rb +1 -0
- data/vendor/gems/haml-2.1.0/FAQ +138 -0
- data/vendor/gems/haml-2.1.0/MIT-LICENSE +20 -0
- data/vendor/gems/haml-2.1.0/README.rdoc +332 -0
- data/vendor/gems/haml-2.1.0/REVISION +1 -0
- data/vendor/gems/haml-2.1.0/Rakefile +185 -0
- data/vendor/gems/haml-2.1.0/VERSION +1 -0
- data/vendor/gems/haml-2.1.0/bin/css2sass +7 -0
- data/vendor/gems/haml-2.1.0/bin/haml +9 -0
- data/vendor/gems/haml-2.1.0/bin/html2haml +7 -0
- data/vendor/gems/haml-2.1.0/bin/sass +8 -0
- data/vendor/gems/haml-2.1.0/extra/haml-mode.el +434 -0
- data/vendor/gems/haml-2.1.0/extra/sass-mode.el +98 -0
- data/vendor/gems/haml-2.1.0/init.rb +8 -0
- data/vendor/gems/haml-2.1.0/lib/haml.rb +1042 -0
- data/vendor/gems/haml-2.1.0/lib/haml/buffer.rb +255 -0
- data/vendor/gems/haml-2.1.0/lib/haml/engine.rb +268 -0
- data/vendor/gems/haml-2.1.0/lib/haml/error.rb +22 -0
- data/vendor/gems/haml-2.1.0/lib/haml/exec.rb +395 -0
- data/vendor/gems/haml-2.1.0/lib/haml/filters.rb +276 -0
- data/vendor/gems/haml-2.1.0/lib/haml/helpers.rb +468 -0
- data/vendor/gems/haml-2.1.0/lib/haml/helpers/action_view_extensions.rb +45 -0
- data/vendor/gems/haml-2.1.0/lib/haml/helpers/action_view_mods.rb +181 -0
- data/vendor/gems/haml-2.1.0/lib/haml/html.rb +218 -0
- data/vendor/gems/haml-2.1.0/lib/haml/precompiler.rb +889 -0
- data/vendor/gems/haml-2.1.0/lib/haml/shared.rb +45 -0
- data/vendor/gems/haml-2.1.0/lib/haml/template.rb +51 -0
- data/vendor/gems/haml-2.1.0/lib/haml/template/patch.rb +58 -0
- data/vendor/gems/haml-2.1.0/lib/haml/template/plugin.rb +72 -0
- data/vendor/gems/haml-2.1.0/lib/haml/util.rb +77 -0
- data/vendor/gems/haml-2.1.0/lib/haml/version.rb +47 -0
- data/vendor/gems/haml-2.1.0/lib/sass.rb +1062 -0
- data/vendor/gems/haml-2.1.0/lib/sass/css.rb +388 -0
- data/vendor/gems/haml-2.1.0/lib/sass/engine.rb +499 -0
- data/vendor/gems/haml-2.1.0/lib/sass/environment.rb +33 -0
- data/vendor/gems/haml-2.1.0/lib/sass/error.rb +35 -0
- data/vendor/gems/haml-2.1.0/lib/sass/plugin.rb +203 -0
- data/vendor/gems/haml-2.1.0/lib/sass/plugin/merb.rb +56 -0
- data/vendor/gems/haml-2.1.0/lib/sass/plugin/rails.rb +24 -0
- data/vendor/gems/haml-2.1.0/lib/sass/repl.rb +51 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script.rb +38 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/bool.rb +13 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/color.rb +97 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/funcall.rb +28 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/functions.rb +122 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/lexer.rb +152 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/literal.rb +60 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/number.rb +231 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/operation.rb +30 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/parser.rb +142 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/string.rb +42 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/unary_operation.rb +21 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/variable.rb +20 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/attr_node.rb +64 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/comment_node.rb +34 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/debug_node.rb +22 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/directive_node.rb +50 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/file_node.rb +27 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/for_node.rb +29 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/if_node.rb +27 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/mixin_def_node.rb +18 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/mixin_node.rb +34 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/node.rb +99 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/rule_node.rb +120 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/variable_node.rb +24 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/while_node.rb +20 -0
- data/vendor/gems/haml-2.1.0/rails/init.rb +1 -0
- data/vendor/gems/haml-2.1.0/test/benchmark.rb +99 -0
- data/vendor/gems/haml-2.1.0/test/haml/engine_test.rb +734 -0
- data/vendor/gems/haml-2.1.0/test/haml/helper_test.rb +224 -0
- data/vendor/gems/haml-2.1.0/test/haml/html2haml_test.rb +92 -0
- data/vendor/gems/haml-2.1.0/test/haml/markaby/standard.mab +52 -0
- data/vendor/gems/haml-2.1.0/test/haml/mocks/article.rb +6 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/content_for_layout.xhtml +15 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/eval_suppressed.xhtml +9 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/filters.xhtml +62 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/helpers.xhtml +93 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/helpful.xhtml +10 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/just_stuff.xhtml +68 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/list.xhtml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/nuke_inner_whitespace.xhtml +40 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/nuke_outer_whitespace.xhtml +148 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/original_engine.xhtml +20 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/partial_layout.xhtml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/partials.xhtml +21 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/render_layout.xhtml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/silent_script.xhtml +74 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/standard.xhtml +42 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/tag_parsing.xhtml +23 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/very_basic.xhtml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/whitespace_handling.xhtml +89 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/_av_partial_1.rhtml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/_av_partial_2.rhtml +8 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/action_view.rhtml +62 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/standard.rhtml +54 -0
- data/vendor/gems/haml-2.1.0/test/haml/template_test.rb +204 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_1.haml +9 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_1_ugly.haml +9 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_2.haml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_2_ugly.haml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_layout.erb +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_layout_for_partial.haml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_partial.haml +8 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_text_area.haml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/action_view.haml +47 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/action_view_ugly.haml +47 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/breakage.haml +8 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/content_for_layout.haml +10 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/eval_suppressed.haml +11 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/filters.haml +66 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/helpers.haml +95 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/helpful.haml +11 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/just_stuff.haml +83 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/list.haml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/nuke_inner_whitespace.haml +32 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/nuke_outer_whitespace.haml +144 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/original_engine.haml +17 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/partial_layout.haml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/partialize.haml +1 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/partials.haml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/render_layout.haml +2 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/silent_script.haml +40 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/standard.haml +42 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/standard_ugly.haml +42 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/tag_parsing.haml +21 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/very_basic.haml +4 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/whitespace_handling.haml +87 -0
- data/vendor/gems/haml-2.1.0/test/linked_rails.rb +12 -0
- data/vendor/gems/haml-2.1.0/test/sass/css2sass_test.rb +193 -0
- data/vendor/gems/haml-2.1.0/test/sass/engine_test.rb +769 -0
- data/vendor/gems/haml-2.1.0/test/sass/functions_test.rb +96 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_results/more1.css +9 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_results/more1_with_line_comments.css +26 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_results/more_import.css +29 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_templates/_more_partial.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_templates/more1.sass +23 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_templates/more_import.sass +11 -0
- data/vendor/gems/haml-2.1.0/test/sass/plugin_test.rb +208 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/alt.css +4 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/basic.css +9 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/compact.css +5 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/complex.css +87 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/compressed.css +1 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/expanded.css +19 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/import.css +29 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/line_numbers.css +49 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/mixins.css +95 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/multiline.css +24 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/nested.css +22 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/parent_ref.css +13 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/script.css +16 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/subdir/nested_subdir/nested_subdir.css +1 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/subdir/subdir.css +3 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/units.css +11 -0
- data/vendor/gems/haml-2.1.0/test/sass/script_test.rb +153 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/_partial.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/alt.sass +16 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/basic.sass +23 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/bork.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/bork2.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/compact.sass +17 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/complex.sass +309 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/compressed.sass +15 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/expanded.sass +17 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/import.sass +11 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/importee.sass +19 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/line_numbers.sass +13 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/mixins.sass +76 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/multiline.sass +20 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/nested.sass +25 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/parent_ref.sass +25 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/script.sass +101 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +3 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/subdir/subdir.sass +6 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/units.sass +11 -0
- data/vendor/gems/haml-2.1.0/test/test_helper.rb +21 -0
- data/vendor/plugins/enumerable_constants/lib/enumerable_constants.rb +1 -1
- data/vendor/plugins/find_by_param/README.markdown +1 -1
- metadata +544 -427
- data/app/controllers/account_controller.rb +0 -31
- data/app/controllers/checkout_controller.rb +0 -96
- data/app/helpers/payments_helper.rb +0 -2
- data/app/helpers/store_helper.rb +0 -3
- data/app/helpers/tax_categories_helper.rb +0 -2
- data/app/helpers/users_helper.rb +0 -2
- data/app/presenters/checkout_presenter.rb +0 -58
- data/app/presenters/payment_presenter.rb +0 -3
- data/app/views/admin/zones/_country.html.erb +0 -15
- data/app/views/admin/zones/_function.rjs +0 -11
- data/app/views/admin/zones/_state.html.erb +0 -15
- data/app/views/admin/zones/_zone.html.erb +0 -15
- data/app/views/admin/zones/index.js.erb +0 -1
- data/app/views/admin/zones/show.html.erb +0 -4
- data/app/views/checkout/_billing.html.erb +0 -49
- data/app/views/checkout/_form.html.erb +0 -33
- data/app/views/checkout/_payment.erb +0 -24
- data/app/views/checkout/_shipping.html.erb +0 -50
- data/app/views/checkout/_shipping_method.html.erb +0 -5
- data/app/views/checkout/new.html.erb +0 -6
- data/app/views/shared/_address.html.erb +0 -35
- data/app/views/shared/_form_address.html.erb +0 -46
- data/app/views/shared/_states.html.erb +0 -14
- data/app/views/users/index.html.erb +0 -21
- data/lib/authenticated_system.rb +0 -124
- data/lib/authenticated_test_helper.rb +0 -10
- data/public/stylesheets/checkout.css +0 -25
- data/public/stylesheets/fullscreen.css +0 -63
- data/public/stylesheets/orders/_controller.css +0 -82
- data/public/stylesheets/prototypes/_controller.css +0 -9
- data/public/stylesheets/spree-admin.css +0 -563
- data/public/stylesheets/spree.css +0 -420
- data/spec/helpers/tax_categories_helper_spec.rb +0 -11
- data/spec/views/admin/mail_settings/edit.html.erb_spec.rb +0 -14
- data/spec/views/admin/mail_settings/show.html.erb_spec.rb +0 -12
- data/spec/views/admin/products/edit.html.erb_spec.rb +0 -88
- data/spec/views/admin/variants/eidt.html.erb_spec.rb +0 -90
- data/vendor/extensions/shipping/README.markdown +0 -3
- data/vendor/extensions/shipping/Rakefile +0 -120
- data/vendor/extensions/shipping/app/controllers/admin/shipments_controller.rb +0 -68
- data/vendor/extensions/shipping/app/models/shipment_presenter.rb +0 -3
- data/vendor/extensions/shipping/app/views/admin/shipments/_form.html.erb +0 -35
- data/vendor/extensions/shipping/app/views/admin/shipments/edit.html.erb +0 -11
- data/vendor/extensions/shipping/app/views/admin/shipments/new.html.erb +0 -12
- data/vendor/extensions/shipping/app/views/admin/shipping_categories/index.html.erb +0 -24
- data/vendor/extensions/shipping/app/views/admin/shipping_methods/index.html.erb +0 -28
- data/vendor/extensions/shipping/config/locales/de.yml +0 -25
- data/vendor/extensions/shipping/config/locales/en-GB.yml +0 -25
- data/vendor/extensions/shipping/config/locales/en-US.yml +0 -25
- data/vendor/extensions/shipping/config/locales/es.yml +0 -25
- data/vendor/extensions/shipping/config/locales/it.yml +0 -25
- data/vendor/extensions/shipping/config/locales/nb-NO.yml +0 -25
- data/vendor/extensions/shipping/config/locales/pl.yml +0 -25
- data/vendor/extensions/shipping/config/locales/pt-BR.yml +0 -25
- data/vendor/extensions/shipping/config/locales/ru-RU.yml +0 -25
- data/vendor/extensions/shipping/config/routes.rb +0 -10
- data/vendor/extensions/shipping/db/sample/addresses.yml +0 -14
- data/vendor/extensions/shipping/db/sample/zone_members.yml +0 -16
- data/vendor/extensions/shipping/lib/spree/shipping_calculator.rb +0 -28
- data/vendor/extensions/shipping/lib/tasks/shipping_extension_tasks.rake +0 -29
- data/vendor/extensions/shipping/shipping_extension.rb +0 -40
- data/vendor/extensions/shipping/spec/spec.opts +0 -6
- data/vendor/extensions/shipping/spec/spec_helper.rb +0 -37
- data/vendor/extensions/tax_calculator/spec/controllers/admin/tax_rates_controller_spec.rb +0 -22
- data/vendor/extensions/tax_calculator/spec/models/order_tax_calc_spec.rb +0 -22
- data/vendor/gems/active_presenter-0.0.6/.specification +0 -64
- data/vendor/gems/active_presenter-0.0.6/LICENSE +0 -22
- data/vendor/gems/active_presenter-0.0.6/README +0 -82
- data/vendor/gems/active_presenter-0.0.6/Rakefile +0 -10
- data/vendor/gems/active_presenter-0.0.6/lib/active_presenter.rb +0 -7
- data/vendor/gems/active_presenter-0.0.6/lib/active_presenter/base.rb +0 -204
- data/vendor/gems/active_presenter-0.0.6/lib/active_presenter/version.rb +0 -9
- data/vendor/gems/active_presenter-0.0.6/lib/tasks/doc.rake +0 -19
- data/vendor/gems/active_presenter-0.0.6/lib/tasks/gem.rake +0 -62
- data/vendor/gems/active_presenter-0.0.6/test/base_test.rb +0 -188
- data/vendor/gems/active_presenter-0.0.6/test/test_helper.rb +0 -74
- data/vendor/plugins/calendar_date_select/History.txt +0 -231
- data/vendor/plugins/calendar_date_select/Manifest.txt +0 -42
- data/vendor/plugins/calendar_date_select/Rakefile +0 -31
- data/vendor/plugins/calendar_date_select/Readme.txt +0 -16
- data/vendor/plugins/calendar_date_select/calendar_date_select.gemspec +0 -33
- data/vendor/plugins/calendar_date_select/init.rb +0 -1
- data/vendor/plugins/calendar_date_select/js_test/functional/cds_test.html +0 -334
- data/vendor/plugins/calendar_date_select/js_test/prototype.js +0 -4184
- data/vendor/plugins/calendar_date_select/js_test/test.css +0 -40
- data/vendor/plugins/calendar_date_select/js_test/unit/cds_helper_methods.html +0 -46
- data/vendor/plugins/calendar_date_select/js_test/unittest.js +0 -564
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select.rb +0 -33
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select/calendar_date_select.rb +0 -116
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select/form_helpers.rb +0 -223
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select/includes_helper.rb +0 -29
- data/vendor/plugins/calendar_date_select/public/blank_iframe.html +0 -2
- data/vendor/plugins/calendar_date_select/public/images/calendar_date_select/calendar.gif +0 -0
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/calendar_date_select.js +0 -443
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_american.js +0 -34
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_db.js +0 -27
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_euro_24hr.js +0 -7
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_euro_24hr_ymd.js +0 -7
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_finnish.js +0 -32
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_hyphen_ampm.js +0 -36
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_iso_date.js +0 -46
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_italian.js +0 -24
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/de.js +0 -11
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/fi.js +0 -10
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/fr.js +0 -10
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/pl.js +0 -10
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/pt.js +0 -11
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/ru.js +0 -10
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/blue.css +0 -130
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/default.css +0 -135
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/plain.css +0 -128
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/red.css +0 -135
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/silver.css +0 -133
- data/vendor/plugins/calendar_date_select/spec/calendar_date_select/calendar_date_select_spec.rb +0 -14
- data/vendor/plugins/calendar_date_select/spec/calendar_date_select/form_helpers_spec.rb +0 -161
- data/vendor/plugins/calendar_date_select/spec/spec_helper.rb +0 -26
- data/vendor/plugins/has_many_polymorphs/CHANGELOG +0 -83
- data/vendor/plugins/has_many_polymorphs/LICENSE +0 -184
- data/vendor/plugins/has_many_polymorphs/Manifest +0 -174
- data/vendor/plugins/has_many_polymorphs/README +0 -205
- data/vendor/plugins/has_many_polymorphs/Rakefile +0 -28
- data/vendor/plugins/has_many_polymorphs/TODO +0 -2
- data/vendor/plugins/has_many_polymorphs/examples/hmph.rb +0 -69
- data/vendor/plugins/has_many_polymorphs/generators/tagging/tagging_generator.rb +0 -97
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/migration.rb +0 -28
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag.rb +0 -39
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb +0 -15
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging.rb +0 -16
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb +0 -159
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb +0 -85
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/taggings.yml +0 -23
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tags.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/init.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb +0 -27
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb +0 -159
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb +0 -70
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/base.rb +0 -60
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb +0 -600
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/configuration.rb +0 -19
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/debugging_tools.rb +0 -103
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/rake_task_redefine_task.rb +0 -35
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/reflection.rb +0 -58
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb +0 -84
- data/vendor/plugins/has_many_polymorphs/test/fixtures/bow_wows.yml +0 -10
- data/vendor/plugins/has_many_polymorphs/test/fixtures/cats.yml +0 -18
- data/vendor/plugins/has_many_polymorphs/test/fixtures/fish.yml +0 -12
- data/vendor/plugins/has_many_polymorphs/test/fixtures/frogs.yml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/fixtures/keep_your_enemies_close.yml +0 -0
- data/vendor/plugins/has_many_polymorphs/test/fixtures/little_whale_pupils.yml +0 -0
- data/vendor/plugins/has_many_polymorphs/test/fixtures/people.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/fixtures/petfoods.yml +0 -11
- data/vendor/plugins/has_many_polymorphs/test/fixtures/whales.yml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/fixtures/wild_boars.yml +0 -10
- data/vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb +0 -42
- data/vendor/plugins/has_many_polymorphs/test/integration/app/README +0 -182
- data/vendor/plugins/has_many_polymorphs/test/integration/app/Rakefile +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/application.rb +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/bones_controller.rb +0 -5
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/addresses_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/application_helper.rb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/bones_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/sellers_helper.rb +0 -28
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/states_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/users_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/bone.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/double_sti_parent.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/double_sti_parent_relationship.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/organic_substance.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/single_sti_parent.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/single_sti_parent_relationship.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/stick.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/stone.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/index.html.erb +0 -18
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/bones/index.rhtml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/addresses.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/sellers.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/states.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/users.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/index.html.erb +0 -20
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/index.html.erb +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/index.html.erb +0 -22
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/boot.rb +0 -110
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/database.yml +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environment.rb +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environment.rb.canonical +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/production.rb +0 -18
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/test.rb +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/routes.rb +0 -33
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/ultrasphinx/default.base +0 -56
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/ultrasphinx/development.conf.canonical +0 -155
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/001_create_sticks.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/002_create_stones.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/003_create_organic_substances.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/004_create_bones.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/005_create_single_sti_parents.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/006_create_double_sti_parents.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/007_create_single_sti_parent_relationships.rb +0 -13
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/008_create_double_sti_parent_relationships.rb +0 -14
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/009_create_library_model.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/doc/README_FOR_APP +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb +0 -83
- data/vendor/plugins/has_many_polymorphs/test/integration/app/lib/library_model.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/404.html +0 -30
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/500.html +0 -30
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.cgi +0 -10
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.fcgi +0 -24
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.rb +0 -10
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/favicon.ico +0 -0
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/images/rails.png +0 -0
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/index.html +0 -277
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/application.js +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/controls.js +0 -833
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/dragdrop.js +0 -942
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/effects.js +0 -1088
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/prototype.js +0 -2515
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/robots.txt +0 -1
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/stylesheets/scaffold.css +0 -74
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/about +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/breakpointer +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/console +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/destroy +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/generate +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/benchmarker +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/profiler +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/plugin +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/inspector +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/reaper +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/spawner +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/runner +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/server +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/double_sti_parent_relationships.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/double_sti_parents.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/organic_substances.yml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/single_sti_parent_relationships.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/single_sti_parents.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/sticks.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/stones.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/bones_controller_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/server_test.rb +0 -43
- data/vendor/plugins/has_many_polymorphs/test/models/aquatic/fish.rb +0 -5
- data/vendor/plugins/has_many_polymorphs/test/models/aquatic/pupils_whale.rb +0 -7
- data/vendor/plugins/has_many_polymorphs/test/models/aquatic/whale.rb +0 -15
- data/vendor/plugins/has_many_polymorphs/test/models/beautiful_fight_relationship.rb +0 -26
- data/vendor/plugins/has_many_polymorphs/test/models/canine.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/models/cat.rb +0 -5
- data/vendor/plugins/has_many_polymorphs/test/models/dog.rb +0 -18
- data/vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb +0 -10
- data/vendor/plugins/has_many_polymorphs/test/models/frog.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/models/kitten.rb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/models/parentship.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/models/person.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/models/petfood.rb +0 -39
- data/vendor/plugins/has_many_polymorphs/test/models/tabby.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/models/wild_boar.rb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/modules/extension_module.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/modules/other_extension_module.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/patches/symlinked_plugins_1.2.6.diff +0 -46
- data/vendor/plugins/has_many_polymorphs/test/schema.rb +0 -87
- data/vendor/plugins/has_many_polymorphs/test/setup.rb +0 -14
- data/vendor/plugins/has_many_polymorphs/test/test_helper.rb +0 -51
- data/vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb +0 -714
@@ -1,10 +1,8 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
</ul>
|
10
|
-
</div>
|
1
|
+
<ul id="language-bar">
|
2
|
+
<li><strong><%= t('change_language') %></strong></li>
|
3
|
+
<% AVAILABLE_LOCALES.each do |locale| -%>
|
4
|
+
<li>
|
5
|
+
<%=link_to(image_tag("flags/#{flag_image(locale[0])}",{:alt => locale[1], :title => locale[1]}), set_locale_path(:locale => locale[0])) %>
|
6
|
+
</li>
|
7
|
+
<% end -%>
|
8
|
+
</ul>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
class LocalizationExtension < Spree::Extension
|
5
5
|
version "0.1.1"
|
6
6
|
description "Localization support for Spree"
|
7
|
-
url "http://support.
|
7
|
+
url "http://support.spreecommerce.com/wiki/1/I18n"
|
8
8
|
|
9
9
|
def activate
|
10
10
|
ApplicationController.class_eval do
|
@@ -18,4 +18,4 @@ class LocalizationExtension < Spree::Extension
|
|
18
18
|
end
|
19
19
|
end
|
20
20
|
end
|
21
|
-
end
|
21
|
+
end
|
data/vendor/extensions/payment_gateway/app/views/admin/gateway_configurations/_form.html.erb
CHANGED
@@ -1,7 +1,8 @@
|
|
1
|
-
<
|
2
|
-
|
3
|
-
<%= f.collection_select :gateway_id, @available_gateways, :id, :name, {}, {:style => "width:250px", :id => "gateway"}%>
|
4
|
-
|
1
|
+
<p>
|
2
|
+
<label for="gateway_id"><%= t("payment_gateway") %></label>
|
3
|
+
<%= f.collection_select :gateway_id, @available_gateways, :id, :name, {}, {:style => "width:250px", :id => "gateway"}%>
|
4
|
+
</p>
|
5
|
+
|
5
6
|
<h2><%= t("configuration_options") %></h2>
|
6
7
|
|
7
8
|
<%= image_tag "spinner.gif", :style => "display:none", :id => 'busy_indicator' %>
|
@@ -1,8 +1,10 @@
|
|
1
|
+
<%= render :partial => 'admin/shared/configuration_menu' %>
|
2
|
+
|
1
3
|
<h1>Gateway Configuration</h1>
|
2
4
|
<%= error_messages_for :gateway_configuration %>
|
3
5
|
<% form_for(:gateway_configuration, :url => object_url, :html => { :method => :put }) do |f| %>
|
4
6
|
<%= render :partial => "form", :locals => { :f => f } %>
|
5
|
-
<p>
|
6
|
-
<%=
|
7
|
+
<p class="form-buttons">
|
8
|
+
<%= button t("update")%>
|
7
9
|
</p>
|
8
10
|
<% end %>
|
data/vendor/extensions/payment_gateway/app/views/admin/gateway_option_values/_options.html.erb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
<table class="
|
1
|
+
<table class="index">
|
2
2
|
<tr>
|
3
3
|
<th><%= t('name') %></th>
|
4
4
|
<th><%= t('description') %></th>
|
@@ -6,9 +6,9 @@
|
|
6
6
|
</tr>
|
7
7
|
<% option_values.each do |option_value| %>
|
8
8
|
<tr>
|
9
|
-
<td
|
10
|
-
<td
|
11
|
-
<td
|
9
|
+
<td><%=option_value.gateway_option.name%></td>
|
10
|
+
<td><%=option_value.gateway_option.description%></td>
|
11
|
+
<td>
|
12
12
|
<% if option_value.gateway_option.textarea %>
|
13
13
|
<textarea name="option[<%=option_value.gateway_option.id%>]"
|
14
14
|
rows="5"
|
@@ -76,8 +76,8 @@ module Spree
|
|
76
76
|
# a billing address when authorizing/voiding a previously captured transaction. So omits these
|
77
77
|
# options in this case since they aren't necessary.
|
78
78
|
def minimal_gateway_options
|
79
|
-
{:email => order.
|
80
|
-
:customer => order.
|
79
|
+
{:email => order.email,
|
80
|
+
:customer => order.email,
|
81
81
|
:ip => order.ip_address,
|
82
82
|
:order_id => order.number,
|
83
83
|
:shipping => order.ship_amount * 100,
|
@@ -1,30 +1,32 @@
|
|
1
|
+
<div class='toolbar'>
|
2
|
+
<ul class='actions'>
|
3
|
+
<li>
|
4
|
+
<%= button_link_to t("new_tax_rate"), new_object_url, :icon => 'add' %>
|
5
|
+
</li>
|
6
|
+
</ul>
|
7
|
+
<br class='clear' />
|
8
|
+
</div>
|
1
9
|
<h1><%=t("ext_tax_calculator_tax_rates") %></h1>
|
2
|
-
<table class="
|
3
|
-
<thead>
|
4
|
-
<
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
<th><%=t("action")%></th>
|
10
|
-
</tr>
|
10
|
+
<table class="index">
|
11
|
+
<thead>
|
12
|
+
<th><%=t("zone")%></th>
|
13
|
+
<th><%=t("category")%></th>
|
14
|
+
<th><%=t("amount")%></th>
|
15
|
+
<th><%=t("tax_type")%></th>
|
16
|
+
<th><%=t("action")%></th>
|
11
17
|
</thead>
|
12
18
|
<tbody>
|
13
|
-
<% @tax_rates.each do |tax_rate
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
<% end %>
|
25
|
-
<% if @tax_rates.empty? %>
|
26
|
-
<tr><td colspan="5">None.</td></tr>
|
19
|
+
<% @tax_rates.each do |tax_rate|%>
|
20
|
+
<tr>
|
21
|
+
<td><%=tax_rate.zone.name %></td>
|
22
|
+
<td><%=tax_rate.tax_category.name %></td>
|
23
|
+
<td><%=tax_rate.amount %></td>
|
24
|
+
<td><%=TaxRate::TaxType.from_value tax_rate.tax_type %></td>
|
25
|
+
<td>
|
26
|
+
<%= link_to_edit tax_rate %>
|
27
|
+
<%= link_to_delete tax_rate %>
|
28
|
+
</td>
|
29
|
+
</tr>
|
27
30
|
<% end %>
|
28
31
|
</tbody>
|
29
|
-
</table>
|
30
|
-
<%= link_to t("new_tax_rate"), new_object_url %>
|
32
|
+
</table>
|
@@ -0,0 +1,17 @@
|
|
1
|
+
<%= render :partial => 'admin/shared/configuration_menu' %>
|
2
|
+
|
3
|
+
<h1><%= t('tax_settings') %></h1>
|
4
|
+
|
5
|
+
<% form_tag(admin_tax_settings_path, :method => :put) do -%>
|
6
|
+
|
7
|
+
<p>
|
8
|
+
<label><%= t("show_price_incl_vat") %></label>
|
9
|
+
<input name="preferences[show_price_inc_vat]" type="hidden" value="0" />
|
10
|
+
<%= check_box_tag('preferences[show_price_inc_vat]', "1", Spree::Tax::Config[:show_price_inc_vat]) %>
|
11
|
+
</p>
|
12
|
+
|
13
|
+
<p class="form-buttons">
|
14
|
+
<%= button t('update') %>
|
15
|
+
or <%= link_to t("cancel"), admin_tax_settings_url %>
|
16
|
+
</p>
|
17
|
+
<% end -%>
|
@@ -0,0 +1,14 @@
|
|
1
|
+
<%= render :partial => 'admin/shared/configuration_menu' %>
|
2
|
+
|
3
|
+
<h1><%= t("tax_settings") %></h1>
|
4
|
+
|
5
|
+
<table>
|
6
|
+
<tr>
|
7
|
+
<th scope="row"><%= t("show_price_inc_vat") %>:</th>
|
8
|
+
<td><%= Spree::Tax::Config[:show_price_inc_vat] %></td>
|
9
|
+
</tr>
|
10
|
+
</table>
|
11
|
+
|
12
|
+
<p><%= link_to_with_icon 'edit', t("edit"), edit_admin_tax_settings_path %></p>
|
13
|
+
|
14
|
+
|
@@ -26,5 +26,7 @@ en-US:
|
|
26
26
|
ext_tax_calculator_new_tax_rate: "New Tax Rate"
|
27
27
|
ext_tax_calculator_tax_rates: "Tax Rates"
|
28
28
|
ext_tax_calculator_tax_rates_description: "Tax rates setup and configuration."
|
29
|
+
ext_tax_calculator_tax_settings: "Tax Settings"
|
30
|
+
ext_tax_calculator_tax_settings_description: "Basic tax settings."
|
29
31
|
ext_tax_calculator_tax_type: "Tax Type"
|
30
32
|
ext_tax_calculator_zone: Zone
|
@@ -34,14 +34,9 @@ module Spree #:nodoc:
|
|
34
34
|
end
|
35
35
|
|
36
36
|
# list the vat rates for the default country
|
37
|
-
def self.default_rates
|
38
|
-
|
39
|
-
|
40
|
-
default_country = Country.find(Spree::Config[:default_country_id], :include => {:zone_members => :parent})
|
41
|
-
default_zone = default_country.zone_members[0].parent unless default_country.zone_members.empty?
|
42
|
-
default_zone.nil? ? [] : TaxRate.find_all_by_zone_id_and_tax_type(default_zone, TaxRate::TaxType::VAT)
|
43
|
-
end
|
44
|
-
rates
|
37
|
+
def self.default_rates
|
38
|
+
return [] unless zone_member = ZoneMember.find(:first, :conditions => ["zoneable_id = #{Spree::Config[:default_country_id]} AND zoneable_type = 'Country'"])
|
39
|
+
TaxRate.find_all_by_zone_id_and_tax_type(zone_member.zone, TaxRate::TaxType::VAT)
|
45
40
|
end
|
46
41
|
end
|
47
42
|
end
|
@@ -15,6 +15,7 @@ class TaxCalculatorExtension < Spree::Extension
|
|
15
15
|
before_filter :add_tax_rate_links, :only => :index
|
16
16
|
def add_tax_rate_links
|
17
17
|
@extension_links << {:link => admin_tax_rates_path, :link_text => t("ext_tax_calculator_tax_rates"), :description => t("ext_tax_calculator_tax_rates_description")}
|
18
|
+
@extension_links << {:link => admin_tax_settings_path, :link_text => t("ext_tax_calculator_tax_settings"), :description => t("ext_tax_calculator_tax_settings_description")}
|
18
19
|
end
|
19
20
|
end
|
20
21
|
|
@@ -0,0 +1,138 @@
|
|
1
|
+
= Frequently Asked Questions
|
2
|
+
|
3
|
+
== Haml
|
4
|
+
|
5
|
+
=== How do I put a punctuation mark after an element, like "<tt>I like <strong>cake</strong>!</tt>"?
|
6
|
+
|
7
|
+
Expressing the structure of a document
|
8
|
+
and expressing inline formatting are two very different problems.
|
9
|
+
Haml is mostly designed for structure,
|
10
|
+
so the best way to deal with formatting is to leave it to other languages
|
11
|
+
that are designed for it.
|
12
|
+
You could use Textile:
|
13
|
+
|
14
|
+
%p
|
15
|
+
:textile
|
16
|
+
I like *cake*!
|
17
|
+
|
18
|
+
or Markdown:
|
19
|
+
|
20
|
+
%p
|
21
|
+
:markdown
|
22
|
+
I like **cake**!
|
23
|
+
|
24
|
+
or plain old XHTML:
|
25
|
+
|
26
|
+
%p I like <strong>cake</strong>!
|
27
|
+
|
28
|
+
If you're inserting something that's generated by a helper, like a link,
|
29
|
+
then it's even easier:
|
30
|
+
|
31
|
+
%p== I like #{link_to 'chocolate', 'http://franschocolates.com'}!
|
32
|
+
|
33
|
+
=== How do I stop Haml from indenting the contents of my +pre+ and +textarea+ tags?
|
34
|
+
|
35
|
+
Because Haml automatically indents the HTML source code,
|
36
|
+
the contents of whitespace-sensitive tags like +pre+ and +textarea+
|
37
|
+
can get screwed up.
|
38
|
+
The solution is to replace the newlines inside these tags
|
39
|
+
with HTML newline entities (<tt>
</tt>),
|
40
|
+
which Haml does using the Haml::Helpers#preserve and Haml::Helpers#find_and_preserve helpers.
|
41
|
+
|
42
|
+
Normally, Haml will do this for you automatically
|
43
|
+
when you're using a tag that needs it
|
44
|
+
(this can be customized using the <tt>:preserve</tt> option;
|
45
|
+
see the Options section of the {Haml reference}(../classes/Haml.html)).
|
46
|
+
For example,
|
47
|
+
|
48
|
+
%p
|
49
|
+
%textarea= "Foo\nBar"
|
50
|
+
|
51
|
+
will be compiled to
|
52
|
+
|
53
|
+
<p>
|
54
|
+
<textarea>Foo
Bar</textarea>
|
55
|
+
</p>
|
56
|
+
|
57
|
+
However, if a helper is generating the tag,
|
58
|
+
Haml can't detect that and so you'll have to call +find_and_preserve+ yourself.
|
59
|
+
You can also use <tt>~</tt>, which is the same as <tt>=</tt>
|
60
|
+
except that it automatically runs +find_and_preserve+ on its input.
|
61
|
+
For example:
|
62
|
+
|
63
|
+
%p= find_and_preserve "<textarea>Foo\nBar</textarea>"
|
64
|
+
|
65
|
+
is the same as
|
66
|
+
|
67
|
+
%p~ "<textarea>Foo\nBar</textarea>"
|
68
|
+
|
69
|
+
and renders
|
70
|
+
|
71
|
+
<p><textarea>Foo
Bar</textarea></p>
|
72
|
+
|
73
|
+
=== How do I make my long lines of Ruby code look nicer in my Haml document?
|
74
|
+
|
75
|
+
Put them in a helper or your model.
|
76
|
+
|
77
|
+
Haml purposefully makes it annoying to put lots of Ruby code into your templates,
|
78
|
+
because lots of code doesn't belong in the view.
|
79
|
+
If you take that huge +link_to_remote+ call
|
80
|
+
and move it to a +update_sidebar_link+ helper,
|
81
|
+
it'll make your view both easier to read and more semantic.
|
82
|
+
|
83
|
+
If you absolutely must put lots of code in your template,
|
84
|
+
Haml offers a somewhat awkward multiline-continuation tool.
|
85
|
+
Put a <tt>|</tt> (pipe character) at the end of each line you want to be merged into one
|
86
|
+
(including the last line!).
|
87
|
+
For example:
|
88
|
+
|
89
|
+
%p= @this.is(way.too.much). |
|
90
|
+
code("and I should"). |
|
91
|
+
really_move.it.into( |
|
92
|
+
:a => @helper) |
|
93
|
+
|
94
|
+
=== I have Haml installed. Why is Rails (only looking for <tt>.html.erb</tt> files | rendering Haml files as plain text | rendering Haml files as blank pages)?
|
95
|
+
|
96
|
+
There are several reasons these things might be happening.
|
97
|
+
First of all, make sure vendor/plugins/haml really exists
|
98
|
+
and has an init.rb file in there.
|
99
|
+
Then try restarting Mongrel or WEBrick or whatever you might be using.
|
100
|
+
|
101
|
+
Finally, if none of these work,
|
102
|
+
chances are you've got some localization plugin like Globalize installed.
|
103
|
+
Such plugins often don't play nicely with Haml.
|
104
|
+
Luckily, there's usually an easy fix.
|
105
|
+
For Globalize, just edit globalize/lib/globalize/rails/action_view.rb
|
106
|
+
and change
|
107
|
+
|
108
|
+
@@re_extension = /\.(rjs|rhtml|rxml)$/
|
109
|
+
|
110
|
+
to
|
111
|
+
|
112
|
+
@@re_extension = /\.(rjs|rhtml|rxml|erb|builder|haml)$/
|
113
|
+
|
114
|
+
For other plugins, a little searching will probably turn up a way to fix them as well.
|
115
|
+
|
116
|
+
== Sass
|
117
|
+
|
118
|
+
=== Can I use a variable from my controller in my Sass file?
|
119
|
+
|
120
|
+
No. Sass files aren't views.
|
121
|
+
They're compiled once into static CSS files,
|
122
|
+
then left along until they're changed and need to be compiled again.
|
123
|
+
Not only don't you want to be running a full request cycle
|
124
|
+
every time someone requests a stylesheet,
|
125
|
+
but it's not a great idea to put much logic in there anyway
|
126
|
+
due to how browsers handle them.
|
127
|
+
|
128
|
+
If you really need some sort of dynamic CSS,
|
129
|
+
the best thing to do is put only the snippet you need to dynamically set
|
130
|
+
in the +head+ of your HTML document.
|
131
|
+
|
132
|
+
== You still haven't answered my question!
|
133
|
+
|
134
|
+
Sorry! Try looking at the Haml or Sass references,
|
135
|
+
in the doucmentation for the haml and Sass modules, respectively.
|
136
|
+
If you can't find an answer there,
|
137
|
+
feel free to ask in #haml on irc.freenode.net
|
138
|
+
or send an email to the {mailing list}[http://groups.google.com/group/haml?hl=en].
|
@@ -0,0 +1,20 @@
|
|
1
|
+
Copyright (c) 2006-2008 Hampton Catlin
|
2
|
+
|
3
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
4
|
+
a copy of this software and associated documentation files (the
|
5
|
+
"Software"), to deal in the Software without restriction, including
|
6
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
7
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
8
|
+
permit persons to whom the Software is furnished to do so, subject to
|
9
|
+
the following conditions:
|
10
|
+
|
11
|
+
The above copyright notice and this permission notice shall be
|
12
|
+
included in all copies or substantial portions of the Software.
|
13
|
+
|
14
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
15
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
16
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
17
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
18
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
19
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
20
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
@@ -0,0 +1,332 @@
|
|
1
|
+
= Haml and Sass
|
2
|
+
|
3
|
+
Haml and Sass are templating engines
|
4
|
+
for the two most common types of documents on the web:
|
5
|
+
HTML and CSS, respectively.
|
6
|
+
They are designed to make it both easier and more pleasant
|
7
|
+
to code HTML and CSS documents,
|
8
|
+
by eliminating redundancy,
|
9
|
+
reflecting the underlying structure that the document represents,
|
10
|
+
and providing elegant, easily understandable, and powerful syntax.
|
11
|
+
|
12
|
+
== Using
|
13
|
+
|
14
|
+
There are several ways to use Haml and Sass.
|
15
|
+
They can be used as a plugin for Rails or Merb,
|
16
|
+
or embedded on their own in other applications.
|
17
|
+
The first step of all of these is to install the Haml gem:
|
18
|
+
|
19
|
+
gem install haml
|
20
|
+
|
21
|
+
To install Haml and Sass as a Rails plugin,
|
22
|
+
just run <tt>haml --rails path/to/rails/app</tt>
|
23
|
+
and both Haml and Sass will be installed.
|
24
|
+
Views with the <tt>.haml</tt> (or <tt>.html.haml</tt> for edge)
|
25
|
+
extension will automatically use Haml.
|
26
|
+
Sass is a little more complicated;
|
27
|
+
<tt>.sass</tt> files should be placed in public/stylesheets/sass,
|
28
|
+
where they'll be automatically compiled
|
29
|
+
to corresponding CSS files in public/stylesheets when needed
|
30
|
+
(the Sass template directory is customizable...
|
31
|
+
see the Sass module docs for details).
|
32
|
+
|
33
|
+
For Merb, <tt>.html.haml</tt> views will work without any further modification.
|
34
|
+
To enable Sass, you also need to add a dependency.
|
35
|
+
To do so, just add
|
36
|
+
|
37
|
+
dependency "merb-haml"
|
38
|
+
|
39
|
+
to config/dependencies.rb (or config/init.rb in a flat/very flat Merb application).
|
40
|
+
Then it'll work just like it does in Rails.
|
41
|
+
|
42
|
+
To use Haml and Sass programatically,
|
43
|
+
check out the RDocs for the Haml and Sass modules.
|
44
|
+
|
45
|
+
== Formatting
|
46
|
+
|
47
|
+
=== Haml
|
48
|
+
|
49
|
+
The most basic element of Haml
|
50
|
+
is a shorthand for creating HTML tags:
|
51
|
+
|
52
|
+
%tagname{:attr1 => 'value1', :attr2 => 'value2'} Contents
|
53
|
+
|
54
|
+
No end-tag is needed; Haml handles that automatically.
|
55
|
+
Adding <tt>class</tt> and <tt>id</tt> attributes is even easier.
|
56
|
+
Haml uses the same syntax as the CSS that styles the document:
|
57
|
+
|
58
|
+
%tagname#id.class
|
59
|
+
|
60
|
+
In fact, when you're using the <tt><div></tt> tag,
|
61
|
+
it becomes <em>even easier</em>.
|
62
|
+
Because <tt><div></tt> is such a common element,
|
63
|
+
a tag without a name defaults to a div. So
|
64
|
+
|
65
|
+
#foo Hello!
|
66
|
+
|
67
|
+
becomes
|
68
|
+
|
69
|
+
<div id='foo'>Hello!</div>
|
70
|
+
|
71
|
+
Haml uses indentation
|
72
|
+
to bring the individual elements to represent the HTML structure.
|
73
|
+
A tag's children are indented beneath than the parent tag.
|
74
|
+
Again, a closing tag is automatically added.
|
75
|
+
For example:
|
76
|
+
|
77
|
+
%ul
|
78
|
+
%li Salt
|
79
|
+
%li Pepper
|
80
|
+
|
81
|
+
becomes:
|
82
|
+
|
83
|
+
<ul>
|
84
|
+
<li>Salt</li>
|
85
|
+
<li>Pepper</li>
|
86
|
+
</ul>
|
87
|
+
|
88
|
+
You can also put plain text as a child of an element:
|
89
|
+
|
90
|
+
%p
|
91
|
+
Hello,
|
92
|
+
World!
|
93
|
+
|
94
|
+
It's also possible to embed Ruby code into Haml documents.
|
95
|
+
An equals sign, <tt>=</tt>, will output the result of the code.
|
96
|
+
A hyphen, <tt>-</tt>, will run the code but not output the result.
|
97
|
+
You can even use control statements
|
98
|
+
like <tt>if</tt> and <tt>while</tt>:
|
99
|
+
|
100
|
+
%p
|
101
|
+
Date/Time:
|
102
|
+
- now = DateTime.now
|
103
|
+
%strong= now
|
104
|
+
- if now > DateTime.parse("December 31, 2006")
|
105
|
+
= "Happy new " + "year!"
|
106
|
+
|
107
|
+
Haml provides far more tools than those presented here.
|
108
|
+
Check out the reference documentation in the Haml module.
|
109
|
+
|
110
|
+
=== Sass
|
111
|
+
|
112
|
+
At its most basic,
|
113
|
+
Sass is just another way of writing CSS.
|
114
|
+
Although it's very much like normal CSS,
|
115
|
+
the basic syntax offers a few helpful features:
|
116
|
+
tabulation indicates the attributes in a rule,
|
117
|
+
rather than non-DRY brackets;
|
118
|
+
and newlines indicate the end of an attribute,
|
119
|
+
rather than a semicolon.
|
120
|
+
For example:
|
121
|
+
|
122
|
+
#main
|
123
|
+
:background-color #f00
|
124
|
+
:width 98%
|
125
|
+
|
126
|
+
becomes:
|
127
|
+
|
128
|
+
#main {
|
129
|
+
background-color: #f00;
|
130
|
+
width: 98% }
|
131
|
+
|
132
|
+
However, Sass provides much more than a way to make CSS look nice.
|
133
|
+
In CSS, it's important to have accurate selectors,
|
134
|
+
so your styles don't just apply to everything.
|
135
|
+
However, in order to do this,
|
136
|
+
you need to use nested element selectors.
|
137
|
+
These get very ugly very quickly.
|
138
|
+
I'm sure everyone's had to write something like
|
139
|
+
"#main .sidebar .top p h1 a",
|
140
|
+
followed by
|
141
|
+
"#main .sidebar .top p h1 a:visited" and
|
142
|
+
"#main .sidebar .top p h1 a:hover".
|
143
|
+
Well, Sass gets rid of that.
|
144
|
+
Like Haml, it uses indentation to indicate the structure of the document.
|
145
|
+
So, what was:
|
146
|
+
|
147
|
+
#main {
|
148
|
+
width: 90%;
|
149
|
+
}
|
150
|
+
#main p {
|
151
|
+
border-style: solid;
|
152
|
+
border-width: 1px;
|
153
|
+
border-color: #00f;
|
154
|
+
}
|
155
|
+
#main p a {
|
156
|
+
text-decoration: none;
|
157
|
+
font-weight: bold;
|
158
|
+
}
|
159
|
+
#main p a:hover {
|
160
|
+
text-decoration: underline;
|
161
|
+
}
|
162
|
+
|
163
|
+
becomes:
|
164
|
+
|
165
|
+
#main
|
166
|
+
:width 90%
|
167
|
+
p
|
168
|
+
:border-style solid
|
169
|
+
:border-width 1px
|
170
|
+
:border-color #00f
|
171
|
+
a
|
172
|
+
:text-decoration none
|
173
|
+
:font-weight bold
|
174
|
+
a:hover
|
175
|
+
:text-decoration underline
|
176
|
+
|
177
|
+
Pretty nice, no? Well, it gets better.
|
178
|
+
One of the main complaints against CSS is that it doesn't allow variables.
|
179
|
+
What if have a color or a width you re-use all the time?
|
180
|
+
In CSS, you just have to re-type it each time,
|
181
|
+
which is a nightmare when you decide to change it later.
|
182
|
+
Not so for Sass!
|
183
|
+
You can use the "!" character to set variables.
|
184
|
+
Then, if you put "=" after your attribute name,
|
185
|
+
you can set it to a variable.
|
186
|
+
For example:
|
187
|
+
|
188
|
+
!note_bg= #55aaff
|
189
|
+
|
190
|
+
#main
|
191
|
+
:width 70%
|
192
|
+
.note
|
193
|
+
:background-color= !note_bg
|
194
|
+
p
|
195
|
+
:width 5em
|
196
|
+
:background-color= !note_bg
|
197
|
+
|
198
|
+
becomes:
|
199
|
+
|
200
|
+
#main {
|
201
|
+
width: 70%; }
|
202
|
+
#main .note {
|
203
|
+
background-color: #55aaff; }
|
204
|
+
#main p {
|
205
|
+
width: 5em;
|
206
|
+
background-color: #55aaff; }
|
207
|
+
|
208
|
+
You can even do simple arithmetic operations with variables,
|
209
|
+
adding numbers and even colors together:
|
210
|
+
|
211
|
+
!main_bg= #46ar12
|
212
|
+
!main_width= 40em
|
213
|
+
|
214
|
+
#main
|
215
|
+
:background-color= !main_bg
|
216
|
+
:width= !main_width
|
217
|
+
.sidebar
|
218
|
+
:background-color= !main_bg + #333333
|
219
|
+
:width= !main_width - 25em
|
220
|
+
|
221
|
+
becomes:
|
222
|
+
|
223
|
+
#main {
|
224
|
+
background-color: #46a312;
|
225
|
+
width: 40em; }
|
226
|
+
#main .sidebar {
|
227
|
+
background-color: #79d645;
|
228
|
+
width: 15em; }
|
229
|
+
|
230
|
+
Taking the idea of variables a bit further are mixins.
|
231
|
+
These let you group whole swathes of CSS attributes into a single
|
232
|
+
directive and then include those anywhere you want:
|
233
|
+
|
234
|
+
=blue-border
|
235
|
+
:border
|
236
|
+
:color blue
|
237
|
+
:width 2px
|
238
|
+
:style dotted
|
239
|
+
|
240
|
+
.comment
|
241
|
+
+blue-border
|
242
|
+
:padding 2px
|
243
|
+
:margin 10px 0
|
244
|
+
|
245
|
+
.reply
|
246
|
+
+blue-border
|
247
|
+
|
248
|
+
becomes:
|
249
|
+
|
250
|
+
.comment {
|
251
|
+
border-color: blue;
|
252
|
+
border-width: 2px;
|
253
|
+
border-style: dotted;
|
254
|
+
padding: 2px;
|
255
|
+
margin: 10px 0;
|
256
|
+
}
|
257
|
+
|
258
|
+
.reply {
|
259
|
+
border-color: blue;
|
260
|
+
border-width: 2px;
|
261
|
+
border-style: dotted;
|
262
|
+
}
|
263
|
+
|
264
|
+
A comprehensive list of features is in
|
265
|
+
the documentation for the Sass module.
|
266
|
+
|
267
|
+
== Indentation
|
268
|
+
|
269
|
+
Indentation can be made up of one or more tabs or spaces.
|
270
|
+
However, indentation must be consistent within a given document.
|
271
|
+
Hard tabs and spaces can't be mixed,
|
272
|
+
and the same number of tabs or spaces must be used throughout.
|
273
|
+
|
274
|
+
== Executables
|
275
|
+
|
276
|
+
The Haml gem includes several executables that are useful
|
277
|
+
for dealing with Haml and Sass from the command line.
|
278
|
+
|
279
|
+
=== +haml+
|
280
|
+
|
281
|
+
The +haml+ executable transforms a source Haml file into HTML.
|
282
|
+
See <tt>haml --help</tt> for further information and options.
|
283
|
+
|
284
|
+
=== +sass+
|
285
|
+
|
286
|
+
The +sass+ executable transforms a source Sass file into CSS.
|
287
|
+
See <tt>sass --help</tt> for further information and options.
|
288
|
+
|
289
|
+
=== <tt>html2haml</tt>
|
290
|
+
|
291
|
+
The <tt>html2haml</tt> executable attempts to transform HTML,
|
292
|
+
optionally with ERB markup, into Haml code.
|
293
|
+
Since HTML is so variable, this transformation is not always perfect;
|
294
|
+
it's a good idea to have a human check the output of this tool.
|
295
|
+
See <tt>html2haml --help</tt> for further information and options.
|
296
|
+
|
297
|
+
=== <tt>css2sass</tt>
|
298
|
+
|
299
|
+
The <tt>css2sass</tt> executable attempts to transform CSS into Sass code.
|
300
|
+
This transformation attempts to use Sass nesting where possible.
|
301
|
+
See <tt>css2sass --help</tt> for further information and options.
|
302
|
+
|
303
|
+
== Authors
|
304
|
+
|
305
|
+
Haml and Sass are designed by Hampton Catlin (hcatlin) and he is the author
|
306
|
+
of the original implementation. However, Hampton doesn't even know his way
|
307
|
+
around the code anymore and mostly just concentrates on the language issues.
|
308
|
+
Hampton lives in Toronto, Ontario (though he's an American by birth) and
|
309
|
+
is a partner at Unspace Interactive.
|
310
|
+
|
311
|
+
Nathan Weizenbaum is the primary maintainer and architect of the "modern" Ruby
|
312
|
+
implementation of Haml. His hard work has kept the project alive by endlessly
|
313
|
+
answering forum posts, fixing bugs, refactoring, finding speed improvements,
|
314
|
+
writing documentation, implementing new features, and getting Hampton
|
315
|
+
coffee (a fitting task for a boy-genius). Nathan lives in Seattle, Washington and
|
316
|
+
while not being a student at University of Washington he consults for
|
317
|
+
Unspace Interactive and Microsoft.
|
318
|
+
|
319
|
+
Chris Eppstein is a core contributor to Sass and the creator of Compass, the first
|
320
|
+
Sass-based framework. Chris focuses on making Sass more powerful, easy to use, and
|
321
|
+
on ways to speed its adoption through the web development community. Chris lives in
|
322
|
+
San Jose, CA with his wife and daughter. He is the Software Architect for Caring.com,
|
323
|
+
a website devoted to the 34 Million caregivers whose parents are sick or elderly,
|
324
|
+
that uses Haml and Sass.
|
325
|
+
|
326
|
+
If you use this software, you must pay Hampton a compliment. And
|
327
|
+
buy Nathan some jelly beans. Maybe pet a kitten. Yeah. Pet that kitty.
|
328
|
+
|
329
|
+
Some of the work on Haml was supported by Unspace Interactive.
|
330
|
+
|
331
|
+
Beyond that, the implementation is licensed under the MIT License.
|
332
|
+
Ok, fine, I guess that means compliments aren't *required*.
|