spree 0.5.1 → 0.6.0

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

@@ -1,10 +1,10 @@
-<h1><%=t("New Tax Category")%></h1>
+<h1><%=t("new_tax_category")%></h1>
 
 <%= error_messages_for :tax_category %>
 
 <% form_for(:tax_category, :url => collection_url) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p>
-    <%= submit_tag t("Create") %>
+    <%= submit_tag t("create") %>
   </p>
 <% end %>

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

@@ -1,6 +1,6 @@
 <table cellspacing="5">
   <tr>
-    <td><%= t("Name")%>: </td>
+    <td><%= t("name")%>: </td>
     <td>
       <%=error_message_on :taxonomy, :name%>  
       <%= text_field :taxonomy, :name  %>

data/app/views/admin/taxonomies/_list.html.erb

@@ -1,9 +1,8 @@
 <table class="admin-report">
   <tr>
-    <th><%= :name.l("Name") %></th>
-    <th><%= :action.l("Action") %></th>
+    <th><%= t("name") %></th>
+    <th><%= t("action") %></th>
   </tr>
-  
 <% for taxonomy in @taxonomies %>
   <tr>
 	<td>

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

@@ -5,12 +5,15 @@
 <% form_for(:taxon, :url => admin_taxonomy_url, :html => { :method => :put }) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
 	  <tr>
-	    <td style="vertical-align:top;"><%= t("Tree")%>: </td>
+	    <td style="vertical-align:top;"><%= t("tree")%>: </td>
 	    <td>
 				<%= yui_tree_helper @taxonomy %>
 			</td>
-		</tr>
+	  </tr>
+	  <tr>
+		<td colspan="2"><small>* Right click a child in the tree to access the menu for adding, deleting or sorting a child.</small></td>
+	  </tr>
 	</table>
-	<%= submit_tag t("Update") %> or <%= link_to t("Cancel"), admin_taxonomies_path %>
+	<%= submit_tag t("update") %> or <%= link_to t("cancel"), admin_taxonomies_path %>
 
-<% end %>
+<% end %>

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

@@ -1,7 +1,7 @@
 <%= render :partial => "yui_head" %>
-<h1><%= :taxonomies.l("Taxonomies") %></h1>	
+<h1><%= t("taxonomies") %></h1>	
 
 <div id='list-taxonomies'>
 	<%= render :partial => 'list' %>
 </div>
-<%= link_to t('New Taxonomy'), new_admin_taxonomy_url %>
+<%= link_to t('new_taxonomy'), new_admin_taxonomy_url %>

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

@@ -1,9 +1,9 @@
-<h1><%= :new_taxonomy.l("New Taxonomy") %></h1>
+<h1><%= t("new_taxonomy") %></h1>
 
-<% form_for(:taxon, :url => object_url) do |f| %>
+<% form_for(:taxon, :url => collection_url) do |f| %>
 	<%= render :partial => "form", :locals => { :f => f } %>
 	</table>
 	<p>
-	  <%= submit_tag t("Create") %>
+	  <%= submit_tag t("create") %>
 </p>
 <% end %>

data/app/views/admin/taxons/_taxon_table.html.erb

@@ -1,9 +1,9 @@
 <table class="basic-table">
   <thead>
   	<tr>
-  		<th><%= t("Name") %></th>
-  		<th><%= t("Path") %></th>
-  		<th><%= t("Action") %></th>
+  		<th><%= t("name") %></th>
+  		<th><%= t("path") %></th>
+  		<th><%= t("action") %></th>
   	</tr>
   </thead>
   <tbody>
@@ -12,7 +12,7 @@
         <td valign="top"><%= taxon.name %></td>
         <td valign="top"><%= taxon_path taxon %></td>
   	    <td valign="top">
-		      <%= link_to_remote t('Remove'), 
+		      <%= link_to_remote t('remove'), 
 		                         :url => remove_admin_product_taxon_url(@product, taxon),
 		                         :loading => "Element.show(#{dom_id(taxon, :rem_spinner)})",
 		                         :update => 'selected-taxons',
