spree_core 1.1.1 → 1.1.2.rc1

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

@@ -60,8 +60,10 @@ format_product_autocomplete = function(item){
     }
 
     html += "<div><h4>" + product['name'] + "</h4>";
-    html += "<span><strong>Sku: </strong>" + product['master']['sku'] + "</span>";
-    html += "<span><strong>On Hand: </strong>" + product['count_on_hand'] + "</span></div>";
+    if (product['master']) {
+      html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + product['master']['sku'] + "</span>";
+    }
+    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + product['count_on_hand'] + "</span></div>";
   }else{
     // variant
     var variant = item.data['variant'];
@@ -76,12 +78,12 @@ format_product_autocomplete = function(item){
     }
 
     name += " - " + $.map(variant['option_values'], function(option_value){
-      return option_value["option_type"]["presentation"] + ": " + option_value['name'];
+      return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
     }).join(", ")
 
     html += "<div><h4>" + name + "</h4>";
-    html += "<span><strong>Sku: </strong>" + variant['sku'] + "</span>";
-    html += "<span><strong>On Hand: </strong>" + variant['count_on_hand'] + "</span></div>";
+    html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + variant['sku'] + "</span>";
+    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + variant['count_on_hand'] + "</span></div>";
   }
 
   return html
@@ -98,7 +100,7 @@ prep_product_autocomplete_data = function(data){
 
         var name = product['name'];
         name += " - " + $.map(variant['option_values'], function(option_value){
-          return option_value["option_type"]["presentation"] + ": " + option_value['name'];
+          return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
         }).join(", ");
 
         return {
@@ -121,7 +123,7 @@ $.fn.product_autocomplete = function(){
   return this.each(function() {
     $(this).autocomplete({
       source: function(request, response) {
-        $.get(ajax_root_prefix() + "admin/products.json?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(Spree.routes.admin_products_path({format: 'json'}) + "?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
           result = prep_product_autocomplete_data(data)
           response(result);
         });
@@ -183,13 +185,13 @@ add_fields = function(target, association, content) {
   $(target).append(content.replace(regexp, new_id));
 }
 
-$('a.remove_fields').live('click', function() {
+$('a.remove_fields').on('click', function() {
   $(this).prev("input[type=hidden]").val("1");
   $(this).closest(".fields").hide();
   return false;
 });
 
-$(".observe_field").live('change', function() {
+$(".observe_field").on('change', function() {
   target = $(this).attr("data-update");
   ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
   $(target).hide();
@@ -208,9 +210,9 @@ $(".observe_field").live('change', function() {
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
     dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
-    dayNames: ["<%= ::I18n.t(:day_names, :scope => :date).join('","') %>"],
-    dayNamesMin: ["<%= ::I18n.t(:abbr_day_names, :scope => :date).join('","') %>"],
-    monthNames: ["<%= ::I18n.t(:month_names, :scope => :date).join('","') %>"],
+    dayNames: <%= ::I18n.t(:day_names, :scope => :date).to_json %>,
+    dayNamesMin: <%= ::I18n.t(:abbr_day_names, :scope => :date).to_json %>,
+    monthNames: <%= (::I18n.t(:month_names, :scope => :date).delete_if(&:blank?)).to_json %>,
     prevText: '<%= ::I18n.t(:previous) %>',
     nextText: '<%= ::I18n.t(:next) %>',
     showOn: "button",
@@ -220,13 +222,53 @@ handle_date_picker_fields = function(){
 }
 
 $(document).ready(function(){
+  $('.add_fields').click(function() {
+    var target = $(this).data("target");
+    var new_table_row = $(target + ' tr:visible:last').clone();
+    var new_id = new Date().getTime();
+    new_table_row.find("input").each(function () {
+      var el = $(this);
+      el.val("");
+      el.attr("id", el.attr("id").replace(/\d+/, new_id))
+      el.attr("name", el.attr("name").replace(/\d+/, new_id))
+    })
+    $(target).append(new_table_row);
+  })
+
+  $('body').on('click', '.delete-resource', function() {
+    var el = $(this);
+    if (confirm(el.data("confirm"))) {
+      $.ajax({
+        type: 'POST',
+        url: $(this).attr("href"),
+        data: {
+          _method: 'delete',
+          authenticity_token: AUTH_TOKEN
+        },
+        dataType: 'script',
+        success: function(response) {
+          el.parents("tr").fadeOut('hide');
+        },
+        error: function(response, textStatus, errorThrown) {
+          show_flash_error(response.responseText);
+        }
+      });
+    }
+    return false;
+  });
+
+  $('body').on('click', 'a.remove_fields', function() {
+    $(this).prev("input[type=hidden]").val("1");
+    $(this).closest(".fields").hide();
+    return false;
+  });
 
   $('.tokeninput.products').productPicker();
   $('.tokeninput.users').userPicker();
 
   handle_date_picker_fields();
 
-  $(".select_properties_from_prototype").live("click", function(){
+  $(".select_properties_from_prototype").on("click", function(){
     $("#busy_indicator").show();
     var clicked_link = $(this);
     $.ajax({ dataType: 'script', url: clicked_link.attr("href"), type: 'get',

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -46,7 +46,7 @@ $(document).ready(function(){
       minChars: 5,
       delay: 1500,
       source: function(request, response) {
-        $.get(ajax_root_prefix() + "admin/users.json?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(Spree.routes.admin_users_path({format: 'json'}) + "?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
         });

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

@@ -8,11 +8,11 @@ $(document).ready(function() {
     $('#s3_settings').toggle();
   });
 
-  $('.destroy_style').live("click", function() {
+  $('.destroy_style').on("click", function() {
    $(this).parent().remove();
   });
 
-  $('.destroy_header').live("click", function() {
+  $('.destroy_header').on("click", function() {
     $(this).parent().remove();
   });
 

data/app/assets/javascripts/admin/orders/edit.js

@@ -1,6 +1,6 @@
 $(document).ready(function(){
 
-  $("#add_line_item_to_order").live("click", function(){
+  $("#add_line_item_to_order").on("click", function(){
     if($('#add_variant_id').val() == ''){ return false; }
     update_target = $(this).attr("data-update");
     $.ajax({ dataType: 'script', url: this.href, type: "POST",

data/app/assets/javascripts/admin/orders/edit_form.js

@@ -1,7 +1,7 @@
 $(document).ready(function() {
   $.each($('td.qty input'), function(i, input) {
 
-    $(input).live('change', function() {
+    $(input).on('change', function() {
 
       var id = "#" + $(this).attr('id').replace("_quantity", "_id");
       console.log($(this))

data/app/assets/javascripts/admin/spree.routes.js.erb

@@ -0,0 +1,30 @@
+// This object provides dynamically generated Rails routes in Javascript.
+// Since Rails does not provide url_helpers in js.erb files, we have to use this little neat hack.
+// Found via https://github.com/magiclabs/alchemy_cms
+
+<% self.class.instance_eval { include Spree::Core::Engine.routes.url_helpers } %>
+
+if (typeof(Spree) === 'undefined') {
+  var Spree = {};
+}
+
+(function($) {
+
+  var routes = {};
+  $.extend(Spree, routes);
+
+  Spree.routes = {
+
+    admin_users_path: function(options) {
+      if (typeof(options) === 'undefined') options = {format: 'html'};
+      return '<%= admin_users_path %>' + '.' + options.format;
+    },
+
+    admin_products_path: function(options) {
+      if (typeof(options) === 'undefined') options = {format: 'html'};
+      return '<%= admin_products_path %>' + '.' + options.format;
+    }
+
+  }
+
+})(jQuery);

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

@@ -190,7 +190,7 @@ $(document).ready(function(){
       .bind("create.jstree", handle_create)
       .bind("rename.jstree", handle_rename);
 
-    $("#taxonomy_tree").delegate("a", "dblclick", function (e) {
+    $("#taxonomy_tree a").on("dblclick", function (e) {
      $("#taxonomy_tree").jstree("rename", this)
     });
 

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

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

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

@@ -2,7 +2,7 @@ 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) {
+  $('ul.thumbnails a').on('click', function(event) {
     $("#main-image").data('selectedThumb', $(event.currentTarget).attr('href'));
     $("#main-image").data('selectedThumbId', $(event.currentTarget).parent().attr('id'));
     $(this).mouseout(function() {
@@ -11,10 +11,10 @@ var add_image_handlers = function() {
     });
     return false;
   });
-  $('ul.thumbnails').delegate('li', 'mouseenter', function(event) {
+  $('ul.thumbnails li').on('mouseenter', function(event) {
     $('#main-image img').attr('src', $(event.currentTarget).find('a').attr('href'));
   });
-  $('ul.thumbnails').delegate('li', 'mouseleave', function(event) {
+  $('ul.thumbnails li').on('mouseleave', function(event) {
     $('#main-image img').attr('src', $("#main-image").data('selectedThumb'));
   });
 };

data/app/assets/stylesheets/admin/admin.css.erb

@@ -566,7 +566,9 @@ span.handle{
   border: 1px solid #000;
 }
 
-.ac_results li h4 { width: 100% }
+.ac_results li div { max-width: 90%; }
+
+.ac_results li h4 { width: 100%; }
 
 .ac_results li:last-child { border: none; }
 

data/app/assets/stylesheets/store/screen.css.scss

@@ -1,60 +1,4 @@
-/*--------------------------------------*/
-/* Colors
-/*--------------------------------------*/
-$c_green:       #8dba53;  /* Spree green    */
-$c_red:         #e45353;  /* Error red      */
-
-$layout_background_color:   #FFFFFF;
-$title_text_color:          #404042;
-$body_text_color:           #404042;
-$link_text_color:           #00ADEE;
-
-$product_background_color:  #FFFFFF;
-$product_title_text_color:  #404042;
-$product_body_text_color:   #404042;
-$product_link_text_color:   #BBBBBB;
-
-/*--------------------------------------*/
-/* Fonts import from remote
-/*--------------------------------------*/
-@import url(//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
-
-/*--------------------------------------*/
-/* Font families
-/*--------------------------------------*/
-$ff_base:       'Ubuntu', sans-serif;
-
-/*--------------------------------------
-  | Font sizes
-  |--------------------------------------
-  |- Navigation                         
-  |                                    */
-      $header_navigation_font_size:           14px;
-      $horizontal_navigation_font_size:       16px;
-      $main_navigation_header_font_size:      14px;
-      $main_navigation_font_size:             12px;
-/*|------------------------------------
-  |- Product Listing                         
-  |                                  */
-      $product_list_name_font_size:           12px;
-      $product_list_price_font_size:          16px;
-      $product_list_header_font_size:         20px;
-      $product_list_search_font_size:         14px;
-/*|------------------------------------
-  |- Product Details
-  |                                  */
-      $product_detail_name_font_size:         24px;
-      $product_detail_description_font_size:  12px;
-      $product_detail_price_font_size:        20px;
-      $product_detail_title_font_size:        14px;
-/*|------------------------------------
-  |- Basic
-  |                                  */
-      $heading_font_size:                     24px;
-      $sub_heading_font_size:                 14px;
-      $button_font_size:                      12px;
-      $input_box_font_size:                   13px;
-      $base_font_size:                        12px;
+@import "store/variables";
 
 /*--------------------------------------*/
 /* Basic styles 
@@ -98,10 +42,6 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   /* Lists
   /*--------------------------------------*/
   ul, ol {
-    li {
-      
-    }
-
     &.inline {
       li {
         display: inline-block;
@@ -190,16 +130,22 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     margin-top: 3px;
   }
 
+  span.required {
+    color: $c_red;
+    font-weight: bold;
+    font-size: 1.2em;
+  }
+
   input[type="submit"], input[type="button"],
   input[type= "reset"], button, a.button {
-    background-color: $link_text_color;;
+    background-color: $link_text_color;
     background-image: none;
     text-shadow: none;
     color: $layout_background_color;
     font-weight: bold;
     font-size: $button_font_size;
     font-family: $ff_base;
-    border: 1px solid rgba(0, 138, 189, .75);
+    border: 1px solid $button_border_color;
     -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
      -khtml-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
        -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
@@ -218,6 +164,11 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       font-size: $button_font_size + 2;
     }
 
+    &.gray {
+      background-color: lighten($body_text_color, 20);
+      border-color: lighten($body_text_color, 10);
+    }
+
     &:hover {
       background-image: none;
       background-color: $body_text_color;
@@ -558,7 +509,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       margin-bottom: 15px;
     }
 
-    span.category {
+    .filter-title {
       display: block;
       font-weight: bold;
       text-transform: uppercase;
@@ -846,6 +797,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   div[data-hook="inside_cart_form"] {
     .links {
       margin-top: 15px;
+      text-align: right;
     }
     
     #subtotal {
@@ -860,8 +812,8 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   }
 
   #empty-cart {
-    margin-top: 15px;
-    float: right;
+    margin-top: -75px !important;
+    float: left !important;
   }
 
   /*--------------------------------------*/

data/app/assets/stylesheets/store/variables.css.scss

@@ -0,0 +1,58 @@
+/*--------------------------------------*/
+/* Colors
+/*--------------------------------------*/
+$c_green:       #8dba53;  /* Spree green    */
+$c_red:         #e45353;  /* Error red      */
+
+$layout_background_color:   #FFFFFF;
+$title_text_color:          #404042;
+$body_text_color:           #404042;
+$link_text_color:           #00ADEE;
+
+$product_background_color:  #FFFFFF;
+$product_title_text_color:  #404042;
+$product_body_text_color:   #404042;
+$product_link_text_color:   #BBBBBB;
+
+/*--------------------------------------*/
+/* Fonts import from remote
+/*--------------------------------------*/
+@import url(//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
+
+/*--------------------------------------*/
+/* Font families
+/*--------------------------------------*/
+$ff_base:       'Ubuntu', sans-serif;
+
+/*--------------------------------------
+  | Font sizes
+  |--------------------------------------
+  |- Navigation                         
+  |                                    */
+      $header_navigation_font_size:           14px;
+      $horizontal_navigation_font_size:       16px;
+      $main_navigation_header_font_size:      14px;
+      $main_navigation_font_size:             12px;
+/*|------------------------------------
+  |- Product Listing                         
+  |                                  */
+      $product_list_name_font_size:           12px;
+      $product_list_price_font_size:          16px;
+      $product_list_header_font_size:         20px;
+      $product_list_search_font_size:         14px;
+/*|------------------------------------
+  |- Product Details
+  |                                  */
+      $product_detail_name_font_size:         24px;
+      $product_detail_description_font_size:  12px;
+      $product_detail_price_font_size:        20px;
+      $product_detail_title_font_size:        14px;
+/*|------------------------------------
+  |- Basic
+  |                                  */
+      $heading_font_size:                     24px;
+      $sub_heading_font_size:                 14px;
+      $button_font_size:                      12px;
+      $input_box_font_size:                   13px;
+      $base_font_size:                        12px;
+      $button_border_color:                   rgba(0, 138, 189, .75);