spree 0.7.1 → 0.8.0

data/app/views/admin/prototypes/new.html.erb

@@ -1,9 +1,11 @@
 <%= render :partial => 'shared/product_sub_menu' %>
-<h1><%= t("new_prototype")%></h1>
 
 <%= error_messages_for :prototype %>
 
 <% form_for(:prototype, :url => collection_url) do |f| %>
+<fieldset>
+  <legend><%= t("new_prototype")%></legend>
   <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => 'shared/new_resource_links' %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
+</fieldset>
 <% end %>

data/app/views/admin/reports/index.html.erb

@@ -2,27 +2,22 @@
   <%= calendar_date_select_includes %>
 <% end %>
 <h1><%= t("listing_reports") %></h1>
-<table>
-  <tr>
-    <td valign="top">
-      <div id="order-summary">
-        <table class="admin-report" width="515">
-          <thead>
-            <tr>
-              <th><%= t("name") %></th>
-              <th><%= t("description") %></th>
-            </tr>
-          </thead>
-          <tbody>     
-            <% @reports.each do |key, value| %>
-            <tr class="<%= cycle('even', 'odd') %>">
-              <td><%= link_to t(value[:name].downcase.gsub(" ","_")), send("#{key}_admin_reports_url".to_sym) %></td>
-              <td><%= t(value[:description].downcase.gsub(" ","_")) %></td>
-            </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    </td>
-  </tr>
+
+
+<table class="index">
+  <thead>
+    <tr>
+      <th><%= t("name") %></th>
+      <th><%= t("description") %></th>
+    </tr>
+  </thead>
+  <tbody>     
+    <% @reports.each do |key, value| %>
+    <tr>
+      <td><%= link_to t(value[:name].downcase.gsub(" ","_")), send("#{key}_admin_reports_url".to_sym) %></td>
+      <td><%= t(value[:description].downcase.gsub(" ","_")) %></td>
+    </tr>
+    <% end %>
+  </tbody>
 </table>
+

data/app/views/admin/reports/sales_total.html.erb

@@ -1,28 +1,27 @@
 <h1><%= t("sales_totals") %> </h1>
-<table>
-  <tr>
-    <td valign="top">
-      <table class="admin-report">
-        <tbody>
-          <tr>
-            <td><%= t("item_total") %>:</td>
-            <td align="right"><%=number_to_currency @item_total%></td>
-          </tr>
-          <tr>
-            <td><%= t("shipping_total") %>:</td>
-            <td align="right"><%=number_to_currency @ship_total%></td>
-          </tr>
-          <tr>
-            <td><%= t("tax_total") %>:</td>
-            <td align="right"><%=number_to_currency @tax_total%></td>
-          </tr>
-          <tr>
-            <td><%= t("sales_total") %>:</td>
-            <td align="right"><%=number_to_currency @sales_total%></td>
-          </tr>
-        </tbody>
-      </table>
-    </td>
-    <%= render :partial => 'shared/report_criteria', :locals => {} %>
-  </tr>
+
+<table class="admin-report">
+  <tbody>
+    <tr>
+      <th scope="row"><%= t("item_total") %>:</th>
+      <td align="right"><%=number_to_currency @item_total%></td>
+    </tr>
+    <tr>
+      <th scope="row"><%= t("shipping_total") %>:</th>
+      <td align="right"><%=number_to_currency @ship_total%></td>
+    </tr>
+    <tr>
+      <th scope="row"><%= t("tax_total") %>:</th>
+      <td align="right"><%=number_to_currency @tax_total%></td>
+    </tr>
+    <tr>
+      <th scope="row"><%= t("sales_total") %>:</th>
+      <td align="right"><%=number_to_currency @sales_total%></td>
+    </tr>
+  </tbody>
 </table>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'admin/shared/report_criteria', :locals => {} %>
+<% end %>
+

data/app/views/admin/shared/_additional_field.html.erb

@@ -0,0 +1,5 @@
+<p>
+  <%= label controller.controller_name.singularize, field[:name] %><br />
+  <%=text_field controller.controller_name.singularize, field[:name].gsub(" ", "_").downcase, :value => get_additional_field_value(controller, field) %>
+	<%=error_message_on controller.controller_name.singularize, field[:name].gsub(" ", "_").downcase%>
+</p>

data/app/views/admin/shared/_address.html.erb

