From cb6ac2064dd41964a2283d515bfbf02eecb2be38 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 26 Jun 2012 10:47:43 +1000
Subject: [PATCH] Rearrange buttons on cart checkout form

---
 .../stylesheets/store/openfoodweb.css.scss      | 17 +++++++++++++++++
 app/overrides/rearrange_cart_form.rb            |  5 +++++
 .../spree/orders/_inside_cart_form.html.haml    | 14 ++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 app/overrides/rearrange_cart_form.rb
 create mode 100644 app/views/spree/orders/_inside_cart_form.html.haml

diff --git a/app/assets/stylesheets/store/openfoodweb.css.scss b/app/assets/stylesheets/store/openfoodweb.css.scss
index fb15ace817..7af85436f6 100644
--- a/app/assets/stylesheets/store/openfoodweb.css.scss
+++ b/app/assets/stylesheets/store/openfoodweb.css.scss
@@ -135,3 +135,20 @@ ul.product-listing {
   .distributor-fixed {
   }
 }
+
+
+/* View cart form */
+#subtotal {
+  width: 100%;
+}
+.links {
+  float: right;
+  text-align: right;
+}
+#empty-cart {
+  float: left;
+
+  p {
+    padding: 0;
+  }
+}
diff --git a/app/overrides/rearrange_cart_form.rb b/app/overrides/rearrange_cart_form.rb
new file mode 100644
index 0000000000..80cd06dfa3
--- /dev/null
+++ b/app/overrides/rearrange_cart_form.rb
@@ -0,0 +1,5 @@
+# Remove column layout from cart form items so we can style it with CSS
+Deface::Override.new(:virtual_path  => "spree/orders/edit",
+                     :replace       => "[data-hook='inside_cart_form']",
+                     :partial       => "spree/orders/inside_cart_form",
+                     :name          => "inside_cart_form")
diff --git a/app/views/spree/orders/_inside_cart_form.html.haml b/app/views/spree/orders/_inside_cart_form.html.haml
new file mode 100644
index 0000000000..6a6612050d
--- /dev/null
+++ b/app/views/spree/orders/_inside_cart_form.html.haml
@@ -0,0 +1,14 @@
+%div{'data-hook' => "inside_cart_form"}
+  %div{'data-hook' => "cart_items"}
+    = render :partial => 'form', :locals => { :order_form => order_form }
+
+  #subtotal{'data-hook' => ""}
+    %h5
+      = t(:subtotal)
+      \:
+      %span.order-total= order_subtotal(@order)
+
+  .links{'data-hook' => "cart_buttons"}
+    = button_tag :class => 'primary', :id => 'update-button' do
+      = t(:update)
+    = link_to t(:checkout), checkout_path, :class => 'button checkout primary', :id => 'checkout-link'