spree_backend 2.4.10 → 3.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (405) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -2
  3. data/app/assets/javascripts/spree/backend/admin.js.erb +136 -53
  4. data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -4
  5. data/app/assets/javascripts/spree/backend/index.html +15 -0
  6. data/app/assets/javascripts/spree/backend/line_items.js.coffee +1 -4
  7. data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb +3 -16
  8. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +2 -4
  9. data/app/assets/javascripts/spree/backend/option_value_picker.js +44 -0
  10. data/app/assets/javascripts/spree/backend/orders/edit_form.js +2 -3
  11. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +8 -12
  12. data/app/assets/javascripts/spree/backend/product_picker.js +10 -8
  13. data/app/assets/javascripts/spree/backend/progress.coffee +0 -21
  14. data/app/assets/javascripts/spree/backend/promotions.js +50 -1
  15. data/app/assets/javascripts/spree/backend/select_payments.js.coffee +7 -0
  16. data/app/assets/javascripts/spree/backend/shipments.js.erb +10 -41
  17. data/app/assets/javascripts/spree/backend/spree-select2.js.erb +0 -15
  18. data/app/assets/javascripts/spree/backend/states.js +3 -3
  19. data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -2
  20. data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee +3 -2
  21. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +2 -4
  22. data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +4 -4
  23. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +15 -34
  24. data/app/assets/javascripts/spree/backend/taxons.js.coffee +27 -8
  25. data/app/assets/javascripts/spree/backend/user_picker.js +2 -3
  26. data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb +1 -2
  27. data/app/assets/javascripts/spree/backend/variant_management.js.coffee +1 -2
  28. data/app/assets/javascripts/spree/backend.js +13 -15
  29. data/app/assets/stylesheets/spree/backend/components/_buttons.scss +37 -0
  30. data/app/assets/stylesheets/spree/backend/components/_filters.scss +25 -0
  31. data/app/assets/stylesheets/spree/backend/components/_icons.scss +257 -0
  32. data/app/assets/stylesheets/spree/backend/components/_labels.scss +49 -0
  33. data/app/assets/stylesheets/spree/backend/components/_main.scss +5 -0
  34. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +10 -165
  35. data/app/assets/stylesheets/spree/backend/components/_page_header.scss +17 -0
  36. data/app/assets/stylesheets/spree/backend/components/_panels.scss +3 -0
  37. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +116 -20
  38. data/app/assets/stylesheets/spree/backend/components/_tables.scss +51 -0
  39. data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss +70 -0
  40. data/app/assets/stylesheets/spree/backend/components/_variables.scss +12 -0
  41. data/app/assets/stylesheets/spree/backend/components/_wells.scss +3 -0
  42. data/app/assets/stylesheets/spree/backend/global/_variables.scss +37 -0
  43. data/app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss +109 -0
  44. data/app/{views/spree/admin/payments/source_forms/_check.html.erb → assets/stylesheets/spree/backend/plugins/_js_tree.scss} +0 -0
  45. data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +84 -155
  46. data/app/assets/stylesheets/spree/backend/sections/_account.scss +16 -0
  47. data/app/assets/stylesheets/spree/backend/shared/_base.scss +15 -0
  48. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +25 -287
  49. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +5 -138
  50. data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +26 -0
  51. data/app/assets/stylesheets/spree/backend.css +1 -7
  52. data/app/controllers/spree/admin/base_controller.rb +0 -2
  53. data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
  54. data/app/controllers/spree/admin/general_settings_controller.rb +5 -12
  55. data/app/controllers/spree/admin/images_controller.rb +33 -17
  56. data/app/controllers/spree/admin/log_entries_controller.rb +2 -2
  57. data/app/controllers/spree/admin/option_types_controller.rb +5 -3
  58. data/app/controllers/spree/admin/orders/customer_details_controller.rb +8 -8
  59. data/app/controllers/spree/admin/orders_controller.rb +4 -5
  60. data/app/controllers/spree/admin/payments_controller.rb +3 -3
  61. data/app/controllers/spree/admin/products_controller.rb +3 -6
  62. data/app/controllers/spree/admin/resource_controller.rb +1 -1
  63. data/app/controllers/spree/admin/root_controller.rb +1 -0
  64. data/app/controllers/spree/admin/search_controller.rb +12 -0
  65. data/app/controllers/spree/admin/state_changes_controller.rb +18 -0
  66. data/app/controllers/spree/admin/stock_locations_controller.rb +4 -13
  67. data/app/controllers/spree/admin/stock_transfers_controller.rb +6 -6
  68. data/app/controllers/spree/admin/tax_categories_controller.rb +0 -13
  69. data/app/controllers/spree/admin/taxonomies_controller.rb +1 -1
  70. data/app/controllers/spree/admin/taxons_controller.rb +53 -36
  71. data/app/controllers/spree/admin/users_controller.rb +44 -41
  72. data/app/controllers/spree/admin/variants_controller.rb +1 -1
  73. data/app/helpers/spree/admin/adjustments_helper.rb +0 -5
  74. data/app/helpers/spree/admin/base_helper.rb +41 -71
  75. data/app/helpers/spree/admin/navigation_helper.rb +96 -28
  76. data/app/helpers/spree/admin/orders_helper.rb +2 -2
  77. data/app/views/kaminari/_first_page.html.erb +11 -0
  78. data/app/views/kaminari/_gap.html.erb +8 -0
  79. data/app/views/kaminari/_last_page.html.erb +11 -0
  80. data/app/views/kaminari/_next_page.html.erb +15 -0
  81. data/app/views/kaminari/_page.html.erb +12 -0
  82. data/app/views/kaminari/_paginator.html.erb +21 -0
  83. data/app/views/kaminari/_prev_page.html.erb +15 -0
  84. data/app/views/spree/admin/adjustments/_adjustment.html.erb +10 -9
  85. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +19 -15
  86. data/app/views/spree/admin/adjustments/_form.html.erb +11 -15
  87. data/app/views/spree/admin/adjustments/edit.html.erb +9 -12
  88. data/app/views/spree/admin/adjustments/index.html.erb +19 -7
  89. data/app/views/spree/admin/adjustments/new.html.erb +7 -11
  90. data/app/views/spree/admin/countries/_form.html.erb +15 -19
  91. data/app/views/spree/admin/countries/edit.html.erb +4 -12
  92. data/app/views/spree/admin/countries/index.html.erb +6 -18
  93. data/app/views/spree/admin/countries/new.html.erb +3 -5
  94. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +4 -4
  95. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +9 -10
  96. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +5 -3
  97. data/app/views/spree/admin/customer_returns/edit.html.erb +17 -21
  98. data/app/views/spree/admin/customer_returns/index.html.erb +12 -16
  99. data/app/views/spree/admin/customer_returns/new.html.erb +29 -20
  100. data/app/views/spree/admin/general_settings/edit.html.erb +101 -90
  101. data/app/views/spree/admin/images/_form.html.erb +12 -12
  102. data/app/views/spree/admin/images/edit.html.erb +23 -21
  103. data/app/views/spree/admin/images/index.html.erb +25 -30
  104. data/app/views/spree/admin/images/new.html.erb +13 -11
  105. data/app/views/spree/admin/inventory_units/adjust.html.erb +29 -0
  106. data/app/views/spree/admin/log_entries/index.html.erb +9 -7
  107. data/app/views/spree/admin/option_types/_form.html.erb +10 -10
  108. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +8 -10
  109. data/app/views/spree/admin/option_types/edit.html.erb +28 -23
  110. data/app/views/spree/admin/option_types/index.html.erb +16 -22
  111. data/app/views/spree/admin/option_types/new.html.erb +4 -3
  112. data/app/views/spree/admin/orders/_add_line_item.html.erb +9 -10
  113. data/app/views/spree/admin/orders/_add_product.html.erb +11 -9
  114. data/app/views/spree/admin/orders/_adjustments.html.erb +21 -7
  115. data/app/views/spree/admin/orders/_form.html.erb +23 -10
  116. data/app/views/spree/admin/orders/_line_item.html.erb +18 -6
  117. data/app/views/spree/admin/orders/_line_items.html.erb +45 -45
  118. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +10 -11
  119. data/app/views/spree/admin/orders/_risk_analysis.html.erb +13 -13
  120. data/app/views/spree/admin/orders/_shipment.html.erb +31 -39
  121. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +23 -17
  122. data/app/views/spree/admin/orders/cart.html.erb +14 -15
  123. data/app/views/spree/admin/orders/customer_details/_form.html.erb +73 -52
  124. data/app/views/spree/admin/orders/customer_details/edit.html.erb +19 -15
  125. data/app/views/spree/admin/orders/edit.html.erb +12 -9
  126. data/app/views/spree/admin/orders/index.html.erb +145 -84
  127. data/app/views/spree/admin/payment_methods/_form.html.erb +26 -30
  128. data/app/views/spree/admin/payment_methods/edit.html.erb +5 -14
  129. data/app/views/spree/admin/payment_methods/index.html.erb +14 -29
  130. data/app/views/spree/admin/payment_methods/new.html.erb +4 -12
  131. data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
  132. data/app/views/spree/admin/payments/_form.html.erb +27 -30
  133. data/app/views/spree/admin/payments/_list.html.erb +20 -16
  134. data/app/views/spree/admin/payments/credit.html.erb +2 -2
  135. data/app/views/spree/admin/payments/index.html.erb +15 -13
  136. data/app/views/spree/admin/payments/new.html.erb +10 -11
  137. data/app/views/spree/admin/payments/show.html.erb +12 -9
  138. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +43 -47
  139. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +19 -19
  140. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +5 -5
  141. data/app/views/spree/admin/product_properties/index.html.erb +5 -17
  142. data/app/views/spree/admin/products/_add_stock_form.html.erb +34 -25
  143. data/app/views/spree/admin/products/_autocomplete.js.erb +18 -7
  144. data/app/views/spree/admin/products/_form.html.erb +145 -150
  145. data/app/views/spree/admin/products/_properties_form.erb +2 -2
  146. data/app/views/spree/admin/products/edit.html.erb +3 -8
  147. data/app/views/spree/admin/products/index.html.erb +42 -63
  148. data/app/views/spree/admin/products/new.html.erb +29 -33
  149. data/app/views/spree/admin/products/stock.html.erb +67 -82
  150. data/app/views/spree/admin/promotion_actions/create.js.erb +1 -2
  151. data/app/views/spree/admin/promotion_actions/destroy.js.erb +1 -1
  152. data/app/views/spree/admin/promotion_categories/_form.html.erb +9 -9
  153. data/app/views/spree/admin/promotion_categories/edit.html.erb +2 -4
  154. data/app/views/spree/admin/promotion_categories/index.html.erb +27 -26
  155. data/app/views/spree/admin/promotion_categories/new.html.erb +1 -3
  156. data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
  157. data/app/views/spree/admin/promotion_rules/destroy.js.erb +1 -1
  158. data/app/views/spree/admin/promotions/_actions.html.erb +20 -17
  159. data/app/views/spree/admin/promotions/_form.html.erb +40 -39
  160. data/app/views/spree/admin/promotions/_promotion_action.html.erb +6 -6
  161. data/app/views/spree/admin/promotions/_promotion_rule.html.erb +7 -6
  162. data/app/views/spree/admin/promotions/_rules.html.erb +36 -35
  163. data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +25 -23
  164. data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +23 -21
  165. data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +16 -16
  166. data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb +8 -6
  167. data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +29 -24
  168. data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +29 -23
  169. data/app/views/spree/admin/promotions/edit.html.erb +16 -11
  170. data/app/views/spree/admin/promotions/index.html.erb +34 -58
  171. data/app/views/spree/admin/promotions/new.html.erb +4 -6
  172. data/app/views/spree/admin/promotions/rules/_item_total.html.erb +11 -7
  173. data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +9 -5
  174. data/app/views/spree/admin/promotions/rules/_option_value.html.erb +42 -0
  175. data/app/views/spree/admin/promotions/rules/_product.html.erb +9 -8
  176. data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -8
  177. data/app/views/spree/admin/promotions/rules/_user.html.erb +5 -3
  178. data/app/views/spree/admin/properties/_form.html.erb +9 -9
  179. data/app/views/spree/admin/properties/edit.html.erb +3 -9
  180. data/app/views/spree/admin/properties/index.html.erb +42 -52
  181. data/app/views/spree/admin/properties/new.html.erb +10 -9
  182. data/app/views/spree/admin/prototypes/_form.html.erb +25 -28
  183. data/app/views/spree/admin/prototypes/_prototypes.html.erb +4 -8
  184. data/app/views/spree/admin/prototypes/available.js.erb +1 -1
  185. data/app/views/spree/admin/prototypes/edit.html.erb +3 -11
  186. data/app/views/spree/admin/prototypes/index.html.erb +23 -36
  187. data/app/views/spree/admin/prototypes/new.html.erb +8 -7
  188. data/app/views/spree/admin/prototypes/show.html.erb +15 -18
  189. data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -2
  190. data/app/views/spree/admin/refund_reasons/index.html.erb +2 -2
  191. data/app/views/spree/admin/refund_reasons/new.html.erb +1 -1
  192. data/app/views/spree/admin/refunds/edit.html.erb +14 -18
  193. data/app/views/spree/admin/refunds/new.html.erb +19 -27
  194. data/app/views/spree/admin/reimbursement_types/index.html.erb +6 -7
  195. data/app/views/spree/admin/reimbursements/edit.html.erb +25 -31
  196. data/app/views/spree/admin/reimbursements/index.html.erb +4 -10
  197. data/app/views/spree/admin/reimbursements/show.html.erb +32 -36
  198. data/app/views/spree/admin/reports/index.html.erb +4 -4
  199. data/app/views/spree/admin/reports/sales_total.html.erb +6 -11
  200. data/app/views/spree/admin/return_authorization_reasons/edit.html.erb +0 -0
  201. data/app/views/spree/admin/return_authorization_reasons/index.html.erb +2 -2
  202. data/app/views/spree/admin/return_authorization_reasons/new.html.erb +0 -0
  203. data/app/views/spree/admin/return_authorizations/_form.html.erb +20 -20
  204. data/app/views/spree/admin/return_authorizations/edit.html.erb +6 -6
  205. data/app/views/spree/admin/return_authorizations/index.html.erb +12 -12
  206. data/app/views/spree/admin/return_authorizations/new.html.erb +6 -10
  207. data/app/views/spree/admin/search/products.rabl +9 -0
  208. data/app/views/spree/admin/search/users.rabl +21 -21
  209. data/app/views/spree/admin/shared/_address_form.html.erb +22 -22
  210. data/app/views/spree/admin/shared/_alert.html.erb +8 -5
  211. data/app/views/spree/admin/shared/_calculator_fields.html.erb +13 -8
  212. data/app/views/spree/admin/shared/_content_header.html.erb +19 -16
  213. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +3 -3
  214. data/app/views/spree/admin/shared/_error_messages.html.erb +12 -0
  215. data/app/views/spree/admin/shared/_head.html.erb +4 -8
  216. data/app/views/spree/admin/shared/_header.html.erb +27 -8
  217. data/app/views/spree/admin/shared/_index_table_options.html.erb +23 -0
  218. data/app/views/spree/admin/shared/_main_menu.html.erb +35 -0
  219. data/app/views/spree/admin/shared/_new_resource_links.html.erb +3 -3
  220. data/app/views/spree/admin/shared/_order_summary.html.erb +121 -48
  221. data/app/views/spree/admin/shared/_order_tabs.html.erb +55 -7
  222. data/app/views/spree/admin/shared/_product_tabs.html.erb +19 -25
  223. data/app/views/spree/admin/shared/_refunds.html.erb +9 -9
  224. data/app/views/spree/admin/shared/_report_criteria.html.erb +4 -4
  225. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +12 -12
  226. data/app/views/spree/admin/shared/_sidebar.html.erb +1 -6
  227. data/app/views/spree/admin/shared/_table_filter.html.erb +21 -5
  228. data/app/views/spree/admin/shared/named_types/_edit.html.erb +6 -7
  229. data/app/views/spree/admin/shared/named_types/_form.html.erb +10 -14
  230. data/app/views/spree/admin/shared/named_types/_index.html.erb +6 -17
  231. data/app/views/spree/admin/shared/named_types/_new.html.erb +5 -5
  232. data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb +21 -0
  233. data/app/views/spree/admin/shared/sub_menu/_product.html.erb +8 -0
  234. data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb +4 -0
  235. data/app/views/spree/admin/shipping_categories/_form.html.erb +2 -2
  236. data/app/views/spree/admin/shipping_categories/edit.html.erb +4 -14
  237. data/app/views/spree/admin/shipping_categories/index.html.erb +24 -32
  238. data/app/views/spree/admin/shipping_categories/new.html.erb +2 -10
  239. data/app/views/spree/admin/shipping_methods/_form.html.erb +88 -67
  240. data/app/views/spree/admin/shipping_methods/edit.html.erb +6 -19
  241. data/app/views/spree/admin/shipping_methods/index.html.erb +13 -25
  242. data/app/views/spree/admin/shipping_methods/new.html.erb +2 -12
  243. data/app/views/spree/admin/state_changes/index.html.erb +42 -0
  244. data/app/views/spree/admin/states/_form.html.erb +6 -6
  245. data/app/views/spree/admin/states/_state_list.html.erb +6 -11
  246. data/app/views/spree/admin/states/edit.html.erb +3 -11
  247. data/app/views/spree/admin/states/index.html.erb +5 -9
  248. data/app/views/spree/admin/states/new.html.erb +1 -4
  249. data/app/views/spree/admin/states/new.js.erb +2 -2
  250. data/app/views/spree/admin/stock_locations/_form.html.erb +51 -45
  251. data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +15 -15
  252. data/app/views/spree/admin/stock_locations/edit.html.erb +4 -6
  253. data/app/views/spree/admin/stock_locations/index.html.erb +12 -26
  254. data/app/views/spree/admin/stock_locations/new.html.erb +3 -5
  255. data/app/views/spree/admin/stock_movements/_form.html.erb +10 -12
  256. data/app/views/spree/admin/stock_movements/edit.html.erb +4 -4
  257. data/app/views/spree/admin/stock_movements/index.html.erb +9 -15
  258. data/app/views/spree/admin/stock_movements/new.html.erb +3 -3
  259. data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +17 -22
  260. data/app/views/spree/admin/stock_transfers/index.html.erb +36 -49
  261. data/app/views/spree/admin/stock_transfers/new.html.erb +73 -77
  262. data/app/views/spree/admin/stock_transfers/show.html.erb +21 -29
  263. data/app/views/spree/admin/tax_categories/_form.html.erb +19 -27
  264. data/app/views/spree/admin/tax_categories/edit.html.erb +4 -6
  265. data/app/views/spree/admin/tax_categories/index.html.erb +13 -26
  266. data/app/views/spree/admin/tax_categories/new.html.erb +3 -6
  267. data/app/views/spree/admin/tax_categories/show.html.erb +1 -1
  268. data/app/views/spree/admin/tax_rates/_form.html.erb +34 -25
  269. data/app/views/spree/admin/tax_rates/edit.html.erb +4 -15
  270. data/app/views/spree/admin/tax_rates/index.html.erb +18 -32
  271. data/app/views/spree/admin/tax_rates/new.html.erb +2 -14
  272. data/app/views/spree/admin/taxonomies/_form.html.erb +5 -5
  273. data/app/views/spree/admin/taxonomies/_js_head.html.erb +0 -0
  274. data/app/views/spree/admin/taxonomies/_list.html.erb +9 -12
  275. data/app/views/spree/admin/taxonomies/edit.erb +11 -22
  276. data/app/views/spree/admin/taxonomies/index.html.erb +9 -15
  277. data/app/views/spree/admin/taxonomies/new.html.erb +4 -16
  278. data/app/views/spree/admin/taxons/_form.html.erb +38 -38
  279. data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
  280. data/app/views/spree/admin/taxons/edit.html.erb +5 -13
  281. data/app/views/spree/admin/taxons/index.html.erb +6 -13
  282. data/app/views/spree/admin/trackers/_form.html.erb +17 -23
  283. data/app/views/spree/admin/trackers/edit.html.erb +4 -14
  284. data/app/views/spree/admin/trackers/index.html.erb +9 -15
  285. data/app/views/spree/admin/trackers/new.html.erb +2 -10
  286. data/app/views/spree/admin/users/_addresses_form.html.erb +33 -17
  287. data/app/views/spree/admin/users/_form.html.erb +17 -17
  288. data/app/views/spree/admin/users/_lifetime_stats.html.erb +26 -0
  289. data/app/views/spree/admin/users/_sidebar.html.erb +14 -34
  290. data/app/views/spree/admin/users/_user_page_actions.html.erb +2 -6
  291. data/app/views/spree/admin/users/addresses.html.erb +8 -7
  292. data/app/views/spree/admin/users/edit.html.erb +55 -38
  293. data/app/views/spree/admin/users/index.html.erb +44 -30
  294. data/app/views/spree/admin/users/items.html.erb +13 -24
  295. data/app/views/spree/admin/users/new.html.erb +1 -7
  296. data/app/views/spree/admin/users/orders.html.erb +11 -17
  297. data/app/views/spree/admin/variants/_autocomplete.js.erb +13 -15
  298. data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +41 -44
  299. data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +46 -51
  300. data/app/views/spree/admin/variants/_form.html.erb +34 -34
  301. data/app/views/spree/admin/variants/_split.js.erb +8 -4
  302. data/app/views/spree/admin/variants/edit.html.erb +2 -4
  303. data/app/views/spree/admin/variants/index.html.erb +14 -33
  304. data/app/views/spree/admin/variants/new.html.erb +8 -6
  305. data/app/views/spree/admin/variants/new.js.erb +1 -1
  306. data/app/views/spree/admin/zones/_country_members.html.erb +14 -8
  307. data/app/views/spree/admin/zones/_form.html.erb +42 -31
  308. data/app/views/spree/admin/zones/_state_members.html.erb +14 -8
  309. data/app/views/spree/admin/zones/edit.html.erb +3 -11
  310. data/app/views/spree/admin/zones/index.html.erb +9 -19
  311. data/app/views/spree/admin/zones/new.html.erb +2 -13
  312. data/app/views/spree/layouts/admin.html.erb +63 -36
  313. data/config/initializers/assets.rb +1 -1
  314. data/config/routes.rb +4 -1
  315. data/lib/spree/backend/engine.rb +3 -0
  316. data/lib/spree_backend.rb +2 -0
  317. data/vendor/assets/javascripts/jquery.cookie.js +115 -39
  318. data/vendor/assets/javascripts/modernizr.js +3 -3
  319. data/vendor/assets/javascripts/underscore-min.js +6 -0
  320. data/vendor/assets/javascripts/underscore-min.map +1 -0
  321. data/vendor/assets/javascripts/velocity.js +3831 -0
  322. data/vendor/assets/stylesheets/animate.css +3158 -0
  323. metadata +85 -96
  324. data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -16
  325. data/app/assets/javascripts/spree/backend/images/new.js.coffee +0 -7
  326. data/app/assets/javascripts/spree/backend/underscore-min.js +0 -1227
  327. data/app/assets/stylesheets/spree/backend/components/_actions.scss +0 -31
  328. data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +0 -159
  329. data/app/assets/stylesheets/spree/backend/components/_messages.scss +0 -54
  330. data/app/assets/stylesheets/spree/backend/components/_pagination.scss +0 -17
  331. data/app/assets/stylesheets/spree/backend/components/_product_autocomplete.scss +0 -29
  332. data/app/assets/stylesheets/spree/backend/components/_progress.scss +0 -35
  333. data/app/assets/stylesheets/spree/backend/components/_states.scss +0 -34
  334. data/app/assets/stylesheets/spree/backend/components/_table-filter.scss +0 -14
  335. data/app/assets/stylesheets/spree/backend/globals/_functions.scss +0 -25
  336. data/app/assets/stylesheets/spree/backend/globals/_mixins.scss +0 -25
  337. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +0 -171
  338. data/app/assets/stylesheets/spree/backend/globals/_variables_override.scss +0 -7
  339. data/app/assets/stylesheets/spree/backend/hacks/_ie.scss +0 -72
  340. data/app/assets/stylesheets/spree/backend/hacks/_mozilla.scss +0 -33
  341. data/app/assets/stylesheets/spree/backend/hacks/_opera.scss +0 -17
  342. data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss +0 -135
  343. data/app/assets/stylesheets/spree/backend/plugins/_powertip.scss +0 -86
  344. data/app/assets/stylesheets/spree/backend/plugins/_token-input.scss +0 -110
  345. data/app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss +0 -8
  346. data/app/assets/stylesheets/spree/backend/sections/_alerts.scss +0 -27
  347. data/app/assets/stylesheets/spree/backend/sections/_bulk_transfer.scss +0 -8
  348. data/app/assets/stylesheets/spree/backend/sections/_edit_checkouts.scss +0 -72
  349. data/app/assets/stylesheets/spree/backend/sections/_image_settings.scss +0 -3
  350. data/app/assets/stylesheets/spree/backend/sections/_log_entries.scss +0 -17
  351. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +0 -64
  352. data/app/assets/stylesheets/spree/backend/sections/_overview.scss +0 -86
  353. data/app/assets/stylesheets/spree/backend/sections/_products.scss +0 -123
  354. data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +0 -119
  355. data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +0 -24
  356. data/app/assets/stylesheets/spree/backend/sections/_tax_zones.scss +0 -15
  357. data/app/assets/stylesheets/spree/backend/sections/_taxons.scss +0 -21
  358. data/app/assets/stylesheets/spree/backend/sections/_users.scss +0 -5
  359. data/app/assets/stylesheets/spree/backend/shared/_icons.scss +0 -53
  360. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +0 -99
  361. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +0 -214
  362. data/app/assets/stylesheets/spree/backend/spree_admin.scss +0 -45
  363. data/app/views/spree/admin/line_items/create.js.erb +0 -1
  364. data/app/views/spree/admin/line_items/destroy.js.erb +0 -1
  365. data/app/views/spree/admin/option_types/new.js.erb +0 -2
  366. data/app/views/spree/admin/payments/_bill_address_form.html.erb +0 -9
  367. data/app/views/spree/admin/payments/source_views/_check.html.erb +0 -0
  368. data/app/views/spree/admin/products/new.js.erb +0 -7
  369. data/app/views/spree/admin/promotions/_tab.html.erb +0 -1
  370. data/app/views/spree/admin/promotions/rules/_first_order.html.erb +0 -0
  371. data/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb +0 -0
  372. data/app/views/spree/admin/promotions/rules/_user_logged_in.html.erb +0 -0
  373. data/app/views/spree/admin/properties/filtered.html.erb +0 -1
  374. data/app/views/spree/admin/properties/new.js.erb +0 -2
  375. data/app/views/spree/admin/prototypes/new.js.erb +0 -5
  376. data/app/views/spree/admin/shared/_address.html.erb +0 -6
  377. data/app/views/spree/admin/shared/_configuration_menu.html.erb +0 -28
  378. data/app/views/spree/admin/shared/_menu.html.erb +0 -9
  379. data/app/views/spree/admin/shared/_order_submenu.html.erb +0 -49
  380. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +0 -10
  381. data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +0 -6
  382. data/app/views/spree/admin/shared/_show_resource_links.html.erb +0 -5
  383. data/app/views/spree/admin/shared/_sub_menu.html.erb +0 -9
  384. data/app/views/spree/admin/shared/_tabs.html.erb +0 -21
  385. data/app/views/spree/admin/taxonomies/_taxon.html.erb +0 -12
  386. data/app/views/spree/admin/taxons/search.rabl +0 -5
  387. data/app/views/spree/admin/variants/update.js.erb +0 -1
  388. data/vendor/assets/images/jquery.alerts/images/help.gif +0 -0
  389. data/vendor/assets/images/jquery.alerts/images/important.gif +0 -0
  390. data/vendor/assets/images/jquery.alerts/images/info.gif +0 -0
  391. data/vendor/assets/images/jquery.alerts/images/title.gif +0 -0
  392. data/vendor/assets/javascripts/css_browser_selector_dev.js +0 -129
  393. data/vendor/assets/javascripts/equalize.js +0 -41
  394. data/vendor/assets/javascripts/jquery.adaptivemenu.js +0 -60
  395. data/vendor/assets/javascripts/jquery.alerts/jquery.alerts.js +0 -235
  396. data/vendor/assets/javascripts/jquery.delayedobserver.js +0 -35
  397. data/vendor/assets/javascripts/jquery.powertip.js +0 -796
  398. data/vendor/assets/javascripts/jquery.vAlign.js +0 -11
  399. data/vendor/assets/javascripts/responsive-tables.js +0 -42
  400. data/vendor/assets/javascripts/spin.js +0 -379
  401. data/vendor/assets/javascripts/trunk8.js +0 -369
  402. data/vendor/assets/stylesheets/jquery.alerts/jquery.alerts.css.erb +0 -57
  403. data/vendor/assets/stylesheets/jquery.alerts/jquery.alerts.spree.css +0 -29
  404. data/vendor/assets/stylesheets/jquery.powertip.css +0 -85
  405. data/vendor/assets/stylesheets/responsive-tables.css +0 -21