@@ -0,0 +1,13 @@
+<%
+# HACK - in_place_editor field works only with instance variables and not local variables  
+# See http://dev.rubyonrails.org/ticket/3094 for details
+
+@address = address 
+%>
+
+<p><%="#{address.firstname} #{address.lastname}" %><br />
+ <%= address.address1 %><br />
+<%= "#{address.address2} <br />" unless address.address2.blank? %>
+<%= "#{address.city}, #{address.state_text} #{address.zipcode}" %><br />
+<%= address.country.name %><br />
+<%= address.phone %></p>

data/app/views/admin/shared/_configuration_menu.html.erb

@@ -0,0 +1,18 @@
+<% content_for :sidebar do %>
+
+  <h3 class="name"><%= t("configurations") -%></h3>
+  <br class="clear" />
+  
+  <ul class="sidebar">
+    <li<%= ' class="active"' if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'mail_settings' %>><%= link_to t("mail_server_settings"), admin_mail_settings_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(214) %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'gateway_configurations' %>><%= link_to t("gateway"), admin_gateways_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'taxonomies' %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
+    <li<%= ' class="active"' if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
+  </ul>
+
+<% end %>

data/app/views/admin/shared/_edit_resource_links.html.erb

@@ -0,0 +1,4 @@
+<p class="form-buttons">
+  <%= button t("update") %>
+  or <%= link_to t("cancel"), collection_url %>
+</p>

data/app/views/admin/shared/_form_address.html.erb

@@ -0,0 +1,50 @@
+<% f.fields_for :address do |address_form| %>
+  <div class="yui-g">
+    <label>Name</label>
+    <div class="yui-u sub-field first">
+      <%= address_form.text_field :firstname, :class => 'fullwidth' %>
+      <br/>
+      <label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+    </div>
+    <div class="yui-u sub-field">
+      <%= address_form.text_field :lastname, :class => 'fullwidth' %>
+      <br/>
+      <label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+    </div>
+  </div>
+  <p>
+    <label><%= t("address") %></label>
+    <div class="sub-field">
+      <%= address_form.label :address1, t("street_address") %><br />
+      <%= address_form.text_field :address1, :class => 'fullwidth' %>
+    </div>
+    <div class="sub-field">
+      <%= address_form.label :address2, t("street_address") %><br />
+      <%= address_form.text_field :address2, :class => 'fullwidth' %>
+    </div>
+  </p>
+  <div class="left sub-field">
+    <%= address_form.label :city, t("city") %><br />
+    <%= address_form.text_field :city, :size => 20 %>
+  </div>
+  <div class="right sub-field">
+    <%= address_form.label :zipcode, t("zip") %><br />
+    <%= address_form.text_field :zipcode, :size => 10 %>
+  </div>
+  <div class="left sub-field">
+    <%= address_form.label :state, t("state") %><br />
+  	<% if @states.length == 0 %>
+  		<%= address_form.text_field :state_name, :autocomplete => 'off' %>
+  	<% else %>
+  	  <%= address_form.collection_select :state_id, @states, :id, :name %>
+  	<% end %>    
+  </div>
+  <div class="right sub-field">
+    <%= address_form.label :country_id, t("country") %><br />
+  	<%= address_form.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;'} %>
+  </div>
+  <p>
+    <%= address_form.label :phone, t("phone") %><br />
+    <%= address_form.text_field :phone %>
+  </p>
+<% end %>

data/app/views/admin/shared/_new_resource_links.html.erb

@@ -0,0 +1,4 @@
+<p class="form-buttons">
+  <%= button t("actions.create") %>
+  or <%= link_to t("actions.cancel"), collection_url %>
+</p>

data/app/views/admin/shared/_order_details.html.erb

