spree_core 0.60.6 → 0.70.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (747) hide show
  1. data/LICENSE +1 -1
  2. data/README.md +10 -4
  3. data/{public → app/assets}/images/admin/bg/active-tab.png +0 -0
  4. data/{public → app/assets}/images/admin/bg/admin_tab_back.png +0 -0
  5. data/{public → app/assets}/images/admin/bg/admin_tab_selected_back.png +0 -0
  6. data/{public → app/assets}/images/admin/bg/content-back-blue.png +0 -0
  7. data/{public → app/assets}/images/admin/bg/content-back-green.png +0 -0
  8. data/{public → app/assets}/images/admin/bg/content-back.png +0 -0
  9. data/{public → app/assets}/images/admin/bg/flash-error.png +0 -0
  10. data/{public → app/assets}/images/admin/bg/flash-notice.png +0 -0
  11. data/{public → app/assets}/images/admin/bg/green-stripes.gif +0 -0
  12. data/{public → app/assets}/images/admin/bg/green-stripes.png +0 -0
  13. data/{public → app/assets}/images/admin/bg/grid_header_back.png +0 -0
  14. data/{public → app/assets}/images/admin/bg/grid_header_back_green.png +0 -0
  15. data/{public → app/assets}/images/admin/bg/header-bg.png +0 -0
  16. data/{public → app/assets}/images/admin/bg/header.png +0 -0
  17. data/{public → app/assets}/images/admin/bg/header_bg.jpg +0 -0
  18. data/{public → app/assets}/images/admin/bg/menu-current.png +0 -0
  19. data/{public → app/assets}/images/admin/bg/red-stripes.gif +0 -0
  20. data/{public → app/assets}/images/admin/bg/red-stripes.png +0 -0
  21. data/{public → app/assets}/images/admin/bg/spree_50.png +0 -0
  22. data/{public → app/assets}/images/admin/bg/subnav-divider.png +0 -0
  23. data/{public → app/assets}/images/admin/bg/subnav.png +0 -0
  24. data/{public → app/assets}/images/admin/bg/tab-back.png +0 -0
  25. data/{public → app/assets}/images/admin/buttons/blue/left_01.png +0 -0
  26. data/{public → app/assets}/images/admin/buttons/blue/right_01.png +0 -0
  27. data/{public → app/assets}/images/admin/buttons/drag-handle-green.png +0 -0
  28. data/{public → app/assets}/images/admin/buttons/green/left_01.png +0 -0
  29. data/{public → app/assets}/images/admin/buttons/green/right_01.png +0 -0
  30. data/{public → app/assets}/images/admin/buttons/left_01.png +0 -0
  31. data/{public → app/assets}/images/admin/buttons/left_01_small.png +0 -0
  32. data/{public → app/assets}/images/admin/buttons/orange/left_03.png +0 -0
  33. data/{public → app/assets}/images/admin/buttons/orange/right_03.png +0 -0
  34. data/{public → app/assets}/images/admin/buttons/right_01.png +0 -0
  35. data/{public → app/assets}/images/admin/buttons/right_01_small.png +0 -0
  36. data/{public → app/assets}/images/admin/icons/16x16/1.png +0 -0
  37. data/{public → app/assets}/images/admin/icons/16x16/10.png +0 -0
  38. data/{public → app/assets}/images/admin/icons/16x16/2.png +0 -0
  39. data/{public → app/assets}/images/admin/icons/16x16/3.png +0 -0
  40. data/{public → app/assets}/images/admin/icons/16x16/4.png +0 -0
  41. data/{public → app/assets}/images/admin/icons/16x16/5.png +0 -0
  42. data/{public → app/assets}/images/admin/icons/16x16/6.png +0 -0
  43. data/{public → app/assets}/images/admin/icons/16x16/7.png +0 -0
  44. data/{public → app/assets}/images/admin/icons/16x16/8.png +0 -0
  45. data/{public → app/assets}/images/admin/icons/16x16/9.png +0 -0
  46. data/{public → app/assets}/images/admin/icons/32x32/1.png +0 -0
  47. data/{public → app/assets}/images/admin/icons/32x32/10.png +0 -0
  48. data/{public → app/assets}/images/admin/icons/32x32/11.png +0 -0
  49. data/{public → app/assets}/images/admin/icons/32x32/2.png +0 -0
  50. data/{public → app/assets}/images/admin/icons/32x32/3.png +0 -0
  51. data/{public → app/assets}/images/admin/icons/32x32/4.png +0 -0
  52. data/{public → app/assets}/images/admin/icons/32x32/5.png +0 -0
  53. data/{public → app/assets}/images/admin/icons/32x32/6.png +0 -0
  54. data/{public → app/assets}/images/admin/icons/32x32/7.png +0 -0
  55. data/{public → app/assets}/images/admin/icons/32x32/8.png +0 -0
  56. data/{public → app/assets}/images/admin/icons/32x32/9.png +0 -0
  57. data/{public → app/assets}/images/admin/icons/accept.png +0 -0
  58. data/{public → app/assets}/images/admin/icons/add.gif +0 -0
  59. data/{public → app/assets}/images/admin/icons/add.png +0 -0
  60. data/{public → app/assets}/images/admin/icons/arrow-down.gif +0 -0
  61. data/{public → app/assets}/images/admin/icons/cross.png +0 -0
  62. data/{public → app/assets}/images/admin/icons/delete.gif +0 -0
  63. data/{public → app/assets}/images/admin/icons/delete.png +0 -0
  64. data/{public → app/assets}/images/admin/icons/drag.gif +0 -0
  65. data/{public → app/assets}/images/admin/icons/edit.gif +0 -0
  66. data/{public → app/assets}/images/admin/icons/edit.png +0 -0
  67. data/{public → app/assets}/images/admin/icons/email.png +0 -0
  68. data/{public → app/assets}/images/admin/icons/error.png +0 -0
  69. data/{public → app/assets}/images/admin/icons/exclamation.png +0 -0
  70. data/{public → app/assets}/images/admin/icons/feed.png +0 -0
  71. data/{public → app/assets}/images/admin/icons/pdf.png +0 -0
  72. data/{public → app/assets}/images/admin/icons/reorder.gif +0 -0
  73. data/{public → app/assets}/images/admin/icons/search.gif +0 -0
  74. data/{public → app/assets}/images/admin/icons/send-email.png +0 -0
  75. data/{public → app/assets}/images/admin/icons/stop.png +0 -0
  76. data/app/assets/images/admin/icons/switch.png +0 -0
  77. data/{public → app/assets}/images/admin/icons/tick.png +0 -0
  78. data/{public → app/assets}/images/admin/icons/up.gif +0 -0
  79. data/{public → app/assets}/images/admin/icons/xls.png +0 -0
  80. data/{public/images → app/assets/images/admin}/progress.gif +0 -0
  81. data/{public/images → app/assets/images/creditcards}/amex_cid.gif +0 -0
  82. data/{public/images → app/assets/images/creditcards}/creditcard.gif +0 -0
  83. data/{public/images → app/assets/images/creditcards}/discover_cid.gif +0 -0
  84. data/{public/images → app/assets/images/creditcards}/master_cid.jpg +0 -0
  85. data/{public/images → app/assets/images/creditcards}/visa_cid.gif +0 -0
  86. data/{public → app/assets}/images/favicon.ico +0 -0
  87. data/{public/images → app/assets/images/icons}/add-to-cart.png +0 -0
  88. data/{public/images → app/assets/images/icons}/checkout.png +0 -0
  89. data/app/assets/images/icons/delete.png +0 -0
  90. data/{public/images → app/assets/images/icons}/update.png +0 -0
  91. data/app/assets/images/noimage/mini.png +0 -0
  92. data/app/assets/images/noimage/product.png +0 -0
  93. data/app/assets/images/noimage/small.png +0 -0
  94. data/{public → app/assets}/images/spinner.gif +0 -0
  95. data/{public → app/assets}/javascripts/admin/address_states.js +4 -4
  96. data/{public/javascripts/admin.js → app/assets/javascripts/admin/admin.js.erb} +90 -93
  97. data/app/assets/javascripts/admin/calculator.js +15 -0
  98. data/{public → app/assets}/javascripts/admin/checkouts/edit.js +13 -13
  99. data/app/assets/javascripts/admin/gateway.js +13 -0
  100. data/app/assets/javascripts/admin/images/index.js +10 -0
  101. data/app/assets/javascripts/admin/images/new.js +5 -0
  102. data/app/assets/javascripts/admin/nested-attribute.js +23 -0
  103. data/app/assets/javascripts/admin/orders/edit.js +15 -0
  104. data/app/assets/javascripts/admin/orders/edit_form.js +18 -0
  105. data/{public → app/assets}/javascripts/admin/payments/new.js +0 -0
  106. data/app/assets/javascripts/admin/products.js +23 -0
  107. data/app/assets/javascripts/admin/spree_core.js +10 -0
  108. data/app/assets/javascripts/admin/taxonomy.js +206 -0
  109. data/app/assets/javascripts/admin/underscore-min.js +26 -0
  110. data/app/assets/javascripts/admin/zone.js +44 -0
  111. data/app/assets/javascripts/store/cart.js +11 -0
  112. data/app/assets/javascripts/store/checkout.js +77 -0
  113. data/app/assets/javascripts/store/product.js +49 -0
  114. data/app/assets/javascripts/store/spree_core.js +6 -0
  115. data/{public/stylesheets/admin/admin-forms.css → app/assets/stylesheets/admin/admin-form.css.erb} +28 -19
  116. data/{public → app/assets}/stylesheets/admin/admin-reset.css +0 -0
  117. data/{public/stylesheets/admin/admin-tables.css → app/assets/stylesheets/admin/admin-tables.css.erb} +3 -2
  118. data/{public → app/assets}/stylesheets/admin/admin-typography.css +2 -2
  119. data/{public/stylesheets/admin/admin.css → app/assets/stylesheets/admin/admin.css.erb} +22 -46
  120. data/{public/stylesheets/admin/autocomplete.css → app/assets/stylesheets/admin/edit_checkouts.css} +6 -7
  121. data/app/assets/stylesheets/admin/spree_core.css +15 -0
  122. data/{public → app/assets}/stylesheets/admin/token-input.css +0 -0
  123. data/app/assets/stylesheets/store/reset.css +175 -0
  124. data/app/assets/stylesheets/store/screen.css +122 -0
  125. data/app/assets/stylesheets/store/spree_core.css +5 -0
  126. data/app/controllers/admin/base_controller.rb +3 -32
  127. data/app/controllers/admin/general_settings_controller.rb +14 -15
  128. data/app/controllers/admin/line_items_controller.rb +4 -2
  129. data/app/controllers/admin/mail_methods_controller.rb +13 -0
  130. data/app/controllers/admin/option_types_controller.rb +1 -2
  131. data/app/controllers/admin/orders_controller.rb +9 -8
  132. data/app/controllers/admin/product_groups_controller.rb +1 -2
  133. data/app/controllers/admin/products_controller.rb +4 -6
  134. data/app/controllers/admin/prototypes_controller.rb +1 -0
  135. data/app/controllers/admin/resource_controller.rb +7 -1
  136. data/app/controllers/admin/shipments_controller.rb +1 -1
  137. data/app/controllers/admin/states_controller.rb +1 -1
  138. data/app/controllers/admin/tax_categories_controller.rb +6 -0
  139. data/app/controllers/admin/tax_rates_controller.rb +2 -2
  140. data/app/controllers/admin/taxons_controller.rb +0 -9
  141. data/app/controllers/admin/users_controller.rb +9 -5
  142. data/app/controllers/admin/variants_controller.rb +22 -0
  143. data/app/controllers/admin/zones_controller.rb +1 -1
  144. data/app/controllers/checkout_controller.rb +12 -0
  145. data/app/controllers/content_controller.rb +1 -1
  146. data/app/controllers/home_controller.rb +10 -0
  147. data/app/controllers/orders_controller.rb +11 -7
  148. data/app/controllers/products_controller.rb +0 -1
  149. data/app/helpers/admin/base_helper.rb +5 -9
  150. data/app/helpers/admin/navigation_helper.rb +9 -2
  151. data/app/helpers/checkout_helper.rb +7 -3
  152. data/app/helpers/hook_helper.rb +5 -15
  153. data/app/helpers/products_helper.rb +4 -0
  154. data/app/helpers/spree/base_helper.rb +70 -16
  155. data/app/helpers/taxons_helper.rb +0 -16
  156. data/app/mailers/order_mailer.rb +5 -5
  157. data/app/mailers/shipment_mailer.rb +3 -3
  158. data/app/mailers/test_mailer.rb +10 -0
  159. data/app/models/activator.rb +27 -0
  160. data/app/models/adjustment.rb +32 -12
  161. data/app/models/app_configuration.rb +7 -6
  162. data/app/models/calculator/flat_percent_item_total.rb +0 -5
  163. data/app/models/calculator/flat_rate.rb +0 -5
  164. data/app/models/calculator/flexi_rate.rb +0 -5
  165. data/app/models/calculator/per_item.rb +0 -5
  166. data/app/models/calculator/price_bucket.rb +0 -6
  167. data/app/models/calculator/sales_tax.rb +1 -6
  168. data/app/models/calculator/vat.rb +26 -47
  169. data/app/models/calculator.rb +7 -9
  170. data/app/models/creditcard.rb +36 -31
  171. data/app/models/gateway.rb +1 -0
  172. data/app/models/image.rb +7 -2
  173. data/app/models/inventory_unit.rb +6 -10
  174. data/app/models/line_item.rb +17 -2
  175. data/app/models/order.rb +35 -20
  176. data/app/models/payment.rb +6 -12
  177. data/app/models/payment_method/check.rb +0 -4
  178. data/app/models/payment_method.rb +1 -11
  179. data/app/models/product.rb +54 -29
  180. data/app/models/product_group.rb +4 -8
  181. data/app/models/product_scope.rb +1 -1
  182. data/app/models/shipment.rb +1 -6
  183. data/app/models/tax_category.rb +6 -0
  184. data/app/models/tax_rate.rb +10 -0
  185. data/app/models/taxon.rb +3 -3
  186. data/app/models/taxonomy.rb +1 -1
  187. data/app/models/zone.rb +4 -4
  188. data/app/views/admin/adjustments/_adjustments_table.html.erb +6 -6
  189. data/app/views/admin/adjustments/_form.html.erb +4 -4
  190. data/app/views/admin/adjustments/edit.html.erb +8 -8
  191. data/app/views/admin/adjustments/index.html.erb +2 -2
  192. data/app/views/admin/adjustments/new.html.erb +7 -7
  193. data/app/views/admin/configurations/index.html.erb +57 -59
  194. data/app/views/admin/general_settings/edit.html.erb +16 -41
  195. data/app/views/admin/general_settings/show.html.erb +15 -26
  196. data/app/views/admin/images/_form.html.erb +6 -6
  197. data/app/views/admin/images/edit.html.erb +11 -11
  198. data/app/views/admin/images/index.html.erb +18 -32
  199. data/app/views/admin/images/new.html.erb +8 -18
  200. data/app/views/admin/inventory_settings/edit.html.erb +10 -10
  201. data/app/views/admin/inventory_settings/show.html.erb +4 -4
  202. data/app/views/admin/inventory_units/adjust.html.erb +13 -13
  203. data/app/views/admin/line_items/create.js.erb +4 -0
  204. data/app/views/admin/mail_methods/_form.html.erb +27 -33
  205. data/app/views/admin/mail_methods/edit.html.erb +5 -5
  206. data/app/views/admin/mail_methods/index.html.erb +19 -23
  207. data/app/views/admin/mail_methods/new.html.erb +5 -5
  208. data/app/views/admin/option_types/_available.html.erb +14 -13
  209. data/app/views/admin/option_types/_form.html.erb +2 -2
  210. data/app/views/admin/option_types/_option_value_fields.html.erb +4 -4
  211. data/app/views/admin/option_types/_selected.html.erb +10 -10
  212. data/app/views/admin/option_types/available.js.erb +1 -1
  213. data/app/views/admin/option_types/edit.html.erb +13 -13
  214. data/app/views/admin/option_types/index.html.erb +11 -11
  215. data/app/views/admin/option_types/new.html.erb +11 -0
  216. data/app/views/admin/option_types/new.js.erb +2 -0
  217. data/app/views/admin/option_types/selected.html.erb +2 -2
  218. data/app/views/admin/orders/_add_product.html.erb +8 -8
  219. data/app/views/admin/orders/_form.html.erb +36 -47
  220. data/app/views/admin/orders/_line_item.html.erb +12 -15
  221. data/app/views/admin/orders/_user_form.html.erb +22 -17
  222. data/app/views/admin/orders/edit.html.erb +16 -20
  223. data/app/views/admin/orders/history.html.erb +11 -11
  224. data/app/views/admin/orders/index.html.erb +54 -67
  225. data/app/views/admin/orders/new.html.erb +10 -11
  226. data/app/views/admin/orders/show.html.erb +11 -13
  227. data/app/views/admin/orders/user.html.erb +8 -13
  228. data/app/views/admin/payment_methods/_form.html.erb +23 -23
  229. data/app/views/admin/payment_methods/edit.html.erb +6 -6
  230. data/app/views/admin/payment_methods/index.html.erb +22 -32
  231. data/app/views/admin/payment_methods/new.html.erb +5 -5
  232. data/app/views/admin/payments/_bill_address_form.html.erb +1 -1
  233. data/app/views/admin/payments/_form.html.erb +6 -6
  234. data/app/views/admin/payments/_list.html.erb +7 -7
  235. data/app/views/admin/payments/_transaction_list.html.erb +9 -9
  236. data/app/views/admin/payments/credit.html.erb +6 -6
  237. data/app/views/admin/payments/index.html.erb +9 -9
  238. data/app/views/admin/payments/new.html.erb +7 -7
  239. data/app/views/admin/payments/show.html.erb +3 -3
  240. data/app/views/admin/payments/source_forms/_gateway.html.erb +13 -13
  241. data/app/views/admin/payments/source_views/_gateway.html.erb +9 -9
  242. data/app/views/admin/product_groups/_preview.html.erb +8 -8
  243. data/app/views/admin/product_groups/_product_scope.html.erb +8 -8
  244. data/app/views/admin/product_groups/edit.html.erb +12 -15
  245. data/app/views/admin/product_groups/index.html.erb +14 -14
  246. data/app/views/admin/product_groups/new.html.erb +4 -4
  247. data/app/views/admin/product_groups/show.html.erb +5 -5
  248. data/app/views/admin/product_groups/update.js.erb +7 -3
  249. data/app/views/admin/product_properties/_product_property_fields.html.erb +4 -4
  250. data/app/views/admin/product_properties/index.html.erb +22 -22
  251. data/app/views/admin/product_scopes/create.js.erb +3 -3
  252. data/app/views/admin/product_scopes/destroy.js.erb +3 -3
  253. data/app/views/admin/products/_form.html.erb +81 -78
  254. data/app/views/admin/products/_option_types.html.erb +36 -36
  255. data/app/views/admin/products/_properties_form.erb +3 -3
  256. data/app/views/admin/products/edit.html.erb +3 -4
  257. data/app/views/admin/products/index.html.erb +34 -43
  258. data/app/views/admin/products/new.html.erb +52 -0
  259. data/app/views/admin/products/new.js.erb +3 -0
  260. data/app/views/admin/products/show.html.erb +1 -1
  261. data/app/views/admin/properties/_form.html.erb +13 -10
  262. data/app/views/admin/properties/edit.html.erb +3 -3
  263. data/app/views/admin/properties/index.html.erb +11 -11
  264. data/app/views/admin/properties/{new.erb → new.html.erb} +4 -4
  265. data/app/views/admin/properties/new.js.erb +2 -0
  266. data/app/views/admin/prototypes/_form.html.erb +21 -21
  267. data/app/views/admin/prototypes/_prototypes.html.erb +21 -0
  268. data/app/views/admin/prototypes/available.js.erb +2 -0
  269. data/app/views/admin/prototypes/edit.html.erb +4 -4
  270. data/app/views/admin/prototypes/index.html.erb +11 -11
  271. data/app/views/admin/prototypes/{new.erb → new.html.erb} +4 -4
  272. data/app/views/admin/prototypes/new.js.erb +2 -0
  273. data/app/views/admin/reports/index.html.erb +5 -5
  274. data/app/views/admin/reports/sales_total.html.erb +8 -8
  275. data/app/views/admin/return_authorizations/_form.html.erb +15 -16
  276. data/app/views/admin/return_authorizations/edit.html.erb +13 -13
  277. data/app/views/admin/return_authorizations/index.html.erb +14 -14
  278. data/app/views/admin/return_authorizations/new.html.erb +8 -8
  279. data/app/views/admin/shared/_additional_field.html.erb +1 -1
  280. data/app/views/admin/shared/_address.html.erb +1 -1
  281. data/app/views/admin/shared/_address_form.html.erb +26 -27
  282. data/app/views/admin/shared/_calculator_fields.html.erb +6 -6
  283. data/app/views/admin/shared/_configuration_menu.html.erb +14 -15
  284. data/app/views/admin/shared/_destroy.js.erb +2 -2
  285. data/app/views/admin/shared/_edit_resource_links.html.erb +3 -3
  286. data/app/views/admin/shared/_group_from_products_form.html.erb +7 -7
  287. data/app/views/admin/shared/_head.html.erb +26 -0
  288. data/app/views/admin/shared/_new_adjustment_button.html.erb +5 -5
  289. data/app/views/admin/shared/_new_resource_links.html.erb +3 -3
  290. data/app/views/admin/shared/_order_details.html.erb +0 -1
  291. data/app/views/admin/shared/_order_tabs.html.erb +43 -48
  292. data/app/views/admin/shared/_product_sub_menu.html.erb +6 -8
  293. data/app/views/admin/shared/_product_tabs.html.erb +21 -25
  294. data/app/views/admin/shared/_report_criteria.html.erb +9 -9
  295. data/app/views/admin/shared/_show_resource_links.html.erb +5 -5
  296. data/app/views/admin/shared/_tabs.html.erb +1 -1
  297. data/app/views/admin/shared/_update_order_state.js +4 -4
  298. data/app/views/admin/shipments/_form.html.erb +42 -46
  299. data/app/views/admin/shipments/edit.html.erb +23 -25
  300. data/app/views/admin/shipments/index.html.erb +25 -34
  301. data/app/views/admin/shipments/new.html.erb +12 -12
  302. data/app/views/admin/shipping_categories/_form.html.erb +4 -4
  303. data/app/views/admin/shipping_categories/edit.html.erb +4 -4
  304. data/app/views/admin/shipping_categories/index.html.erb +12 -12
  305. data/app/views/admin/shipping_categories/new.html.erb +4 -4
  306. data/app/views/admin/shipping_methods/_form.html.erb +9 -10
  307. data/app/views/admin/shipping_methods/edit.html.erb +11 -11
  308. data/app/views/admin/shipping_methods/index.html.erb +19 -29
  309. data/app/views/admin/shipping_methods/new.html.erb +10 -10
  310. data/app/views/admin/states/_form.html.erb +3 -3
  311. data/app/views/admin/states/_state_list.html.erb +11 -13
  312. data/app/views/admin/states/edit.html.erb +4 -4
  313. data/app/views/admin/states/index.html.erb +6 -6
  314. data/app/views/admin/states/new.html.erb +8 -0
  315. data/app/views/admin/states/new.js.erb +2 -0
  316. data/app/views/admin/tax_categories/_form.html.erb +6 -6
  317. data/app/views/admin/tax_categories/edit.html.erb +4 -4
  318. data/app/views/admin/tax_categories/index.html.erb +14 -15
  319. data/app/views/admin/tax_categories/new.html.erb +4 -4
  320. data/app/views/admin/tax_rates/_form.html.erb +9 -9
  321. data/app/views/admin/tax_rates/edit.html.erb +5 -5
  322. data/app/views/admin/tax_rates/index.html.erb +14 -14
  323. data/app/views/admin/tax_rates/new.html.erb +4 -4
  324. data/app/views/admin/tax_settings/edit.html.erb +15 -9
  325. data/app/views/admin/tax_settings/show.html.erb +11 -7
  326. data/app/views/admin/taxonomies/_form.html.erb +3 -3
  327. data/app/views/admin/taxonomies/_js_head.html.erb +4 -5
  328. data/app/views/admin/taxonomies/_list.html.erb +7 -7
  329. data/app/views/admin/taxonomies/_taxon.html.erb +2 -2
  330. data/app/views/admin/taxonomies/edit.erb +31 -32
  331. data/app/views/admin/taxonomies/get_children.json.erb +7 -7
  332. data/app/views/admin/taxonomies/index.html.erb +7 -7
  333. data/app/views/admin/taxonomies/new.html.erb +5 -5
  334. data/app/views/admin/taxons/_form.html.erb +5 -5
  335. data/app/views/admin/taxons/_taxon_table.html.erb +10 -10
  336. data/app/views/admin/taxons/available.js.erb +7 -14
  337. data/app/views/admin/taxons/edit.html.erb +4 -4
  338. data/app/views/admin/taxons/remove.html.erb +1 -1
  339. data/app/views/admin/taxons/select.js.erb +1 -1
  340. data/app/views/admin/taxons/selected.html.erb +14 -14
  341. data/app/views/admin/trackers/_form.html.erb +16 -15
  342. data/app/views/admin/trackers/edit.html.erb +5 -5
  343. data/app/views/admin/trackers/index.html.erb +15 -20
  344. data/app/views/admin/trackers/new.html.erb +4 -4
  345. data/app/views/admin/users/_form.html.erb +17 -18
  346. data/app/views/admin/users/edit.html.erb +10 -10
  347. data/app/views/admin/users/index.html.erb +24 -38
  348. data/app/views/admin/users/new.html.erb +10 -10
  349. data/app/views/admin/users/show.html.erb +7 -7
  350. data/app/views/admin/variants/_form.html.erb +9 -9
  351. data/app/views/admin/variants/edit.html.erb +5 -5
  352. data/app/views/admin/variants/index.html.erb +20 -24
  353. data/app/views/admin/variants/new.html.erb +8 -0
  354. data/app/views/admin/variants/new.js.erb +2 -0
  355. data/app/views/admin/zones/_country_member.html.erb +2 -2
  356. data/app/views/admin/zones/_form.html.erb +15 -15
  357. data/app/views/admin/zones/_member_type.html.erb +2 -2
  358. data/app/views/admin/zones/_state_member.html.erb +3 -3
  359. data/app/views/admin/zones/_zone_member.html.erb +2 -2
  360. data/app/views/admin/zones/edit.html.erb +5 -5
  361. data/app/views/admin/zones/index.html.erb +12 -13
  362. data/app/views/admin/zones/new.html.erb +5 -5
  363. data/app/views/checkout/_address.html.erb +125 -134
  364. data/app/views/checkout/_confirm.html.erb +3 -3
  365. data/app/views/checkout/_delivery.html.erb +11 -7
  366. data/app/views/checkout/_payment.html.erb +10 -10
  367. data/app/views/checkout/_summary.html.erb +8 -7
  368. data/app/views/checkout/edit.html.erb +9 -11
  369. data/app/views/checkout/payment/_gateway.html.erb +13 -13
  370. data/app/views/checkout/registration.html.erb +9 -9
  371. data/app/views/content/cvv.html.erb +7 -7
  372. data/app/views/home/index.html.erb +10 -0
  373. data/app/views/layouts/admin.html.erb +23 -32
  374. data/app/views/layouts/spree_application.html.erb +29 -43
  375. data/app/views/order_mailer/cancel_email.text.erb +2 -2
  376. data/app/views/order_mailer/confirm_email.text.erb +1 -1
  377. data/app/views/orders/_form.html.erb +9 -11
  378. data/app/views/orders/_line_item.html.erb +21 -31
  379. data/app/views/orders/edit.html.erb +25 -23
  380. data/app/views/orders/new.html.erb +3 -3
  381. data/app/views/orders/show.html.erb +5 -5
  382. data/app/views/products/_cart_form.html.erb +42 -47
  383. data/app/views/products/_properties.html.erb +5 -4
  384. data/app/views/products/_taxons.html.erb +10 -12
  385. data/app/views/products/_thumbnails.html.erb +14 -35
  386. data/app/views/products/index.html.erb +10 -13
  387. data/app/views/products/show.html.erb +19 -24
  388. data/app/views/shared/_error_messages.html.erb +1 -1
  389. data/app/views/shared/_filters.html.erb +3 -4
  390. data/app/views/shared/_google_analytics.html.erb +6 -6
  391. data/app/views/shared/_head.html.erb +4 -7
  392. data/app/views/shared/_nav_bar.html.erb +3 -2
  393. data/app/views/shared/_order_details.html.erb +31 -41
  394. data/app/views/shared/_products.html.erb +10 -16
  395. data/app/views/shared/_store_menu.html.erb +2 -2
  396. data/app/views/shared/_taxonomies.html.erb +3 -14
  397. data/app/views/shipment_mailer/shipped_email.text.erb +2 -2
  398. data/app/views/taxons/_taxon.html.erb +2 -2
  399. data/app/views/taxons/show.html.erb +10 -10
  400. data/app/views/test_mailer/test_email.text.erb +4 -0
  401. data/config/initializers/deprecation_checker.rb +7 -0
  402. data/config/initializers/form_builder.rb +0 -4
  403. data/config/initializers/rails_3_1.rb +12 -0
  404. data/config/initializers/workarounds_for_ruby19.rb +1 -1
  405. data/config/locales/en.yml +59 -24
  406. data/config/routes.rb +9 -8
  407. data/db/default/roles.yml +1 -3
  408. data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +9 -0
  409. data/db/migrate/20110329141434_create_activators.rb +21 -0
  410. data/db/migrate/20110418151136_eligible_for_adjustments.rb +9 -0
  411. data/db/seeds.rb +4 -2
  412. data/lib/custom_fixtures.rb +64 -3
  413. data/lib/environment_extension.rb +26 -0
  414. data/lib/generators/spree/dummy/dummy_generator.rb +106 -0
  415. data/lib/generators/spree/dummy/templates/cucumber/cucumber.rb +38 -0
  416. data/lib/generators/spree/dummy/templates/rails/application.rb +10 -0
  417. data/lib/generators/spree/dummy/templates/rails/boot.rb +6 -0
  418. data/lib/generators/spree/dummy/templates/rails/database.yml +30 -0
  419. data/lib/generators/spree/dummy/templates/rails/routes.rb +3 -0
  420. data/lib/generators/spree/sandbox/sandbox_generator.rb +27 -0
  421. data/lib/generators/spree/site/site_generator.rb +87 -0
  422. data/lib/generators/spree/site/templates/app/assets/javascripts/admin/all.js +16 -0
  423. data/lib/generators/spree/site/templates/app/assets/javascripts/store/all.js +16 -0
  424. data/lib/generators/spree/site/templates/app/assets/stylesheets/admin/all.css +17 -0
  425. data/lib/generators/spree/site/templates/app/assets/stylesheets/store/all.css +17 -0
  426. data/lib/product_filters.rb +8 -0
  427. data/lib/scopes/product.rb +6 -6
  428. data/lib/scopes.rb +1 -1
  429. data/lib/spree/calculated_adjustments.rb +16 -11
  430. data/lib/spree/environment/calculators.rb +10 -0
  431. data/lib/spree/environment.rb +12 -0
  432. data/lib/spree/search/base.rb +1 -5
  433. data/lib/spree_base.rb +17 -6
  434. data/lib/spree_core/ext/active_record.rb +1 -1
  435. data/lib/spree_core/preferences/model_hooks.rb +7 -3
  436. data/lib/spree_core/railtie.rb +42 -36
  437. data/lib/spree_core/ssl_requirement.rb +1 -1
  438. data/lib/spree_core/testing_support/common_rake.rb +12 -0
  439. data/lib/spree_core/testing_support/factories/activator_factory.rb +6 -0
  440. data/lib/spree_core/testing_support/factories/adjustment_factory.rb +1 -0
  441. data/lib/spree_core/testing_support/factories/calculator_factory.rb +6 -0
  442. data/lib/spree_core/testing_support/factories/order_factory.rb +7 -6
  443. data/lib/spree_core/testing_support/factories/product_factory.rb +6 -0
  444. data/lib/spree_core/testing_support/factories/user_factory.rb +14 -10
  445. data/lib/spree_core/testing_support/factories/zone_factory.rb +1 -1
  446. data/lib/spree_core/theme_support/hook_listener.rb +112 -35
  447. data/lib/spree_core/theme_support.rb +0 -3
  448. data/lib/spree_core/version.rb +1 -1
  449. data/lib/spree_core.rb +10 -7
  450. data/lib/tasks/assets.rake +58 -0
  451. data/lib/tasks/core.rake +18 -11
  452. data/lib/tasks/install.rake +4 -12
  453. data/{public → vendor/assets}/images/datepicker/cal.gif +0 -0
  454. data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
  455. data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
  456. data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
  457. data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
  458. data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
  459. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
  460. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
  461. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
  462. data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
  463. data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
  464. data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
  465. data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
  466. data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
  467. data/{public → vendor/assets}/javascripts/jquery.alerts/images/help.gif +0 -0
  468. data/{public → vendor/assets}/javascripts/jquery.alerts/images/important.gif +0 -0
  469. data/{public → vendor/assets}/javascripts/jquery.alerts/images/info.gif +0 -0
  470. data/{public → vendor/assets}/javascripts/jquery.alerts/images/title.gif +0 -0
  471. data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.css +0 -0
  472. data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.js +0 -0
  473. data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.spree.css +0 -0
  474. data/{public → vendor/assets}/javascripts/jquery.autocomplete.min.js +0 -0
  475. data/vendor/assets/javascripts/jquery.cookie.js +41 -0
  476. data/{public → vendor/assets}/javascripts/jquery.delayedobserver.js +0 -0
  477. data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/jquery.jstree.js +4544 -3510
  478. data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/bg.jpg +0 -0
  479. data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/d.png +0 -0
  480. data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/dot_for_ie.gif +0 -0
  481. data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/style.css +2 -1
  482. data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/throbber.gif +0 -0
  483. data/vendor/assets/javascripts/jquery.tokeninput.js +860 -0
  484. data/vendor/assets/javascripts/jquery.validate/additional-methods.min.js +28 -0
  485. data/vendor/assets/javascripts/jquery.validate/jquery.validate.min.js +51 -0
  486. data/vendor/assets/javascripts/jquery.validate/localization/messages_ar.js +24 -0
  487. data/vendor/assets/javascripts/jquery.validate/localization/messages_bg.js +23 -0
  488. data/vendor/assets/javascripts/jquery.validate/localization/messages_ca.js +23 -0
  489. data/vendor/assets/javascripts/jquery.validate/localization/messages_cn.js +23 -0
  490. data/vendor/assets/javascripts/jquery.validate/localization/messages_cs.js +23 -0
  491. data/vendor/assets/javascripts/jquery.validate/localization/messages_da.js +20 -0
  492. data/vendor/assets/javascripts/jquery.validate/localization/messages_de.js +21 -0
  493. data/vendor/assets/javascripts/jquery.validate/localization/messages_el.js +24 -0
  494. data/{public/javascripts → vendor/assets/javascripts/jquery.validate}/localization/messages_es.js +22 -23
  495. data/vendor/assets/javascripts/jquery.validate/localization/messages_fa.js +23 -0
  496. data/vendor/assets/javascripts/jquery.validate/localization/messages_fi.js +21 -0
  497. data/vendor/assets/javascripts/jquery.validate/localization/messages_fr.js +23 -0
  498. data/vendor/assets/javascripts/jquery.validate/localization/messages_ge.js +23 -0
  499. data/vendor/assets/javascripts/jquery.validate/localization/messages_he.js +23 -0
  500. data/vendor/assets/javascripts/jquery.validate/localization/messages_hu.js +21 -0
  501. data/vendor/assets/javascripts/jquery.validate/localization/messages_it.js +23 -0
  502. data/vendor/assets/javascripts/jquery.validate/localization/messages_ja.js +23 -0
  503. data/vendor/assets/javascripts/jquery.validate/localization/messages_kk.js +23 -0
  504. data/vendor/assets/javascripts/jquery.validate/localization/messages_lt.js +23 -0
  505. data/vendor/assets/javascripts/jquery.validate/localization/messages_lv.js +23 -0
  506. data/vendor/assets/javascripts/jquery.validate/localization/messages_nl.js +23 -0
  507. data/vendor/assets/javascripts/jquery.validate/localization/messages_no.js +23 -0
  508. data/vendor/assets/javascripts/jquery.validate/localization/messages_pl.js +23 -0
  509. data/vendor/assets/javascripts/jquery.validate/localization/messages_ptbr.js +30 -0
  510. data/vendor/assets/javascripts/jquery.validate/localization/messages_ptpt.js +23 -0
  511. data/{public/javascripts → vendor/assets/javascripts/jquery.validate}/localization/messages_ro.js +22 -23
  512. data/vendor/assets/javascripts/jquery.validate/localization/messages_ru.js +23 -0
  513. data/vendor/assets/javascripts/jquery.validate/localization/messages_se.js +23 -0
  514. data/vendor/assets/javascripts/jquery.validate/localization/messages_si.js +23 -0
  515. data/vendor/assets/javascripts/jquery.validate/localization/messages_sk.js +21 -0
  516. data/vendor/assets/javascripts/jquery.validate/localization/messages_sr.js +23 -0
  517. data/vendor/assets/javascripts/jquery.validate/localization/messages_th.js +23 -0
  518. data/vendor/assets/javascripts/jquery.validate/localization/messages_tr.js +24 -0
  519. data/vendor/assets/javascripts/jquery.validate/localization/messages_tw.js +24 -0
  520. data/vendor/assets/javascripts/jquery.validate/localization/messages_ua.js +24 -0
  521. data/vendor/assets/javascripts/jquery.validate/localization/messages_vi.js +23 -0
  522. data/vendor/assets/javascripts/jquery.validate/localization/methods_de.js +12 -0
  523. data/vendor/assets/javascripts/jquery.validate/localization/methods_nl.js +9 -0
  524. data/vendor/assets/javascripts/jquery.validate/localization/methods_pt.js +9 -0
  525. data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +357 -0
  526. metadata +310 -417
  527. data/app/models/spree/alert.rb +0 -13
  528. data/app/stylesheets/_buttons.less +0 -80
  529. data/app/stylesheets/_cart.less +0 -24
  530. data/app/stylesheets/_checkout.less +0 -76
  531. data/app/stylesheets/_checkout_progress.less +0 -62
  532. data/app/stylesheets/_colors.less +0 -16
  533. data/app/stylesheets/_forms.less +0 -50
  534. data/app/stylesheets/_layout.less +0 -77
  535. data/app/stylesheets/_messages.less +0 -32
  536. data/app/stylesheets/_mixins.less +0 -71
  537. data/app/stylesheets/_navigation.less +0 -130
  538. data/app/stylesheets/_prices.less +0 -18
  539. data/app/stylesheets/_product_details.less +0 -56
  540. data/app/stylesheets/_product_lists.less +0 -66
  541. data/app/stylesheets/_registration.less +0 -24
  542. data/app/stylesheets/_reset.less +0 -69
  543. data/app/stylesheets/_typography.less +0 -158
  544. data/app/stylesheets/screen.less +0 -13
  545. data/app/views/admin/extensions/index.html.erb +0 -23
  546. data/app/views/admin/option_types/new.erb +0 -11
  547. data/app/views/admin/product_scopes/_form.html.erb +0 -106
  548. data/app/views/admin/products/new.erb +0 -53
  549. data/app/views/admin/prototypes/available.html.erb +0 -22
  550. data/app/views/admin/shared/_alert.html.erb +0 -6
  551. data/app/views/admin/states/new.erb +0 -8
  552. data/app/views/admin/variants/new.erb +0 -11
  553. data/app/views/shared/_additional_field.html.erb +0 -7
  554. data/app/views/shared/_admin_head.html.erb +0 -34
  555. data/app/views/shared/_basic_layout.html.erb +0 -44
  556. data/app/views/shared/_edit_resource_links.html.erb +0 -1
  557. data/app/views/shared/_footer.html.erb +0 -13
  558. data/app/views/shared/_method_error_message.html.erb +0 -4
  559. data/app/views/shared/_new_resource_links.html.erb +0 -1
  560. data/app/views/shared/_show_resource_links.html.erb +0 -3
  561. data/app/views/shared/_test_hook.html.erb +0 -1
  562. data/config/initializers/load_unobtrusive_date_picker.rb +0 -8
  563. data/db/migrate/20101026184833_migrate_adjustments.rb +0 -9
  564. data/lib/generators/spree_core/upgrade_generator.rb +0 -23
  565. data/lib/generators/templates/config/initializers/%file_name%.rb.tt +0 -1
  566. data/lib/generators/templates/config/locales/%current_locale%.yml.tt +0 -2
  567. data/lib/generators/templates/config/routes.rb +0 -3
  568. data/lib/spree_core/theme_support/hook.rb +0 -51
  569. data/lib/spree_core/theme_support/hook_modifier.rb +0 -35
  570. data/lib/spree_core/theme_support/more_patches.rb +0 -118
  571. data/lib/tasks/common.rb +0 -30
  572. data/lib/tasks/themes.rake +0 -34
  573. data/public/images/admin/tabs/off-left.png +0 -0
  574. data/public/images/admin/tabs/off-right.png +0 -0
  575. data/public/images/admin/tabs/on-left.png +0 -0
  576. data/public/images/admin/tabs/on-right.png +0 -0
  577. data/public/images/ajax_loader.gif +0 -0
  578. data/public/images/bg-button-hover.png +0 -0
  579. data/public/images/bg-button-pressed.png +0 -0
  580. data/public/images/bg-button.gif +0 -0
  581. data/public/images/bg-button.png +0 -0
  582. data/public/images/blue/left_01.png +0 -0
  583. data/public/images/blue/right_01.png +0 -0
  584. data/public/images/body-back.png +0 -0
  585. data/public/images/bottom_shine.png +0 -0
  586. data/public/images/breadcrumb.gif +0 -0
  587. data/public/images/button-dark-hover.png +0 -0
  588. data/public/images/button-dark.png +0 -0
  589. data/public/images/buttons/bg-button-hover.png +0 -0
  590. data/public/images/buttons/bg-button-pressed.png +0 -0
  591. data/public/images/buttons/bg-button.gif +0 -0
  592. data/public/images/buttons/bg-button.png +0 -0
  593. data/public/images/buttons/blue/left_01.png +0 -0
  594. data/public/images/buttons/blue/right_01.png +0 -0
  595. data/public/images/buttons/button-dark-hover.png +0 -0
  596. data/public/images/buttons/button-dark.png +0 -0
  597. data/public/images/buttons/drag-handle-green.png +0 -0
  598. data/public/images/buttons/green/left_01.png +0 -0
  599. data/public/images/buttons/green/right_01.png +0 -0
  600. data/public/images/buttons/left_01.png +0 -0
  601. data/public/images/buttons/left_01_small.png +0 -0
  602. data/public/images/buttons/orange/left_03.png +0 -0
  603. data/public/images/buttons/orange/right_03.png +0 -0
  604. data/public/images/buttons/right_01.png +0 -0
  605. data/public/images/buttons/right_01_small.png +0 -0
  606. data/public/images/buttons/sxsw-ribbon-v1.png +0 -0
  607. data/public/images/buttons/top-shine.png +0 -0
  608. data/public/images/calendar_date_select/calendar.gif +0 -0
  609. data/public/images/cart-empty.png +0 -0
  610. data/public/images/cart-empty_x32.png +0 -0
  611. data/public/images/cart-full.png +0 -0
  612. data/public/images/cart-full_x32.png +0 -0
  613. data/public/images/datepicker/backstripes.gif +0 -0
  614. data/public/images/datepicker/bg_header.jpg +0 -0
  615. data/public/images/datepicker/bullet1.gif +0 -0
  616. data/public/images/datepicker/bullet2.gif +0 -0
  617. data/public/images/datepicker/gradient-e5e5e5-ffffff.gif +0 -0
  618. data/public/images/drag-handle-green.png +0 -0
  619. data/public/images/green/left_01.png +0 -0
  620. data/public/images/green/right_01.png +0 -0
  621. data/public/images/grid.png +0 -0
  622. data/public/images/left_01.png +0 -0
  623. data/public/images/left_01_small.png +0 -0
  624. data/public/images/menu-current.png +0 -0
  625. data/public/images/menu-hover.png +0 -0
  626. data/public/images/noimage/mini.jpg +0 -0
  627. data/public/images/noimage/product.jpg +0 -0
  628. data/public/images/noimage/small.jpg +0 -0
  629. data/public/images/openid-inputicon.gif +0 -0
  630. data/public/images/orange/left_03.png +0 -0
  631. data/public/images/orange/right_03.png +0 -0
  632. data/public/images/reorder.jpg +0 -0
  633. data/public/images/right_01.png +0 -0
  634. data/public/images/right_01_small.png +0 -0
  635. data/public/images/separator.png +0 -0
  636. data/public/images/shadow-top.png +0 -0
  637. data/public/images/shadow_top.png +0 -0
  638. data/public/images/spree/progress.gif +0 -0
  639. data/public/images/spree/spinner.gif +0 -0
  640. data/public/images/spree/spree.jpg +0 -0
  641. data/public/images/spree.jpg +0 -0
  642. data/public/images/step-progress/completed-completed.gif +0 -0
  643. data/public/images/step-progress/completed-current.gif +0 -0
  644. data/public/images/step-progress/completed-first.gif +0 -0
  645. data/public/images/step-progress/current-first.gif +0 -0
  646. data/public/images/step-progress/current-incomplete.gif +0 -0
  647. data/public/images/step-progress/current-right.gif +0 -0
  648. data/public/images/step-progress/incomplete-incomplete.gif +0 -0
  649. data/public/images/step-progress/incomplete-right.gif +0 -0
  650. data/public/images/steps/1.png +0 -0
  651. data/public/images/steps/1_small.png +0 -0
  652. data/public/images/steps/2.png +0 -0
  653. data/public/images/steps/2_small.png +0 -0
  654. data/public/images/steps/3.png +0 -0
  655. data/public/images/steps/3_small.png +0 -0
  656. data/public/images/steps/4.png +0 -0
  657. data/public/images/steps/4_small.png +0 -0
  658. data/public/images/steps/5.png +0 -0
  659. data/public/images/steps/5_small.png +0 -0
  660. data/public/images/steps/6.png +0 -0
  661. data/public/images/steps/6_small.png +0 -0
  662. data/public/images/sxsw-ribbon-v1.png +0 -0
  663. data/public/images/tab_bottom.gif +0 -0
  664. data/public/images/tile-header.png +0 -0
  665. data/public/images/tile-slider.png +0 -0
  666. data/public/images/top-shine.png +0 -0
  667. data/public/images/tree-nav-icons/bullet.gif +0 -0
  668. data/public/images/tree-nav-icons/minus.gif +0 -0
  669. data/public/images/tree-nav-icons/plus.gif +0 -0
  670. data/public/images/tree-nav-icons/treeview-loading.gif +0 -0
  671. data/public/images/tree-nav-icons/treeview-sprite.gif +0 -0
  672. data/public/images/wrapper-back-2.png +0 -0
  673. data/public/images/wrapper-back.png +0 -0
  674. data/public/images/yui-menubaritem_submenuindicator.png +0 -0
  675. data/public/images/yui-menubaritem_submenuindicator_disabled.png +0 -0
  676. data/public/images/yui-menuitem_checkbox.png +0 -0
  677. data/public/images/yui-menuitem_checkbox_disabled.png +0 -0
  678. data/public/images/yui-menuitem_submenuindicator.png +0 -0
  679. data/public/images/yui-menuitem_submenuindicator_disabled.png +0 -0
  680. data/public/images/yui-sprite.png +0 -0
  681. data/public/javascripts/additional-methods.js +0 -236
  682. data/public/javascripts/admin/orders/edit.js +0 -23
  683. data/public/javascripts/admin/orders/edit_form.js +0 -16
  684. data/public/javascripts/admin/unobtrusive_handlers.js +0 -43
  685. data/public/javascripts/application.js +0 -12
  686. data/public/javascripts/calculator.js +0 -15
  687. data/public/javascripts/checkout.js +0 -75
  688. data/public/javascripts/datepicker.js +0 -1445
  689. data/public/javascripts/gateway.js +0 -13
  690. data/public/javascripts/jquery-1.4.2.min.js +0 -154
  691. data/public/javascripts/jquery-ui.js +0 -188
  692. data/public/javascripts/jquery.cookie.js +0 -96
  693. data/public/javascripts/jquery.suggest.js +0 -276
  694. data/public/javascripts/jquery.template.js +0 -255
  695. data/public/javascripts/jquery.tokeninput.js +0 -618
  696. data/public/javascripts/jquery.validate.min.js +0 -16
  697. data/public/javascripts/lang/af.js +0 -40
  698. data/public/javascripts/lang/ar.js +0 -50
  699. data/public/javascripts/lang/de.js +0 -40
  700. data/public/javascripts/lang/du.js +0 -40
  701. data/public/javascripts/lang/en.js +0 -42
  702. data/public/javascripts/lang/es.js +0 -41
  703. data/public/javascripts/lang/fi.js +0 -40
  704. data/public/javascripts/lang/fr.js +0 -44
  705. data/public/javascripts/lang/gr.js +0 -40
  706. data/public/javascripts/lang/he.js +0 -49
  707. data/public/javascripts/lang/it.js +0 -13
  708. data/public/javascripts/lang/nl.js +0 -40
  709. data/public/javascripts/lang/no.js +0 -40
  710. data/public/javascripts/lang/pt.js +0 -50
  711. data/public/javascripts/lang/ro.js +0 -40
  712. data/public/javascripts/lang/ru.js +0 -40
  713. data/public/javascripts/lang/sp.js +0 -40
  714. data/public/javascripts/lang/sv.js +0 -41
  715. data/public/javascripts/lang/ua.js +0 -40
  716. data/public/javascripts/localization/messages_cn.js +0 -24
  717. data/public/javascripts/localization/messages_cs.js +0 -23
  718. data/public/javascripts/localization/messages_da.js +0 -21
  719. data/public/javascripts/localization/messages_de.js +0 -21
  720. data/public/javascripts/localization/messages_fr.js +0 -23
  721. data/public/javascripts/localization/messages_hu.js +0 -21
  722. data/public/javascripts/localization/messages_it.js +0 -26
  723. data/public/javascripts/localization/messages_kk.js +0 -23
  724. data/public/javascripts/localization/messages_nl.js +0 -23
  725. data/public/javascripts/localization/messages_no.js +0 -23
  726. data/public/javascripts/localization/messages_pl.js +0 -23
  727. data/public/javascripts/localization/messages_ptbr.js +0 -30
  728. data/public/javascripts/localization/messages_ru.js +0 -23
  729. data/public/javascripts/localization/messages_se.js +0 -23
  730. data/public/javascripts/localization/messages_sk.js +0 -21
  731. data/public/javascripts/localization/messages_tr.js +0 -24
  732. data/public/javascripts/localization/messages_tw.js +0 -24
  733. data/public/javascripts/localization/messages_ua.js +0 -24
  734. data/public/javascripts/nested-attribute.js +0 -26
  735. data/public/javascripts/open_id.js +0 -15
  736. data/public/javascripts/product.js +0 -49
  737. data/public/javascripts/rails.js +0 -127
  738. data/public/javascripts/taxonomy.js +0 -201
  739. data/public/javascripts/zone.js +0 -39
  740. data/public/stylesheets/admin/dashboard.css +0 -143
  741. data/public/stylesheets/admin/edit_checkouts.css +0 -57
  742. data/public/stylesheets/admin/grids.css +0 -314
  743. data/public/stylesheets/admin/reset-fonts-grids-2-6-0.css +0 -7
  744. data/public/stylesheets/admin/yui-includes.css +0 -14
  745. data/public/stylesheets/datepicker.css +0 -263
  746. data/public/stylesheets/jquery.autocomplete.css +0 -48
  747. data/public/stylesheets/screen.css +0 -916
