RubyGems - spree - Versions diffs - 0.10.2 → 0.11.0 - Mend

spree 0.10.2 → 0.11.0

Potentially problematic release.

This version of spree might be problematic. Click here for more details.

Files changed (536) hide show

data/vendor/extensions/theme_default/app/views/checkouts/edit.html.erb CHANGED

@@ -5,15 +5,15 @@
 <div id="checkout">
   <h1><%= t("checkout")%></h1>
   <%= checkout_progress %>
+  <br clear="left" />
   <%= error_messages_for :checkout %>
   <% hook :checkout_summary_box do %>
-    <div id="checkout-summary" style="background-color:#C3C9DF;float:right;margin-top:10px;padding:20px;width:180px;">
+    <div id="checkout-summary">
       <%= render :partial => "summary" %>
     </div>
   <% end %>
   <% form_for @checkout, :url => object_url, :html => { :method => :put, :id => "checkout_form_#{@checkout.state}"} do |checkout_form| %>
-    <%= render @checkout.state, :checkout_form => checkout_form %>
+    <%= render @checkout.state, :checkout_form => checkout_form %>
     <input type="hidden" name="step" value="<%= @checkout.state %>">
     <input id="post-final" type="submit" style="display:none"/>
   <% end %>

data/vendor/extensions/theme_default/app/views/layouts/admin.html.erb CHANGED

@@ -12,7 +12,8 @@
 <![endif]-->
 <div id='wrapper'>
-  <div id="header">
+  <div id="header" class="admin_header_bg">
     <% if current_user -%>
     <ul id="login-nav">
       <li><%= t('logged_in_as') %>: <%= current_user.email %></li>
@@ -24,6 +25,7 @@
     <h1 class='logo'><%= link_to t("administration"), admin_path %></h1>
     <div id="progress"><%= image_tag 'progress.gif' %> <%= t('loading') %>...</div>
   </div>
+<div class='tile_bg_img'>
     <div id="admin-menu">
       <ul>
         <% hook :admin_tabs do %>
@@ -38,14 +40,14 @@
       <br class="clear" />
     </div>
-    <div class="<%= 'with-sidebar ' unless @content_for_sidebar.blank? %> clear" id="content">
+    <div class="<%= 'with-sidebar ' unless @content_for_sidebar.blank? %> clear tile_bg" id="content">
       <% if flash[:error] %>
       <div class="flash error"><%= flash[:error] %></div>
       <% end %>
-      <% if flash[:notice] %>
-      <div class="flash notice"><%= flash[:notice] %></div>
+      <% if self.notice %>
+      <div class="flash notice"><%= self.notice %></div>
       <% end %>
@@ -63,7 +65,7 @@
     <div id="footer">
       <p><%= t("icons_by") %> <a href='http://pinvoke.com'>pInvoke</a></p>
     </div>
+</div>
 </div>
 <!--[if IE]>
 </div>

data/vendor/extensions/theme_default/app/views/layouts/spree_application.html.erb CHANGED

@@ -15,14 +15,17 @@ if @body_class.nil?
 end
  %>
 <body class="<%= @body_class %>"<%= %( id="#{@body_id}") if @body_id %>>
-  <div id="header" class="container">
-    <div id="login-bar">
+  <div id="header" class="container_bg">
+    <div class="container">
+		<div id="login-bar">
       <ul id="nav-bar">
         <%= render 'shared/nav_bar' %>
       </ul>
     </div>
 	<%= logo %>
+	</div>
   </div>
   <div id="wrapper" class="container">
     <% if @content_for_sidebar %>
     <div id="sidebar">
@@ -34,8 +37,8 @@ end
     <div id="content">
       <%= breadcrumbs(@taxon) if @taxon %>
-      <% if flash[:notice] %>
-      <div class="flash notice"><%= flash[:notice] %></div>
+      <% if self.notice %>
+      <div class="flash notice"><%= self.notice %></div>
       <% end %>
       <% if flash[:error] %>
       <div class="flash errors"><%= flash[:error] %></div>
@@ -44,5 +47,6 @@ end
     </div>
     <%= render :partial => 'shared/footer'%>
   </div>
 </body>
 </html>