@@ -0,0 +1,36 @@
+<table class="index">
+  <tr>
+    <th><%= t('item_description') %></th>
+    <th><%= t('price') %></th>
+    <th><%= t('qty') %></th>
+    <th><%= t('total') %></th>
+  </tr>
+  <% @order.line_items.each do |item| %>
+  <tr >
+    <td width="300"><%=item.variant.product.name-%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+    <td><%= number_to_currency item.price -%></td>
+    <td><%=item.quantity-%></td>
+    <td><%= number_to_currency (item.price * item.quantity)-%></td>
+  </tr>
+  <% end %>      
+  <tr class="total">
+    <td colspan="3"><strong><%= t('subtotal') %>:</strong></td>
+    <td><%= number_to_currency @order.item_total -%></td>
+  </tr>
+  <tr class="total">
+    <td colspan="3"><strong><%= t('tax') %>:</strong></td>
+    <td><%= number_to_currency @order.tax_amount -%></td>
+  </tr>
+  <tr class="total">
+    <td colspan="3"><strong><%= t('shipping') %>:</strong> 
+      <% if @order.shipment %>
+        (<%= @order.shipment.shipping_method.name %>)
+      <% end %>
+    </td>
+    <td><%= number_to_currency @order.ship_amount -%></td>
+  </tr>
+  <tr class="total">
+    <td colspan="3"><b><%= t('order_total') %>:</b></td>
+    <td><%= number_to_currency @order.total -%></td>
+  </tr>
+</table>

data/app/views/admin/shared/_order_tabs.html.erb

@@ -0,0 +1,27 @@
+<h1><%= t(:order) + " #{@order.number}" %></h1>
+
+<% content_for :sidebar do %>
+
+  <h3 class="name"><%= t(:order) + " ##{@order.number} (#{@order.state.titleize})" %></h3>
+  <br clear="clear" />
+
+  <ul class="sidebar">
+  	<li <%= ' class="active"' if current == "Order Details" %>>
+  	  <%= link_to t("order_details"), admin_order_url(@order) %>
+  	</li>
+  	<li <%= ' class="active"' if current == "Payments" %>>
+  	  <%= link_to t("payments"), 
+  	              admin_order_payments_url(@order) %>
+  	</li>
+  	<% if @order_admin_tabs && @order_admin_tabs.size > 0
+  		@order_admin_tabs.each do |extension| %>
+    	<li <%= ' class="active"' if current == extension[:name].titleize.pluralize %>>
+    	  <%= link_to extension[:name].titleize.pluralize, 
+    	              eval(extension[:url] + " @order") %>
+    	</li>
+     <% end
+  	end %>
+	
+  </ul>
+
+<% end %>

data/app/views/admin/shared/_product_sub_menu.html.erb

@@ -0,0 +1,8 @@
+<% content_for :sub_menu do %>
+  <ul id="sub_nav">
+    <%= tab :products, :match_path => '/products' %>
+    <%= tab :option_types, :match_path => '/option_types' %>
+    <%= tab :properties %>
+    <%= tab :prototypes, :css_class => 'last' %>
+  </ul>
+<% end %>

data/app/views/admin/shared/_product_tabs.html.erb

@@ -0,0 +1,35 @@
+<h1><%= t("editing_product") + " &ldquo;#{@product.name}&rdquo;" %></h1>
+
+<% content_for :sidebar do %>
+
+  <h3 class="name"><%= @product.name %><span class='sku'><%= @product.sku %></span></h3>
+  <br clear="clear" />
+
+  <ul class="sidebar product-menu">
+    <li<%= ' class="active"' if current == "Product Details" %>>
+      <%= link_to t("product_details"), edit_admin_product_url(@product) %>
+    </li>
+    <li<%= ' class="active"' if current == "Variants" %>>
+      <%= link_to t("variants"),  admin_product_variants_url(@product) %>
+    </li>
+    <li<%= ' class="active"' if current == "Option Types" %>>
+      <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
+    </li>
+    <li<%= ' class="active"' if current == "Product Properties" %>>
+      <%= link_to t("product_properties"), admin_product_product_properties_url(@product) %>
+    </li>
+    <li<%= ' class="active"' if current == "Taxons" %>>
+      <%= link_to t("taxons"), selected_admin_product_taxons_url(@product) %>
+    </li>
+    <% if @product_admin_tabs && @product_admin_tabs.size > 0
+      @product_admin_tabs.each do |extension| %>
+      <li<%= ' class="active"' if current == extension[:name].capitalize.pluralize %>>
+        <%= link_to extension[:name].capitalize.pluralize,  eval(extension[:url] + " @product") %>
+      </li>
+      <% end %>
+    <% end %>
+
+  </ul>
+  <br clear="clear" />
+
+<% end %>

data/app/views/admin/shared/_report_criteria.html.erb