@@ -1,22 +1,12 @@
1
- <h4><%= t("new_image") %></h4>
2
- <%= form_for(:image, :url => { :controller => 'images', :action => 'create' }, :html => { :multipart => true }) do |form| %>
3
- <table class="basic-table">
4
- <%= render :partial => "form", :locals => { :f => form } %>
1
+ <h4><%= t(:new_image) %></h4>
2
+ <%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
3
+ <table class="basic-table" data-hook="new_image">
4
+ <%= render :partial => 'form', :locals => { :f => f } %>
5
5
  </table>
6
- <p class="form-buttons">
7
- <%= button t("update") %>
8
- <%= t('or') %> <%= link_to t("cancel"), "#", :id => "cancel_link" %>
6
+ <p class="form-buttons" data-hook="buttons">
7
+ <%= button t(:update) %>
8
+ <%= t(:or) %> <%= link_to t(:cancel), admin_product_images_url(@product), :id => 'cancel_link' %>
9
9
  </p>
10
10
  <% end %>
11
11
 
12
-
13
- <script type="text/javascript">
14
- jQuery('#cancel_link').click(function (event) {
15
- jQuery('#new_image_link').show();
16
- jQuery('#images').html('');
17
- });
18
-
19
- </script>
20
-
21
-
22
-
12
+ <%= javascript_include_tag 'admin/images/new.js' %>
@@ -1,27 +1,27 @@
1
1
  <%= render :partial => 'admin/shared/configuration_menu' %>