data/vendor/extensions/theme_default/app/views/orders/_line_item.html.erb CHANGED

@@ -36,7 +36,7 @@
   </td>
   <td>
     <% hook :cart_item_delete, locals do %>
-      <%= link_to image_tag('/images/admin/icons/delete.png'), order_line_item_path(@order, line_item), :method => :delete %>
+      <%= link_to(image_tag('/images/admin/icons/delete.png'), order_line_item_path(@order, line_item), :method => :delete) unless line_item.new_record? %>
     <% end %>
   </td>

data/vendor/extensions/theme_default/app/views/products/index.html.erb CHANGED

@@ -11,7 +11,6 @@
 <% if params[:keywords] %>
-  <h1><%= t(:search_results, :keywords => h(params[:keywords])) %></h1>
   <% hook :search_results do %>
     <% if @products.empty? %>
       <%= t(:no_products_found) %>

data/vendor/extensions/theme_default/app/views/shared/_footer.html.erb CHANGED

@@ -1,11 +1,13 @@
 <div id="footer">
   <div class="left">
+    <% hook :footer_left do -%>
     <p>
       <%= t("powered_by") %> <a href="http://spreecommerce.com/">Spree</a>
     </p>
+    <% end -%>
   </div>
   <div class="right">
-    <%= render 'shared/language_bar' if Spree::Config[:allow_locale_switching] %>
+    <%= hook :footer_right %>
   </div>
 </div>
-<%= render 'shared/google_analytics' %>
+<%= render 'shared/google_analytics' %>

data/vendor/extensions/theme_default/app/views/shared/_products.html.erb CHANGED

@@ -1,9 +1,11 @@
 <%
-  paginated_products = Spree::Config.searcher.products if params.key?(:keywords)
+  paginated_products = Spree::Config.searcher.products if params.key?(:keywords)
   paginated_products ||= products
 %>
 <% if products.empty? %>
   <%= t(:no_products_found) %>
+<% elsif params.key?(:keywords) %>
+  <h3><%= t(:search_results, :keywords => h(params[:keywords])) %></h3>
 <% end %>
 <% if products.any? %>

data/vendor/extensions/theme_default/app/views/shared/_user_form.html.erb CHANGED

@@ -9,7 +9,7 @@
   </p>
   <p>
-    <%= f.label :password_confirmation, t("password_confirmation", :default => t(:confirm)) %><br />
+    <%= f.label :password_confirmation, t(:confirm_password) %><br />
     <%= f.password_field :password_confirmation, :class => 'title' %>
   </p>
 </div>

data/vendor/extensions/theme_default/public/images/admin/bg/spree_50.png CHANGED

Binary file

data/vendor/extensions/theme_default/public/images/tile-header.png ADDED

Binary file

data/vendor/extensions/theme_default/public/images/tile-slider.png ADDED

Binary file

data/vendor/extensions/theme_default/public/javascripts/admin/checkouts/edit.js CHANGED

