spree_core 1.2.5 → 1.3.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (817) hide show
  1. data/app/assets/javascripts/admin/address_states.js +5 -4
  2. data/app/assets/javascripts/admin/admin.js.erb +106 -58
  3. data/app/assets/javascripts/admin/calculator.js +2 -2
  4. data/app/assets/javascripts/admin/checkouts/edit.js +5 -5
  5. data/app/assets/javascripts/admin/image_settings.js.erb +62 -0
  6. data/app/assets/javascripts/admin/images/index.js.coffee +3 -0
  7. data/app/assets/javascripts/admin/images/new.js.coffee +3 -0
  8. data/app/assets/javascripts/admin/orders/edit.js +1 -1
  9. data/app/assets/javascripts/admin/progress.coffee +27 -0
  10. data/app/assets/javascripts/admin/shipping_methods.js.coffee +1 -1
  11. data/app/assets/javascripts/admin/spree-select2.js.erb +24 -0
  12. data/app/assets/javascripts/admin/spree_core.js +10 -0
  13. data/app/assets/javascripts/admin/taxon_autocomplete.js.erb +1 -1
  14. data/app/assets/javascripts/admin/taxonomy.js +9 -9
  15. data/app/assets/javascripts/admin/variant_autocomplete.js.erb +40 -0
  16. data/app/assets/javascripts/store/checkout.js.coffee +23 -5
  17. data/app/assets/javascripts/store/product.js.coffee +15 -8
  18. data/app/assets/javascripts/store/spree_core.js +0 -1
  19. data/app/assets/stylesheets/admin/components/_actions.scss +31 -0
  20. data/app/assets/stylesheets/admin/components/_date-picker.scss +154 -0
  21. data/app/assets/stylesheets/admin/components/_messages.scss +43 -0
  22. data/app/assets/stylesheets/admin/components/_navigation.scss +150 -0
  23. data/app/assets/stylesheets/admin/components/_pagination.scss +17 -0
  24. data/app/assets/stylesheets/admin/components/_product_autocomplete.scss +29 -0
  25. data/app/assets/stylesheets/admin/components/_progress.scss +35 -0
  26. data/app/assets/stylesheets/admin/components/_sidebar.scss +23 -0
  27. data/app/assets/stylesheets/admin/components/_states.scss +30 -0
  28. data/app/assets/stylesheets/admin/components/_table-filter.scss +14 -0
  29. data/app/assets/stylesheets/admin/globals/_functions.scss +25 -0
  30. data/app/assets/stylesheets/admin/globals/_mixins.scss +25 -0
  31. data/app/assets/stylesheets/admin/globals/_variables.scss +134 -0
  32. data/app/assets/stylesheets/admin/globals/_variables_override.scss +7 -0
  33. data/app/assets/stylesheets/admin/hacks/_ie.scss +73 -0
  34. data/app/assets/stylesheets/admin/hacks/_mozilla.scss +32 -0
  35. data/app/assets/stylesheets/admin/hacks/_opera.scss +17 -0
  36. data/app/assets/stylesheets/admin/plugins/_jstree.scss +132 -0
  37. data/app/assets/stylesheets/admin/plugins/_powertip.scss +86 -0
  38. data/app/assets/stylesheets/admin/plugins/_select2.scss +176 -0
  39. data/app/assets/stylesheets/admin/{token-input.css → plugins/_token-input.scss} +9 -8
  40. data/app/assets/stylesheets/admin/plugins/font-awesome.scss +303 -0
  41. data/app/assets/stylesheets/admin/{edit_checkouts.css → sections/_edit_checkouts.scss} +1 -1
  42. data/app/assets/stylesheets/admin/sections/_image_settings.scss +3 -0
  43. data/app/assets/stylesheets/admin/sections/_orders.scss +38 -0
  44. data/app/assets/stylesheets/admin/sections/_overview.scss +86 -0
  45. data/app/assets/stylesheets/admin/sections/_products.scss +26 -0
  46. data/app/assets/stylesheets/admin/sections/_promotions.scss +100 -0
  47. data/app/assets/stylesheets/admin/shared/_forms.scss +250 -0
  48. data/app/assets/stylesheets/admin/shared/_icons.scss +21 -0
  49. data/app/assets/stylesheets/admin/shared/_layout.scss +84 -0
  50. data/app/assets/stylesheets/admin/shared/_tables.scss +180 -0
  51. data/app/assets/stylesheets/admin/shared/_typography.scss +132 -0
  52. data/app/assets/stylesheets/admin/spree_admin.scss +38 -0
  53. data/app/assets/stylesheets/admin/spree_core.css +7 -7
  54. data/app/assets/stylesheets/store/screen.css.scss +57 -49
  55. data/app/assets/stylesheets/store/spree_core.css +2 -3
  56. data/app/assets/stylesheets/store/variables.css.scss +2 -0
  57. data/app/controllers/spree/admin/adjustments_controller.rb +3 -7
  58. data/app/controllers/spree/admin/base_controller.rb +1 -1
  59. data/app/controllers/spree/admin/countries_controller.rb +11 -0
  60. data/app/controllers/spree/admin/general_settings_controller.rb +7 -8
  61. data/app/controllers/spree/admin/image_settings_controller.rb +2 -7
  62. data/app/controllers/spree/admin/inventory_settings_controller.rb +2 -6
  63. data/app/controllers/spree/admin/mail_methods_controller.rb +1 -1
  64. data/app/controllers/spree/admin/orders/customer_details_controller.rb +3 -4
  65. data/app/controllers/spree/admin/orders_controller.rb +3 -9
  66. data/app/controllers/spree/admin/payment_methods_controller.rb +5 -2
  67. data/app/controllers/spree/admin/payments_controller.rb +4 -4
  68. data/app/controllers/spree/admin/product_properties_controller.rb +0 -12
  69. data/app/controllers/spree/admin/products_controller.rb +19 -42
  70. data/app/controllers/spree/admin/properties_controller.rb +2 -2
  71. data/app/controllers/spree/admin/prototypes_controller.rb +0 -8
  72. data/app/controllers/spree/admin/reports_controller.rb +7 -4
  73. data/app/controllers/spree/admin/resource_controller.rb +3 -3
  74. data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
  75. data/app/controllers/spree/admin/shipments_controller.rb +3 -3
  76. data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
  77. data/app/controllers/spree/admin/tax_categories_controller.rb +1 -1
  78. data/app/controllers/spree/admin/taxons_controller.rb +4 -4
  79. data/app/controllers/spree/admin/variants_controller.rb +11 -15
  80. data/app/controllers/spree/base_controller.rb +4 -1
  81. data/app/controllers/spree/checkout_controller.rb +3 -3
  82. data/app/controllers/spree/content_controller.rb +1 -1
  83. data/app/controllers/spree/countries_controller.rb +12 -0
  84. data/app/controllers/spree/home_controller.rb +2 -1
  85. data/app/controllers/spree/locale_controller.rb +3 -3
  86. data/app/controllers/spree/orders_controller.rb +7 -9
  87. data/app/controllers/spree/products_controller.rb +5 -4
  88. data/app/controllers/spree/states_controller.rb +1 -1
  89. data/app/controllers/spree/store_controller.rb +11 -0
  90. data/app/controllers/spree/taxons_controller.rb +2 -1
  91. data/app/helpers/spree/admin/base_helper.rb +16 -15
  92. data/app/helpers/spree/admin/navigation_helper.rb +38 -28
  93. data/app/helpers/spree/admin/orders_helper.rb +1 -7
  94. data/app/helpers/spree/admin/tables_helper.rb +15 -0
  95. data/app/helpers/spree/admin/taxons_helper.rb +0 -13
  96. data/app/helpers/spree/base_helper.rb +14 -28
  97. data/app/helpers/spree/checkout_helper.rb +0 -15
  98. data/app/helpers/spree/products_helper.rb +23 -10
  99. data/app/mailers/spree/order_mailer.rb +6 -17
  100. data/app/mailers/spree/shipment_mailer.rb +3 -8
  101. data/app/mailers/spree/test_mailer.rb +0 -5
  102. data/app/models/spree/address.rb +2 -1
  103. data/app/models/spree/adjustment.rb +5 -1
  104. data/app/models/spree/app_configuration.rb +2 -7
  105. data/app/models/spree/calculator/default_tax.rb +2 -6
  106. data/app/models/spree/calculator/flat_rate.rb +3 -1
  107. data/app/models/spree/calculator/flexi_rate.rb +2 -1
  108. data/app/models/spree/calculator/per_item.rb +3 -4
  109. data/app/models/spree/calculator/price_sack.rb +3 -1
  110. data/app/models/spree/country.rb +11 -0
  111. data/app/models/spree/credit_card.rb +5 -1
  112. data/app/models/spree/gateway.rb +2 -8
  113. data/app/models/spree/image.rb +1 -1
  114. data/app/models/spree/inventory_unit.rb +7 -3
  115. data/app/models/spree/line_item.rb +16 -2
  116. data/app/models/spree/order.rb +64 -137
  117. data/app/models/spree/order/checkout.rb +1 -8
  118. data/app/models/spree/order_updater.rb +134 -0
  119. data/app/models/spree/payment.rb +8 -19
  120. data/app/models/spree/payment/processing.rb +3 -3
  121. data/app/models/spree/payment_method.rb +6 -4
  122. data/app/models/spree/preference.rb +1 -1
  123. data/app/models/spree/preferences/preferable_class_methods.rb +9 -6
  124. data/app/models/spree/preferences/store.rb +11 -26
  125. data/app/models/spree/price.rb +51 -0
  126. data/app/models/spree/product.rb +22 -14
  127. data/app/models/spree/product/scopes.rb +20 -28
  128. data/app/models/spree/prototype.rb +1 -1
  129. data/app/models/spree/return_authorization.rb +8 -0
  130. data/app/models/spree/shipment.rb +13 -5
  131. data/app/models/spree/shipping_method.rb +10 -1
  132. data/app/models/spree/shipping_rate.rb +2 -2
  133. data/app/models/spree/taxon.rb +0 -5
  134. data/app/models/spree/variant.rb +75 -25
  135. data/app/models/spree/zone.rb +1 -1
  136. data/app/views/spree/address/_form.html.erb +75 -0
  137. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +23 -22
  138. data/app/views/spree/admin/adjustments/_form.html.erb +15 -12
  139. data/app/views/spree/admin/adjustments/edit.html.erb +15 -6
  140. data/app/views/spree/admin/adjustments/index.html.erb +12 -2
  141. data/app/views/spree/admin/adjustments/new.html.erb +15 -6
  142. data/app/views/spree/admin/banners/_gateway.html.erb +3 -1
  143. data/app/views/spree/admin/countries/_form.html.erb +22 -0
  144. data/app/views/spree/admin/countries/edit.html.erb +21 -0
  145. data/app/views/spree/admin/countries/index.html.erb +33 -0
  146. data/app/views/spree/admin/general_settings/edit.html.erb +75 -27
  147. data/app/views/spree/admin/image_settings/edit.html.erb +112 -99
  148. data/app/views/spree/admin/images/_form.html.erb +16 -12
  149. data/app/views/spree/admin/images/edit.html.erb +20 -11
  150. data/app/views/spree/admin/images/index.html.erb +70 -46
  151. data/app/views/spree/admin/images/new.html.erb +11 -8
  152. data/app/views/spree/admin/inventory_settings/edit.html.erb +16 -18
  153. data/app/views/spree/admin/inventory_settings/show.html.erb +14 -4
  154. data/app/views/spree/admin/line_items/create.js.erb +0 -3
  155. data/app/views/spree/admin/mail_methods/_form.html.erb +46 -47
  156. data/app/views/spree/admin/mail_methods/edit.html.erb +12 -3
  157. data/app/views/spree/admin/mail_methods/index.html.erb +37 -33
  158. data/app/views/spree/admin/mail_methods/new.html.erb +16 -4
  159. data/app/views/spree/admin/option_types/_form.html.erb +16 -12
  160. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +7 -3
  161. data/app/views/spree/admin/option_types/edit.html.erb +45 -27
  162. data/app/views/spree/admin/option_types/index.html.erb +31 -26
  163. data/app/views/spree/admin/option_types/new.html.erb +1 -1
  164. data/app/views/spree/admin/orders/_add_product.html.erb +13 -10
  165. data/app/views/spree/admin/orders/_form.html.erb +53 -42
  166. data/app/views/spree/admin/orders/_line_item.html.erb +7 -9
  167. data/app/views/spree/admin/orders/customer_details/_form.html.erb +59 -41
  168. data/app/views/spree/admin/orders/customer_details/edit.html.erb +11 -2
  169. data/app/views/spree/admin/orders/edit.html.erb +5 -8
  170. data/app/views/spree/admin/orders/index.html.erb +105 -67
  171. data/app/views/spree/admin/orders/new.html.erb +16 -5
  172. data/app/views/spree/admin/orders/show.html.erb +23 -14
  173. data/app/views/spree/admin/payment_methods/_form.html.erb +46 -45
  174. data/app/views/spree/admin/payment_methods/edit.html.erb +19 -6
  175. data/app/views/spree/admin/payment_methods/index.html.erb +33 -27
  176. data/app/views/spree/admin/payment_methods/new.html.erb +16 -5
  177. data/app/views/spree/admin/payments/_form.html.erb +27 -16
  178. data/app/views/spree/admin/payments/_list.html.erb +23 -19
  179. data/app/views/spree/admin/payments/credit.html.erb +4 -0
  180. data/app/views/spree/admin/payments/index.html.erb +12 -11
  181. data/app/views/spree/admin/payments/new.html.erb +13 -7
  182. data/app/views/spree/admin/payments/show.html.erb +13 -5
  183. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +36 -26
  184. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +26 -31
  185. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +3 -1
  186. data/app/views/spree/admin/product_properties/index.html.erb +37 -30
  187. data/app/views/spree/admin/products/_form.html.erb +115 -87
  188. data/app/views/spree/admin/products/_properties_form.erb +6 -3
  189. data/app/views/spree/admin/products/edit.html.erb +8 -2
  190. data/app/views/spree/admin/products/index.html.erb +88 -55
  191. data/app/views/spree/admin/products/new.html.erb +24 -20
  192. data/app/views/spree/admin/products/new.js.erb +4 -0
  193. data/app/views/spree/admin/properties/_form.html.erb +15 -12
  194. data/app/views/spree/admin/properties/edit.html.erb +11 -3
  195. data/app/views/spree/admin/properties/index.html.erb +18 -17
  196. data/app/views/spree/admin/properties/new.html.erb +4 -2
  197. data/app/views/spree/admin/prototypes/_form.html.erb +22 -43
  198. data/app/views/spree/admin/prototypes/_prototypes.html.erb +7 -3
  199. data/app/views/spree/admin/prototypes/edit.html.erb +14 -3
  200. data/app/views/spree/admin/prototypes/index.html.erb +19 -16
  201. data/app/views/spree/admin/prototypes/new.html.erb +1 -1
  202. data/app/views/spree/admin/prototypes/new.js.erb +3 -0
  203. data/app/views/spree/admin/reports/index.html.erb +3 -1
  204. data/app/views/spree/admin/reports/sales_total.html.erb +31 -17
  205. data/app/views/spree/admin/return_authorizations/_form.html.erb +36 -27
  206. data/app/views/spree/admin/return_authorizations/edit.html.erb +16 -17
  207. data/app/views/spree/admin/return_authorizations/index.html.erb +47 -40
  208. data/app/views/spree/admin/return_authorizations/new.html.erb +5 -3
  209. data/app/views/spree/admin/shared/_address.html.erb +2 -2
  210. data/app/views/spree/admin/shared/_address_form.html.erb +58 -78
  211. data/app/views/spree/admin/shared/_calculator_fields.html.erb +16 -13
  212. data/app/views/spree/admin/shared/_configuration_menu.html.erb +23 -19
  213. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +5 -4
  214. data/app/views/spree/admin/shared/_head.html.erb +10 -2
  215. data/app/views/spree/admin/shared/_new_resource_links.html.erb +5 -4
  216. data/app/views/spree/admin/shared/_order_details.html.erb +16 -15
  217. data/app/views/spree/admin/shared/_order_tabs.html.erb +65 -51
  218. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +2 -2
  219. data/app/views/spree/admin/shared/_product_tabs.html.erb +23 -20
  220. data/app/views/spree/admin/shared/_report_criteria.html.erb +13 -11
  221. data/app/views/spree/admin/shared/_routes.html.erb +1 -2
  222. data/app/views/spree/admin/shared/_tabs.html.erb +5 -4
  223. data/app/views/spree/admin/shared/_translations.html.erb +22 -18
  224. data/app/views/spree/admin/shipments/_form.html.erb +54 -58
  225. data/app/views/spree/admin/shipments/edit.html.erb +20 -15
  226. data/app/views/spree/admin/shipments/index.html.erb +40 -33
  227. data/app/views/spree/admin/shipments/new.html.erb +4 -0
  228. data/app/views/spree/admin/shipping_categories/_form.html.erb +4 -6
  229. data/app/views/spree/admin/shipping_categories/edit.html.erb +17 -3
  230. data/app/views/spree/admin/shipping_categories/index.html.erb +18 -14
  231. data/app/views/spree/admin/shipping_categories/new.html.erb +15 -3
  232. data/app/views/spree/admin/shipping_methods/_form.html.erb +36 -24
  233. data/app/views/spree/admin/shipping_methods/edit.html.erb +18 -5
  234. data/app/views/spree/admin/shipping_methods/index.html.erb +21 -15
  235. data/app/views/spree/admin/shipping_methods/new.html.erb +18 -6
  236. data/app/views/spree/admin/states/_form.html.erb +13 -10
  237. data/app/views/spree/admin/states/_state_list.html.erb +10 -14
  238. data/app/views/spree/admin/states/edit.html.erb +13 -3
  239. data/app/views/spree/admin/states/index.html.erb +12 -4
  240. data/app/views/spree/admin/states/new.html.erb +9 -3
  241. data/app/views/spree/admin/tax_categories/_form.html.erb +23 -15
  242. data/app/views/spree/admin/tax_categories/edit.html.erb +11 -3
  243. data/app/views/spree/admin/tax_categories/index.html.erb +20 -15
  244. data/app/views/spree/admin/tax_categories/new.html.erb +12 -3
  245. data/app/views/spree/admin/tax_rates/_form.html.erb +38 -27
  246. data/app/views/spree/admin/tax_rates/edit.html.erb +18 -3
  247. data/app/views/spree/admin/tax_rates/index.html.erb +59 -40
  248. data/app/views/spree/admin/tax_rates/new.html.erb +20 -3
  249. data/app/views/spree/admin/tax_settings/edit.html.erb +10 -9
  250. data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
  251. data/app/views/spree/admin/taxonomies/_list.html.erb +24 -18
  252. data/app/views/spree/admin/taxonomies/edit.erb +24 -10
  253. data/app/views/spree/admin/taxonomies/get_children.json.erb +1 -1
  254. data/app/views/spree/admin/taxonomies/index.html.erb +8 -9
  255. data/app/views/spree/admin/taxonomies/new.html.erb +15 -5
  256. data/app/views/spree/admin/taxons/_form.html.erb +23 -18
  257. data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
  258. data/app/views/spree/admin/taxons/edit.html.erb +13 -5
  259. data/app/views/spree/admin/trackers/_form.html.erb +29 -24
  260. data/app/views/spree/admin/trackers/edit.html.erb +15 -3
  261. data/app/views/spree/admin/trackers/index.html.erb +43 -31
  262. data/app/views/spree/admin/trackers/new.html.erb +14 -3
  263. data/app/views/spree/admin/variants/_autocomplete.js.erb +30 -0
  264. data/app/views/spree/admin/variants/_form.html.erb +50 -31
  265. data/app/views/spree/admin/variants/index.html.erb +64 -46
  266. data/app/views/spree/admin/variants/new.html.erb +1 -0
  267. data/app/views/spree/admin/variants/new.js.erb +1 -0
  268. data/app/views/spree/admin/variants/search.rabl +15 -0
  269. data/app/views/spree/admin/zones/_country_member.html.erb +1 -1
  270. data/app/views/spree/admin/zones/_form.html.erb +30 -27
  271. data/app/views/spree/admin/zones/_member_type.html.erb +12 -9
  272. data/app/views/spree/admin/zones/_state_member.html.erb +2 -2
  273. data/app/views/spree/admin/zones/edit.html.erb +16 -3
  274. data/app/views/spree/admin/zones/index.html.erb +45 -36
  275. data/app/views/spree/admin/zones/new.html.erb +12 -1
  276. data/app/views/spree/checkout/_address.html.erb +17 -165
  277. data/app/views/spree/checkout/_confirm.html.erb +1 -1
  278. data/app/views/spree/checkout/_delivery.html.erb +1 -1
  279. data/app/views/spree/checkout/_payment.html.erb +1 -1
  280. data/app/views/spree/checkout/_summary.html.erb +4 -4
  281. data/app/views/spree/checkout/edit.html.erb +2 -0
  282. data/app/views/spree/checkout/payment/_gateway.html.erb +2 -2
  283. data/app/views/spree/checkout/registration.html.erb +1 -1
  284. data/app/views/spree/countries/index.js.erb +1 -0
  285. data/app/views/spree/layouts/admin.html.erb +125 -61
  286. data/app/views/spree/layouts/spree_application.html.erb +17 -6
  287. data/app/views/spree/order_mailer/cancel_email.text.erb +4 -4
  288. data/app/views/spree/order_mailer/confirm_email.text.erb +3 -3
  289. data/app/views/spree/orders/_adjustments.html.erb +1 -1
  290. data/app/views/spree/orders/_line_item.html.erb +3 -3
  291. data/app/views/spree/orders/show.html.erb +15 -15
  292. data/app/views/spree/products/_cart_form.html.erb +5 -5
  293. data/app/views/spree/products/_properties.html.erb +4 -3
  294. data/app/views/spree/products/_thumbnails.html.erb +15 -17
  295. data/app/views/spree/products/index.html.erb +1 -1
  296. data/app/views/spree/products/show.html.erb +1 -1
  297. data/app/views/spree/shared/_google_analytics.html.erb +9 -9
  298. data/app/views/spree/shared/_order_details.html.erb +14 -14
  299. data/app/views/spree/shared/_products.html.erb +1 -2
  300. data/app/views/spree/taxons/show.html.erb +1 -1
  301. data/config/locales/en.yml +43 -4
  302. data/config/routes.rb +4 -5
  303. data/db/migrate/20120831092320_spree_one_two.rb +481 -0
  304. data/db/migrate/20120929093553_remove_unused_preference_columns.rb +8 -0
  305. data/db/migrate/20121010142909_add_states_required_to_countries.rb +5 -0
  306. data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +6 -0
  307. data/db/migrate/20121031162139_split_prices_from_variants.rb +30 -0
  308. data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +9 -0
  309. data/db/migrate/20121107184631_add_currency_to_line_items.rb +5 -0
  310. data/db/migrate/20121107194006_add_currency_to_orders.rb +5 -0
  311. data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +5 -0
  312. data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +5 -0
  313. data/lib/generators/spree/custom_user/custom_user_generator.rb +1 -1
  314. data/lib/generators/spree/dummy/templates/rails/database.yml +6 -9
  315. data/lib/generators/spree/install/templates/config/initializers/spree.rb +2 -2
  316. data/lib/spree/core.rb +0 -7
  317. data/lib/spree/core/action_callbacks.rb +4 -4
  318. data/lib/spree/core/calculated_adjustments.rb +2 -2
  319. data/lib/spree/core/controller_helpers/auth.rb +65 -0
  320. data/lib/spree/core/controller_helpers/common.rb +90 -0
  321. data/lib/spree/core/controller_helpers/order.rb +71 -0
  322. data/lib/spree/core/{respond_with.rb → controller_helpers/respond_with.rb} +27 -25
  323. data/lib/spree/core/engine.rb +6 -5
  324. data/lib/spree/core/search/base.rb +3 -1
  325. data/lib/spree/core/testing_support/factories/payment_factory.rb +24 -0
  326. data/lib/spree/core/testing_support/factories/payment_method_factory.rb +0 -3
  327. data/lib/spree/core/testing_support/factories/price_factory.rb +8 -0
  328. data/lib/spree/core/testing_support/factories/zone_factory.rb +1 -1
  329. data/lib/spree/core/testing_support/flash.rb +17 -5
  330. data/lib/spree/core/testing_support/preferences.rb +6 -12
  331. data/lib/spree/core/validators/email.rb +1 -1
  332. data/lib/spree/core/version.rb +1 -1
  333. data/lib/spree/money.rb +3 -12
  334. data/lib/spree/product_filters.rb +8 -8
  335. data/lib/tasks/core.rake +3 -3
  336. data/lib/tasks/taxon.rake +1 -1
  337. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  338. data/vendor/assets/fonts/fontawesome-webfont.svg +255 -0
  339. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  340. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  341. data/vendor/assets/images/flags/ad.png +0 -0
  342. data/vendor/assets/images/flags/ae.png +0 -0
  343. data/vendor/assets/images/flags/af.png +0 -0
  344. data/vendor/assets/images/flags/ag.png +0 -0
  345. data/vendor/assets/images/flags/ai.png +0 -0
  346. data/vendor/assets/images/flags/al.png +0 -0
  347. data/vendor/assets/images/flags/am.png +0 -0
  348. data/vendor/assets/images/flags/an.png +0 -0
  349. data/vendor/assets/images/flags/ao.png +0 -0
  350. data/vendor/assets/images/flags/ar.png +0 -0
  351. data/vendor/assets/images/flags/as.png +0 -0
  352. data/vendor/assets/images/flags/at.png +0 -0
  353. data/vendor/assets/images/flags/au.png +0 -0
  354. data/vendor/assets/images/flags/aw.png +0 -0
  355. data/vendor/assets/images/flags/ax.png +0 -0
  356. data/vendor/assets/images/flags/az.png +0 -0
  357. data/vendor/assets/images/flags/ba.png +0 -0
  358. data/vendor/assets/images/flags/bb.png +0 -0
  359. data/vendor/assets/images/flags/bd.png +0 -0
  360. data/vendor/assets/images/flags/be.png +0 -0
  361. data/vendor/assets/images/flags/bf.png +0 -0
  362. data/vendor/assets/images/flags/bg.png +0 -0
  363. data/vendor/assets/images/flags/bh.png +0 -0
  364. data/vendor/assets/images/flags/bi.png +0 -0
  365. data/vendor/assets/images/flags/bj.png +0 -0
  366. data/vendor/assets/images/flags/bm.png +0 -0
  367. data/vendor/assets/images/flags/bn.png +0 -0
  368. data/vendor/assets/images/flags/bo.png +0 -0
  369. data/vendor/assets/images/flags/br.png +0 -0
  370. data/vendor/assets/images/flags/bs.png +0 -0
  371. data/vendor/assets/images/flags/bt.png +0 -0
  372. data/vendor/assets/images/flags/bv.png +0 -0
  373. data/vendor/assets/images/flags/bw.png +0 -0
  374. data/vendor/assets/images/flags/by.png +0 -0
  375. data/vendor/assets/images/flags/bz.png +0 -0
  376. data/vendor/assets/images/flags/ca.png +0 -0
  377. data/vendor/assets/images/flags/catalonia.png +0 -0
  378. data/vendor/assets/images/flags/cc.png +0 -0
  379. data/vendor/assets/images/flags/cd.png +0 -0
  380. data/vendor/assets/images/flags/cf.png +0 -0
  381. data/vendor/assets/images/flags/cg.png +0 -0
  382. data/vendor/assets/images/flags/ch.png +0 -0
  383. data/vendor/assets/images/flags/ci.png +0 -0
  384. data/vendor/assets/images/flags/ck.png +0 -0
  385. data/vendor/assets/images/flags/cl.png +0 -0
  386. data/vendor/assets/images/flags/cm.png +0 -0
  387. data/vendor/assets/images/flags/cn.png +0 -0
  388. data/vendor/assets/images/flags/co.png +0 -0
  389. data/vendor/assets/images/flags/cr.png +0 -0
  390. data/vendor/assets/images/flags/cs.png +0 -0
  391. data/vendor/assets/images/flags/cu.png +0 -0
  392. data/vendor/assets/images/flags/cv.png +0 -0
  393. data/vendor/assets/images/flags/cx.png +0 -0
  394. data/vendor/assets/images/flags/cy.png +0 -0
  395. data/vendor/assets/images/flags/cz.png +0 -0
  396. data/vendor/assets/images/flags/de.png +0 -0
  397. data/vendor/assets/images/flags/dj.png +0 -0
  398. data/vendor/assets/images/flags/dk.png +0 -0
  399. data/vendor/assets/images/flags/dm.png +0 -0
  400. data/vendor/assets/images/flags/do.png +0 -0
  401. data/vendor/assets/images/flags/dz.png +0 -0
  402. data/vendor/assets/images/flags/ec.png +0 -0
  403. data/vendor/assets/images/flags/ee.png +0 -0
  404. data/vendor/assets/images/flags/eg.png +0 -0
  405. data/vendor/assets/images/flags/eh.png +0 -0
  406. data/vendor/assets/images/flags/england.png +0 -0
  407. data/vendor/assets/images/flags/er.png +0 -0
  408. data/vendor/assets/images/flags/es.png +0 -0
  409. data/vendor/assets/images/flags/et.png +0 -0
  410. data/vendor/assets/images/flags/europeanunion.png +0 -0
  411. data/vendor/assets/images/flags/fam.png +0 -0
  412. data/vendor/assets/images/flags/fi.png +0 -0
  413. data/vendor/assets/images/flags/fj.png +0 -0
  414. data/vendor/assets/images/flags/fk.png +0 -0
  415. data/vendor/assets/images/flags/fm.png +0 -0
  416. data/vendor/assets/images/flags/fo.png +0 -0
  417. data/vendor/assets/images/flags/fr.png +0 -0
  418. data/vendor/assets/images/flags/ga.png +0 -0
  419. data/vendor/assets/images/flags/gb.png +0 -0
  420. data/vendor/assets/images/flags/gd.png +0 -0
  421. data/vendor/assets/images/flags/ge.png +0 -0
  422. data/vendor/assets/images/flags/gf.png +0 -0
  423. data/vendor/assets/images/flags/gh.png +0 -0
  424. data/vendor/assets/images/flags/gi.png +0 -0
  425. data/vendor/assets/images/flags/gl.png +0 -0
  426. data/vendor/assets/images/flags/gm.png +0 -0
  427. data/vendor/assets/images/flags/gn.png +0 -0
  428. data/vendor/assets/images/flags/gp.png +0 -0
  429. data/vendor/assets/images/flags/gq.png +0 -0
  430. data/vendor/assets/images/flags/gr.png +0 -0
  431. data/vendor/assets/images/flags/gs.png +0 -0
  432. data/vendor/assets/images/flags/gt.png +0 -0
  433. data/vendor/assets/images/flags/gu.png +0 -0
  434. data/vendor/assets/images/flags/gw.png +0 -0
  435. data/vendor/assets/images/flags/gy.png +0 -0
  436. data/vendor/assets/images/flags/hk.png +0 -0
  437. data/vendor/assets/images/flags/hm.png +0 -0
  438. data/vendor/assets/images/flags/hn.png +0 -0
  439. data/vendor/assets/images/flags/hr.png +0 -0
  440. data/vendor/assets/images/flags/ht.png +0 -0
  441. data/vendor/assets/images/flags/hu.png +0 -0
  442. data/vendor/assets/images/flags/id.png +0 -0
  443. data/vendor/assets/images/flags/ie.png +0 -0
  444. data/vendor/assets/images/flags/il.png +0 -0
  445. data/vendor/assets/images/flags/in.png +0 -0
  446. data/vendor/assets/images/flags/io.png +0 -0
  447. data/vendor/assets/images/flags/iq.png +0 -0
  448. data/vendor/assets/images/flags/ir.png +0 -0
  449. data/vendor/assets/images/flags/is.png +0 -0
  450. data/vendor/assets/images/flags/it.png +0 -0
  451. data/vendor/assets/images/flags/ja.png +0 -0
  452. data/vendor/assets/images/flags/jm.png +0 -0
  453. data/vendor/assets/images/flags/jo.png +0 -0
  454. data/vendor/assets/images/flags/ke.png +0 -0
  455. data/vendor/assets/images/flags/kg.png +0 -0
  456. data/vendor/assets/images/flags/kh.png +0 -0
  457. data/vendor/assets/images/flags/ki.png +0 -0
  458. data/vendor/assets/images/flags/km.png +0 -0
  459. data/vendor/assets/images/flags/kn.png +0 -0
  460. data/vendor/assets/images/flags/kp.png +0 -0
  461. data/vendor/assets/images/flags/kr.png +0 -0
  462. data/vendor/assets/images/flags/kw.png +0 -0
  463. data/vendor/assets/images/flags/ky.png +0 -0
  464. data/vendor/assets/images/flags/kz.png +0 -0
  465. data/vendor/assets/images/flags/la.png +0 -0
  466. data/vendor/assets/images/flags/lb.png +0 -0
  467. data/vendor/assets/images/flags/lc.png +0 -0
  468. data/vendor/assets/images/flags/li.png +0 -0
  469. data/vendor/assets/images/flags/lk.png +0 -0
  470. data/vendor/assets/images/flags/lr.png +0 -0
  471. data/vendor/assets/images/flags/ls.png +0 -0
  472. data/vendor/assets/images/flags/lt.png +0 -0
  473. data/vendor/assets/images/flags/lu.png +0 -0
  474. data/vendor/assets/images/flags/lv.png +0 -0
  475. data/vendor/assets/images/flags/ly.png +0 -0
  476. data/vendor/assets/images/flags/ma.png +0 -0
  477. data/vendor/assets/images/flags/mc.png +0 -0
  478. data/vendor/assets/images/flags/md.png +0 -0
  479. data/vendor/assets/images/flags/me.png +0 -0
  480. data/vendor/assets/images/flags/mg.png +0 -0
  481. data/vendor/assets/images/flags/mh.png +0 -0
  482. data/vendor/assets/images/flags/mk.png +0 -0
  483. data/vendor/assets/images/flags/ml.png +0 -0
  484. data/vendor/assets/images/flags/mm.png +0 -0
  485. data/vendor/assets/images/flags/mn.png +0 -0
  486. data/vendor/assets/images/flags/mo.png +0 -0
  487. data/vendor/assets/images/flags/mp.png +0 -0
  488. data/vendor/assets/images/flags/mq.png +0 -0
  489. data/vendor/assets/images/flags/mr.png +0 -0
  490. data/vendor/assets/images/flags/ms.png +0 -0
  491. data/vendor/assets/images/flags/mt.png +0 -0
  492. data/vendor/assets/images/flags/mu.png +0 -0
  493. data/vendor/assets/images/flags/mv.png +0 -0
  494. data/vendor/assets/images/flags/mw.png +0 -0
  495. data/vendor/assets/images/flags/mx.png +0 -0
  496. data/vendor/assets/images/flags/my.png +0 -0
  497. data/vendor/assets/images/flags/mz.png +0 -0
  498. data/vendor/assets/images/flags/na.png +0 -0
  499. data/vendor/assets/images/flags/nc.png +0 -0
  500. data/vendor/assets/images/flags/ne.png +0 -0
  501. data/vendor/assets/images/flags/nf.png +0 -0
  502. data/vendor/assets/images/flags/ng.png +0 -0
  503. data/vendor/assets/images/flags/ni.png +0 -0
  504. data/vendor/assets/images/flags/nl.png +0 -0
  505. data/vendor/assets/images/flags/no.png +0 -0
  506. data/vendor/assets/images/flags/np.png +0 -0
  507. data/vendor/assets/images/flags/nr.png +0 -0
  508. data/vendor/assets/images/flags/nu.png +0 -0
  509. data/vendor/assets/images/flags/nz.png +0 -0
  510. data/vendor/assets/images/flags/om.png +0 -0
  511. data/vendor/assets/images/flags/pa.png +0 -0
  512. data/vendor/assets/images/flags/pe.png +0 -0
  513. data/vendor/assets/images/flags/pf.png +0 -0
  514. data/vendor/assets/images/flags/pg.png +0 -0
  515. data/vendor/assets/images/flags/ph.png +0 -0
  516. data/vendor/assets/images/flags/pk.png +0 -0
  517. data/vendor/assets/images/flags/pl.png +0 -0
  518. data/vendor/assets/images/flags/pm.png +0 -0
  519. data/vendor/assets/images/flags/pn.png +0 -0
  520. data/vendor/assets/images/flags/pr.png +0 -0
  521. data/vendor/assets/images/flags/ps.png +0 -0
  522. data/vendor/assets/images/flags/pt.png +0 -0
  523. data/vendor/assets/images/flags/pw.png +0 -0
  524. data/vendor/assets/images/flags/py.png +0 -0
  525. data/vendor/assets/images/flags/qa.png +0 -0
  526. data/vendor/assets/images/flags/re.png +0 -0
  527. data/vendor/assets/images/flags/ro.png +0 -0
  528. data/vendor/assets/images/flags/rs.png +0 -0
  529. data/vendor/assets/images/flags/ru.png +0 -0
  530. data/vendor/assets/images/flags/rw.png +0 -0
  531. data/vendor/assets/images/flags/sa.png +0 -0
  532. data/vendor/assets/images/flags/sb.png +0 -0
  533. data/vendor/assets/images/flags/sc.png +0 -0
  534. data/vendor/assets/images/flags/scotland.png +0 -0
  535. data/vendor/assets/images/flags/sd.png +0 -0
  536. data/vendor/assets/images/flags/se.png +0 -0
  537. data/vendor/assets/images/flags/sg.png +0 -0
  538. data/vendor/assets/images/flags/sh.png +0 -0
  539. data/vendor/assets/images/flags/si.png +0 -0
  540. data/vendor/assets/images/flags/sj.png +0 -0
  541. data/vendor/assets/images/flags/sk.png +0 -0
  542. data/vendor/assets/images/flags/sl.png +0 -0
  543. data/vendor/assets/images/flags/sm.png +0 -0
  544. data/vendor/assets/images/flags/sn.png +0 -0
  545. data/vendor/assets/images/flags/so.png +0 -0
  546. data/vendor/assets/images/flags/sr.png +0 -0
  547. data/vendor/assets/images/flags/st.png +0 -0
  548. data/vendor/assets/images/flags/sv.png +0 -0
  549. data/vendor/assets/images/flags/sy.png +0 -0
  550. data/vendor/assets/images/flags/sz.png +0 -0
  551. data/vendor/assets/images/flags/tc.png +0 -0
  552. data/vendor/assets/images/flags/td.png +0 -0
  553. data/vendor/assets/images/flags/tf.png +0 -0
  554. data/vendor/assets/images/flags/tg.png +0 -0
  555. data/vendor/assets/images/flags/th.png +0 -0
  556. data/vendor/assets/images/flags/tj.png +0 -0
  557. data/vendor/assets/images/flags/tk.png +0 -0
  558. data/vendor/assets/images/flags/tl.png +0 -0
  559. data/vendor/assets/images/flags/tm.png +0 -0
  560. data/vendor/assets/images/flags/tn.png +0 -0
  561. data/vendor/assets/images/flags/to.png +0 -0
  562. data/vendor/assets/images/flags/tr.png +0 -0
  563. data/vendor/assets/images/flags/tt.png +0 -0
  564. data/vendor/assets/images/flags/tv.png +0 -0
  565. data/vendor/assets/images/flags/tw.png +0 -0
  566. data/vendor/assets/images/flags/tz.png +0 -0
  567. data/vendor/assets/images/flags/ua.png +0 -0
  568. data/vendor/assets/images/flags/ug.png +0 -0
  569. data/vendor/assets/images/flags/um.png +0 -0
  570. data/vendor/assets/images/flags/us.png +0 -0
  571. data/vendor/assets/images/flags/uy.png +0 -0
  572. data/vendor/assets/images/flags/uz.png +0 -0
  573. data/vendor/assets/images/flags/va.png +0 -0
  574. data/vendor/assets/images/flags/vc.png +0 -0
  575. data/vendor/assets/images/flags/ve.png +0 -0
  576. data/vendor/assets/images/flags/vg.png +0 -0
  577. data/vendor/assets/images/flags/vi.png +0 -0
  578. data/vendor/assets/images/flags/vn.png +0 -0
  579. data/vendor/assets/images/flags/vu.png +0 -0
  580. data/vendor/assets/images/flags/wales.png +0 -0
  581. data/vendor/assets/images/flags/wf.png +0 -0
  582. data/vendor/assets/images/flags/ws.png +0 -0
  583. data/vendor/assets/images/flags/ye.png +0 -0
  584. data/vendor/assets/images/flags/yt.png +0 -0
  585. data/vendor/assets/images/flags/za.png +0 -0
  586. data/vendor/assets/images/flags/zm.png +0 -0
  587. data/vendor/assets/images/flags/zw.png +0 -0
  588. data/vendor/assets/javascripts/css_browser_selector_dev.js +156 -0
  589. data/vendor/assets/javascripts/equalize.js +41 -0
  590. data/vendor/assets/javascripts/handlebars.js +1920 -0
  591. data/vendor/assets/javascripts/jquery.adaptivemenu.js +60 -0
  592. data/vendor/assets/javascripts/jquery.horizontalNav.js +141 -0
  593. data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.css +3 -3
  594. data/vendor/assets/javascripts/jquery.powertip.js +796 -0
  595. data/vendor/assets/javascripts/jquery.vAlign.js +11 -0
  596. data/vendor/assets/javascripts/modernizr.js +4 -0
  597. data/vendor/assets/javascripts/responsive-tables.js +42 -0
  598. data/vendor/assets/javascripts/spin.js +319 -0
  599. data/vendor/assets/javascripts/trunk8.js +233 -0
  600. data/vendor/assets/stylesheets/font-awesome-ie7.css +645 -0
  601. data/vendor/assets/stylesheets/jquery.powertip.css +85 -0
  602. data/vendor/assets/stylesheets/normalize.css +375 -0
  603. data/vendor/assets/stylesheets/responsive-tables.css +21 -0
  604. data/vendor/assets/stylesheets/skeleton.css +4 -4
  605. metadata +394 -281
  606. checksums.yaml +0 -7
  607. data/app/assets/images/admin/bg/active-tab.png +0 -0
  608. data/app/assets/images/admin/bg/admin_tab_back.png +0 -0
  609. data/app/assets/images/admin/bg/admin_tab_selected_back.png +0 -0
  610. data/app/assets/images/admin/bg/content-back-blue.png +0 -0
  611. data/app/assets/images/admin/bg/content-back-green.png +0 -0
  612. data/app/assets/images/admin/bg/content-back.png +0 -0
  613. data/app/assets/images/admin/bg/flash-error.png +0 -0
  614. data/app/assets/images/admin/bg/flash-notice.png +0 -0
  615. data/app/assets/images/admin/bg/green-stripes.gif +0 -0
  616. data/app/assets/images/admin/bg/green-stripes.png +0 -0
  617. data/app/assets/images/admin/bg/grid_header_back.png +0 -0
  618. data/app/assets/images/admin/bg/grid_header_back_green.png +0 -0
  619. data/app/assets/images/admin/bg/header-bg.png +0 -0
  620. data/app/assets/images/admin/bg/header.png +0 -0
  621. data/app/assets/images/admin/bg/header_bg.jpg +0 -0
  622. data/app/assets/images/admin/bg/menu-current.png +0 -0
  623. data/app/assets/images/admin/bg/red-stripes.gif +0 -0
  624. data/app/assets/images/admin/bg/red-stripes.png +0 -0
  625. data/app/assets/images/admin/bg/subnav-divider.png +0 -0
  626. data/app/assets/images/admin/bg/subnav.png +0 -0
  627. data/app/assets/images/admin/bg/tab-back.png +0 -0
  628. data/app/assets/images/admin/buttons/blue/left_01.png +0 -0
  629. data/app/assets/images/admin/buttons/blue/right_01.png +0 -0
  630. data/app/assets/images/admin/buttons/drag-handle-green.png +0 -0
  631. data/app/assets/images/admin/buttons/green/left_01.png +0 -0
  632. data/app/assets/images/admin/buttons/green/right_01.png +0 -0
  633. data/app/assets/images/admin/buttons/left_01.png +0 -0
  634. data/app/assets/images/admin/buttons/left_01_small.png +0 -0
  635. data/app/assets/images/admin/buttons/orange/left_03.png +0 -0
  636. data/app/assets/images/admin/buttons/orange/right_03.png +0 -0
  637. data/app/assets/images/admin/buttons/right_01.png +0 -0
  638. data/app/assets/images/admin/buttons/right_01_small.png +0 -0
  639. data/app/assets/images/admin/icons/16x16/1.png +0 -0
  640. data/app/assets/images/admin/icons/16x16/10.png +0 -0
  641. data/app/assets/images/admin/icons/16x16/2.png +0 -0
  642. data/app/assets/images/admin/icons/16x16/3.png +0 -0
  643. data/app/assets/images/admin/icons/16x16/4.png +0 -0
  644. data/app/assets/images/admin/icons/16x16/5.png +0 -0
  645. data/app/assets/images/admin/icons/16x16/6.png +0 -0
  646. data/app/assets/images/admin/icons/16x16/7.png +0 -0
  647. data/app/assets/images/admin/icons/16x16/8.png +0 -0
  648. data/app/assets/images/admin/icons/16x16/9.png +0 -0
  649. data/app/assets/images/admin/icons/32x32/1.png +0 -0
  650. data/app/assets/images/admin/icons/32x32/10.png +0 -0
  651. data/app/assets/images/admin/icons/32x32/11.png +0 -0
  652. data/app/assets/images/admin/icons/32x32/2.png +0 -0
  653. data/app/assets/images/admin/icons/32x32/3.png +0 -0
  654. data/app/assets/images/admin/icons/32x32/4.png +0 -0
  655. data/app/assets/images/admin/icons/32x32/5.png +0 -0
  656. data/app/assets/images/admin/icons/32x32/6.png +0 -0
  657. data/app/assets/images/admin/icons/32x32/7.png +0 -0
  658. data/app/assets/images/admin/icons/32x32/8.png +0 -0
  659. data/app/assets/images/admin/icons/32x32/9.png +0 -0
  660. data/app/assets/images/admin/icons/accept.png +0 -0
  661. data/app/assets/images/admin/icons/add.gif +0 -0
  662. data/app/assets/images/admin/icons/add.png +0 -0
  663. data/app/assets/images/admin/icons/arrow-down.gif +0 -0
  664. data/app/assets/images/admin/icons/cross.png +0 -0
  665. data/app/assets/images/admin/icons/delete.gif +0 -0
  666. data/app/assets/images/admin/icons/delete.png +0 -0
  667. data/app/assets/images/admin/icons/drag.gif +0 -0
  668. data/app/assets/images/admin/icons/edit.gif +0 -0
  669. data/app/assets/images/admin/icons/edit.png +0 -0
  670. data/app/assets/images/admin/icons/email.png +0 -0
  671. data/app/assets/images/admin/icons/error.png +0 -0
  672. data/app/assets/images/admin/icons/exclamation.png +0 -0
  673. data/app/assets/images/admin/icons/feed.png +0 -0
  674. data/app/assets/images/admin/icons/pdf.png +0 -0
  675. data/app/assets/images/admin/icons/reorder.gif +0 -0
  676. data/app/assets/images/admin/icons/search.gif +0 -0
  677. data/app/assets/images/admin/icons/send-email.png +0 -0
  678. data/app/assets/images/admin/icons/stop.png +0 -0
  679. data/app/assets/images/admin/icons/switch.png +0 -0
  680. data/app/assets/images/admin/icons/tick.png +0 -0
  681. data/app/assets/images/admin/icons/up.gif +0 -0
  682. data/app/assets/images/admin/icons/xls.png +0 -0
  683. data/app/assets/images/credit_cards/icons/diners_club.png +0 -0
  684. data/app/assets/javascripts/admin/image_settings.js +0 -49
  685. data/app/assets/javascripts/admin/product_autocomplete.js.erb +0 -117
  686. data/app/assets/stylesheets/admin/admin-form.css.erb +0 -167
  687. data/app/assets/stylesheets/admin/admin-reset.css +0 -69
  688. data/app/assets/stylesheets/admin/admin-tables.css.erb +0 -40
  689. data/app/assets/stylesheets/admin/admin-typography.css +0 -117
  690. data/app/assets/stylesheets/admin/admin.css.erb +0 -682
  691. data/app/controllers/spree/admin/configurations_controller.rb +0 -7
  692. data/app/controllers/spree/admin/mail_settings_controller.rb +0 -17
  693. data/app/controllers/spree/admin/option_values_controller.rb +0 -11
  694. data/app/helpers/spree/account_helper.rb +0 -4
  695. data/app/helpers/spree/admin/overview_helper.rb +0 -16
  696. data/app/helpers/spree/admin/users_helper.rb +0 -10
  697. data/app/helpers/spree/admin/zones_helper.rb +0 -15
  698. data/app/helpers/spree/orders_helper.rb +0 -5
  699. data/app/helpers/spree/search_helper.rb +0 -12
  700. data/app/helpers/spree/trackers_helper.rb +0 -4
  701. data/app/views/spree/admin/configurations/index.html.erb +0 -68
  702. data/app/views/spree/admin/general_settings/show.html.erb +0 -40
  703. data/app/views/spree/admin/image_settings/show.html.erb +0 -11
  704. data/app/views/spree/admin/shared/_new_adjustment_button.html.erb +0 -8
  705. data/app/views/spree/admin/shared/_order_sub_menu.html.erb +0 -0
  706. data/app/views/spree/admin/tax_settings/show.html.erb +0 -14
  707. data/config/initializers/rails_3_1.rb +0 -12
  708. data/db/migrate/20090823005402_spree_zero_nine_zero.rb +0 -391
  709. data/db/migrate/20090904192342_create_indexes_for_inventory_units.rb +0 -6
  710. data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb +0 -49
  711. data/db/migrate/20091007134354_change_taxons_to_nested_set.rb +0 -46
  712. data/db/migrate/20091008091614_move_to_configurable_gateways.rb +0 -54
  713. data/db/migrate/20091015110842_add_open_id_authentication_tables.rb +0 -15
  714. data/db/migrate/20091015153048_add_openid_field_to_users.rb +0 -26
  715. data/db/migrate/20091016174634_change_preference_value_type.rb +0 -10
  716. data/db/migrate/20091017175558_create_billing_integrations.rb +0 -12
  717. data/db/migrate/20091021133257_charge_refactoring.rb +0 -39
  718. data/db/migrate/20091104151730_add_some_indexes.rb +0 -11
  719. data/db/migrate/20091126190904_checkout_state_machine.rb +0 -5
  720. data/db/migrate/20091209153045_state_for_shipments.rb +0 -5
  721. data/db/migrate/20091209202200_make_state_events_polymorphic.rb +0 -12
  722. data/db/migrate/20091211203813_ship_address_id_for_checkouts.rb +0 -5
  723. data/db/migrate/20091212161118_shipping_method_id_for_checkouts.rb +0 -5
  724. data/db/migrate/20091213222815_creditcard_last_four_digits.rb +0 -14
  725. data/db/migrate/20091214183826_populate_legacy_shipment_state.rb +0 -15
  726. data/db/migrate/20100105090147_add_cost_price.rb +0 -5
  727. data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb +0 -25
  728. data/db/migrate/20100111205525_cim_fields_for_creditcards.rb +0 -6
  729. data/db/migrate/20100112151511_create_return_authorizations.rb +0 -12
  730. data/db/migrate/20100113090919_add_return_authorization_to_inventory_units.rb +0 -5
  731. data/db/migrate/20100113203104_create_trackers.rb +0 -10
  732. data/db/migrate/20100121160010_creditcard_id_for_creditcard_txns.rb +0 -5
  733. data/db/migrate/20100121183934_original_creditcard_txn_id_for_creditcard_txns.rb +0 -5
  734. data/db/migrate/20100125145351_add_test_mode_to_billing_integration.rb +0 -6
  735. data/db/migrate/20100209025806_create_payment_methods.rb +0 -16
  736. data/db/migrate/20100209144531_polymorphic_payments.rb +0 -42
  737. data/db/migrate/20100213103131_change_payments_payment_method_to_belongs_to.rb +0 -11
  738. data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb +0 -23
  739. data/db/migrate/20100223170312_sti_for_transactions.rb +0 -15
  740. data/db/migrate/20100223183812_drop_billing_integrations.rb +0 -16
  741. data/db/migrate/20100224153127_deleted_at_for_payment_methods.rb +0 -14
  742. data/db/migrate/20100301163454_add_adjustments_index.rb +0 -6
  743. data/db/migrate/20100317120946_add_alt_text_to_images.rb +0 -5
  744. data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +0 -13
  745. data/db/migrate/20100427121301_add_display_to_payment_methods.rb +0 -5
  746. data/db/migrate/20100504142133_add_addresses_checkouts_indexes.rb +0 -8
  747. data/db/migrate/20100506180619_add_icon_to_taxons.rb +0 -17
  748. data/db/migrate/20100506185838_add_description_to_taxons.rb +0 -11
  749. data/db/migrate/20100528155333_index_for_shipments_number.rb +0 -5
  750. data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb +0 -7
  751. data/db/migrate/20100605152042_add_default_to_tax_categories.rb +0 -5
  752. data/db/migrate/20100624110730_add_display_to_shipping_methods.rb +0 -5
  753. data/db/migrate/20100624123336_rename_payment_method_display.rb +0 -5
  754. data/db/migrate/20100624175547_rename_preferences_field.rb +0 -5
  755. data/db/migrate/20100811163637_add_guest_flag.rb +0 -7
  756. data/db/migrate/20100811205836_drop_order_token.rb +0 -9
  757. data/db/migrate/20100812162326_payments_state_and_assigned_to_order_only.rb +0 -14
  758. data/db/migrate/20100813023502_create_address_keys_for_order.rb +0 -6
  759. data/db/migrate/20100813185745_payment_total_for_orders.rb +0 -5
  760. data/db/migrate/20100816212146_shipping_method_id_for_orders.rb +0 -5
  761. data/db/migrate/20100817152723_add_shipment_and_payment_state.rb +0 -6
  762. data/db/migrate/20100819170125_refactor_adjustments.rb +0 -29
  763. data/db/migrate/20100820135707_response_code_and_avs_response_for_payments.rb +0 -6
  764. data/db/migrate/20100901171814_change_guest_flag_to_anonymous.rb +0 -7
  765. data/db/migrate/20100903203949_email_for_orders.rb +0 -5
  766. data/db/migrate/20100923162011_create_mail_methods.rb +0 -10
  767. data/db/migrate/20100929151905_rename_frozen_to_locked.rb +0 -5
  768. data/db/migrate/20101008190536_move_special_instructions_to_orders.rb +0 -10
  769. data/db/migrate/20101026184700_create_log_entries.rb +0 -11
  770. data/db/migrate/20101026184714_migrate_transactions_to_payment_state.rb +0 -98
  771. data/db/migrate/20101026184746_delete_in_progress_orders.rb +0 -19
  772. data/db/migrate/20101026184808_migrate_checkout_to_orders.rb +0 -23
  773. data/db/migrate/20101026184855_remove_shipped_state.rb +0 -12
  774. data/db/migrate/20101026184916_prevent_nil_payment_total.rb +0 -8
  775. data/db/migrate/20101026184932_prevent_nil_email.rb +0 -9
  776. data/db/migrate/20101026184959_generate_anonymous_users.rb +0 -20
  777. data/db/migrate/20101026185022_update_order_state.rb +0 -12
  778. data/db/migrate/20101026192225_cleanup_legacy_tables.rb +0 -11
  779. data/db/migrate/20101028151745_remove_number_and_cvv_from_credicard.rb +0 -11
  780. data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb +0 -11
  781. data/db/migrate/20101111133551_renamed_rma_cancelled_state.rb +0 -9
  782. data/db/migrate/20101117031806_fix_problematic_index_names.rb +0 -13
  783. data/db/migrate/20101223215658_add_position_to_variants.rb +0 -5
  784. data/db/migrate/20110110130847_add_next_state_to_state_events.rb +0 -5
  785. data/db/migrate/20110111122537_add_position_to_option_types.rb +0 -5
  786. data/db/migrate/20110314192118_remove_trailing_slashes_in_taxon_permalinks.rb +0 -19
  787. data/db/migrate/20110329141434_create_activators.rb +0 -14
  788. data/db/migrate/20110418151136_eligible_for_adjustments.rb +0 -5
  789. data/db/migrate/20111007143030_namespace_top_level_models.rb +0 -66
  790. data/db/migrate/20111107143030_migrate_namespaced_polymorphic_models.rb +0 -52
  791. data/db/migrate/20111201024007_make_adjustments_polymorphic.rb +0 -9
  792. data/db/migrate/20111215032408_add_company_to_addresses.rb +0 -5
  793. data/db/migrate/20111216154844_add_inc_tax_to_tax_rates.rb +0 -5
  794. data/db/migrate/20111219203242_rename_inc_price_attribute.rb +0 -5
  795. data/db/migrate/20111219205902_add_default_tax_zone.rb +0 -5
  796. data/db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb +0 -7
  797. data/db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb +0 -7
  798. data/db/migrate/20120119024710_new_preferences.rb +0 -48
  799. data/db/migrate/20120203001428_rename_state_events_to_state_changes.rb +0 -9
  800. data/db/migrate/20120203153759_add_deleted_at_to_tax_category.rb +0 -5
  801. data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb +0 -37
  802. data/db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb +0 -5
  803. data/db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb +0 -9
  804. data/db/migrate/20120509055454_create_tokenized_permissions_table.rb +0 -16
  805. data/db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb +0 -9
  806. data/db/migrate/20120530012000_rename_creditcards_to_credit_cards.rb +0 -11
  807. data/db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb +0 -5
  808. data/db/migrate/20120604203654_remove_credit_total_from_orders.rb +0 -5
  809. data/db/migrate/20120712172620_add_counter_cache_to_zone_members.rb +0 -14
  810. data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +0 -5
  811. data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +0 -5
  812. data/lib/spree/core/authorize_net_cim_hack.rb +0 -871
  813. data/lib/spree/core/controller_helpers.rb +0 -185
  814. data/lib/spree/core/current_order.rb +0 -38
  815. data/lib/spree/core/file_utilz.rb +0 -74
  816. data/lib/tasks/assets.rake +0 -58
  817. data/vendor/assets/stylesheets/html5reset.css +0 -177