2
2
 
3
- <h1><%= t('inventory_settings') %></h1>
3
+ <h1><%= t(:inventory_settings) %></h1>
4
4
 
5
- <%= form_tag(admin_inventory_settings_path, :method => :put) do %>
5
+ <%= form_tag admin_inventory_settings_path, :method => :put do %>
6
6
 
7
- <p>
7
+ <p data-hook="show_zero_stock">
8
8
  <label>
9
- <input name="preferences[show_zero_stock_products]" type="hidden" value="0" />
9
+ <%= hidden_field_tag 'preferences[show_zero_stock_products]', '0' %>
10
10
  <%= check_box_tag('preferences[show_zero_stock_products]', "1", Spree::Config[:show_zero_stock_products]) %>
11
- <%= t('show_out_of_stock_products') %>
11
+ <%= t(:show_out_of_stock_products) %>
12
12
  </label>
13
13
  </p>
14
14
 
15
- <p>
15
+ <p data-hook="allow_backorders">
16
16
  <label>
17
- <input name="preferences[allow_backorders]" type="hidden" value="0" />
17
+ <%= hidden_field_tag 'preferences[allow_backorders]', '0' %>
18
18
  <%= check_box_tag('preferences[allow_backorders]', "1", Spree::Config[:allow_backorders]) %>
