spree_core 0.40.4 → 0.50.0

data/lib/tasks/install.rake

@@ -18,7 +18,7 @@ namespace :spree_core do
     task :assets do
       source = File.join(File.dirname(__FILE__), '..', '..', 'public')
       destination = File.join(Rails.root, 'public')
-      puts "INFO: Mirroring assets from #{source} to #{destination}"
+      #puts "INFO: Mirroring assets from #{source} to #{destination}"
       Spree::FileUtilz.mirror_files(source, destination)
     end
 

data/lib/tasks/rake_util.rb

@@ -0,0 +1,19 @@
+class RakeUtil
+
+  def self.add_marker(msg)
+    puts "#"*30 + " #{msg} " + '#'*30
+  end
+
+  def self.warning(msg)
+    puts "#"*50
+    puts msg
+    puts "#"*50
+  end
+
+  def self.execute(cmd)
+    puts cmd
+    system cmd
+  end
+
+end
+

data/lib/tasks/taxon.rake

@@ -0,0 +1,14 @@
+namespace :spree do
+  desc "Resets all taxon permalinks"
+  task :reset_taxon_peramlinks => :environment do
+    Taxon.where(:parent_id => nil).each {|taxon| redo_permalinks(taxon) }
+  end
+
+  def redo_permalinks(taxon)
+    taxon.permalink = nil
+    puts "#{taxon.permalink} => #{taxon.set_permalink}"
+    taxon.save
+
+    taxon.children.each { |t| redo_permalinks(t) }
+  end
+end 

data/public/javascripts/admin.js

@@ -224,9 +224,3 @@ jQuery(".observe_field").live('change', function() {
     }
   );
 });
-
-jQuery(document).ready(function() {
-  $('div.alert a.dismiss').click(function() {
-    $(this).parent().fadeOut();
-  });
-});

data/public/javascripts/admin/unobtrusive_handlers.js

@@ -12,4 +12,32 @@ $(document).ready(function(){
     return false;
   });
 
+
+  jQuery('table.sortable').ready(function(){ 
+    jQuery('table.sortable tbody').sortable(
+      {
+        handle: '.handle',
+        update: function(event, ui) {
+          $("#progress").show();
+          positions = {};
+          type = '';
+          jQuery.each(jQuery('table.sortable tbody tr'), function(position, obj){
+            reg = /(\w+_?)+_(\d+)/;
+            parts = reg.exec(jQuery(obj).attr('id'));
+            if (parts) { 
+              positions['positions['+parts[2]+']'] = position;
+              type = parts[1];
+            }
+          });
+          jQuery.ajax({
+            type: 'POST',
+            dataType: 'script',
+            url: type+'s/update_positions',
+            data: positions,
+            success: function(data){ $("#progress").hide(); }
+          });
+        }
+      });
+  });
+
 });

data/public/javascripts/checkout.js

@@ -4,7 +4,7 @@
     $('#checkout_form_address').validate();
 
     var get_states = function(region){
-      var country        = $('span#' + region + 'country :only-child').val();
+      var country        = $('p#' + region + 'country' + ' span#' + region + 'country :only-child').val();
       return state_mapper[country];
     }
     
@@ -43,8 +43,8 @@
       if(this.checked){ $('#payment_method_'+this.value).show(); }
     }).triggerHandler('click');
 
-    $('span#bcountry select').change(function() { update_state('b'); });
-    $('span#scountry select').change(function() { update_state('s'); });
+    $('p#bcountry span#bcountry select').change(function() { update_state('b'); });
+    $('p#scountry span#scountry select').change(function() { update_state('s'); });
     update_state('b');
     update_state('s');
 

data/public/stylesheets/admin/admin-forms.css

@@ -105,7 +105,7 @@ form div.right.w30 {
 
 
 .member-list {
-  list-style:none;margin:0;
+  list-style:none;margin:0;margin-bottom:1em;
 }
 
 
@@ -135,11 +135,6 @@ form div.right.w30 {
     display: block; }
     .field label span.label {
       display: block; }
-      
-      
-
-
-
 
 fieldset {
   margin-bottom: 1em;

data/public/stylesheets/admin/admin.css

@@ -583,31 +583,3 @@ span.handle{
   width:14px;
   height:15px;
 }
-
-.alert {
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  font-size: 1.3em;
-  margin-bottom: 1em;
-  padding: 0.8em;
-}
-.alert a.dismiss {
-  float:right;
-  font-size: 0.8em;
-}
-.alert.release {
-  background: #ccddff url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #556699;
-  border: 1px solid #99aacc;
-}
-.alert.security {
-  background: #f4b4b4 url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #000000;
-  border: 1px solid #e75b5b;
-}
-.alert.news {
-  background: #ccffd4 url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #000000;
-  border: 1px solid #66ff7e;
-}

data/public/stylesheets/screen.css

@@ -332,41 +332,6 @@ p img {
   margin-right: 5px;
   vertical-align: middle;
 }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 .navigation-list {
   list-style: none;
   margin: 0 0 1.5em -15px;
@@ -497,41 +462,6 @@ ul#nav-bar li.cart-indicator a.full { background-image: url(../images/cart-full_
   background-color: #2e6ab1;
   color: #ffffff;
 }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 .flash {
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
@@ -587,41 +517,6 @@ ul#nav-bar li.cart-indicator a.full { background-image: url(../images/cart-full_
   margin: 0px;
 }
 .fieldWithErrors { clear: none; }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 button, a.button, input.button {
   -moz-border-radius: 0.3em;
   -webkit-border-radius: 0.3em;
@@ -702,41 +597,6 @@ p button img { margin: 0 5px 0 0; }
   font-weight: normal;
   color: #666666;
 }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 .product-listing {
   list-style: none;
   margin: 2em 0px 0px 0px;
@@ -800,41 +660,6 @@ ul.thumbnails li img {
 }
 ul.thumbnails li:hover { border-color: #cccccc; }
 ul.thumbnails li.selected { border-color: #999999; }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 #product-variants { margin-bottom: 1em; }
 #product-variants ul {
   list-style: none;
@@ -907,41 +732,6 @@ dl.table-display dd {
 }
 dl.table-display dt { width: 100px; }
 dl.table-display dd { width: 180px; }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 div#subtotal {
   float: right;
   width: 49%;
@@ -959,41 +749,6 @@ table#cart tr td {
 }
 table#cart tr#none td { border-bottom: none; }
 table#cart h4 { margin-bottom: 0em; }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 #signup #new-customer {
   display: inline;
   float: left;
@@ -1026,41 +781,6 @@ input.openid_url {
   border: 1px solid #bbbbbb;
   font-size: 1.5em;
 }
-.no_margin_or_padding {
-  margin: 0;
-  padding: 0;
-}
-.leftie {
-  float: left;
-  width: 49%;
-}
-.rightie {
-  float: right;
-  width: 49%;
-}
-.clearfix {
-  overflow: hidden;
-  display: inline-block;
-}
-.clearfix { display: block; }
-.nowrap { white-space: nowrap; }
-.no-bullets { list-style: none; }
-.inline-list {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.inline-list li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-}
-.colborder {
-  padding-right: 24px;
-  margin-right: 25px;
-  border-right: 1px solid #eeeeee;
-}
 ol.progress-steps {
   list-style: none;
   margin: 0;