spree_core 0.60.6 → 0.70.RC1

data/app/assets/javascripts/admin/zone.js

@@ -0,0 +1,44 @@
+$(function() {
+  if ($('#country_based').is(':checked')) {
+    show_country();
+  } else if ($('#state_based').is(':checked')) {
+    show_state();
+  } else {
+    show_zone();
+  }
+  $('#country_based').click(function() { show_country();} );
+  $('#state_based').click(function() { show_state();} );
+  $('#zone_based').click(function() { show_zone();} );
+})
+
+var show_country = function() {
+  $('#state_members :input').each(function() { $(this).prop("disabled", true); })
+  $('#state_members').hide();
+  $('#zone_members :input').each(function() { $(this).prop("disabled", true); })
+  $('#zone_members').hide();
+  $('#country_members :input').each(function() { $(this).prop("disabled", false); })
+  $('#country_members').show();
+};
+
+var show_state = function() {
+  $('#country_members :input').each(function() { $(this).prop("disabled", true);
+ })
+  $('#country_members').hide();
+  $('#zone_members :input').each(function() { $(this).prop("disabled", true);
+ })
+  $('#zone_members').hide();
+  $('#state_members :input').each(function() { $(this).prop("disabled", false); })
+  $('#state_members').show();
+};
+
+var show_zone = function() {
+  $('#state_members :input').each(function() { $(this).prop("disabled", true);
+ })
+  $('#state_members').hide();
+  $('#country_members :input').each(function() { $(this).prop("disabled", true);
+ })
+  $('#country_members').hide();
+  $('#zone_members :input').each(function() { $(this).prop("disabled", false); })
+  $('#zone_members').show();
+};
+

data/app/assets/javascripts/store/cart.js

@@ -0,0 +1,11 @@
+(function($){
+  $(document).ready(function(){
+    if($('form#update-cart').is('*')){
+      $('form#update-cart a.delete').show().live('click', function(e){
+        $(this).parents('tr').find('input.line_item_quantity').val(0);
+        $(this).parents('form').submit();
+        e.preventDefault();
+      });
+    }
+  });
+})(jQuery);

data/app/assets/javascripts/store/checkout.js

@@ -0,0 +1,77 @@
+(function($){
+  $(document).ready(function(){
+    if($('#checkout_form_address').is('*')){
+
+      $('#checkout_form_address').validate();
+
+      var get_states = function(region){
+        country = $('p#' + region + 'country' + ' span#' + region + 'country :only-child').val();
+        return state_mapper[country];
+      }
+
+      var update_state = function(region) {
+        states = get_states(region);
+
+        state_select = $('p#' + region + 'state select');
+        state_input = $('p#' + region + 'state input');
+
+        if(states) {
+          selected = state_select.val();
+          state_select.html('');
+          states_with_blank = [["",""]].concat(states);
+          $.each(states_with_blank, function(pos,id_nm) {
+            var opt = $(document.createElement('option'))
+                      .attr('value', id_nm[0])
+                      .html(id_nm[1]);
+            if(selected==id_nm[0]){
+              opt.prop("selected", true);
+            }
+            state_select.append(opt);
+          });
+          state_select.prop("disabled", false).show();
+          state_input.hide().prop("disabled", true);
+
+        } else {
+          state_input.prop("disabled", false).show();
+          state_select.hide().prop("disabled", true);
+        }
+
+      };
+
+      $('p#bcountry select').change(function() { update_state('b'); });
+      $('p#scountry select').change(function() { update_state('s'); });
+      update_state('b');
+      update_state('s');
+
+      $('input#order_use_billing').click(function() {
+        if($(this).is(':checked')) {
+          $('#shipping .inner').hide();
+          $('#shipping .inner input, #shipping .inner select').prop("disabled", true);
+        } else {
+          $('#shipping .inner').show();
+          $('#shipping .inner input, #shipping .inner select').prop("disabled", false);
+          //only want to enable relevant field
+          if(get_states('s')){
+            $('span#sstate input').hide().prop("disabled", true);
+          }else{
+            $('span#sstate select').hide().prop("disabled", true);
+          }
+
+        }
+      }).triggerHandler('click');
+
+      $('form.edit_order').submit(function() {
+        $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
+      });
+
+    }
+
+    if($('#checkout_form_payment').is('*')){
+      // Show fields for the selected payment method
+      $("input[type='radio'][name='order[payments_attributes][][payment_method_id]']").click(function(){
+        $('#payment-methods li').hide();
+        if(this.checked){ $('#payment_method_'+this.value).show(); }
+      }).triggerHandler('click');
+    }
+  });
+})(jQuery);

data/app/assets/javascripts/store/product.js