19
- <%= t('allow_backorders') %>
19
+ <%= t(:allow_backorders) %>
20
20
  </label>
21
21
  </p>
22
22
 
23
- <p class="form-buttons">
24
- <%= button t('update') %>
23
+ <p class="form-buttons" data-hook="buttons">
24
+ <%= button t(:update) %>
25
25
  </p>
26
26
 
27
27
  <% end %>
@@ -1,9 +1,9 @@
1
1
  <%= render :partial => 'admin/shared/configuration_menu' %>
2
2
 
3
- <h1><%= t("inventory_settings") %></h1>
3
+ <h1><%= t(:inventory_settings) %></h1>
4
4
 
5
- <h4><%= t("products_with_zero_inventory_display", :not => show_not(Spree::Config[:show_zero_stock_products])) %> </h4>
6
- <h4><%= t("backordering_is_allowed", :not => show_not(Spree::Config[:allow_backorders])) %></h4>
5
+ <h4><%= t(:products_with_zero_inventory_display, :not => show_not(Spree::Config[:show_zero_stock_products])) %> </h4>
6
+ <h4><%= t(:backordering_is_allowed, :not => show_not(Spree::Config[:allow_backorders])) %></h4>
7
7
 
8
- <%= link_to_with_icon 'edit', t("edit"), edit_admin_inventory_settings_path, :id => 'admin_inventory_settings_link' %>
8
+ <%= link_to_with_icon 'edit', t(:edit), edit_admin_inventory_settings_path, :id => 'admin_inventory_settings_link' %>
9
9
 