@@ -41,11 +41,17 @@ jQuery(document).ready(function(){
   }
   $("#customer_search").autocomplete("/admin/users.json", {
+    minChars: 5,
+    delay: 1500,
     parse: prep_autocomplete_data,
     formatItem: function(item) {
       return format_autocomplete(item);
     }
   }).result(function(event, data, formatted) {
+    $('#user_id').val(data['id']);
+    $('#guest_checkout_true').removeAttr("checked");
+    $('#guest_checkout_false').attr("checked", "checked");
+    $('#guest_checkout_false').removeAttr("disabled");
     $('#checkout_email').val(data['email']);
     var addr = data['bill_address'];
@@ -75,5 +81,49 @@ jQuery(document).ready(function(){
     }
   });
+  $('input#checkout_use_billing').click(function() {
+    show_billing(!this.checked);
+  });
+  $('#guest_checkout_true').change(function() {
+    $('#customer_search').val("");
+    $('#user_id').val("");
+    $('#checkout_email').val("");
+    $('#guest_checkout_false').attr("disabled", "true");
+    $('#checkout_bill_address_attributes_firstname').val("");
+    $('#checkout_bill_address_attributes_lastname').val("");
+    $('#checkout_bill_address_attributes_address1').val("");
+    $('#checkout_bill_address_attributes_address2').val("");
+    $('#checkout_bill_address_attributes_city').val("");
+    $('#checkout_bill_address_attributes_zipcode').val("");
+    $('#checkout_bill_address_attributes_state_id').val("");
+    $('#checkout_bill_address_attributes_country_id').val("");
+    $('#checkout_bill_address_attributes_phone').val("");
+    $('#checkout_ship_address_attributes_firstname').val("");
+    $('#checkout_ship_address_attributes_lastname').val("");
+    $('#checkout_ship_address_attributes_address1').val("");
+    $('#checkout_ship_address_attributes_address2').val("");
+    $('#checkout_ship_address_attributes_city').val("");
+    $('#checkout_ship_address_attributes_zipcode').val("");
+    $('#checkout_ship_address_attributes_state_id').val("");
+    $('#checkout_ship_address_attributes_country_id').val("");
+    $('#checkout_ship_address_attributes_phone').val("");
+  });
+  var show_billing = function(show) {
+    if(show) {
+      $('#shipping').show();
+      $('#shipping input').removeAttr('disabled', 'disabled');
+      $('#shipping select').removeAttr('disabled', 'disabled');
+    } else {
+      $('#shipping').hide();
+      $('#shipping input').attr('disabled', 'disabled');
+      $('#shipping select').attr('disabled', 'disabled');
+    }
+  }
 });

data/vendor/extensions/theme_default/public/javascripts/taxonomy.js CHANGED

@@ -48,7 +48,7 @@ var handle_created = function(id,result) {
 }
 var handle_rename = function(li, tree, rb) {
-  var name = jQuery(li).children().text();
+  var name = jQuery(li).children(":first").text();
   name = jQuery.trim(name);
   if (creating){
@@ -193,4 +193,4 @@ jQuery(document).ready(function(){
         e.preventDefault();
     }
   });
-});
+});

data/vendor/extensions/theme_default/public/stylesheets/admin/admin-tables.css CHANGED

@@ -6,12 +6,20 @@ table.index th {
   border-right: 1px solid #aaa;
   border-bottom: 1px solid #aaa;
   text-shadow: #efefef 1px 1px 0px; }
+  table.index th .right {
+    float:right;
+    font-weight:normal;
+  }
   table.index th.id-col {
     text-align: center; }
   table.index td {
     border-bottom:1px solid #ddd;
     padding: 3px 10px;
   }
+  table.index td.lbl-col {
+    width: 12%; }
+   table.index td.val-col {
+    width: 38%; }
 table.index tr.alt td {
   background-color: #efefef; }
 table.index.green th {

data/vendor/extensions/theme_default/public/stylesheets/admin/admin.css CHANGED

@@ -34,8 +34,20 @@ p.help-text {
 body {
-  background-color: #162F54;
+	margin-top: 0px;
+	  /*background: #ffffff;*/
+  /*background-color: #162F54;*/
   color: #476D9B; }
+.tile_bg_img{
+width:100%;
+		 background: #ffffff url(../../images/tile-slider.png) top left repeat-x;
+}
+.admin_header_bg{
+	width:100%;
+height:95px;
+	background:url(../../images/tile-header.png) top left repeat-x;
+}
   a {
     color: #4884BD; }
     a:active,
@@ -75,6 +87,9 @@ body {
           #sidebar h3 a {
             color: #111;
             text-decoration: none; }
+        #sidebar h5 {
+          margin: 0 10px;
+           float: left;}
         #sidebar span.sku {
           display: block;
           font-weight: normal; }
@@ -129,14 +144,14 @@ body {
             color: #fff; }
   h1.logo {
     float: left;
-    margin: 20px 10px 10px 10px;   }
+    margin: 10px 10px 10px 10px;   }
     h1.logo a {
       background: url(../../images/admin/bg/spree_50.png) left center no-repeat;
-      padding-left: 120px;
+      padding-left: 190px;
       display: block;
-      height: 50px;
+      height: 82px;
       text-decoration: none;
-      line-height: 50px;
+      line-height: 82px;
       color: #BBDAFD; }
   #admin-menu { clear: both; }
   #admin-menu,
@@ -520,26 +535,26 @@ div.product-preview-products {
 /* Product Groups */
 table#product_scopes tr {
-	background-color: #eee;
+  background-color: #eee;
 }
 table#product_scopes tr td {
-	border-top: 4px solid #fff;
-	border-bottom: 1px solid #bbb;
-	padding: 5px 10px;
+  border-top: 4px solid #fff;
+  border-bottom: 1px solid #bbb;
+  padding: 5px 10px;
 }
 table#product_scopes tr td.actions {
   vertical-align: middle;
   text-align: right;
 }
 table#product_scopes tr td table {
-	margin: 0;
-	width: auto;
+  margin: 0;
+  width: auto;
 }
 table#product_scopes tr td table tr td {
-	padding: 0;
-	border:  none;
-	padding-right: 5px;
+  padding: 0;
+  border:  none;
+  padding-right: 5px;
 }
 #product_group_forms_container {
@@ -548,7 +563,7 @@ table#product_scopes tr td table tr td {
 #new_product_group_form {
   position: absolute;
   right: 25px;
-  bottom: 0;
+  bottom: 0;
 }
 #new_product_group_form p {
   text-align: right;