@@ -22,7 +22,7 @@
       </tr>
     <% end %>
     <% if taxons.empty? %>
-     <tr><td colspan="3">None.</td></tr>
+     <tr><td colspan="3"><%= t('none') %>.</td></tr>
     <% end %>
   </tbody>
 </table>

data/app/views/admin/taxons/available.js.erb

@@ -5,13 +5,13 @@
     else row.style.display = '';
   }
 </script>
-<h4><%= t('Available Taxons') %></h4>
+<h4><%= t('available_taxons') %></h4>
 <table class="basic-table">
 	<thead>
 		<tr>
-			<th><%= t("Name") %></th>
-			<th><%= t("Path") %></th>
-			<th><%= t("Action") %></th>
+			<th><%= t("name") %></th>
+			<th><%= t("path") %></th>
+			<th><%= t("action") %></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -20,7 +20,7 @@
         <td valign="top"><%= taxon.name %></td>
         <td valign="top"><%= taxon_path taxon %></td>
 		    <td valign="top">
-		      <%= link_to_remote t('Select'), 
+		      <%= link_to_remote t('select'), 
 		                         :url => select_admin_product_taxon_path(@product, taxon),
 		                         :loading => "Element.show(#{dom_id(taxon, :spinner)})",
 		                         :update => 'selected-taxons',
@@ -30,7 +30,7 @@
       </tr>
     <% end %>
     <% if @available_taxons.empty? %>
-     <tr><td colspan="3"><%= t('No match found') %>.</td></tr>
+     <tr><td colspan="3"><%= t('no_match_found') %>.</td></tr>
     <% end %>
   </tbody>
 </table>

data/app/views/admin/taxons/selected.html.erb

@@ -1,12 +1,12 @@
 <%= render :partial => 'shared/product_sub_menu' %>
-<h1><%= t("Taxons")%></h1>
+<h1><%= t("taxons")%></h1>
 <%= render :partial => 'shared/product_tabs', :locals => {:current => "Taxons"} %>
 <div id="selected-taxons">
   <%= render :partial => "taxon_table", :locals => {:taxons => @taxons} %>
 </div>
 <table>
   <tr>
-    <td><b><%= t('Search') %>:</b></td>
+    <td><b><%= t('search') %>:</b></td>
     <td><input id="searchtext" size="25"></td>
   </tr>
 </table>

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

@@ -1,22 +1,36 @@
-<table>
-  <tr>
-    <td><%= t("Email") %>: </td>
-    <td>
-      <%= error_message_on :user, :email%>
-      <%= f.text_field :email  %>
-    </td>
-  </tr>
-  <tr>
-    <td><%= t("Password") %>:</td>
-    <td>
-      <%= error_message_on :user, :password%>
-      <%= f.password_field :password  %>
-    </td>
-  </tr>
-  <tr>
-    <td><%= t("Confirm") %>:</td>
-    <td>
-      <%= f.password_field :password_confirmation %>
-    </td>
-  </tr>    
-</table>
+<table>
+  <tr>
+    <td><%= t("email") %>: </td>
+    <td>
+      <%= error_message_on :user, :email%>
+      <%= f.text_field :email  %>
+    </td>
+  </tr>
+  <tr>
+    <td><%= t("roles") %>: </td>
+    <td> 
+      <table>
+        <tr>    
+          <% for role in @roles %>
+            <td><%= check_box_tag 'user[role_' + role.name + ']', 1, @user.has_role?(role.name) %></td>
+            <td valign="top"><%= role.name %> &nbsp;</td>
+          <% end %>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td><%= t("password") %>:</td>
+    <td>
+      <%= error_message_on :user, :password%>
+      <%= f.password_field :password  %>
+    </td>
+  </tr>
+  <tr>
+    <td><%= t("confirm") %>:</td>
+    <td>
+      <%= f.password_field :password_confirmation %>
+    </td>
+  </tr>
+  <%= render_extra_partials f %>      
+</table>

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

@@ -1,9 +1,9 @@
 <%= error_messages_for :user %>