@@ -0,0 +1,23 @@
+<% content_for :head do %>
+  <%= calendar_date_select_includes %>
+<% end %>
+
+<% form_for [:admin, @search], :url => "" do |f| %> 
+	<% f.fields_for @search.conditions do |s| %>
+
+    <label><%= t("date_range") %></label><br />
+    <div class="yui-g date-range-filter">
+      <div class="yui-u sub-field first">
+        <%= s.calendar_date_select :created_at_after %><br />
+        <label class="sub"><%= t("start") %></label>
+      </div>
+      <div class="yui-u sub-field">
+        <%= s.calendar_date_select :created_at_before %><br />
+        <label><%= t("stop") %></label>
+      </div>
+    </div>
+
+		<p><%= button t("search") %></p>
+
+	<% end %>
+<% end %>	

data/app/views/admin/shared/_show_resource_links.html.erb

@@ -0,0 +1,5 @@
+<p class="actions">
+<%= link_to t("edit"), edit_object_url %> |
+<%= link_to t("back"), collection_url %> |
+<%= link_to t("delete"), object_url, :confirm => t('are_you_sure_you_want_to_delete_this_record'), :method => :delete %>
+</p>

data/app/views/admin/shipments/_details.html.erb

@@ -0,0 +1,19 @@
+<h2><%= t('shipment') %> # <%=@shipment.number%></h2>
+
+<table class="index" style="width:100%;">
+  <tr>
+    <th><%= t('sku') %></th>
+    <th><%= t('item_description') %></th>
+    <th><%= t('qty') %></th>
+  </tr>
+  <% @order.line_items.each do |item| %>
+    <tr>
+      <td valign="top"><%=item.variant.sku %></td>
+      <td width="300">
+        <%=item.variant.product.name %> 
+        <%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      </td>
+      <td valign="top"><%=item.quantity %></td>
+    </tr>
+  <% end %>      
+</table>

data/app/views/admin/shipments/_form.html.erb

@@ -0,0 +1,21 @@
+<div class="yui-g">
+  <div class="yui-u first">
+    <fieldset>
+      <legend><%= t("shipping_address")%></legend>
+  	  <%= render :partial => 'admin/shared/form_address', :locals => {:f => shipment_form} %>
+  	</fieldset>
+  </div>
+  <div class="yui-u">
+    <fieldset>
+      <legend>&nbsp;</legend>
+      <p><%= shipment_form.label :tracking, t('tracking') %>:<br /><%= shipment_form.text_field :tracking %></p>
+      <p><%= shipment_form.label :cost, t('shipping_cost') %>:<br /><%= shipment_form.text_field :cost %></p>
+      <p>
+        <label>
+          <%= shipment_form.check_box :shipped?, :disabled => (not @order.can_ship?) %></td>
+          <%= t('mark_shipped') %>
+        </label>
+      </p>
+    </fieldset>
+  </div>
+</div>

data/app/views/admin/shipments/edit.html.erb

@@ -0,0 +1,12 @@
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+<%= render :partial => "details" %>
+
+<%= error_messages_for :shipment %>
+<% form_for(@shipment, :url => object_url, :html => { :method => :put }) do |shipment_form| %>
+
+  <%= render :partial => "form", :locals => { :shipment_form => shipment_form } %>
+  <p class="form-buttons">
+    <%= button t('update') %>
+  </p>
+  
+<% end %>

data/{vendor/extensions/shipping/app → app}/views/admin/shipments/index.html.erb

@@ -1,12 +1,12 @@
-<%= render :partial => 'shared/order_tabs', :locals => {:current => "Shipments"} %>
-<table class="admin-report">
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+<table class="index">
   <tr>
-    <th><%= t("ext_shipping_shipment_number") %></th>
-    <th><%= t("ext_shipping_method") %></th>
-    <th><%= t("ext_shipping_cost") %></th>
-    <th><%= t("ext_shipping_tracking") %></th>
+    <th><%= t("shipment_number") %></th>
+    <th><%= t("shipping_method") %></th>
+    <th><%= t("shipping_cost") %></th>
+    <th><%= t("tracking") %></th>
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t("action") %></th>
+    <th></th>
   </tr>
   <% @shipments.each do |shipment| %>
     <tr>
@@ -15,7 +15,7 @@
       <td><%= shipment.cost %></td>
       <td><%= shipment.tracking %></td>
       <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
-      <td><%= link_to t('edit'), edit_admin_order_shipment_url(@order, shipment) %></td>
+      <td class="actions"><%= link_to_with_icon 'edit', t('edit'), edit_admin_order_shipment_url(@order, shipment) %></td>
     </tr>
   <% end %>
 </table>