data/vendor/extensions/theme_default/public/stylesheets/screen.css CHANGED

@@ -259,8 +259,8 @@ legend {
   border-right: 1px solid #eeeeee;
 }
 body {
-  margin-top: 10px;
-  background: #ffffff url(../images/body-back.png) top left repeat-x;
+  margin-top: 0px;
+  background: #ffffff url(../images/tile-slider.png) top left repeat-x;
 }
 div.left {
   float: left;
@@ -283,6 +283,12 @@ body.two-col #wrapper { background-image: url(../images/wrapper-back-2.png); }
   overflow: hidden;
   display: block;
 }
+.container_bg{
+	width:100%;
+	background:url(../images/tile-header.png) top left repeat-x;
+}
 #sidebar {
   display: inline;
   float: left;
@@ -309,7 +315,7 @@ body.two-col #content {
   clear: both;
 }
 #header a { color: #2e6ab1; }
-#header a:hover { color: #eeeeee; }
+#header a:hover { color: #3C7DFB; }
 #footer {
   padding-top: 2em;
   clear: both;
@@ -1179,3 +1185,10 @@ div#checkout #payment-methods li.last {
   float: left;
   width: 190px;
 }
+div#checkout #checkout-summary {
+  background-color: #c3c9df;
+  float: right;
+  margin-top: 10px;
+  padding: 20px;
+  width: 180px;
+}

data/vendor/plugins/attribute_fu/{tasks → lib/tasks}/attribute_fu_tasks.rake RENAMED

File without changes

data/vendor/plugins/enumerable_constants/{tasks → lib/tasks}/enumerable_constants_tasks.rake RENAMED

File without changes

data/vendor/plugins/find_by_param/lib/find_by_param.rb CHANGED

@@ -57,16 +57,20 @@ module Railslove
         protected
         def save_permalink
           return unless self.class.column_names.include?(permalink_options[:field].to_s)
-          counter = 0
-          permalink_value = self.to_param
+          return if !changed?
+          base_value = self.to_param
+          permalink_value = base_value
           conditions = ["#{self.class.table_name}.#{permalink_options[:field]} = ?", permalink_value]
           unless new_record?
             conditions.first << " and #{self.class.table_name}.#{self.class.primary_key} != ?"
             conditions       << self.send(self.class.primary_key.to_sym)
           end
-          while self.class.count(:all, :conditions => conditions) > 0
-            permalink_value = "#{permalink_value}-#{counter += 1}"
+          counter = 0
+          while self.class.first(:all, :conditions => conditions).present?
+            permalink_value = "#{base_value}-#{counter += 1}"
             conditions[1] = permalink_value
           end
           write_attribute(permalink_options[:field], permalink_value)
@@ -76,4 +80,4 @@ module Railslove
     end
   end
-end
+end

data/vendor/plugins/find_by_param/{tasks → lib/tasks}/find_by_param_tasks.rake RENAMED

File without changes

data/vendor/plugins/jrails/{tasks → lib/tasks}/jrails.rake RENAMED

File without changes