@@ -1,33 +1,33 @@
1
1
  <%= render 'shared/error_messages', :target => @level %>
2
2
 
3
3
  <%= form_tag do %>
4
- <br/><br/>
4
+ <br /><br />
5
5
 
6
- <h1><%= t("inventory_adjustment") %></h1>
6
+ <h1><%= t(:inventory_adjustment) %></h1>
7
7
 
8
8
  <table class="basic-table">
9
- <thead>
9
+ <thead data-hook="inventory_header">
10
10
  <tr>
11
- <th><%= t("sku") %></th>
12
- <th><%= t("product") %></th>
13
- <th><%= t("options") %></th>
14
- <th><%= t("current") %></th>
15
- <th><%= t("adjustment") %></th>
11
+ <th><%= t(:sku) %></th>
12
+ <th><%= t(:product) %></th>
13
+ <th><%= t(:options) %></th>
14
+ <th><%= t(:current) %></th>
15
+ <th><%= t(:adjustment) %></th>
16
16
  </tr>
17
17
  </thead>
18
18
  <tbody>
19
- <tr>
19
+ <tr data-hook="inventory_row">
20
20
  <td><%= @variant.sku %></td>
21
21
  <td><%= @variant.product.name %></td>
22
22
  <td><%= variant_options @variant %></td>