@@ -1,69 +0,0 @@
1
- html, body {
2
- margin: 0;
3
- padding: 0;
4
- border: 0;
5
- font-weight: inherit;
6
- font-style: inherit;
7
- font-size: 100%;
8
- font-family: inherit;
9
- vertical-align: baseline; }
10
-
11
- div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
12
- pre, a, abbr, acronym, address, code, del, dfn, em, img,
13
- dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr, hr {
14
- margin: 0;
15
- padding: 0;
16
- border: 0;
17
- font-weight: inherit;
18
- font-style: inherit;
19
- font-size: 100%;
20
- font-family: inherit;
21
- vertical-align: baseline; }
22
-
23
- body { line-height: 1.5 }
24
-
25
- blockquote, q {
26
- margin: 0;
27
- padding: 0;
28
- border: 0;
29
- font-weight: inherit;
30
- font-style: inherit;
31
- font-size: 100%;
32
- font-family: inherit;
33
- vertical-align: baseline;
34
- quotes: "" ""; }
35
- blockquote:before,
36
- blockquote:after, q:before,
37
- q:after {
38
- content: ""; }
39
-
40
- th, td, caption {
41
- margin: 0;
42
- padding: 0;
43
- border: 0;
44
- font-weight: inherit;
45
- font-style: inherit;
46
- font-size: 100%;
47
- font-family: inherit;
48
- vertical-align: baseline;
49
- text-align: left;
50
- font-weight: normal;
51
- vertical-align: top; }
52
-
53
- table {
54
- margin: 0;
55
- padding: 0;
56
- border: 0;
57
- font-weight: inherit;
58
- font-style: inherit;
59
- font-size: 100%;
60
- font-family: inherit;
61
- vertical-align: baseline;
62
- border-collapse: separate;
63
- border-spacing: 0;
64
- vertical-align: middle; }
65
-
66
- a img { border: none }
67
-
68
- #taxons-tree li { list-style-type: none; }
69
-
@@ -1,40 +0,0 @@
1
- table.index th {
2
- background: #cdcdcd url(<%= asset_path 'admin/bg/grid_header_back.png' %>) top left repeat-x;
3
- padding: 7px 10px;
4
- border-left: 1px solid #ddd;
5
- border-top: 1px solid #ddd;
6
- border-right: 1px solid #aaa;
7
- border-bottom: 1px solid #aaa;
8
- text-shadow: #efefef 1px 1px 0px; }
9
- table.index th .right {
10
- float:right;
11
- font-weight:normal;
12
- }
13
- table.index th.id-col {
14
- text-align: center; }
15
- table.index td {
16
- background-color: #fff;
17
- border-bottom:1px solid #ddd;
18
- padding: 3px 10px;
19
- }
20
- table.index td.lbl-col {
21
- width: 12%; }
22
- table.index td.val-col {
23
- width: 38%; }
24
- table.index tr.alt td {
25
- background-color: #efefef; }
26
- table.index.green th {
27
- background: #cfefa7 url(<%= asset_path 'admin/bg/grid_header_back_green.png' %>) top left repeat-x;
28
- border-left: 1px solid #E4FDB4;
29
- border-top: 1px solid #E4FDB4;
30
- border-right: 1px solid #B7CB90;
31
- border-bottom: 1px solid #B7CB90; }
32
- table.index.green td {
33
- background-color: #efe; }
34
- table.index.order-summary {
35
- clear: both; }
36
- table.index.order-summary tr.totals th {
37
- background: transparent;
38
- text-align: right;
39
- border: none; }
40
- table.index td.actions {text-align:right;}
@@ -1,117 +0,0 @@
1
- /* --------------------------------------------------------------
2
-
3
- typography.css
4
- * Sets up some sensible default typography.
5
-
6
- -------------------------------------------------------------- */
7
-
8
- /* Default font settings.
9
- The font-size percentage is of 16px. (0.75 * 16px = 12px) */
10
- body {
11
- font-size: 75%;
12
- color: #222;
13
- font-family: "Helvetica Neue", Helvetica, Tahoma, Verdana, Arial, sans-serif;
14
- }
15
-
16
- /* Headings
17
- -------------------------------------------------------------- */
18
-
19
- h1,h2,h3,h4,h5,h6 { font-weight: bold; color: #111; }
20
-
21
- h1 { font-size: 2.5em; margin-bottom: 0.75em; line-height: 1em; }
22
- h2 { font-size: 1.5em; line-height: 1; margin-bottom: 0.6em; }
23
- h3 { font-size: 1.5em; line-height: 1.25; margin-bottom: 0.6em; }
24
- h4 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
25
- h5 { font-size: 1em; font-weight: bold; }
26
- h6 { font-weight: normal }
27
-
28
- h1 img, h2 img, h3 img,
29
- h4 img, h5 img, h6 img { margin: 0 }
30
-
31
-
32
- h1, h2 { letter-spacing: -1px }
33
-
34
-
35
- /* Text elements
36
- -------------------------------------------------------------- */
37
-
38
- p { margin: 0 0 1em; }
39
- p img.left { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
40
- p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; }
41
-
42
- a:focus,
43
- a:hover { color: #000; }
44
- a { color: #009; text-decoration: none; }
45
-
46
- blockquote { margin: 1.5em; color: #666; font-style: italic; }
47
- strong { font-weight: bold; }
48
- em,dfn { font-style: italic; }
49
- dfn { font-weight: bold; }
50
- sup, sub { line-height: 0; }
51
-
52
- abbr,
53
- acronym { border-bottom: 1px dotted #666; }
54
- address { margin: 0 0 1.5em; font-style: italic; }
55
- del { color:#666; }
56
-
57
- pre { margin: 1.5em 0; white-space: pre; }
58
- pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
59
-
60
-
61
- /* Lists
62
- -------------------------------------------------------------- */
63
-
64
- li ul,
65
- li ol { margin:0 1.5em; }
66
- ul, ol { margin: 0 1.5em 1.5em 1.5em; }
67
-
68
- ul { list-style-type: disc; }
69
- ol { list-style-type: decimal; }
70
-
71
- dl { margin: 0 0 1.5em 0; }
72
- dl dt { font-weight: bold; }
73
- dd { margin-left: 1.5em;}
74
-
75
-
76
- /* Tables
77
- -------------------------------------------------------------- */
78
-
79
- table { margin-bottom: 1.4em; width:100%; }
80
- th { font-weight: bold; }
81
- thead th { background: #c3d9ff; }
82
- th,td,caption { padding: 4px 10px 4px 5px; }
83
- tr.even td { background: #e5ecf9; }
84
- tfoot { font-style: italic; }
85
- caption { background: #eee; }
86
-
87
-
88
- /* Misc
89
- -------------------------------------------------------------- */
90
-
91
- hr { clear: both; height:0; border:none}
92
-
93
- .small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
94
- .large { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; }
95
- .hide { display: none; }
96
-
97
- .quiet { color: #666; }
98
- .loud { color: #000; }
99
- .highlight { background:#ff0; }
100
- .added { background:#060; color: #fff; }
101
- .removed { background:#900; color: #fff; }
102
-
103
- .first { margin-left:0; padding-left:0; }
104
- .last { margin-right:0; padding-right:0; }
105
- .top { margin-top:0; padding-top:0; }
106
- .bottom { margin-bottom:0; padding-bottom:0; }
107
-
108
-
109
- .clear { clear: both }
110
- .nowrap { white-space: nowrap }
111
-
112
- .clearfix {
113
- overflow: auto;
114
- overflow: -moz-scrollbars-none;
115
- display: inline-block; }
116
- .clearfix {
117
- display: block; }
@@ -1,682 +0,0 @@
1
- #language-bar,
2
- #login-nav,
3
- #store-nav {
4
- float: right;
5
- margin-top: 10px;}
6
- #language-bar li,
7
- #login-nav li,
8
- #store-nav li {
9
- float: left;
10
- margin-right: 1em;
11
- list-style: none; }
12
-
13
- .address-form label,
14
- #creditcard label {
15
- width: 200px;
16
- display: block;
17
- float: left; }
18
-
19
- #creditcard label {
20
- width: 150px; }
21
-
22
- input.default {
23
- color: #999; }
24
- input.default:focus {
25
- color: inherit; }
26
-
27
- p.help-text {
28
- font-style: italic;
29
- font-weight: normal;
30
- margin-bottom: 0;
31
- color: #999; }
32
-
33
-
34
-
35
-
36
- body {
37
- margin-top: 0px;
38
- background-color: #162F54;
39
- color: #476D9B;
40
- }
41
-
42
- a {
43
- color: #4884BD; }
44
- a:active,
45
- a:visited {
46
- color: #4884BD; }
47
-
48
- #header {
49
- height:95px;
50
- position: relative;
51
- margin-bottom: 13px;
52
- }
53
- #header,
54
- #footer {
55
- position: relative;
56
- clear: both; }
57
- #content {
58
- margin: 0em 1em 1em 1em;
59
- padding: 1em;
60
- background: #fff;
61
- color: #111;
62
- min-height: 500px; }
63
- #content a {
64
- color: #3C7DFB; }
65
- #content a:active,
66
- #content a:visited {
67
- color: #3C7DFB; }
68
- #content.with-sidebar {
69
- background: #fff url(<%= asset_path 'admin/bg/content-back.png' %>) right top repeat-y;
70
- padding-right: 340px;
71
- position: relative; }
72
- #sidebar {
73
- position: absolute;
74
- width: 305px;
75
- top: 0; right: 0;
76
- padding-top: 3em;
77
- }
78
- #sidebar .box {
79
- padding:10px;
80
- }
81
- #sidebar .box h3 { margin: 0 0 10px 0; }
82
- #sidebar h3 {
83
- margin: 0 10px; }
84
- #sidebar h3 a {
85
- color: #111;
86
- text-decoration: none; }
87
- #sidebar h5 {
88
- margin: 0 10px;
89
- width: 130px;
90
- float: left;}
91
- #sidebar span.sku {
92
- display: block;
93
- font-weight: normal; }
94
- #sidebar img {
95
- float: right;
96
- margin-right: 1em; }
97
- #sidebar img.calendar_date_select_popup_icon {
98
- float: none; }
99
- #sidebar .field {
100
- padding: 0 1em; }
101
- #sidebar .form-buttons {
102
- padding: 0 1em; }
103
- #sidebar h4 {
104
- margin-left: 10px; }
105
- #sidebar ul.sidebar {
106
- clear: both;
107
- position: relative;
108
- margin: 0;
109
- padding: 0; }
110
- #sidebar ul.sidebar li {
111
- list-style: none; }
112
- #sidebar ul.sidebar li a {
113
- display: block;
114
- padding: 10px 20px 10px;
115
- outline: none;
116
- text-decoration: none;
117
- color: #666 !important; }
118
- #sidebar ul.sidebar li a:hover { background-color:#ddd }
119
- #sidebar ul.sidebar li.active a {
120
- font-weight: bold;
121
- background: url(<%= asset_path 'admin/bg/menu-current.png' %>) left center no-repeat;
122
- color: #363 !important;
123
- margin-left: -20px;
124
- padding-left: 30px; }
125
- #sidebar .order-number,
126
- #sidebar .order-status {
127
- text-align: right;
128
- margin-right: 20px; }
129
- #sidebar .order-status {
130
- padding: 7px 15px;
131
- -moz-border-radius: 3px;
132
- -webkit-border-radius: 3px;
133
- float: right;
134
- background-color: #999;
135
- color: #111;
136
- text-transform: uppercase; }
137
- #sidebar .order-status.new {
138
- background-color: #5D9C0F;
139
- color: #fff; }
140
- #sidebar .order-status.canceled {
141
- background-color: #c00;
142
- color: #fff; }
143
-
144
- #header #logo {
145
- position: absolute;
146
- top: 0;
147
- left: 10px;
148
- }
149
- #header h1 {
150
- position: absolute;
151
- left: 200px;
152
- bottom: 19px;
153
- margin: 10px 10px 10px 10px;
154
- display: block;
155
- text-decoration: none;
156
- line-height: 100%;
157
-
158
- }
159
- #header h1 a {
160
- color: #8CB952;
161
- }
162
- #admin-menu { clear: both; }
163
- #admin-menu,
164
- #sub-menu {
165
- margin: 0 1em;
166
- }
167
- #admin-menu li {
168
-
169
- }
170
- #admin-menu ul,
171
- #sub-menu ul {
172
- padding: 0;
173
- margin: 0; }
174
- #admin-menu ul li,
175
- #sub-menu ul li {
176
- float: left;
177
- margin-right: 1em;
178
- list-style: none; }
179
- #admin-menu ul li,
180
- #sub-menu ul li {
181
- margin-right: 0; margin-bottom: -1px;}
182
- #admin-menu ul li a,
183
- #sub-menu ul li a {
184
- display: block;
185
- padding: 10px 20px;
186
- color: #fff;
187
- text-decoration: none;
188
- outline: none; }
189
- #admin-menu ul li.selected a,
190
- #sub-menu ul li.selected a {
191
- background-color: #0095da;
192
- }
193
- #admin-menu ul li.selected {
194
- border-bottom:1px solid #0095DA;
195
- }
196
- #IE7 #admin-menu {
197
- height: 39px; }
198
- #admin-menu {
199
- background: #154e8c url(<%= asset_path 'admin/bg/admin_tab_back.png' %>) top left repeat-x;
200
- border-top: 1px solid #4B83E2;
201
- border-right: 1px solid #34599B;
202
- border-bottom: 1px solid #41A6F0;
203
- }
204
- #admin-menu ul {
205
- margin-bottom: -1px; }
206
- #admin-menu ul li:first-child {
207
- border-left: 1px solid #34599B; }
208
- #admin-menu ul li.selected {
209
- background: #0095da url(<%= asset_path 'admin/bg/admin_tab_selected_back.png' %>) top left repeat-x;
210
- border-left: 1px solid #41A6F0;
211
- border-top: 1px solid #41A6F0;
212
- border-right: 1px solid #4986BF;
213
- height: 40px;
214
- margin-top: -2px; }
215
- #sub-menu {
216
- background: #0095da;
217
- border-left: 1px solid #41A6F0;
218
- border-right: 1px solid #4986BF; }
219
- #IE7 #sub-menu ul {
220
- height: 26px; }
221
- #sub-menu ul li a {
222
- padding: 3px 7px;
223
- margin: 10px 5px;
224
- color: #154e8c;
225
- background: none; }
226
- #sub-menu ul li.selected a {
227
- background: #154e8c;
228
- color: #9BC3FC;
229
- -moz-border-radius: 3px;
230
- -webkit-border-radius: 3px; }
231
- #slide-content {
232
- margin: 0 1em;
233
- background-color: #cdf; }
234
- .toolbar {
235
- float: right;
236
- margin-bottom: 1em; }
237
- .toolbar ul.actions {
238
- margin: 0;
239
- padding: 0;
240
- float: right; }
241
- .toolbar ul.actions li {
242
- float: left;
243
- margin-right: 1em;
244
- list-style: none; }
245
- .toolbar ul.actions li {
246
- margin-right: 0; }
247
- .toolbar.order-links a {
248
- text-transform: capitalize; }
249
- .search-form {
250
- display: none;
251
- padding: 1em; }
252
- .search-form label {
253
- display: block; }
254
- a.button {
255
- background: transparent url(<%= asset_path 'admin/buttons/right_01.png' %>) no-repeat scroll top right;
256
- display: block;
257
- float: left;
258
- margin-right: 6px;
259
- padding-right: 20px;
260
- text-decoration: none;
261
- color: #111 !important;
262
- font-weight: bold;
263
- outline: none; }
264
- a.button span {
265
- background: transparent url(<%= asset_path 'admin/buttons/left_01.png' %>) no-repeat;
266
- display: block;
267
- line-height: 22px;
268
- padding: 7px 0 5px 14px;
269
- text-shadow: #efefef 1px 1px 0px; }
270
- a.button img {
271
- vertical-align: middle;
272
- margin: 0 3px 0 0; }
273
- a.button.cancel span {
274
- font-weight: normal; }
275
- a.button.small {
276
- font-size: 1em;
277
- background: transparent url(<%= asset_path 'admin/buttons/right_01_small.png' %>) no-repeat scroll top right;
278
- padding-right: 20px; }
279
- a.button.small span {
280
- background: transparent url(<%= asset_path 'admin/buttons/left_01_small.png' %>) no-repeat;
281
- padding: 5px 0 3px 20px;
282
- line-height: 21px; }
283
- a.button.green {
284
- background: transparent url(<%= asset_path 'admin/buttons/green/right_01.png' %>) no-repeat scroll top right;
285
- color: #151 !important; }
286
- a.button.green span {
287
- background: transparent url(<%= asset_path 'admin/buttons/green/left_01.png' %>) no-repeat; }
288
- button {
289
- border: 0;
290
- cursor: pointer;
291
- font-weight: bold;
292
- padding: 0 20px 0 0;
293
- text-align: center;
294
- background: url(<%= asset_path 'admin/buttons/right_01.png' %>) center right no-repeat;
295
- font-size: 1.3em;
296
- outline: none; }
297
- button span {
298
- position: relative;
299
- display: block;
300
- white-space: nowrap;
301
- padding: 0 0 0 20px;
302
- height: 35px;
303
- line-height: 35px;
304
- background: url(<%= asset_path 'admin/buttons/left_01.png' %>) center left no-repeat;
305
- text-shadow: #efefef 1px 1px 0px; }
306
- button span img {
307
- vertical-align: middle;
308
- margin: 0 3px 0 0; }
309
- button:focus {
310
- outline: none; }
311
- button.tick {
312
- background: none;
313
- width: 24px; }
314
- button.small {
315
- font-size: 1em;
316
- padding: 0 10px 0 10px;
317
- }
318
- input.title,
319
- textarea {
320
- margin: 0; }
321
- .errorExplanation {
322
- border: solid 2px #f15700;
323
- padding: 1em;
324
- margin-bottom: 1em;
325
- background: #cdf;
326
- -moz-border-radius: 10px;
327
- -webkit-border-radius: 10px; }
328
- .errorExplanation ul {
329
- color: #f15700;
330
- list-style: square; }
331
- .errorExplanation h2 {
332
- font-size: 1.75em;
333
- padding-left: 40px;
334
- background: url(<%= asset_path 'admin/icons/32x32/3.png' %>) center left no-repeat; }
335
- ul.checkbox-list {
336
- list-style: none; }
337
- ul.checkbox-list li {
338
- display: block;
339
- float: left;
340
- width: 200px; }
341
- ul.checkbox-list li label {
342
- font-weight: normal !important; }
343
- #busy_indicator {
344
- margin-bottom: 1em; }
345
- select#filter_state {
346
- font-size: 1.5em; }
347
- h2.order-number {
348
- margin-bottom: 0; }
349
- h4.order-status {
350
- display: block;
351
- font-weight: normal; }
352
- .adr {
353
- float: left;
354
- margin-right: 1em;
355
- margin-bottom: 1em;
356
- padding: 1em;
357
- border: solid 1px #999;
358
- -moz-border-radius: .5em;
359
- -webkit-border-radius: .5em;
360
- min-width: 46%; }
361
- .adr .fn {
362
- font-weight: bold; }
363
- .adr h4 {
364
- margin-bottom: 1em;
365
- border-bottom: 1px solid #ccc;
366
- padding-bottom: .5em;
367
- color: #666; }
368
- ul.taxonomy-tree {
369
- cursor: default;
370
- list-style: none;
371
- margin: 0;
372
- padding: 0 0 0 35px;
373
- min-height: 2em; }
374
- ul.taxonomy-tree li.taxon {
375
- clear: both;
376
- padding: 5px; }
377
- ul.taxonomy-tree li.taxon span,
378
- ul.taxonomy-tree li.taxon input {
379
- float: left;
380
- margin-right: 1em; }
381
- ul.taxonomy-tree li.taxon .name {
382
- float: left;
383
- cursor: move; }
384
- ul.taxonomy-tree li.taxon.new ul.taxonomy-actions,
385
- ul.taxonomy-tree li.taxon.editing ul.taxonomy-actions {
386
- display: none; }
387
- ul.taxonomy-tree li.taxon.to-destroy {
388
- color: #900;
389
- text-decoration: line-through; }
390
- ul.taxonomy-tree li.taxon.to-destroy ul.taxonomy-actions {
391
- display: none; }
392
- .placeholder {
393
- height: 30px;
394
- clear: both;
395
- border: dashed 2px #ddd; }
396
- ul.taxonomy-actions {
397
- float: left;
398
- list-style: none;
399
- margin: 0px 0px 10px 10px;
400
- padding: 0; }
401
- ul.taxonomy-actions li {
402
- float: left;
403
- margin-right: 5px; }
404
- ul.taxonomy-actions li img {
405
- vertical-align: text-top; }
406
- ul.taxonomy-actions li.disabled {
407
- opacity: .5; }
408
- h3.warning {
409
- background-image: url(<%= asset_path 'admin/icons/exclamation.png' %>);
410
- background-position: 10px 15px;
411
- background-repeat: no-repeat;
412
- padding-left: 35px; }
413
- #searching {
414
- clear: both;
415
- margin-top: 2em; }
416
-
417
-
418
- .pagination{
419
- padding-top: 10px;
420
- text-align: right;
421
- }
422
- a.page, span.page {
423
- padding: 0px 5px;
424
- margin: 0 3px;
425
- }
426
- a.page {
427
- text-decoration: none;
428
- border: 1px solid #9aafe5;
429
- color: #2e6ab1;
430
- }
431
- a.page:hover, a.page:active {
432
- border: 1px solid #2b66a5;
433
- color: #000;
434
- background-color: LightYellow;
435
- }
436
-
437
- a.next_page {
438
- font-weight: bold;
439
- }
440
-
441
-
442
- span.disabled_page {
443
- border: 1px solid #929292;
444
- color: #929292;
445
- }
446
-
447
- span.current_page {
448
- font-weight: bold;
449
- border: 1px solid navy;
450
- background-color: #2e6ab1;
451
- color: #FFF;
452
- }
453
-
454
- div#calculator-settings-warning, .warning {
455
- color: #f00;
456
- }
457
- #progress{
458
- display:none;
459
- background:#154E8C url(<%= asset_path 'admin/bg/admin_tab_back.png' %>) repeat-x scroll left top;
460
- color:#fff;
461
- font-size:170%;
462
- height:25px;
463
- left:33%;
464
- padding:10px 0 15px;
465
- position:fixed;
466
- text-align:center;
467
- width:320px;
468
- font-weight:bold;
469
- -moz-border-radius-bottomleft:15px;
470
- -moz-border-radius-bottomright:15px;
471
- -webkit-border-bottom-left-radius: 15px;
472
- -webkit-border-bottom-right-radius: 15px;
473
- }
474
- #progress img{
475
- vertical-align:middle;
476
- padding-right:10px;
477
- }
478
-
479
- ul#shipping_specs {
480
- margin: 0;
481
- padding-bottom:10px;
482
- }
483
- ul#shipping_specs li {
484
- list-style-image:none;
485
- display:inline;
486
- }
487
-
488
- div.product-preview-products {
489
- max-height: 200px;
490
- overflow: auto;
491
- }
492
-
493
- #preference-settings input, #preference-settings select, #preference-settings textarea{
494
- float:left;
495
-
496
- }
497
-
498
- #preference-settings input[type=text], #preference-settings input[type=password] {
499
- width: 250px;
500
- }
501
-
502
- #preference-settings input.input_integer[type=text] {
503
- width: 100px;
504
- }
505
-
506
- #preference-settings label{
507
- clear:both;
508
- display:block;
509
- float:left;
510
- width:170px;
511
- }
512
- .index .price{
513
- width: 50px;
514
- text-align:center;
515
- }
516
- .index .qty{
517
- width: 50px;
518
- text-align:center;
519
- }
520
- .index .total{
521
- width: 50px;
522
- text-align:right;
523
- }
524
- .index .orders-actions{
525
- width:40px;
526
- padding-left:10px;
527
- }
528
-
529
- .product-prototype-options,
530
- .product-prototype-options ul {
531
- list-style-type: none;
532
- margin-left: 0;
533
- }
534
- .product-prototype-options > li {
535
- display: block;
536
- float: left;
537
- width: auto;
538
- }
539
- .product-prototype-options > li b {
540
- display: block;
541
- padding-right: 30px;
542
- margin-right: 20px;
543
- font-size: 14px;
544
- border-bottom: 1px solid #ddd;
545
- }
546
- .product-prototype-options > li ul {
547
- padding: 5px 0;
548
- }
549
- .product-prototype-options > li label {
550
- padding-left: 5px;
551
- }
552
-
553
- span.handle{
554
- background-image: url(<%= asset_path 'admin/icons/switch.png' %>);
555
- display: inline-block;
556
- cursor: move;
557
- width:14px;
558
- height:15px;
559
- }
560
-
561
- .ac_results, .ui-autocomplete {
562
- max-height: 230px;
563
- overflow-y: auto;
564
- overflow-x: hidden;
565
- padding-right: 20px;
566
- border: 1px solid #000;
567
- }
568
-
569
- .ac_results li div { max-width: 90%; }
570
-
571
- .ac_results li h4 { width: 100%; }
572
-
573
- .ac_results li:last-child { border: none; }
574
-
575
- .ui-autocomplete a.ui-state-hover { color: #444; text-decoration: none; font-weight:normal; padding: 0 0 0 0; margin: 0 0 0 0; border:none; }
576
-
577
- .alert {
578
- -moz-border-radius: 5px;
579
- -webkit-border-radius: 5px;
580
- border-radius: 5px;
581
- font-size: 1.3em;
582
- margin-bottom: 1em;
583
- padding: 0.8em;
584
- }
585
- .alert a.dismiss {
586
- float:right;
587
- font-size: 0.8em;
588
- }
589
- .alert.release {
590
- background-color: #ccddff;
591
- color: #556699;
592
- border: 1px solid #99aacc;
593
- }
594
- .alert.security {
595
- background-color: #f4b4b4;
596
- color: #000000;
597
- border: 1px solid #e75b5b;
598
- }
599
- .alert.news {
600
- background-color: #ccffd4;
601
- color: #000000;
602
- border: 1px solid #66ff7e;
603
- }
604
-
605
- /* Spree analytics preview buttons */
606
- .analytics_splash{
607
- text-align: center;
608
- }
609
- .preview-buttons {
610
- position: absolute;
611
- left: 860px;
612
- top: 820px;
613
- }
614
- .preview-buttons a.button {
615
- display: inline-block;
616
- float: none;
617
- font-size: 14px;
618
- }
619
-
620
- /* Spree admin banners*/
621
- .banner {
622
- overflow: auto;
623
- }
624
- .banner p {
625
- text-transform: uppercase;
626
- font-weight: bold;
627
- }
628
- .banner .button {
629
- float: none !important;
630
- display: inline-block;
631
- }
632
-
633
- .banner.payment_banner {
634
- width: 739px;
635
- height: 135px;
636
- background: transparent url(<%= asset_path 'admin/payment_banner.png' %>) no-repeat left top;
637
- position: absolute;
638
- left: -17px;
639
- }
640
- .banner.payment_banner .message {
641
- padding-left: 40px;
642
- padding-top: 35px;
643
- font-size: 16px;
644
- width: 500px;
645
- color: #5A81B3;
646
- line-height: 25px;
647
- }
648
- .banner.payment_banner .message a {
649
- color: #82a653 !important;
650
- }
651
-
652
- .banner.payment_banner .dismiss {
653
- color: #B25B59 !important;
654
- font-weight: bold;
655
- float: right;
656
- margin-right: 25px;
657
- }
658
-
659
- /* Image Settings Styles */
660
- #s3_settings {
661
- display: none;
662
- }
663
- #styles_list {
664
- list-style: none;
665
- }
666
- #headers_list {
667
- list-style: none;
668
- }
669
- #s3_settings label, #attachment_styles label {
670
- padding-left: 3px;
671
- padding-right: 5px;
672
- }
673
-
674
- /* Select2 select box styles */
675
- select.select2 {
676
- width: 30em;
677
- }
678
-
679
- .ui-widget-content .ui-menu-item .ui-state-focus {
680
- color: #476D9B;
681
- border: none;
682
- }