@@ -0,0 +1,70 @@
1
+ .taxon-products-view {
2
+ ul.taxon {
3
+ list-style: none;
4
+ margin-left: -2%;
5
+ padding: 0;
6
+ > * {
7
+ margin-left: 2%;
8
+ }
9
+ li.product {
10
+ position: relative;
11
+ float: left;
12
+ width: 18%;
13
+ margin-bottom: 2%;
14
+ padding: 8px 8px 5px 8px;
15
+ border-radius: 4px;
16
+ background: #f4f4f4;
17
+ .well {
18
+ padding-bottom: 12px;
19
+ }
20
+ .sort-handle {
21
+ position: absolute;
22
+ top: 14px;
23
+ left: 16px;
24
+ color: $gray;
25
+ cursor: move;
26
+ }
27
+ .btn-group {
28
+ display: none;
29
+ position: absolute;
30
+ top: 14px;
31
+ right: 16px;
32
+ .btn {
33
+ padding: 2px 7px;
34
+ }
35
+ .dropdown-menu {
36
+ left: auto;
37
+ right: 0;
38
+ }
39
+ a.delete-product {
40
+ color: red;
41
+ }
42
+ }
43
+ .image {
44
+ .thumbnail {
45
+ margin-bottom: 8px;
46
+ display: inline-block;
47
+ width: 100%;
48
+ }
49
+ }
50
+ .product-info {
51
+ margin-bottom: 0.3em;
52
+ font-size: 0.9em;
53
+ div.name {
54
+ white-space: nowrap;
55
+ overflow: hidden;
56
+ text-overflow: ellipsis;
57
+ font-weight: bold;
58
+ }
59
+ div.price {
60
+ color: $gray;
61
+ }
62
+ }
63
+ &:hover {
64
+ .btn-group {
65
+ display: inline-block;
66
+ }
67
+ }
68
+ }
69
+ }
70
+ }
@@ -0,0 +1,12 @@
1
+ // Colors
2
+ $brand-success: #79B340;
3
+ $brand-primary: #468ABD;
4
+ $black: #444;
5
+ $grey: #666;
6
+ $medium-grey: lighten($grey, 30%);
7
+ $light-grey: #f5f5f5;
8
+ $color-border: #CCCCCC;
9
+
10
+ // Well
11
+ $well-bg: white;
12
+ $well-border: $color-border;
@@ -0,0 +1,3 @@
1
+ .well {
2
+ box-shadow: none;
3
+ }
@@ -0,0 +1,37 @@
1
+ /*------------------------------------------
2
+ Colors
3
+ -----------------------------------------*/
4
+ $brand-primary: #478DC1;
5
+ $brand-success: #7DB942;
6
+ $brand-info: #48B0F7;
7
+ $brand-warning: #F8D053;
8
+ $brand-danger: #F55753;
9
+
10
+ $input-border: darken(#EDEDED, 5);
11
+
12
+ /*------------------------------------------
13
+ Components
14
+ -----------------------------------------*/
15
+ $border-radius-base: 2px;
16
+ $padding-base-vertical: 8px;
17
+ $padding-base-horizontal: 16px;
18
+
19
+ /*------------------------------------------
20
+ Fonts
21
+ -----------------------------------------*/
22
+ $headings-font-family: "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif;
23
+ $headings-font-weight: 300;
24
+
25
+ /*------------------------------------------
26
+ Buttons
27
+ -----------------------------------------*/
28
+
29
+ /*------------------------------------------
30
+ Navbar
31
+ -----------------------------------------*/
32
+ $navbar-inverse-bg: darken($brand-primary, 35);
33
+
34
+ /*------------------------------------------
35
+ Wells
36
+ -----------------------------------------*/
37
+ $well-bg: #fbfbfb;
@@ -0,0 +1,109 @@
1
+ .ui-widget {
2
+ font-family: $headings-font-family;
3
+ font-size: $font-size-base - 1;
4
+ font-weight: 400;
5
+ }
6
+
7
+ #ui-datepicker-div {
8
+ background-color: white;
9
+ background-image: none;
10
+ color: $gray;
11
+ border-color: $input-border;
12
+ width: auto;
13
+ padding: 20px;
14
+
15
+ &.ui-corner-all {
16
+ border-radius: $border-radius-base;
17
+ }
18
+
19
+ .ui-datepicker-header {
20
+ border-radius: 0;
21
+ border: none;
22
+ background-image: none;
23
+ background-color: transparent;
24
+ }
25
+
26
+ .ui-widget-header .ui-icon {
27
+ background-color: transparent;
28
+ background-image: none;
29
+ text-indent: 0;
30
+ vertical-align: bottom !important;
31
+ width: 12px;
32
+ color: $brand-primary;
33
+
34
+ &.ui-icon-circle-triangle-w {
35
+ @extend .glyphicon;
36
+ @extend .glyphicon-chevron-left;
37
+ }
38
+
39
+ &.ui-icon-circle-triangle-e {
40
+ @extend .glyphicon;
41
+ @extend .glyphicon-chevron-right;
42
+ }
43
+ }
44
+
45
+ .ui-state-hover {
46
+ border: none;
47
+ background-image: none;
48
+ background-color: transparent;
49
+ transition: color 0.2s ease-in-out;
50
+ cursor: pointer;
51
+
52
+ span.ui-icon {
53
+ color: $brand-success;
54
+ }
55
+ }
56
+
57
+ .ui-datepicker-next-hover {
58
+ right: 2;
59
+ }
60
+
61
+ .ui-datepicker-prev-hover {
62
+ left: 2;
63
+ }
64
+
65
+ .ui-datepicker-title {
66
+ font-weight: 500;
67
+ color: $gray;
68
+ }
69
+
70
+ table.ui-datepicker-calendar {
71
+ th {
72
+ span {
73
+ text-transform: uppercase;
74
+ letter-spacing: 1px;
75
+ color: $brand-primary;
76
+ font-weight: 500;
77
+ }
78
+ }
79
+
80
+ td {
81
+ width: 31px;
82
+ height: 29px;
83
+ transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
84
+
85
+ .ui-state-default,
86
+ .ui-widget-content .ui-state-default,
87
+ .ui-widget-header .ui-state-default {
88
+ background-color: transparent;
89
+ background-image: none;
90
+ border: none;
91
+ text-align: center;
92
+ font-weight: 300;
93
+ }
94
+
95
+ &:hover {
96
+ background-color: $gray-lighter;
97
+ }
98
+
99
+ &:active {
100
+ background-color: $brand-success;
101
+
102
+ a {
103
+ color: white;
104
+ }
105
+ }
106
+ }
107
+ }
108
+ }
109
+
@@ -1,198 +1,127 @@
1
1
  .select2-container {
2
- &:hover .select2-choice, &.select2-container-active .select2-choice {
3
- background-color: $color-sel-hover-bg !important;
4
- border-color: $color-sel-hover-bg !important;
5
- }
2
+ display: block;
3
+
6
4
  .select2-choice {
7
- background-image: none !important;
8
- background-color: $color-sel-bg;
9
- border: none !important;
10
- box-shadow: none !important;
11
- @include border-radius($border-radius);
12
- color: $color-1 !important;
13
- font-size: 90%;
14
- height: 31px;
15
- line-height: inherit !important;
16
- padding: 5px 15px 7px;
17
-
18
- span {
19
- display: block;
20
- padding: 2px;
5
+ height: $input-height-base;
6
+ line-height: 2.2;
7
+ border-color: $input-border;
8
+ background-image: none;
9
+ background-color: $input-bg;
10
+
11
+ &, .select2-arrow {
12
+ border-radius: $border-radius-base;
21
13
  }
22
14
 
23
- .select2-search-choice-close {
24
- @extend .fa;
25
- @extend .fa-times;
26
- margin-top: 2px;
27
- font-size: 100% !important;
28
- background-image: none !important;
15
+ .select2-arrow {
16
+ background-image: none;
17
+ background-color: $input-bg;
18
+ border-top-left-radius: 0;
19
+ border-bottom-left-radius: 0;
20
+ border-left-color: $input-border;
21
+
22
+ b {
23
+ background-position: 0 7px;
24
+ }
29
25
  }
30
- }
31
26
 
32
- &.select2-container-active {
33
- .select2-choice {
34
- box-shadow: none !important;
27
+ .select2-chosen {
28
+ line-height: 36px;
29
+ vertical-align: middle;
30
+ display: inline;
35
31
  }
36
32
 
37
- &.select2-dropdown-open .select2-choice div b {
38
- @extend .fa-caret-up
33
+ abbr {
34
+ top: 12px;
39
35
  }
40
36
  }
41
37
  }
42
38
 
43
- .select2-drop {
44
- box-shadow: none !important;
45
- z-index: 1000000;
46
- max-width: auto !important;
47
- border-top: 1px solid;
48
- border-color: $color-sel-hover-bg;
49
-
50
- &.select2-drop-above {
51
- border-color: $color-sel-hover-bg;
52
- }
39
+ .select2-search input {
40
+ border-color: $input-border;
41
+ border-radius: $border-radius-base;
53
42
  }
54
43
 
55
- .select2-search {
56
- @extend .fa;
57
- @extend .fa-search;
58
-
59
- font-size: 100%;
60
- color: darken($color-border, 15);
61
- padding: 0 9px 0 0;
62
-
63
- &:before {
64
- @extend [class^="icon-"]:before;
65
-
66
- position: absolute;
67
- top: 16px;
68
- left: 13px;
69
- }
70
-
71
- input {
72
- @extend input[type="text"];
73
- margin-top: 5px;
74
- margin-left: 4px;
75
- padding-left: 25px;
76
- padding-top: 6px;
77
- padding-bottom: 6px;
78
- font-family: $base-font-family;
79
- font-size: 90%;
44
+ .select2-drop {
45
+ &, &.select2-drop-above {
46
+ border-radius: $border-radius-base;
80
47
  box-shadow: none;
81
- background-image: none;
82
48
  }
83
49
  }
84
50
 
85
- .select2-container .select2-choice .select2-arrow {
86
- background-image: none;
87
- background: transparent;
88
- border: 0;
89
-
90
- b {
91
- padding-top: 7px;
92
- display: block;
93
- width: 100%;
94
- height: 100%;
95
- background: none !important;
96
- font-family: FontAwesome;
97
- font-weight: 200 !important;
98
-
99
- &:before {
100
- content: "\f0d7";
101
- }
51
+ .select2-container-active {
52
+ &, & a {
53
+ box-shadow: none !important;
102
54
  }
103
55
  }
104
56
 
105
- .select2-results {
106
- padding-left: 0 !important;
107
-
108
- li {
109
- font-size: 85% !important;
110
-
57
+ .select2-dropdown-open.select2-drop-above .select2-choice,
58
+ .select2-dropdown-open.select2-drop-above .select2-choices {
59
+ background-image: none;
60
+ }
111
61
 
112
- &:nth-child(odd) {
113
- background: #efefef;
114
- }
62
+ .select2-dropdown-open.select2-drop-above .select2-choice {
63
+ border-radius: 0 0 $border-radius-base $border-radius-base;
64
+ }
115
65
 
116
- &.select2-highlighted {
117
- .select2-result-label {
118
- &, h6 {
119
- color: $color-1 !important;
120
- }
121
- }
122
- }
66
+ .select2-drop-above,
67
+ .select2-dropdown-open.select2-drop-above .select2-choice,
68
+ .select2-dropdown-open .select2-choice,
69
+ .select2-drop.select2-drop-above.select2-drop-active,
70
+ .select2-drop.select2-drop-active {
71
+ border-color: lighten($brand-success, 20);
72
+ }
123
73
 
124
- .select2-result-label {
125
- color: $color-body-text;
126
- min-height: 22px;
127
- clear: both;
128
- overflow: auto;
129
- }
74
+ .select2-result-label {
75
+ color: $gray;
76
+ }
130
77
 
131
- &.select2-no-results, &.select2-searching {
132
- padding: 5px;
133
- background-color: transparent;
134
- color: $color-body-text;
135
- text-align: center;
136
- font-weight: $font-weight-bold;
137
- text-transform: uppercase;
138
- }
139
- }
78
+ .select2-results .select2-highlighted {
79
+ background-color: $brand-primary;
140
80
 
141
- .select2-highlighted {
142
- background-color: $color-sel-bg !important;
81
+ .select2-result-label {
82
+ color: white;
143
83
  }
144
84
  }
145
85
 
146
86
  .select2-container-multi {
147
- &.select2-container-active, &.select2-dropdown-open {
148
- .select2-choices {
149
- border-color: $color-sel-hover-bg !important;
150
- box-shadow: none;
151
- border-bottom-left-radius: 0;
152
- border-bottom-right-radius: 0;
153
- }
154
- }
155
87
  .select2-choices {
156
- @extend input[type="text"];
157
- padding: 6px 3px 3px 3px;
158
- box-shadow: none;
159
- background-image: none !important;
88
+ line-height: 1.8;
89
+ border-color: $input-border;
90
+ background-image: none;
91
+ background-color: $input-bg;
160
92
 
161
93
  .select2-search-choice {
162
- @include border-radius($border-radius);
163
- margin: 0 0 3px 3px;
164
- background-image: none;
165
- background-color: $color-sel-bg;
166
- border: none;
167
- box-shadow: none;
168
- color: $color-1 !important;
169
- font-size: 85%;
94
+ @extend .label;
95
+ @extend .label-info;
170
96
 
171
- &:hover {
172
- background-color: $color-sel-hover-bg;
173
- }
97
+ box-shadow: none;
98
+ border: none;
99
+ background-image: none;
100
+ margin: 5px;
101
+ padding: 7px;
174
102
 
175
103
  .select2-search-choice-close {
104
+ @extend .glyphicon;
105
+ @extend .glyphicon-remove;
106
+
176
107
  background-image: none !important;
177
- font-size: 85% !important;
178
- @extend .fa;
179
- @extend .fa-times;
180
- margin-left: 2px;
181
- color: $color-1;
182
- &:before {
183
- font-size: 11px;
184
- }
108
+ font-size: 100%;
109
+ color: white !important;
110
+ position: absolute;
111
+ left: 7px;
112
+ top: 7px;
113
+ }
114
+
115
+ div {
116
+ padding-left: 15px;
185
117
  }
186
118
  }
187
119
  }
188
- }
189
120
 
190
- label .select2-container {
191
- margin-top: -6px;
192
- .select2-choice {
193
- span {
194
- text-transform: none;
195
- font-weight: normal;
121
+ &.select2-container-active {
122
+ .select2-choices {
123
+ box-shadow: none;
124
+ border-color: lighten($brand-success, 20);
196
125
  }
197
126
  }
198
- }
127
+ }
@@ -0,0 +1,16 @@
1
+ .dropdown.user-menu {
2
+ a {
3
+ color: white !important;
4
+ font-weight: 400;
5
+ }
6
+
7
+ .dropdown-menu {
8
+ padding: 20px;
9
+ min-width: 240px;
10
+ text-align: center;
11
+
12
+ a {
13
+ color: $dropdown-link-color !important;
14
+ }
15
+ }
16
+ }
@@ -0,0 +1,15 @@
1
+ body {
2
+ padding-top: $navbar-height + 2px;
3
+ }
4
+
5
+ .row {
6
+ padding: 0 0 15px 0;
7
+ }
8
+
9
+ .is-hidden {
10
+ display: none;
11
+ }
12
+
13
+ .no-padding-bottom {
14
+ padding-bottom: 0;
15
+ }