@@ -0,0 +1,49 @@
+var add_image_handlers = function() {
+  $("#main-image").data('selectedThumb', $('#main-image img').attr('src'));
+  $('ul.thumbnails li').eq(0).addClass('selected');
+
+  $('ul.thumbnails').delegate('a', 'click', function(event) {
+    $("#main-image").data('selectedThumb', $(event.currentTarget).attr('href'));
+    $("#main-image").data('selectedThumbId', $(event.currentTarget).parent().attr('id'));
+    $(this).mouseout(function() {
+      $('ul.thumbnails li').removeClass('selected');
+      $(event.currentTarget).parent('li').addClass('selected');
+    });
+    return false;
+  });
+  $('ul.thumbnails').delegate('li', 'mouseenter', function(event) {
+    $('#main-image img').attr('src', $(event.currentTarget).find('a').attr('href'));
+  });
+  $('ul.thumbnails').delegate('li', 'mouseleave', function(event) {
+    $('#main-image img').attr('src', $("#main-image").data('selectedThumb'));
+  });
+};
+
+var show_variant_images = function(variant_id) {
+  $('li.vtmb').hide();
+  $('li.vtmb-' + variant_id).show();
+  var currentThumb = $('#' + $("#main-image").data('selectedThumbId'));
+  // if currently selected thumb does not belong to current variant, nor to common images,
+  // hide it and select the first available thumb instead.
+  if(!currentThumb.hasClass('vtmb-' + variant_id) && !currentThumb.hasClass('tmb-all')) {
+    var thumb = $($('ul.thumbnails li:visible').eq(0));
+    var newImg = thumb.find('a').attr('href');
+    $('ul.thumbnails li').removeClass('selected');
+    thumb.addClass('selected');
+    $('#main-image img').attr('src', newImg);
+    $("#main-image").data('selectedThumb', newImg);
+    $("#main-image").data('selectedThumbId', thumb.attr('id'));
+  }
+}
+
+$(document).ready(function() {
+  add_image_handlers();
+  if($('#product-variants input[type=radio]').length > 0) {
+    show_variant_images($('#product-variants input[type=radio]').eq(0).attr('value'));
+  }
+
+  $('#product-variants input[type=radio]').click(function (event) {
+    show_variant_images(this.value);
+  });
+});
+

data/app/assets/javascripts/store/spree_core.js

@@ -0,0 +1,6 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery.validate/jquery.validate.min
+//= require store/checkout
+//= require store/product
+//= require store/cart

data/{public/stylesheets/admin/admin-forms.css → app/assets/stylesheets/admin/admin-form.css.erb}

@@ -1,12 +1,12 @@
-/* -------------------------------------------------------------- 
-   
+/* --------------------------------------------------------------
+
    forms.css
    * Sets up some default styling for forms
    * Gives you classes to enhance your forms
-   
+
    Usage:
    * For text fields, use class .title or .text
-   
+
 -------------------------------------------------------------- */
 
 label       { font-weight: bold; }
@@ -28,11 +28,21 @@ textarea:focus, select:focus {
   border:1px solid #666;
 }
 
-input.text, 
+input.text,
 input.title   { padding:5px; }
 input.title   { font-size:1.5em; }
 textarea      { height: 250px; padding:5px; }
 