23
23
  <td><%= on_hand(@variant) %></td>
24
24
  <td>
25
- <%= text_field :level, :adjustment, :class => "quantity" %>
25
+ <%= text_field :level, :adjustment, :class => 'quantity' %>
26
26
  </td>
27
27
  </tr>
28
28
  </tbody>
29
29
  </table>
30
- <%= submit_tag t('update') %>
31
- <%= t("or") %>
32
- <%= link_to t('cancel'), :controller => 'overview', :action => :index %>
30
+ <%= submit_tag t(:update) %>
31
+ <%= t(:or) %>
32
+ <%= link_to t(:cancel), :controller => 'overview', :action => :index %>
33
33
  <% end %>
@@ -0,0 +1,4 @@
1
+ $("#order-form-wrapper").html('<%= escape_javascript(render :partial => "admin/orders/form") %>');
2
+ $('#add_product_name').val('');
3
+ $('#add_variant_id').val('');
4
+ $('#add_quantity').val(1);
@@ -1,50 +1,44 @@
1
- <div class="yui-g">
2
-
3
- <div class="yui-u first">
4
-
1
+ <div class="clearfix">
2
+ <div class="left" data-hook="general">
5
3
  <fieldset>
6
- <legend><%= t('general') %></legend>
7
-
4
+ <legend><%= t(:general) %></legend>
8
5
  <p>
9
- <label><%=t("environment")%></label>
10
- <br/>
6
+ <%= f.label :environment, t(:environment) %><br />
11
7
  <%= f.collection_select(:environment,
12
8
  Configuration.configurations.keys.sort,
13
9
  :to_s, :titleize,
14
- {}, {:id => "gtwy-env"}) %>
10
+ {}, {:id => 'gtwy-env'}) %>
15
11
  </p>
16
12
 
17
13
  <p>
18
14
  <%= f.check_box :preferred_enable_mail_delivery, {:style => "vertical-align:middle;"} %>
19
- <label>
20
- <%= t('enable_mail_delivery') %>
21
- </label>
15
+ <%= f.label :preferred_enable_mail_delivery, t(:enable_mail_delivery) %>
22
16
  </p>
23
17
 
24
18
  <p>
25
- <label><%= t('send_mails_as') %></label><br />
19
+ <%= f.label :preferred_mails_from, t(:send_mails_as) %><br />
26
20
  <%= f.text_field :preferred_mails_from, :size => 40, :maxlength => 256 %>
27
- <br/>
21
+ <br />
28
22
  <span class="info">
29
- <%= t("smtp_send_all_emails_as_from_following_address") %>
23
+ <%= t(:smtp_send_all_emails_as_from_following_address) %>
30
24
  </span>
31
25
  </p>
32
26
 
33
27
  <p>
34
- <label><%= t('send_copy_of_all_mails_to') %></label><br />
28
+ <%= f.label :preferred_mail_bcc, t(:send_copy_of_all_mails_to) %><br />
35
29
  <%= f.text_field :preferred_mail_bcc, :size => 40, :maxlength => 256 %>
