show.html.erb in piggybak-0.2.0

- old
+ new

@@ -2,97 +2,100 @@
 
 <h1>Checkout</h1>
 <%= form_for @order, :url => piggybak.order_submit_url, :method => "POST" do |f| %>
 
 <% if @order.errors.any? -%>
+<div id="checkout_error">
 <b>You have errors with your submission:</b><br />
 <%= raw @order.errors.full_messages.join("<br />") %>
+</div>
 <% end -%>
 <div class="clear"></div>
+	
+<div id="user_details">
+	<h3>User Details</h3>
+	<div class="item">
+		<% if current_user -%>
+		<%= f.label :email %>
+		<%= f.text_field :email, { :readonly => true, :class => "readonly" } %><br />
+		<span>or <%= link_to 'LOGOUT', destroy_user_session_path, :method => :delete, :class => "last" %></span>
+		<% else -%>
+		<%= f.label :email %>
+		<%= f.text_field :email %><br />
+		<span>or <%= link_to 'LOG IN', new_user_session_path %></span>
+		<% end -%>
+	</div>
+	<div class="item">
+		<%= f.label :phone %>
+		<%= f.text_field :phone %>
+	</div>
+</div>
 
 <div id="billing_address">
 	<h3>Billing Address</h3>
 	<%= f.fields_for :billing_address do |billing_address| %>
 	<%= render "address_form", :address => billing_address %>
 	<% end -%>
 </div>
 <div id="shipping_address">
-	<h3>Shipping Address</h3>
+	<h3>
+		Shipping Address
+		<a href="#" id="copy">copy from billing</a>
+	</h3>
+
 	<%= f.fields_for :shipping_address do |shipping_address| %>
 	<%= render "address_form", :address => shipping_address %>
 	<% end -%>
 </div>
 
 <div id="add_details">
-	<div id="user_details">
-	<h3>User Details</h3>
-	<p>
-		<% if current_user -%>
-		<%= f.label :email %>
-		<%= f.text_field :email, { :readonly => true, :class => "readonly" } %>
-		<% if false -%>
-		<span>or <%= link_to 'LOGOUT', destroy_user_session_path, :method => :delete, :class => "last" %></span>
-		<% end -%>
-		<% else -%>
-		<%= f.label :email %>
-		<%= f.text_field :email %>
-		<% if false -%>
-		<span>or <%= link_to 'LOG IN', new_user_session_path %></span>
-		<% end -%>
-		<% end -%>
-	</p>
-	<p>
-		<%= f.label :phone %>
-		<%= f.text_field :phone %>
-	</p>
-	</div>
 	<div id="shipping">
 	<h3>Shipping Option</h3>
 	<%= f.fields_for :shipments, f.object.shipments.build do |shipment| %>
-		<p>
+		<div class="item">
 		<%= shipment.label :shipping_method_id %>
 		<%= shipment.select :shipping_method_id, [] %>
-		</p>
+		</div>
 	<% end -%>
 	</div>
 	<div id="payment">
 	<h3>Payment</h3>
 	<%= f.fields_for :payments, f.object.payments.build do |payment| %>
-		<p>
+		<div class="item">
 		<%= payment.label :number %>
 		<% if @order.errors.keys.include?("payments.number".to_sym) %>
 		<span class="field_with_errors">
 		<%= payment.text_field :number %>
 		</span>
 		<% else -%>
 		<%= payment.text_field :number %>
 		<% end -%>
-		</p>
+		</div>
 
-		<p>
+		<div class="item">
 		<%= payment.label :verification_value %>
 		<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
 		<span class="field_with_errors">
 		<%= payment.text_field :verification_value %>
 		</span>
 		<% else -%>
 		<%= payment.text_field :verification_value %>
 		<% end -%>
-		</p>
+		</div>
 
-		<p>
+		<div class="item">
 		<%= payment.label :month %>
 		<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
 		<span class="field_with_errors">
 		<%= payment.select :month, 1.upto(12) %> /
 		<%= payment.select :year, Time.now.year.upto(Time.now.year + 10) %>
 		</span>
 		<% else -%>
 		<%= payment.select :month, 1.upto(12) %> /
 		<%= payment.select :year, Time.now.year.upto(Time.now.year + 10) %>
 		<% end -%>
-		</p>
+		</div>
 	<% end -%>
 	</div>
 	<div id="submit">
 	<%= f.submit %>
 	</div>
@@ -104,9 +107,11 @@
 	<%= render "piggybak/cart/items", :page => "checkout" %>
 </div>
 
 </div>
 
+<%= javascript_include_tag "piggybak" %>
 <script type="text/javascript">
 var shipping_lookup = "<%= piggybak.orders_shipping_url %>"; 
 var tax_lookup = "<%= piggybak.orders_tax_url %>"; 
+var geodata_lookup = "<%= piggybak.orders_geodata_url %>"; 
 </script>