-<h1><%= t("Editing User") %></h1>
+<h1><%= t("editing_user") %></h1>
 <br/>
 <% form_for(:user, :url => object_url, :html => { :method => :put }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p>
-    <%=submit_tag t("Update") %>
+    <%=submit_tag t("update") %>
   </p>
 <% end %>

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

@@ -1,21 +1,52 @@
-<h1><%= t("Listing Users") %></h1>
+<h1><%= t("listing_users") %></h1>
 
-<table class="admin-report">
-  <thead>
-    <th><%= t("User") %></th>
-    <th><%= t("Action") %></th>
-  </thead>
-  <tbody>
-    <%- @users.each do |user|%>
-    <tr>
-      <td width="350px"><%=link_to user.email, object_url(user) %></td>
-      <td>
-	<%=link_to t('Edit'), edit_object_url(user) %> |
-	<%=link_to t('Destroy'), object_url(user), :confirm => 'Are you sure?', :method => :delete %></td>
-    </tr>
-    <% end %>
-  </tbody>
+<table>
+  <tr>
+    <td valign="top">
+      <table class="admin-report">
+        <thead>
+          <th><%= t("user") %></th>
+          <th><%= t("action") %></th>
+        </thead>
+        <tbody>
+          <%- @users.each do |user|%>
+          <tr>
+            <td width="350px"><%=link_to user.email, object_url(user) %></td>
+            <td>
+            	<%=link_to t('edit'), edit_object_url(user) %> |
+            	<%=link_to t('destroy'), object_url(user), :confirm => t('are_you_sure'), :method => :delete %>
+            </td>
+          </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </td>
+    <td valign="top">
+      <% form_for :filter, :url => admin_users_url, :html => { :method => :get } do |f| %>
+        <div id="search-col">
+          <table class="admin-search">
+            <thead>
+              <tr>
+                <th colspan="2"><%= t("user_details") %></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td><%= t("email") %></td>
+                <td>
+                  <%= f.text_field :email, :size=>18 %>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <%=submit_tag t("search") %>
+        </div>
+      <% end %>
+    </td>
+  </tr>
 </table>
-<br/>
+<%= render :partial => 'shared/paginate', :locals => {:collection => @users, :options => generate_search_options(@filter)} unless @users.empty? %>            
+
+
+<%= link_to t('new_user'), new_object_url %>
 
-<%= link_to t('New User'), new_object_url %>

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

@@ -1,11 +1,11 @@
 <%= error_messages_for :user %>
-<h1><%= t("New User") %></h1>
+<h1><%= t("new_user") %></h1>
 <br/>
 <% form_for(:user, :url => collection_url) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p>
-    <%= submit_tag t("Create") %>
+    <%= submit_tag t("create") %>
   </p>
 <% end %>
 <br/>
-<%= link_to t('Back'), collection_url %>
+<%= link_to t('back'), collection_url %>

data/app/views/admin/users/show.html.erb

@@ -1,11 +1,18 @@
-<h1><%= t("My Account") %></h1>
+<h1><%= t("user_account") %></h1>        
+<br/>
 <table>
   <tr>
-    <td><%= t("Email") %>:</td>
+    <td><%= t("email") %>: &nbsp;</td>
     <td>
       <%= @user.email %>
     </td>
+  </tr>  
+  <tr>
+    <td><%= t("roles") %>: &nbsp;</td>
+    <td>
+      <%= list_roles(@user) %>
+    </td>
   </tr>
 </table>
 <br/>
-<%= link_to t('Edit'), edit_object_url %>
+<%= link_to t('edit'), edit_object_url %>

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

@@ -18,21 +18,18 @@
     <% end %>
   <% end %>
   <tr>
-    <td><%= t("SKU") %>: </td>
+    <td><%= t("sku") %>: </td>
     <td><%= f.text_field :sku %></td>
   </tr>
   <tr>
-    <td><%= t("Price") %>: </td>
+    <td><%= t("price") %>: </td>
     <td><%= f.text_field :price %></td>
   </tr>
   <tr>
-    <td><%= t("On Hand") %>: </td>
+    <td><%= t("on_hand") %>: </td>
     <td><%= f.text_field :on_hand %></td>
   </tr>  
-  <% @additional_fields.each do |field| %>
-  <tr>
-    <td><%= t(field.titleize) %>: </td>
-    <td><%= f.text_field field %></td>
-  </tr>  
-  <% end %>
+	<% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
+		<%= render :partial => "shared/additional_field", :locals => {:field => field, :f => f} %>
+	<% end %>
 </table>

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

@@ -1,6 +1,6 @@
 <%= render :partial => 'shared/product_sub_menu' %>
-<h1><%= t("Editing Product") %></h1>
-<%= render :partial => 'shared/product_tabs', :locals => {:current => "Variants"} %>
+<h1><%= t("editing_product") %></h1>
+<%= render :partial => 'shared/product_tabs', :locals => {:current => "variants"} %>
 <%= error_messages_for :variant %>
 
 <% form_for(:variant, :url => object_url, :html => { :method => :put }) do |f| %>

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

@@ -1,40 +1,40 @@
 <%= render :partial => 'shared/product_sub_menu' %>
-<h1><%= t("Editing Product") %></h1>
+<h1><%= t("editing_product") %></h1>
 <%= render :partial => 'shared/product_tabs', :locals => {:current => "Variants"} %>
 <table class="full-table">
 	<thead>
 		<tr>
-			<th><%= t("Options") %></th>
-			<th><%= t("Price") %></th>
-		  <th><%= t("SKU") %></th>
-		  <% @additional_fields.each do |field| %>
-		    <th><%= field.titleize %></th>
+			<th><%= t("options") %></th>
+			<th><%= t("price") %></th>
+		  <th><%= t("sku") %></th>
+		  <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
+		    <th><%= field[:name].titleize %></th>
 		  <% end %>
-		  <th><%= t("On Hand") %></th>
-			<th><%= t("Action") %></th>
+		  <th><%= t("on_hand") %></th>
+			<th><%= t("action") %></th>
 		</tr>
 	</thead>
 	<tbody>
     <% @variants.each do |variant| %>
       <!-- you can skip variant with no options: that's just the default variant that all products have -->
       <% next if variant.option_values.empty? %>
-      <tr>
-      	<td><%= variant_options variant %></td>
+      <tr <%= 'style="color:red;"' unless variant.deleted_at.nil? %>>
+      	<td><%= variant_options variant %> '<%= variant.id.to_s   %>'</td>
       	<td><%= variant.price %>
         <td><%= variant.sku %></td>
-        <% @additional_fields.each do |field| %>        
-  		    <td><%= variant[field] %></td>
+        <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>        
+  		    <td><%= variant[field[:name].gsub(" ", "_").downcase] %></td>
   		  <% end %>
         <td><%= variant.on_hand %></td>
 		    <td valign="top">
-		      <%= link_to_edit(variant) %>
+		      <%= link_to_edit(variant) if variant.deleted_at.nil? %>
 		      &nbsp;
-		      <%= link_to_delete(variant) %>
+		      <%= link_to_delete(variant) if variant.deleted_at.nil? %>
 		    </td>        
       </tr>
     <% end %>
     <% unless @product.variants? %>
-      <tr><td colspan="5"><%= t("None") %>.</td></tr>
+      <tr><td colspan="5"><%= t("none") %>.</td></tr>
     <% end %>
   </tbody>
 </table>
@@ -44,11 +44,11 @@
   <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
   <br/>
   <span id="new_var_link">
-    <%= link_to_remote t("New Variant"), 
+    <%= link_to_remote t("new_variant"), 
                        :url => new_admin_product_variant_url(@product), 
                        :method => :get,
                        :update => "variants",
                        :before => "Element.hide('new_var_link');Element.show('busy_indicator')", 
                        :complete => "Element.hide('busy_indicator')" %>
-  </span>
+  </span>&nbsp;|&nbsp;<%= link_to @deleted.blank? ? t("show_deleted") : t("show_active"), admin_product_variants_url(@product, :deleted =>  @deleted.blank? ? "on" : "off") %>
 <% end %>