36
- <br/>
30
+ <br />
37
31
  <span class="info">
38
- <%= t("smtp_send_copy_to_this_addresses") %>
32
+ <%= t(:smtp_send_copy_to_this_addresses) %>
39
33
  </span>
40
34
  </p>
41
35
 
42
36
  <p>
43
- <label><%= t('intercept_email_address') %></label><br />
37
+ <%= f.label :preferred_intercept_email, t(:intercept_email_address) %><br />
44
38
  <%= f.text_field :preferred_intercept_email, :size => 40, :maxlength => 256 %>
45
- <br/>
39
+ <br />
46
40
  <span class="info">
47
- <%= t("intercept_email_instructions") %>
41
+ <%= t(:intercept_email_instructions) %>
48
42
  </span>
49
43
  </p>
50
44
 
@@ -52,45 +46,45 @@
52
46
 
53
47
  </div>
54
48
 
55
- <div class="yui-u">
49
+ <div class="right" data-hook="smtp">
56
50
 
57
51
  <fieldset>
58
- <legend><%= t('smtp') %></legend>
52
+ <legend><%= t(:smtp) %></legend>
59
53
  <p>
60
- <label><%= t("smtp_domain") %></label><br />
54
+ <%= f.label :preferred_mail_domain, t(:smtp_domain) %><br />
61
55
  <%= f.text_field :preferred_mail_domain %>
62
56
  </p>
63
57
  <p>
64
- <label><%= t('smtp_mail_host') %></label><br />
58
+ <%= f.label :preferred_mail_host, t(:smtp_mail_host) %><br />
65
59
  <%= f.text_field :preferred_mail_host %>
66
60
  </p>
67
61
  <p>
68
- <label><%= t('smtp_port') %></label><br />
62
+ <%= f.label :preferred_mail_port, t(:smtp_port) %><br />
69
63
  <%= f.text_field :preferred_mail_port %>
70
64
  </p>
71
65
  <p>
72
- <label><%= t('secure_connection_type') %></label><br />
66
+ <%= f.label :preferred_secure_connection_type, t(:secure_connection_type) %><br />
73
67
  <%= f.collection_select(:preferred_secure_connection_type,
74
68
  MailMethod::SECURE_CONNECTION_TYPES,
75
69
  :to_s, :to_s,
76
- {}, {"style" => "width:200px"}) %>
70
+ {}, {'style' => 'width:200px'}) %>
77
71
  <p>
78
- <label><%= t('smtp_authentication_type') %></label><br />
72
+ <%= f.label :preferred_mail_auth_type, t(:smtp_authentication_type) %><br />
79
73
  <%= f.collection_select(:preferred_mail_auth_type,
80
74
  MailMethod::MAIL_AUTH,
81
75
  :to_s, :to_s,
82
- {}, {"style" => "width:200px"}) %>
76
+ {}, {'style' => 'width:200px'}) %>
83
77
  </p>
84
78
  <p>
85
- <label><%= t('smtp_username') %></label><br />
79
+ <%= f.label :preferred_smtp_username, t(:smtp_username) %><br />
86
80
  <%= f.text_field :preferred_smtp_username %>
87
81
  </p>
88
82
  <p>
89
- <label><%= t('smtp_password') %></label><br />
83
+ <%= f.label :preferred_smtp_password, t(:smtp_password) %><br />
90
84
  <%= f.password_field :preferred_smtp_password %>
91
85
  </p>
92
86
  </fieldset>
93
87
 
94
88
  </div>
95
89
 
96
- </div>
90
+ </div>
@@ -1,9 +1,9 @@
1
1
  <%= render :partial => 'admin/shared/configuration_menu' %>
2
2
 
3
- <h1><%= t("editing_mail_method") %></h1>
3
+ <h1><%= t(:editing_mail_method) %></h1>
4
4
  <%= render 'shared/error_messages', :target => @mail_method %>
5
5
 
6
- <%= form_for(:mail_method, :url => object_url, :html => { :method => :put }) do |f| %>
7
- <%= render :partial => "form", :locals => { :f => f } %>
8
- <p class="form-buttons"><%= button t("update") %></p>
9
- <% end %>
6
+ <%= form_for [:admin, @mail_method] do |f| %>
7
+ <%= render :partial => 'form', :locals => { :f => f } %>
8
+ <p class="form-buttons" data-hook="buttons"><%= button t(:update) %></p>
9
+ <% end %>
@@ -1,38 +1,34 @@
1
1
  <%= render :partial => 'admin/shared/configuration_menu' %>
2
2
 
3
- <div class='toolbar'>
4
- <ul class='actions'>
3
+ <div class="toolbar" data-hook="toolbar">
4
+ <ul class="actions">
5
5
  <li>
6
- <%= button_link_to t("new_mail_method"), new_object_url, :icon => 'add', :id => 'admin_new_mail_method_link' %>
6
+ <%= button_link_to t(:new_mail_method), new_object_url, :icon => 'add', :id => 'admin_new_mail_method_link' %>
7
7
  </li>
8
8
  </ul>
9
- <br class='clear' />
9
+ <br class="clear" />
10
10
  </div>
11
11
 
12
- <h1><%= t("mail_methods") %></h1>
12
+ <h1><%= t(:mail_methods) %></h1>
13
13
 
14
- <table class="index" id='mail_methods_listing'>
15
- <thead>
16
- <%= hook :admin_mail_methods_index_headers do %>
17
- <th><%= t("environment") %></th>
18
- <th><%= t("active") %></th>
19
- <% end %>
20
- <th>
21
- <%= hook :admin_mail_methods_index_header_actions %>
14
+ <table class="index" id="mail_methods_listing">
15
+ <thead data-hook="admin_mail_methods_index_headers">
16
+ <th><%= t(:environment) %></th>
17
+ <th><%= t(:active) %></th>
18
+ <th data-hook="admin_mail_methods_index_header_actions">
22
19
  </th>
23
20
  </thead>
24
21
  <tbody>
25
22
  <% @mail_methods.each do |method|%>
26
- <tr id="<%= dom_id method %>">
27
- <%- locals = {:method => method} %>
28
- <%= hook :admin_mail_methods_index_rows, locals do %>
29
- <td width="100px"><%= method.environment.to_s.titleize %></td>
30
- <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
31
- <% end %>
32
- <td width="140px">
33
- <%= hook :admin_mail_methods_index_row_actions, locals do %>
34
- <%= link_to_edit method, :class => 'edit' %> &nbsp;
35
- <%= link_to_delete method %>
23
+ <tr id="<%= dom_id method %>" data-hook="admin_mail_methods_index_rows">
24
+ <td width="100px"><%= method.environment.to_s.titleize %></td>
25
+ <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
26
+ <td width="140px" data-hook="admin_mail_methods_index_row_actions">
27
+ <%= link_to_edit method, :class => 'edit' %> &nbsp;
28
+ <%= link_to_delete method %>
29
+ <%= link_to testmail_admin_mail_method_path(method), :method => :post, :class => 'send_mail' do %>
30
+ <%= image_tag('admin/icons/send-email.png') %>
31
+ <%= t('admin.mail_methods.send_testmail') %>
36
32
  <% end %>
37
33
  </td>
38
34
  </tr>
@@ -1,9 +1,9 @@
1
1
  <%= render :partial => 'admin/shared/configuration_menu' %>
2
2
 
3
- <h1><%= t("new_mail_method") %></h1>
3
+ <h1><%= t(:new_mail_method) %></h1>
4
4
  <%= render 'shared/error_messages', :target => @mail_method %>
5
5
 
6
- <%= form_for(:mail_method, :url => collection_url) do |f| %>
7
- <%= render :partial => "form", :locals => { :f => f } %>
8
- <p class="form-buttons"><%= button t("create") %></p>
9
- <% end %>
6
+ <%= form_for [:admin, @mail_method] do |f| %>
7
+ <%= render :partial => 'form', :locals => { :f => f } %>
8
+ <p class="form-buttons" data-hook="buttons"><%= button t(:create) %></p>
9
+ <% end %>
@@ -1,27 +1,28 @@
1
- <h4><%= t("add_option_types") %></h4>
1
+ <h4><%= t(:add_option_types) %></h4>
2
2
  <table class="index">
3
- <tr>
4
- <th><%= t("name") %></th>
5
- <th><%= t("presentation") %></th>
3
+ <tr data-hook="option_type_header">
4
+ <th><%= t(:name) %></th>
5
+ <th><%= t(:presentation) %></th>
6
6
  <th></th>
7
7
  </tr>
8
8
  <% @available_option_types.each do |ot| %>