+
+fieldset#preferences input.input_string, fieldset#preferences textarea {
+  border: 1px solid #BBB;
+  padding: 5px;
+  font-size: 1.5em;
+  width: 98%;
+}
+
+fieldset#preferences textarea { height: 100px; }
+
 .required { color:#f00; font-weight:bold; font-size:1.2em;}
 .fullwidth { width:98% }
 
@@ -54,16 +64,16 @@ div.split {
 }
 form div.left
 {
-	display:inline;
-	float:left;
-	width:48%;
+  display:inline;
+  float:left;
+  width:48%;
 }
 
 form div.right
 {
-	display:inline;
-	float:right;
-	width:48%;
+  display:inline;
+  float:right;
+  width:48%;
 }
 form p {
   clear:both;
@@ -86,17 +96,17 @@ form div.right.w30 {
   border-left:none;border-right:none;
 }
 .flash.error {
-  background: #FDE4E4 url(../../images/admin/icons/exclamation.png) 10px center no-repeat;
+  background: #FDE4E4 url(<%= asset_path 'admin/icons/exclamation.png' %>) 10px center no-repeat;
   color:#c00; border-color:#c00;
 }
 .flash.notice {
-  background: #E7F8D7 url(../../images/admin/icons/tick.png) 10px center no-repeat;
+  background: #E7F8D7 url(<%= asset_path 'admin/icons/tick.png' %>) 10px center no-repeat;
   color:#59A151; border-color: #59A151;
 }
 
 .withError {
   background-color:#FDE4E4;
-  background-image:url(../../images/admin/bg/red-stripes.png);
+  background-image:url(<%= asset_path 'admin/bg/red-stripes.png' %>);
 }
 .formError {
   color:#c00; font-weight:bold;
@@ -122,7 +132,7 @@ form div.right.w30 {
   position: relative; }
   .field .formError {
     color: #fff;
-    background: #f15700 url(../../images/admin/icons/fugue/exclamation_small.png) center left no-repeat;
+    background: #f15700 url(<%= asset_path 'admin/icons/exclamation.png' %>) center left no-repeat;
     padding: 3px 7px;
     display: inline-block;
     margin-bottom: 1em;
@@ -140,8 +150,9 @@ fieldset {
   margin-bottom: 1em;
   padding: 1em;
   border: solid 1px #ccc;
+  background-color: #fff;
   -moz-border-radius: 10px;
-  -webkit-border-radius: 10px; 
+  -webkit-border-radius: 10px;
   }
   fieldset h1 {
     font-size: 1.75em; }

data/{public/stylesheets/admin/admin-tables.css → app/assets/stylesheets/admin/admin-tables.css.erb}

@@ -1,5 +1,5 @@
 table.index th {
-  background: #cdcdcd url(../../images/admin/bg/grid_header_back.png) top left repeat-x;
+  background: #cdcdcd url(<%= asset_path 'admin/bg/grid_header_back.png' %>) top left repeat-x;
   padding: 7px 10px;
   border-left: 1px solid #ddd;
   border-top: 1px solid #ddd;
@@ -13,6 +13,7 @@ table.index th {
   table.index th.id-col {
     text-align: center; }
   table.index td {
+    background-color: #fff;
     border-bottom:1px solid #ddd;
     padding: 3px 10px;
   }
@@ -23,7 +24,7 @@ table.index th {
 table.index tr.alt td {
   background-color: #efefef; }
 table.index.green th {
-  background: #cfefa7 url(/images/grid_header_back_green.png) top left repeat-x;
+  background: #cfefa7 url(<%= asset_path 'admin/grid_header_back_green.png' %>) top left repeat-x;
   border-left: 1px solid #E4FDB4;
   border-top: 1px solid #E4FDB4;
   border-right: 1px solid #B7CB90;

data/{public → app/assets}/stylesheets/admin/admin-typography.css

@@ -54,7 +54,7 @@ acronym     { border-bottom: 1px dotted #666; }
 address     { margin: 0 0 1.5em; font-style: italic; }
 del         { color:#666; }
 
-pre 				{ margin: 1.5em 0; white-space: pre; }
+pre         { margin: 1.5em 0; white-space: pre; }
 pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
 
 
@@ -78,7 +78,7 @@ dd          { margin-left: 1.5em;}
 
 table       { margin-bottom: 1.4em; width:100%; }
 th          { font-weight: bold; }
-thead th 		{ background: #c3d9ff; }
+thead th    { background: #c3d9ff; }
 th,td,caption { padding: 4px 10px 4px 5px; }
 tr.even td  { background: #e5ecf9; }
 tfoot       { font-style: italic; }

data/{public/stylesheets/admin/admin.css → app/assets/stylesheets/admin/admin.css.erb}

@@ -66,7 +66,7 @@ body {
       #content a:visited {
         color: #3C7DFB; }
     #content.with-sidebar {
-      background: #fff url(../../images/admin/bg/content-back.png) right top repeat-y;
+      background: #fff url(<%= asset_path 'admin/bg/content-back.png' %>) right top repeat-y;
       padding-right: 340px;
       position: relative; }
       #sidebar {
@@ -118,7 +118,7 @@ body {
               #sidebar ul.sidebar li a:hover { background-color:#ddd }
               #sidebar ul.sidebar li.active a {
                 font-weight: bold;
-                background: url(../../images/admin/bg/menu-current.png) left center no-repeat;
+                background: url(<%= asset_path 'admin/bg/menu-current.png' %>) left center no-repeat;
                 color: #363 !important;
                 margin-left: -20px;
                 padding-left: 30px; }
@@ -196,7 +196,7 @@ body {
   #IE7 #admin-menu {
     height: 39px; }
   #admin-menu {
-    background: #154e8c url(../../images/admin/bg/admin_tab_back.png) top left repeat-x;
+    background: #154e8c url(<%= asset_path 'admin/bg/admin_tab_back.png' %>) top left repeat-x;
     border-top: 1px solid #4B83E2;
     border-right: 1px solid #34599B;
     border-bottom: 1px solid #41A6F0;
@@ -206,7 +206,7 @@ body {
       #admin-menu ul li:first-child {
         border-left: 1px solid #34599B; }
       #admin-menu ul li.selected {
-        background: #0095da url(../../images/admin/bg/admin_tab_selected_back.png) top left repeat-x;
+        background: #0095da url(<%= asset_path 'admin/bg/admin_tab_selected_back.png' %>) top left repeat-x;
         border-left: 1px solid #41A6F0;
         border-top: 1px solid #41A6F0;
         border-right: 1px solid #4986BF;
@@ -252,7 +252,7 @@ body {
     .search-form label {
       display: block; }
   a.button {
-    background: transparent url(../../images/admin/buttons/right_01.png) no-repeat scroll top right;
+    background: transparent url(<%= asset_path 'admin/buttons/right_01.png' %>) no-repeat scroll top right;
     display: block;
     float: left;
     margin-right: 6px;
@@ -262,7 +262,7 @@ body {
     font-weight: bold;
     outline: none; }
     a.button span {
-      background: transparent url(../../images/admin/buttons/left_01.png) no-repeat;
+      background: transparent url(<%= asset_path 'admin/buttons/left_01.png' %>) no-repeat;
       display: block;
       line-height: 22px;
       padding: 7px 0 5px 14px;
@@ -274,24 +274,24 @@ body {
       font-weight: normal; }
     a.button.small {
       font-size: 1em;
-      background: transparent url(../../images/admin/buttons/right_01_small.png) no-repeat scroll top right;
+      background: transparent url(<%= asset_path 'admin/buttons/right_01_small.png' %>) no-repeat scroll top right;
       padding-right: 20px; }
       a.button.small span {
-        background: transparent url(../../images/admin/buttons/left_01_small.png) no-repeat;
+        background: transparent url(<%= asset_path 'admin/buttons/left_01_small.png' %>) no-repeat;
         padding: 5px 0 3px 20px;
         line-height: 21px; }
     a.button.green {
-      background: transparent url(../../images/admin/buttons/green/right_01.png) no-repeat scroll top right;
+      background: transparent url(<%= asset_path 'admin/buttons/green/right_01.png' %>) no-repeat scroll top right;
       color: #151 !important; }
       a.button.green span {
-        background: transparent url(../../images/admin/buttons/green/left_01.png) no-repeat; }
+        background: transparent url(<%= asset_path 'admin/buttons/green/left_01.png' %>) no-repeat; }
   button {
     border: 0;
     cursor: pointer;
     font-weight: bold;
     padding: 0 20px 0 0;
     text-align: center;
-    background: url(../../images/admin/buttons/right_01.png) center right no-repeat;
+    background: url(<%= asset_path 'admin/buttons/right_01.png' %>) center right no-repeat;
     font-size: 1.3em;
     outline: none; }
     button span {
@@ -301,7 +301,7 @@ body {
       padding: 0 0 0 20px;
       height: 35px;
       line-height: 35px;
-      background: url(../../images/admin/buttons/left_01.png) center left no-repeat;
+      background: url(<%= asset_path 'admin/buttons/left_01.png' %>) center left no-repeat;
       text-shadow: #efefef 1px 1px 0px; }
       button span img {
         vertical-align: middle;
@@ -311,6 +311,10 @@ body {
     button.tick {
       background: none;
       width: 24px; }
+    button.small {
+      font-size: 1em;
+      padding: 0 10px 0 10px;
+    }
   input.title,
   textarea {
     margin: 0; }
@@ -327,7 +331,7 @@ body {
     .errorExplanation h2 {
       font-size: 1.75em;
       padding-left: 40px;
-      background: url(../../images/admin/icons/orb/32x32/3.png) center left no-repeat; }
+      background: url(<%= asset_path 'admin/icons/orb/32x32/3.png' %>) center left no-repeat; }
   ul.checkbox-list {
     list-style: none; }
     ul.checkbox-list li {
@@ -402,7 +406,7 @@ body {
       ul.taxonomy-actions li.disabled {
         opacity: .5; }
   h3.warning {
-    background-image: url(../../images/admin/icons/fugue/exclamation.png);
+    background-image: url(<%= asset_path 'admin/icons/fugue/exclamation.png' %>);
     background-position: 10px 15px;
     background-repeat: no-repeat;
     padding-left: 35px; }
@@ -447,12 +451,12 @@ span.current_page {
   color: #FFF;
 }
 
-div#calculator-settings-warning {
+div#calculator-settings-warning, .warning {
  color: #f00;
 }
 #progress{
   display:none;
-  background:#154E8C url(../../images/admin/bg/admin_tab_back.png) repeat-x scroll left top;
+  background:#154E8C url(<%= asset_path 'admin/bg/admin_tab_back.png' %>) repeat-x scroll left top;
   color:#fff;
   font-size:170%;
   height:25px;
@@ -578,37 +582,9 @@ table#product_scopes tr td table tr td {
 
 
 span.handle{
-  background-image: url(../../images/reorder.jpg);
+  background-image: url(<%= asset_path 'admin/icons/switch.png' %>);
   display: inline-block;
+  cursor: move;
   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;
-}
-