9
- <tr>
10
- <td><%=ot.name %></td>
11
- <td><%=ot.presentation %></td>
12
- <td class="actions"><%= link_to icon('add') + ' ' + t("select"),
13
- url_for(:controller => "admin/option_types",
9
+ <tr data-hook="option_type_row">
10
+ <td><%= ot.name %></td>
11
+ <td><%= ot.presentation %></td>
12
+ <td class="actions"><%= link_to icon('add') + ' ' + t(:select),
13
+ url_for(:controller => 'admin/option_types',
14
14
  :id => ot,
15
15
  :product_id => @product.permalink,
16
- :action => "select",
16
+ :action => 'select',
17
17
  :option_type_id => ot),
18
- :remote => true, :class => 'iconlink' %>
18
+ :remote => true,
19
+ :class => 'iconlink' %>
19
20
  </td>
20
21
  </tr>
21
22
  <% end %>
22
23
  <% if @available_option_types.empty? %>
23
- <tr>
24
- <td colspan="3"><%= t('none_available') %></td>
24
+ <tr data-hook="option_type_empty">
25
+ <td colspan="3"><%= t(:none_available) %></td>
25
26
  </tr>
26
27
  <% end %>
27
28
  </table>
@@ -1,11 +1,11 @@
1
1
  <%= f.field_container :name do %>
2
- <%= f.label :name, t("name") %> <span class="required">*</span><br />
2
+ <%= f.label :name, t(:name) %> <span class="required">*</span><br />
3
3
  <%= f.text_field :name %>
4
4
  <%= f.error_message_on :name %>
5
5
  <% end %>
6
6
 
7
7
  <%= f.field_container :presentation do %>
8
- <%= f.label :presentation, t("presentation") %> <span class="required">*</span><br />
8
+ <%= f.label :presentation, t(:presentation) %> <span class="required">*</span><br />
9
9
  <%= f.text_field :presentation %>
10
10
  <%= f.error_message_on :presentation %>
11
11
  <% end %>
@@ -1,5 +1,5 @@
1
- <tr class="option_value fields" id="<%= dom_id(f.object) %>">
2
- <td class='name'><%= f.text_field :name %></td>
3
- <td class='presentation'><%= f.text_field :presentation %></td>
4
- <td class="actions"><%= link_to_remove_fields t("remove"), f %></td>
1
+ <tr class="option_value fields" id="<%= dom_id(f.object) %>" data-hook="option_value">
2
+ <td class="name"><%= f.text_field :name %></td>
3
+ <td class="presentation"><%= f.text_field :presentation %></td>
4
+ <td class="actions"><%= link_to_remove_fields t(:remove), f %></td>
5
5
  </tr>
@@ -1,26 +1,26 @@
1
1
  <table class="index">
2
- <tr>
3
- <th><%= t("name") %></th>
4
- <th><%= t("presentation") %></th>
2
+ <tr data-hook="selected_head">
3
+ <th><%= t(:name) %></th>
4
+ <th><%= t(:presentation) %></th>
5
5
  <th>&nbsp;</th>
6
6
  </tr>
7
7
  <% @option_types.each do |option_type| %>
8
- <tr>
8
+ <tr data-hook="selected_row">
9
9
  <td><%= option_type.name %></td>
10
10
  <td><%= option_type.presentation %></td>
11
11
  <td class="actions">
12
- <%= link_to_with_icon 'delete', t("remove"), remove_admin_product_option_type_url(@product, option_type) %>
12
+ <%= link_to_with_icon 'delete', t(:remove), remove_admin_product_option_type_url(@product, option_type) %>
13
13
  </td>
14
14
  </tr>
15
15
  <% end %>
16
16
  <% if @option_types.empty? %>
17
- <tr><td colspan="3"><%= t(:none) %></td></tr>
17
+ <tr data-hook="selected_none"><td colspan="3"><%= t(:none) %></td></tr>
18
18
  <% end %>
19
19
  </table>
20
20
 
21
- <div id="option-types"></div>
21
+ <div id="option-types" data-hook></div>
22
22
  <% if @product.variants.empty? %>
23
- <span id="new_opt_link">
24
- <%= link_to icon('add') + ' ' + t("add_option_type"), available_admin_product_option_types_url(@product), :remote => :true, :class => 'iconlink' %>
23
+ <span id="new_opt_link" data-hook="links">
24
+ <%= link_to icon('add') + ' ' + t(:add_option_type), available_admin_product_option_types_url(@product), :remote => :true, :class => 'iconlink' %>
25
25
  </span>
26
- <% end %>
26
+ <% end %>
@@ -1,2 +1,2 @@
1
- $("#option-types").html("<%= escape_javascript(render('available')) %>");
1
+ $("#option-types").html("<%= escape_javascript(render 'available') %>");
2
2
  $("#new_opt_link").hide();
@@ -1,30 +1,30 @@
1
1
  <%= render :partial => 'admin/shared/product_sub_menu' %>
2
- <h1><%= t("editing_option_type") %></h1>
2
+ <h1><%= t(:editing_option_type) %></h1>
3
3
  <%= render 'shared/error_messages', :target => @option_type %>
4
- <%= form_for(@option_type, :url => object_url, :html => { :method => :put }) do |f| %>
4
+ <%= form_for [:admin, @option_type] do |f| %>
5
5
  <fieldset>
6
- <legend><%= t("editing_option_type") %></legend>
7
- <%= render :partial => "form", :locals => { :f => f } %>
8
- <h3><%= t("option_values") %></h3>
6
+ <legend><%= t(:editing_option_type) %></legend>
7
+ <%= render :partial => 'form', :locals => { :f => f } %>
8
+ <h3><%= t(:option_values) %></h3>
9
9
  <table class="index">
10
- <thead>
10
+ <thead data-hook="option_header">
11
11
  <tr>
12
- <th><%= t("name") %></th>
13
- <th><%= t("display") %></th>
12
+ <th><%= t(:name) %></th>
13
+ <th><%= t(:display) %></th>
14
14
  <th></th>
15
15
  </tr>
16
16
  </thead>
17
17
  <tbody id="option_values">
18
- <tr id="none">
19
- <td colspan="3"><%= @option_type.option_values.empty? ? t("none") : "" %></td>
18
+ <tr id="none" data-hook="option_none">
19
+ <td colspan="3"><%= @option_type.option_values.empty? ? t(:none) : '' %></td>
20
20
  </tr>
21
21
  <%= f.fields_for :option_values do |option_value_form| %>
22
- <%= render "option_value_fields", :f => option_value_form %>
22
+ <%= render 'option_value_fields', :f => option_value_form %>
23
23
  <% end %>
24
24
  </tbody>
25
25
  </table>
26
- <span id='new_add_option_value'>
27
- <%= link_to_add_fields t("add_option_value"), "tbody#option_values", f, :option_values %>
26
+ <span id="new_add_option_value" data-hook>
27
+ <%= link_to_add_fields t(:add_option_value), "tbody#option_values", f, :option_values %>
28
28
  </span>
29
29
 
30
30
  <%= render :partial => 'admin/shared/edit_resource_links' %>
@@ -1,28 +1,28 @@
1
1
  <%= render :partial => 'admin/shared/product_sub_menu' %>
2
2
 
3
- <div class='toolbar'>
4
- <ul class='actions'>
3
+ <div class="toolbar" data-hook="toolbar">
4
+ <ul class="actions">
5
5
  <li id="new_ot_link">
6
- <%= button_link_to t("new_option_type"), new_admin_option_type_url, {:remote => true, :icon => 'add', :id => 'new_option_type_link'} %>
6
+ <%= button_link_to t(:new_option_type), new_admin_option_type_url, {:remote => true, :icon => 'add', :id => 'new_option_type_link'} %>
7
7
  </li>
8
8
  </ul>
9
- <br class='clear' />
9
+ <br class="clear" />
10
10
  </div>
11
11
 
12
- <h1><%= t("option_types") %></h1>
12
+ <h1><%= t(:option_types) %></h1>
13
13
 
14
14
  <div id="new_option_type"></div>
15
15
 
16
- <table class="index sortable" id='listing_option_types'>
17
- <tr>
18
- <th><%= t("name") %></th>
19
- <th><%= t("presentation") %></th>
16
+ <table class="index sortable" id="listing_option_types" data-hook>
17
+ <tr data-hook="option_header">
18
+ <th><%= t(:name) %></th>
19
+ <th><%= t(:presentation) %></th>
20
20
  <th></th>
21
21
  </tr>
22
22
  <% @option_types.each do |option_type| %>
23
- <tr id="<%= dom_id option_type %>">
23
+ <tr id="<%= dom_id option_type %>" data-hook="option_row">
24
24
  <td><span class="handle"></span> <%= option_type.name %></td>
25
- <td class='presentation'><%= option_type.presentation %></td>
25
+ <td class="presentation"><%= option_type.presentation %></td>
26
26
  <td class="actions">
27
27
  <%= link_to_edit(option_type, :class => 'admin_edit_option_type') %>
28
28
  &nbsp;
@@ -0,0 +1,11 @@
1
+ <%= render :partial => 'admin/shared/product_sub_menu' %>
2
+
3
+ <%= render 'shared/error_messages', :target => @option_type %>
4
+
5
+ <%= form_for [:admin, @option_type] do |f| %>
6
+ <fieldset>
7
+ <legend><%= t(:new_option_type) %></legend>
8
+ <%= render :partial => 'form', :locals => { :f => f } %>
9
+ <%= render :partial => 'admin/shared/new_resource_links' %>
10
+ </fieldset>
11
+ <% end %>
@@ -0,0 +1,2 @@
1
+ $("#new_option_type").html('<%= escape_javascript(render :template => "admin/option_types/new.html.erb") %>');
2
+ $("#new_option_type_link").parent().hide();
@@ -1,6 +1,6 @@
1
1
  <%= render :partial => 'admin/shared/product_sub_menu' %>
2
- <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Option Types"} %>
2
+ <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Option Types'} %>
3
3
 
4
- <div id="selected-options">
4
+ <div id="selected-options" data-hook>
5
5
  <%= render 'selected' %>
6
6
  </div>
@@ -1,17 +1,17 @@
1
- <div id="add-line-item">
1
+ <div id="add-line-item" data-hook>
2
2
  <fieldset>
3
- <legend><%= t('add_product') %></legend>
4
- <div style="float:left;width:65%;margin-right:5%;">
5
- <%= label_tag :add_product_name, t("name_or_sku") %>
3
+ <legend><%= t(:add_product) %></legend>
4
+ <div style="float:left; width:65%; margin-right:5%;" data-hook="add_product_name">
5
+ <%= label_tag :add_product_name, t(:name_or_sku) %>
6
6
  <%= text_field_tag :add_product_name, nil, :class => 'fullwidth title' %>
7
7
  <%= hidden_field_tag :add_variant_id %>
8
8
  </div>
9
- <div style="float:left;width:10%;margin-right:5%;">
10
- <%= label_tag :add_quantity, t("qty") %>
9
+ <div style="float:left; width:10%; margin-right:5%;" data-hook="add_quantity">
10
+ <%= label_tag :add_quantity, t(:qty) %>
11
11
  <%= text_field_tag :add_quantity, 1 , :class => 'fullwidth title' %>
12
12
  </div>
13
- <div style="float: left; width: 15%; padding-top: 17px;">
14
- <%= link_to text_for_button_link(t("add"), :icon => 'add'),
13
+ <div style="float: left; width: 15%; padding-top: 17px;" data-hook="add_button">
14
+ <%= link_to text_for_button_link(t(:add), :icon => 'add'),
15
15
  admin_order_line_items_url(@order),
16
16
  {:id => 'add_line_item_to_order', :class => 'button', 'data-update' => 'order-form-wrapper'} %>
17
17
  </div>