caboose-cms 0.5.55 → 0.5.56

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWFiNTgyMjY5NzczYmMzNjA4NDY5MjAxOGQxNzI2MmM2NmNlMGIzNQ==
+    NTkzNGRkMmQ3YWRiMDVmOWE1NjA3MjExMTM5ZDI2NGI5MWUxODc3MA==
   data.tar.gz: !binary |-
-    Y2E4YzI3MzkwNjk0ZTYwMjU0OWQyMjFjMzkxN2E3M2RhM2ExNmViMQ==
+    NGI4NjU2ZGU5ZDUzOTQzMDc4NmVkZDcxMzRlOTUxMzIxMmJkZmYyOQ==
 SHA512:
   metadata.gz: !binary |-
-    NmM3MDdkMGU3M2ZhZjNiZmI2NjhiOTY0ZmMyZmIzZGU1MDMzNjg3MjAxNWNl
-    YjFmODAyMDIyOWY0YTQ5Mzk4YTViNGVmMGQwZWMzNDljN2NjNjk4MTA4ZjBm
-    YmQ3OTk5ZmQwZjQ3MDRlNThmOWM2ZTkyZmQxNWFhZjU4MGFiY2E=
+    MzM1NzQ4MGE0MTAxMzIyNjQ5YzE3YWY2MDJjY2E2MjdiZThlYjI1NmQ2OWYx
+    MzA5YzE4MWYwZTUyYTJmNGQ2YzVjYmE2YjgxYzliZjU5ZTU2ZDdlYmE3NmM4
+    YTMyMGZlYTMxZGQ3ZWVmZGM5MjZiMjllNWY1OGVkM2EzMmFiYmE=
   data.tar.gz: !binary |-
-    NWY1Y2E4MjUzMTc5MDFhZjk1ZWIzMTJhZmFhYzE4MTAzMTg0ZTQ0YzgwOTM4
-    OTNlZmJhNjc3OGNmOTVkZWEzNTc4MzhmMjgzNWZjNDI5NDdhOTI1M2RkZjc4
-    MWFjYzYwMDI1YzkwZWZhOTczYzAyMmE2NzkzNWU0MzIxYzE2YzU=
+    OWY5NmJiOTdmNmVkZGRiYzExM2QyNTZkMmI3YjM4MWIxNmE2YmFiYTZjYmY0
+    MDVlOWFhODc5ZThhOGNhMTAzYzBiMjQ3NGUzZDdjMWQ1MzU0NGI1Mjc5NzMz
+    YWQwNTVkNDhmM2NlMjM5ZThiZWViOWNlMjQzMjgwZTEwY2JiNzI=

data/app/controllers/caboose/products_controller.rb

@@ -378,41 +378,6 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/products/:id/variants
-    # GET /admin/products/:id/variants/:variant_id
-    def admin_edit_variants   
-      return if !user_is_allowed('products', 'edit')    
-      @product = Product.find(params[:id])
-      
-      if @product.variants.nil? || @product.variants.count == 0
-        v = Variant.new
-        v.option1 = @product.default1 if @product.option1
-        v.option2 = @product.default2 if @product.option2
-        v.option3 = @product.default3 if @product.option3
-        v.status  = 'Active'
-        @product.variants = [v]
-        @product.save
-      end
-      @variant = params[:variant_id] ? Variant.find(params[:variant_id]) : @product.variants[0]
-      session['variant_cols'] = self.default_variant_cols if session['variant_cols'].nil?
-      @cols = session['variant_cols']
-      
-      @highlight_variant_id = params[:highlight] ? params[:highlight].to_i : nil        
-      
-      if @product.options.nil? || @product.options.count == 0
-        render 'caboose/products/admin_edit_variants_single', :layout => 'caboose/admin'  
-      else
-        render 'caboose/products/admin_edit_variants', :layout => 'caboose/admin'
-      end          
-    end
-    
-    # GET /admin/products/:id/variants/json
-    def admin_variants_json
-      render :json => false if !user_is_allowed('products', 'edit')    
-      p = Product.find(params[:id])
-      render :json => p.variants
-    end
-    
     # GET /admin/products/:id/variant-cols  
     def admin_edit_variant_columns
       return if !user_is_allowed('products', 'edit')    
@@ -560,13 +525,6 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/products/:id/variants/sort-order  
-    def admin_edit_variant_sort_order
-      return if !user_is_allowed('products', 'edit')    
-      @product = Product.find(params[:id])      
-      render :layout => 'caboose/admin'
-    end
-    
     # GET /admin/products/:id/delete
     def admin_delete_form
       return if !user_is_allowed('products', 'edit')    
@@ -596,7 +554,7 @@ module Caboose
           when 'seo_description'    then product.seo_description    = value
           when 'status'             then product.status             = value
           when 'category_id'        then product.toggle_category(value[0], value[1])
-          when 'stackable_group_id' then product.stackable_group_id = value
+          when 'stackable_group_id' then product.stackable_group_id = value          
           when 'option1'            then product.option1            = value
           when 'option2'            then product.option2            = value
           when 'option3'            then product.option3            = value
@@ -754,39 +712,7 @@ module Caboose
       end      
       render :json => { :success => true }
     end
-    
-    # PUT /admin/products/:id/variants/option1-sort-order
-    def admin_update_variant_option1_sort_order
-      product_id = params[:id]
-      params[:values].each_with_index do |value, i|
-        Variant.where(:product_id => product_id, :option1 => value).all.each do |v|
-          v.update_attribute(:option1_sort_order, i)
-        end
-      end            
-      render :json => { :success => true }
-    end
-    
-    # PUT /admin/products/:id/variants/option1-sort-order
-    def admin_update_variant_option2_sort_order            
-      product_id = params[:id]
-      params[:values].each_with_index do |value, i|
-        Variant.where(:product_id => product_id, :option2 => value).all.each do |v|
-          v.update_attribute(:option2_sort_order, i)
-        end
-      end            
-      render :json => { :success => true }
-    end
-    
-    # PUT /admin/products/:id/variants/option1-sort-order
-    def admin_update_variant_option3_sort_order      
-      product_id = params[:id]
-      params[:values].each_with_index do |value, i|
-        Variant.where(:product_id => product_id, :option3 => value).all.each do |v|
-          v.update_attribute(:option3_sort_order, i)
-        end
-      end            
-      render :json => { :success => true }
-    end
+        
   end
 end
 

data/app/controllers/caboose/variants_controller.rb

@@ -29,53 +29,61 @@ module Caboose
     # Admin actions
     #=============================================================================
      
+    # GET /admin/products/:product_id/variants/json
+    def admin_json
+      return if !user_is_allowed('products', 'view')
+      
+      pager = Caboose::PageBarGenerator.new(params, {
+        'product_id'   => params[:product_id]
+      }, {
+        'model'          => 'Caboose::Variant',
+        'sort'           => 'option1, option2, option3',
+        'desc'           => false,
+        'base_url'       => "/admin/products/#{params[:product_id]}/variants",
+        'items_per_page' => 100,
+        'use_url_params' => false        
+      })
+      render :json => {
+        :pager => pager,
+        :models => pager.items
+      }      
+    end
+    
     # GET /admin/variants/:variant_id/edit
     # GET /admin/products/:product_id/variants/:variant_id/edit
     def admin_edit
       return if !user_is_allowed('variants', 'edit')    
       @variant = Variant.find(params[:variant_id])
       @product = @variant.product
-      render :layout => 'caboose/admin'
+      render :layout => 'caboose/admin'            
     end
     
-    # GET /admin/variants
-    def admin_group
-      return if !user_is_allowed('variants', 'edit')
-      
-      joins  = []
-      where  = ''
-      values = []
-      
-      if params[:category_ids]
-        joins  << [:category_memberships]
-        where  << 'store_category_memberships.category_id IN (?)'
-        values << params[:category_ids]
-      end
-      
-      if params[:vendor_ids]
-        joins  << [:vendor]
-        where  << 'store_vendors.id IN (?)'
-        values << params[:vendor_ids]
-      end
+    # GET /admin/products/:id/variants
+    # GET /admin/products/:id/variants/:variant_id
+    def admin_edit_variants   
+      return if !user_is_allowed('products', 'edit')    
+      @product = Product.find(params[:id])
       
-      if params[:title]
-        where  << 'LOWER(store_products.title) LIKE ?'
-        values << "%#{params[:title].downcase}%"
+      if @product.variants.nil? || @product.variants.count == 0
+        v = Variant.new
+        v.option1 = @product.default1 if @product.option1
+        v.option2 = @product.default2 if @product.option2
+        v.option3 = @product.default3 if @product.option3
+        v.status  = 'Active'
+        @product.variants = [v]
+        @product.save
       end
+      @variant = params[:variant_id] ? Variant.find(params[:variant_id]) : @product.variants[0]
+      session['variant_cols'] = self.default_variant_cols if session['variant_cols'].nil?
+      @cols = session['variant_cols']
       
-      # Query for all relevant products
-      products = values.any? ? Caboose::Product.joins(joins).where([where].concat(values)) : []
-      
-      # Grab variants for each product
-      @variants = products.collect { |product| product.variants }.flatten
-      
-      # Grab all categories; except for all and uncategorized
-      @categories = Caboose::Category.where('parent_id IS NOT NULL')
+      @highlight_variant_id = params[:highlight] ? params[:highlight].to_i : nil        
       
-      # Grab all vendors
-      @vendors = Caboose::Vendor.all
-      
-      render layout: 'caboose/admin'
+      if @product.options.nil? || @product.options.count == 0
+        render 'caboose/products/admin_edit_variants_single', :layout => 'caboose/admin'  
+      else
+        render 'caboose/products/admin_edit_variants', :layout => 'caboose/admin'
+      end          
     end
     
     # PUT /admin/variants/:id
@@ -88,40 +96,23 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name        
-          when 'alternate_id'
-            v.alternate_id = value
-          when 'sku'
-            v.sku = value
-          when 'barcode'
-            v.barcode = value
-          when 'price'
-            v.price = value
-          when 'quantity_in_stock'
-            v.quantity_in_stock = value
-          when 'ignore_quantity'
-            v.ignore_quantity = value
-          when 'allow_backorder'
-            v.allow_backorder = value
-          when 'status'
-            v.status = value
-          when 'weight'
-            v.weight = value
-          when 'length'
-            v.length = value
-          when 'width'
-            v.width = value
-          when 'height'
-            v.height = value
-          when 'option1'
-            v.option1 = value
-          when 'option2'
-            v.option2 = value
-          when 'option3'
-            v.option3 = value
-          when 'requires_shipping'
-            v.requires_shipping = value
-          when 'taxable'
-            v.taxable = value
+          when 'alternate_id'       then v.alternate_id       = value
+          when 'sku'                then v.sku                = value
+          when 'barcode'            then v.barcode            = value
+          when 'price'              then v.price              = value
+          when 'quantity_in_stock'  then v.quantity_in_stock  = value
+          when 'ignore_quantity'    then v.ignore_quantity    = value
+          when 'allow_backorder'    then v.allow_backorder    = value
+          when 'status'             then v.status             = value
+          when 'weight'             then v.weight             = value
+          when 'length'             then v.length             = value
+          when 'width'              then v.width              = value
+          when 'height'             then v.height             = value
+          when 'option1'            then v.option1            = value
+          when 'option2'            then v.option2            = value
+          when 'option3'            then v.option3            = value
+          when 'requires_shipping'  then v.requires_shipping  = value
+          when 'taxable'            then v.taxable            = value
         end
       end
       resp.success = save && v.save
@@ -201,7 +192,87 @@ module Caboose
         :redirect => "/admin/products/#{v.product_id}/variants"
       })
     end
+    
+    # GET /admin/products/:product_id/variants/sort-order  
+    def admin_edit_sort_order
+      return if !user_is_allowed('products', 'edit')    
+      @product = Product.find(params[:product_id])      
+      render :layout => 'caboose/admin'
+    end
+    
+    # PUT /admin/products/:product_id/variants/option1-sort-order
+    def admin_update_option1_sort_order
+      product_id = params[:product_id]
+      params[:values].each_with_index do |value, i|
+        Variant.where(:product_id => product_id, :option1 => value).all.each do |v|
+          v.update_attribute(:option1_sort_order, i)
+        end
+      end            
+      render :json => { :success => true }
+    end
+    
+    # PUT /admin/products/:product_id/variants/option1-sort-order
+    def admin_update_option2_sort_order            
+      product_id = params[:product_id]
+      params[:values].each_with_index do |value, i|
+        Variant.where(:product_id => product_id, :option2 => value).all.each do |v|
+          v.update_attribute(:option2_sort_order, i)
+        end
+      end            
+      render :json => { :success => true }
+    end
+    
+    # PUT /admin/products/:product_id/variants/option1-sort-order
+    def admin_update_option3_sort_order      
+      product_id = params[:product_id]
+      params[:values].each_with_index do |value, i|
+        Variant.where(:product_id => product_id, :option3 => value).all.each do |v|
+          v.update_attribute(:option3_sort_order, i)
+        end
+      end            
+      render :json => { :success => true }
+    end
   
+    # GET /admin/variants
+    def admin_group
+      return if !user_is_allowed('variants', 'edit')
+      
+      joins  = []
+      where  = ''
+      values = []
+      
+      if params[:category_ids]
+        joins  << [:category_memberships]
+        where  << 'store_category_memberships.category_id IN (?)'
+        values << params[:category_ids]
+      end
+      
+      if params[:vendor_ids]
+        joins  << [:vendor]
+        where  << 'store_vendors.id IN (?)'
+        values << params[:vendor_ids]
+      end
+      
+      if params[:title]
+        where  << 'LOWER(store_products.title) LIKE ?'
+        values << "%#{params[:title].downcase}%"
+      end
+      
+      # Query for all relevant products
+      products = values.any? ? Caboose::Product.joins(joins).where([where].concat(values)) : []
+      
+      # Grab variants for each product
+      @variants = products.collect { |product| product.variants }.flatten
+      
+      # Grab all categories; except for all and uncategorized
+      @categories = Caboose::Category.where('parent_id IS NOT NULL')
+      
+      # Grab all vendors
+      @vendors = Caboose::Vendor.all
+      
+      render :layout => 'caboose/admin'
+    end
+    
     # GET /admin/variants/status-options
     def admin_status_options
       arr = ['Active', 'Inactive', 'Deleted']

data/app/models/caboose/page_cacher.rb

@@ -75,12 +75,14 @@ module Caboose
       block.children.each{ |b2| self.cache_helper(site, p, b2) }
     end
     
-    def self.cache_helper2(site, p, bt)      
+    def self.cache_helper2(site, p, bt)
+      return if bt.nil?      
       self.add_block_type(site, p, bt)
       bt.children.each{ |bt2| self.cache_helper2(site, p, bt2) }
     end
             
     def self.add_block_type(site, p, bt)
+      return if bt.nil?
       if !@render_functions.has_key?(bt.id)
         f = ''        
         if bt.use_render_function && bt.render_function

data/app/views/caboose/products/admin_edit_categories.html.erb

@@ -3,22 +3,7 @@ p = @product
 %>
 <%= render :partial => 'caboose/products/admin_header' %>
 
-<div id='categories'>
-<table>
-  <tr>
-    <% @top_categories.each do |cat| %>
-      <% next if cat.children && cat.children.count > 0 %>
-      <td valign='top'><%= raw category_checkboxes([cat], @selected_ids) %></td>
-    <% end %>
-  </tr>
-  <tr>
-    <% @top_categories.each do |cat| %>
-      <% next if cat.children.nil? || cat.children.count == 0 %>
-      <td valign='top'><%= raw category_checkboxes([cat], @selected_ids) %></td>
-    <% end %>
-  </tr>
-</table>
-</div>
+<div id='product_<%= p.id %>_category_id'></div>
 
 <%= render :partial => 'caboose/products/admin_footer' %>
 
@@ -35,39 +20,26 @@ p = @product
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
+var mb = false;
 $(document).ready(function() {
-  $('#categories input').click(function() {
-    var cat_id = $(this).attr('id').split('_')[1];
-    if ($(this).is(':checked'))
-      add_product_to_category(<%= p.id %>, cat_id);
-    else
-      remove_product_from_category(<%= p.id %>, cat_id);        
+  mb = new ModelBinder({
+    name: 'Product',
+    id: <%= p.id %>,
+    update_url: '/admin/products/<%= p.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      {
+        name: 'category_id',
+        nice_name: 'Categories',
+        type: 'checkbox-multiple',        
+        options_url: '/admin/categories/options',
+        value: <%= raw Caboose.json(p.categories.collect{ |cat| cat.id }) %>,
+        fixed_placeholder: false,
+        width: 400
+      }      
+    ]
   });  
 });
 
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal(800);
-});
-
-function add_product_to_category(product_id, cat_id)
-{
-  $.ajax({
-    url: '/admin/products/' + product_id + '/categories',
-    type: 'post',
-    data: { category_id: cat_id },
-    success: function(resp) {}
-  });
-}
-
-function remove_product_from_category(product_id, cat_id)
-{
-  $.ajax({
-    url: '/admin/products/' + product_id + '/categories/' + cat_id,
-    type: 'delete',
-    success: function(resp) {}
-  });
-}
-
 </script>
 <% end %>

data/app/views/caboose/products/admin_edit_images.html.erb

@@ -15,10 +15,7 @@ p = @product
 <div id='images'>
   <% if p.product_images.count > 0 %>
     <% p.product_images.each do |img| %>
-      <% 
-      #url = "https://s3.amazonaws.com/tuskwear/products/#{img.product_id}_#{img.id}_tiny.jpg" 
-      url = img.image.url(:tiny)
-      %>
+      <% url = img.image.url(:tiny) %>
       <div id='img_<%= img.id %>_container'><a href="javascript:select_image(<%= img.id %>);"><img src='<%= url %>' width='75' /></a></div> 
     <% end %>
   <% else %>
@@ -42,13 +39,7 @@ p = @product
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
-var modal = false;
-$(window).load(function() {
-  modal.autosize();
-});
-
-$(document).ready(function() {
-  modal = new CabooseModal(900);
+$(document).ready(function() {  
   <% if p.product_images.count > 0 %>
   select_image(<%= p.product_images[0].id %>);
   <% end %>
@@ -76,7 +67,7 @@ function select_image(image_id, confirm)
 {
   if (!variants)
   {
-    modal.autosize("<p class='loading'>Getting attached product variants...</p>", 'variants');
+    $('#variants').html("<p class='loading'>Getting attached product variants...</p>");
     $.ajax({
       url: '/admin/products/<%= p.id %>/variants/json',
       success: function(resp) { variants = resp; select_image(image_id); }
@@ -109,8 +100,7 @@ function select_image(image_id, confirm)
   $('#variants').empty().append('<br/>');
   $('#variants').append($('<div/>').attr('id','delete_message'));
   $('#variants').append($('<input/>').attr('type','button').val('Delete Image').click(function() { delete_image(image_id); }));  
-  $('#variants').append(tbl);
-  modal.autosize();
+  $('#variants').append(tbl);  
 }
 
 function variants_subtable(image_id, x, y)
@@ -121,20 +111,6 @@ function variants_subtable(image_id, x, y)
     var v = variants[i];
     if (!v) break;
     checked = image_is_attached_to_variant(v.id);
-    
-    //var a = $('<a/>')
-    //  .attr('href', '#')
-    //  .attr('id', 'v_' + v.id)
-    //  .html(variant_title(v))
-    //  .click(function(e) {
-    //    e.preventDefault();
-    //    variant_id = $(this).attr('id').split('_')[1];
-    //    var attach = false;
-    //    if ($(this).hasClass('selected')) { attach = false; $(this).removeClass('selected'); }
-    //    else                              { attch = true;   $(this).addClass('selected');    }          
-    //    attach_image_to_variant(image_id, variant_id, attach); 
-    //  });
-    //tbody.append($('<tr/>').append($('<td/>').append(a)));
         
     tbody.append($('<tr/>')
       .append($('<td/>')
@@ -145,8 +121,8 @@ function variants_subtable(image_id, x, y)
           .css('position','relative')     
           .val('1')
           .click(function() {
-            variant_id = $(this).attr('id').split('_')[1];
-            attach_image_to_variant(image_id, variant_id, $(this).is(':checked')); 
+            variant_id = $(this).attr('id').split('_')[1];            
+            attach_image_to_variant(image_id, variant_id, $(this).prop('checked')); 
           })
         )        
       )
@@ -173,9 +149,7 @@ function variant_title(v)
 }
 
 function attach_image_to_variant(image_id, variant_id, attach)
-{
-	attach = attach || true;
-	
+{  	
   if (attach)
     image_variant_ids[image_variant_ids.length] = variant_id;
   else
@@ -193,8 +167,7 @@ function attach_image_to_variant(image_id, variant_id, attach)
 
 function add_image()
 {
-  $('#new_image_message').html("<p class='loading'>Adding image...</p>");
-  modal.autosize();
+  $('#new_image_message').html("<p class='loading'>Adding image...</p>");  
 }
 
 function delete_image(image_id, confirm)
@@ -204,17 +177,17 @@ function delete_image(image_id, confirm)
     var p = $('<p/>').addClass('note error').css('margin-bottom', '10px')
       .append("Are you sure you want to delete the image?<br />This can't be undone.<br /><br />")
       .append($('<input/>').attr('type', 'button').val('Yes').click(function() { delete_image(image_id, true); })).append(' ')
-      .append($('<input/>').attr('type', 'button').val('No').click(function() { $('#delete_message').empty(); modal.autosize(); }));      
-    modal.autosize(p, 'delete_message');
+      .append($('<input/>').attr('type', 'button').val('No').click(function() { $('#delete_message').empty(); }));      
+    $('#delete_message').empty().append(p);
     return;
   }
-  modal.autosize("<p class='loading'>Deleting the image...</p>", 'delete_message');
+  $('#delete_message').empty().append("<p class='loading'>Deleting the image...</p>");
   $.ajax({
     url: '/admin/product-images/' + image_id,
     type: 'delete',
     success: function(resp) {
       if (resp.error)
-        modal.autosize("<p class='note error'>" + resp.error + "</p>", 'delete_message');
+        $('#delete_message').html("<p class='note error'>" + resp.error + "</p>");
       else
         window.location.reload(true);
     }

data/app/views/caboose/products/admin_edit_variants.html.erb

@@ -15,7 +15,7 @@ v = @variant
 
 <%= render :partial => 'caboose/products/admin_header' %>
 
-<p style='font-size: 75%;'><a href='/admin/products/<%= p.id %>/variant-cols'>Edit visible columns</a></p>
+<div id='variants'></div>
 
 <div id='message'><%
 # Make sure we're not trying to highlight a deleted variant
@@ -29,57 +29,6 @@ if @highlight_variant_id
 end 
 %></div>
 
-<div id='variants_wrapper'>
-  <table id='variants'>
-    <tr>
-      <th>&nbsp;</th>
-      <% if @cols['option1'           ] && p.option1 %><th valign='bottom'><%= p.option1    %></th><% end %>
-      <% if @cols['option2'           ] && p.option2 %><th valign='bottom'><%= p.option2    %></th><% end %>
-      <% if @cols['option3'           ] && p.option3 %><th valign='bottom'><%= p.option3    %></th><% end %>
-      <% if @cols['status'            ] == true      %><th valign='bottom'>Status             </th><% end %>
-      <% if @cols['alternate_id'      ] == true      %><th valign='bottom'>Alternate ID       </th><% end %>
-      <% if @cols['barcode'           ] == true      %><th valign='bottom'>Barcode            </th><% end %>
-      <% if @cols['price'             ] == true      %><th valign='bottom'>Price              </th><% end %>
-      <% if @cols['quantity_in_stock' ] == true      %><th valign='bottom'>Quantity           </th><% end %>
-      <% if @cols['weight'            ] == true      %><th valign='bottom'>Weight             </th><% end %>
-      <% if @cols['length'            ] == true      %><th valign='bottom'>Length             </th><% end %>
-      <% if @cols['width'             ] == true      %><th valign='bottom'>Width              </th><% end %>
-      <% if @cols['height'            ] == true      %><th valign='bottom'>Height             </th><% end %>
-      <% if @cols['cylinder'          ] == true      %><th valign='bottom'>Cylinder           </th><% end %>
-      <% if @cols['requires_shipping' ] == true      %><th valign='bottom'>Requires Shipping  </th><% end %>
-      <% if @cols['allow_backorder'   ] == true      %><th valign='bottom'>Allow Backorder    </th><% end %>
-      <% if @cols['taxable'           ] == true      %><th valign='bottom'>Taxable            </th><% end %>
-      <th>&nbsp;</th>
-      <th>&nbsp;</th>
-    </tr>
-    <tbody id='variants_tbody'>
-      <% p.variants.where(:status => ['Active', 'Inactive']).each do |v| %>      
-        <tr id='variant_<%= v.id %>' <% if @highlight_variant_id && v.id == @highlight_variant_id %>class='highlight'<% end %>>
-          <td class='sort_handle'>&nbsp;</td>
-          <% if @cols['option1'           ] && p.option1 %><td><div id='variant_<%= v.id %>_option1'           ></div></td><% end %>
-          <% if @cols['option2'           ] && p.option2 %><td><div id='variant_<%= v.id %>_option2'           ></div></td><% end %>
-          <% if @cols['option3'           ] && p.option3 %><td><div id='variant_<%= v.id %>_option3'           ></div></td><% end %>
-          <% if @cols['status'            ] == true      %><td><div id='variant_<%= v.id %>_status'            ></div></td><% end %>
-          <% if @cols['alternate_id'      ] == true      %><td><div id='variant_<%= v.id %>_alternate_id'      ></div></td><% end %>
-          <% if @cols['barcode'           ] == true      %><td><div id='variant_<%= v.id %>_barcode'           ></div></td><% end %> 
-          <% if @cols['price'             ] == true      %><td><div id='variant_<%= v.id %>_price'             ></div></td><% end %> 
-          <% if @cols['quantity_in_stock' ] == true      %><td><div id='variant_<%= v.id %>_quantity_in_stock' ></div></td><% end %> 
-          <% if @cols['weight'            ] == true      %><td><div id='variant_<%= v.id %>_weight'            ></div></td><% end %> 
-          <% if @cols['length'            ] == true      %><td><div id='variant_<%= v.id %>_length'            ></div></td><% end %> 
-          <% if @cols['width'             ] == true      %><td><div id='variant_<%= v.id %>_width'             ></div></td><% end %> 
-          <% if @cols['height'            ] == true      %><td><div id='variant_<%= v.id %>_height'            ></div></td><% end %> 
-          <% if @cols['cylinder'          ] == true      %><td><div id='variant_<%= v.id %>_cylinder'          ></div></td><% end %> 
-          <% if @cols['requires_shipping' ] == true      %><td><div id='variant_<%= v.id %>_requires_shipping' ></div></td><% end %>
-          <% if @cols['allow_backorder'   ] == true      %><td><div id='variant_<%= v.id %>_allow_backorder'   ></div></td><% end %>
-          <% if @cols['taxable'           ] == true      %><td><div id='variant_<%= v.id %>_taxable'           ></div></td><% end %>
-          <td class='edit'><a href='/admin/products/<%= p.id %>/variants/<%= v.id %>/edit'>Edit</a></td>
-          <td class='delete'><a href='#' onclick='delete_variant(<%= v.id %>);'>Delete</a></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
-
 <p><input type='button' value='New Variant' onclick="add_variant(<%= p.id %>);" /></p>
 
 <form id="add-multiple" action="/admin/products/<%= @product.id %>/variants/add-multiple" method="post">
@@ -102,69 +51,41 @@ td.sort_handle { background: #ccc; width: 20px; }
 <script type='text/javascript'>
 
 $(document).ready(function() {
-  $('form#add-multiple').on('submit', function(event) {
-    event.preventDefault();
-    var $form = $(event.target);
-    
-    $.ajax({
-      type: $form.attr('method'),
-      url: $form.attr('action'),
-      data: $form.serialize(),
-      success: function(response) {
-        console.log(response);
-        if (response.success) {
-          location.reload();
-        } else {
-          $form.find('.message').empty().text(response.error);
-        }
-      }
-    });
-  });
-  
-  <% p.variants.each do |v| %>
-  new ModelBinder({
-    name: 'Variant',
-    id: <%= v.id %>,
-    update_url: '/admin/variants/<%= v.id %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      <% if @cols['option1'           ] && p.option1 %>{ name: 'option1'            , nice_name: <%= raw Caboose.json(p.option1) %> , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.option1             ) %>, width: 75, fixed_placeholder: false },<% end %>
-      <% if @cols['option2'           ] && p.option2 %>{ name: 'option2'            , nice_name: <%= raw Caboose.json(p.option2) %> , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.option2             ) %>, width: 75, fixed_placeholder: false },<% end %>
-      <% if @cols['option3'           ] && p.option3 %>{ name: 'option3'            , nice_name: <%= raw Caboose.json(p.option3) %> , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.option3             ) %>, width: 75, fixed_placeholder: false },<% end %>
-      <% if @cols['status'            ] == true      %>{ name: 'status'             , nice_name: 'Status'                           , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.status              ) %>, width: 75, fixed_placeholder: false },<% end %>
-      <% if @cols['alternate_id'      ] == true      %>{ name: 'alternate_id'       , nice_name: 'Alternate ID'                     , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.alternate_id        ) %>, width: 75, fixed_placeholder: false },<% end %>
-      <% if @cols['sku'               ] == true      %>{ name: 'sku'                , nice_name: 'SKU'                              , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.sku                 ) %>, width: 75, fixed_placeholder: false },<% end %>                         
-      <% if @cols['barcode'           ] == true      %>{ name: 'barcode'            , nice_name: 'Barcode'                          , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.barcode             ) %>, width: 75, fixed_placeholder: false },<% end %> 
-      <% if @cols['price'             ] == true      %>{ name: 'price'              , nice_name: 'Price'                            , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.price               ) %>, width: 75, fixed_placeholder: false },<% end %> 
-      <% if @cols['quantity_in_stock' ] == true      %>{ name: 'quantity_in_stock'  , nice_name: 'Quantity'                         , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.quantity_in_stock   ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['weight'            ] == true      %>{ name: 'weight'             , nice_name: 'Weight (grams)'                   , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.weight              ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['length'            ] == true      %>{ name: 'length'             , nice_name: 'Length (in)'                      , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.length              ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['width'             ] == true      %>{ name: 'width'              , nice_name: 'Width (in)'                       , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.width               ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['height'            ] == true      %>{ name: 'height'             , nice_name: 'Height (in)'                      , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.height              ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['cylinder'          ] == true      %>{ name: 'cylinder'           , nice_name: 'Cylinder'                         , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.cylinder            ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['requires_shipping' ] == true      %>{ name: 'requires_shipping'  , nice_name: 'Requires shipping'                , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.requires_shipping   ) %>, width: 50, fixed_placeholder: false },<% end %> 
-      <% if @cols['taxable'           ] == true      %>{ name: 'taxable'            , nice_name: 'Taxable'                          , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.taxable             ) %>, width: 50, fixed_placeholder: false },<% end %>
-      <% if @cols['allow_backorder'   ] == true      %>{ name: 'allow_backorder'    , nice_name: 'Allow backorder'                  , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.allow_backorder     ) %>, width: 50, fixed_placeholder: false } <% end %>     
-    ]
-  });
-  <% end %>
-  
-  $('#variants_tbody').sortable({
-    handle: '.sort_handle',
-    update: function(event, ui) {
-      $.ajax({
-        url: '/admin/products/<%= p.id %>/variants/sort-order',
-        type: 'put',
-        data: $('#variants_tbody').sortable('serialize', { key: 'variant_ids[]' }),
-        success: function(resp) {}
-      });        
-    }    
-  });
-});
-
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal('100%');
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'variants',
+    base_url: '/admin/products/<%= p.id %>/variants',
+    allow_bulk_edit: false,
+    allow_bulk_delete: true,
+    allow_duplicate: false,
+    allow_advanced_edit: true,
+    fields: [
+      <% if p.option1 %>{ show: true , name: 'option1' , nice_name: <%= raw Caboose.json(p.option1) %> , sort: 'option1'           , type: 'text'     , value: function(v) { return v.option1             }, width: 75, align: 'left'   },<% end %>
+      <% if p.option2 %>{ show: true , name: 'option2' , nice_name: <%= raw Caboose.json(p.option2) %> , sort: 'option2'           , type: 'text'     , value: function(v) { return v.option2             }, width: 75, align: 'left'   },<% end %>
+      <% if p.option3 %>{ show: true , name: 'option3' , nice_name: <%= raw Caboose.json(p.option3) %> , sort: 'option3'           , type: 'text'     , value: function(v) { return v.option3             }, width: 75, align: 'left'   },<% end %>
+      { show: true , name: 'status'                    , nice_name: 'Status'                           , sort: 'status'            , type: 'text'     , value: function(v) { return v.status              }, width: 75, align: 'left'   },
+      { show: true , name: 'alternate_id'              , nice_name: 'Alternate ID'                     , sort: 'alternate_id'      , type: 'text'     , value: function(v) { return v.alternate_id        }, width: 75, align: 'left'   },
+      { show: true , name: 'sku'                       , nice_name: 'SKU'                              , sort: 'sku'               , type: 'text'     , value: function(v) { return v.sku                 }, width: 75, align: 'left'   },                         
+      { show: true , name: 'barcode'                   , nice_name: 'Barcode'                          , sort: 'barcode'           , type: 'text'     , value: function(v) { return v.barcode             }, width: 75, align: 'left'   }, 
+      { show: true , name: 'price'                     , nice_name: 'Price'                            , sort: 'price'             , type: 'text'     , value: function(v) { return v.price               }, width: 75, align: 'right'  }, 
+      { show: true , name: 'quantity_in_stock'         , nice_name: 'Quantity'                         , sort: 'quantity_in_stock' , type: 'text'     , value: function(v) { return v.quantity_in_stock   }, width: 50, align: 'right'  }, 
+      { show: true , name: 'weight'                    , nice_name: 'Weight (grams)'                   , sort: 'weight'            , type: 'text'     , value: function(v) { return v.weight              }, width: 50, align: 'right'  }, 
+      { show: true , name: 'length'                    , nice_name: 'Length (in)'                      , sort: 'length'            , type: 'text'     , value: function(v) { return v.length              }, width: 50, align: 'right'  }, 
+      { show: true , name: 'width'                     , nice_name: 'Width (in)'                       , sort: 'width'             , type: 'text'     , value: function(v) { return v.width               }, width: 50, align: 'right'  }, 
+      { show: true , name: 'height'                    , nice_name: 'Height (in)'                      , sort: 'height'            , type: 'text'     , value: function(v) { return v.height              }, width: 50, align: 'right'  }, 
+      { show: true , name: 'cylinder'                  , nice_name: 'Cylinder'                         , sort: 'cylinder'          , type: 'checkbox' , value: function(v) { return v.cylinder            }, width: 50, align: 'center' }, 
+      { show: true , name: 'requires_shipping'         , nice_name: 'Requires shipping'                , sort: 'requires_shipping' , type: 'checkbox' , value: function(v) { return v.requires_shipping   }, width: 50, align: 'center' }, 
+      { show: true , name: 'taxable'                   , nice_name: 'Taxable'                          , sort: 'taxable'           , type: 'checkbox' , value: function(v) { return v.taxable             }, width: 50, align: 'center' },
+      { show: true , name: 'allow_backorder'           , nice_name: 'Allow backorder'                  , sort: 'allow_backorder'   , type: 'checkbox' , value: function(v) { return v.allow_backorder     }, width: 50, align: 'center' }             
+    ],
+    new_model_text: 'New Variant',
+    new_model_fields: [
+      <% if p.option1 %>{ name: 'name', nice_name: 'Name', type: 'text', width: 400 },<% end %>
+      <% if p.option1 %>{ name: 'name', nice_name: 'Name', type: 'text', width: 400 },<% end %>
+      <% if p.option1 %>{ name: 'name', nice_name: 'Name', type: 'text', width: 400 },<% end %>
+    ],    
+  });        
 });
 
 </script>

data/app/views/caboose/products/admin_edit_variants_old.html.erb

@@ -0,0 +1,171 @@
+<% content_for :caboose_css do %>
+  <style>
+    ul {
+      list-style-type: square;
+      padding: 0 0 0 24px;
+      margin: 12px 0 24px;
+    }
+  </style>
+<% end %>
+
+<%
+p = @product
+v = @variant    
+%>
+
+<%= render :partial => 'caboose/products/admin_header' %>
+
+<p style='font-size: 75%;'><a href='/admin/products/<%= p.id %>/variant-cols'>Edit visible columns</a></p>
+
+<div id='message'><%
+# Make sure we're not trying to highlight a deleted variant
+if @highlight_variant_id
+  v = Variant.where(:id => @highlight_variant_id).first
+  if v.nil?
+    %><p class='note error'>The variant you want to highlight is not in the database.</p><%
+  elsif v.status == 'Deleted'
+    %><p class='note error'>The variant you want to highlight has been deleted.</p><%
+  end
+end 
+%></div>
+
+<div id='variants_wrapper'>
+  <table id='variants'>
+    <tr>
+      <th>&nbsp;</th>
+      <% if @cols['option1'           ] && p.option1 %><th valign='bottom'><%= p.option1    %></th><% end %>
+      <% if @cols['option2'           ] && p.option2 %><th valign='bottom'><%= p.option2    %></th><% end %>
+      <% if @cols['option3'           ] && p.option3 %><th valign='bottom'><%= p.option3    %></th><% end %>
+      <% if @cols['status'            ] == true      %><th valign='bottom'>Status             </th><% end %>
+      <% if @cols['alternate_id'      ] == true      %><th valign='bottom'>Alternate ID       </th><% end %>
+      <% if @cols['barcode'           ] == true      %><th valign='bottom'>Barcode            </th><% end %>
+      <% if @cols['price'             ] == true      %><th valign='bottom'>Price              </th><% end %>
+      <% if @cols['quantity_in_stock' ] == true      %><th valign='bottom'>Quantity           </th><% end %>
+      <% if @cols['weight'            ] == true      %><th valign='bottom'>Weight             </th><% end %>
+      <% if @cols['length'            ] == true      %><th valign='bottom'>Length             </th><% end %>
+      <% if @cols['width'             ] == true      %><th valign='bottom'>Width              </th><% end %>
+      <% if @cols['height'            ] == true      %><th valign='bottom'>Height             </th><% end %>
+      <% if @cols['cylinder'          ] == true      %><th valign='bottom'>Cylinder           </th><% end %>
+      <% if @cols['requires_shipping' ] == true      %><th valign='bottom'>Requires Shipping  </th><% end %>
+      <% if @cols['allow_backorder'   ] == true      %><th valign='bottom'>Allow Backorder    </th><% end %>
+      <% if @cols['taxable'           ] == true      %><th valign='bottom'>Taxable            </th><% end %>
+      <th>&nbsp;</th>
+      <th>&nbsp;</th>
+    </tr>
+    <tbody id='variants_tbody'>
+      <% p.variants.where(:status => ['Active', 'Inactive']).each do |v| %>      
+        <tr id='variant_<%= v.id %>' <% if @highlight_variant_id && v.id == @highlight_variant_id %>class='highlight'<% end %>>
+          <td class='sort_handle'>&nbsp;</td>
+          <% if @cols['option1'           ] && p.option1 %><td><div id='variant_<%= v.id %>_option1'           ></div></td><% end %>
+          <% if @cols['option2'           ] && p.option2 %><td><div id='variant_<%= v.id %>_option2'           ></div></td><% end %>
+          <% if @cols['option3'           ] && p.option3 %><td><div id='variant_<%= v.id %>_option3'           ></div></td><% end %>
+          <% if @cols['status'            ] == true      %><td><div id='variant_<%= v.id %>_status'            ></div></td><% end %>
+          <% if @cols['alternate_id'      ] == true      %><td><div id='variant_<%= v.id %>_alternate_id'      ></div></td><% end %>
+          <% if @cols['barcode'           ] == true      %><td><div id='variant_<%= v.id %>_barcode'           ></div></td><% end %> 
+          <% if @cols['price'             ] == true      %><td><div id='variant_<%= v.id %>_price'             ></div></td><% end %> 
+          <% if @cols['quantity_in_stock' ] == true      %><td><div id='variant_<%= v.id %>_quantity_in_stock' ></div></td><% end %> 
+          <% if @cols['weight'            ] == true      %><td><div id='variant_<%= v.id %>_weight'            ></div></td><% end %> 
+          <% if @cols['length'            ] == true      %><td><div id='variant_<%= v.id %>_length'            ></div></td><% end %> 
+          <% if @cols['width'             ] == true      %><td><div id='variant_<%= v.id %>_width'             ></div></td><% end %> 
+          <% if @cols['height'            ] == true      %><td><div id='variant_<%= v.id %>_height'            ></div></td><% end %> 
+          <% if @cols['cylinder'          ] == true      %><td><div id='variant_<%= v.id %>_cylinder'          ></div></td><% end %> 
+          <% if @cols['requires_shipping' ] == true      %><td><div id='variant_<%= v.id %>_requires_shipping' ></div></td><% end %>
+          <% if @cols['allow_backorder'   ] == true      %><td><div id='variant_<%= v.id %>_allow_backorder'   ></div></td><% end %>
+          <% if @cols['taxable'           ] == true      %><td><div id='variant_<%= v.id %>_taxable'           ></div></td><% end %>
+          <td class='edit'><a href='/admin/products/<%= p.id %>/variants/<%= v.id %>/edit'>Edit</a></td>
+          <td class='delete'><a href='#' onclick='delete_variant(<%= v.id %>);'>Delete</a></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<p><input type='button' value='New Variant' onclick="add_variant(<%= p.id %>);" /></p>
+
+<form id="add-multiple" action="/admin/products/<%= @product.id %>/variants/add-multiple" method="post">
+  <p style="margin: 0 0 12px"><small>CSV format: Alternate ID, Quantity, Price<%= ', ' if @product.option1 || @product.option2 || @product.option3 %><%= [@product.option1, @product.option2, @product.option3].compact.join(', ') %></small></p>
+  <textarea id="variants_csv" name="variants_csv" rows="8" cols="12" style="min-width: 500px; min-height: 250px; margin: 0 0 16px; padding: 12px"></textarea><br />
+  <input type="submit" value="Submit" />
+  <p class="message" style="margin: 12px 0 0; color: red"></p>
+</form>
+
+<%= render :partial => 'caboose/products/admin_footer' %>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+tr.highlight td { background: #ffff99 }
+td.sort_handle { background: #ccc; width: 20px; }
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  $('form#add-multiple').on('submit', function(event) {
+    event.preventDefault();
+    var $form = $(event.target);
+    
+    $.ajax({
+      type: $form.attr('method'),
+      url: $form.attr('action'),
+      data: $form.serialize(),
+      success: function(response) {
+        console.log(response);
+        if (response.success) {
+          location.reload();
+        } else {
+          $form.find('.message').empty().text(response.error);
+        }
+      }
+    });
+  });
+  
+  <% p.variants.each do |v| %>
+  new ModelBinder({
+    name: 'Variant',
+    id: <%= v.id %>,
+    update_url: '/admin/variants/<%= v.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      <% if @cols['option1'           ] && p.option1 %>{ name: 'option1'            , nice_name: <%= raw Caboose.json(p.option1) %> , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.option1             ) %>, width: 75, fixed_placeholder: false },<% end %>
+      <% if @cols['option2'           ] && p.option2 %>{ name: 'option2'            , nice_name: <%= raw Caboose.json(p.option2) %> , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.option2             ) %>, width: 75, fixed_placeholder: false },<% end %>
+      <% if @cols['option3'           ] && p.option3 %>{ name: 'option3'            , nice_name: <%= raw Caboose.json(p.option3) %> , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.option3             ) %>, width: 75, fixed_placeholder: false },<% end %>
+      <% if @cols['status'            ] == true      %>{ name: 'status'             , nice_name: 'Status'                           , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.status              ) %>, width: 75, fixed_placeholder: false },<% end %>
+      <% if @cols['alternate_id'      ] == true      %>{ name: 'alternate_id'       , nice_name: 'Alternate ID'                     , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.alternate_id        ) %>, width: 75, fixed_placeholder: false },<% end %>
+      <% if @cols['sku'               ] == true      %>{ name: 'sku'                , nice_name: 'SKU'                              , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.sku                 ) %>, width: 75, fixed_placeholder: false },<% end %>                         
+      <% if @cols['barcode'           ] == true      %>{ name: 'barcode'            , nice_name: 'Barcode'                          , type: 'text'     , align: 'left'  , value: <%= raw Caboose.json(v.barcode             ) %>, width: 75, fixed_placeholder: false },<% end %> 
+      <% if @cols['price'             ] == true      %>{ name: 'price'              , nice_name: 'Price'                            , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.price               ) %>, width: 75, fixed_placeholder: false },<% end %> 
+      <% if @cols['quantity_in_stock' ] == true      %>{ name: 'quantity_in_stock'  , nice_name: 'Quantity'                         , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.quantity_in_stock   ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['weight'            ] == true      %>{ name: 'weight'             , nice_name: 'Weight (grams)'                   , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.weight              ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['length'            ] == true      %>{ name: 'length'             , nice_name: 'Length (in)'                      , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.length              ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['width'             ] == true      %>{ name: 'width'              , nice_name: 'Width (in)'                       , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.width               ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['height'            ] == true      %>{ name: 'height'             , nice_name: 'Height (in)'                      , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.height              ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['cylinder'          ] == true      %>{ name: 'cylinder'           , nice_name: 'Cylinder'                         , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.cylinder            ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['requires_shipping' ] == true      %>{ name: 'requires_shipping'  , nice_name: 'Requires shipping'                , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.requires_shipping   ) %>, width: 50, fixed_placeholder: false },<% end %> 
+      <% if @cols['taxable'           ] == true      %>{ name: 'taxable'            , nice_name: 'Taxable'                          , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.taxable             ) %>, width: 50, fixed_placeholder: false },<% end %>
+      <% if @cols['allow_backorder'   ] == true      %>{ name: 'allow_backorder'    , nice_name: 'Allow backorder'                  , type: 'checkbox' , align: 'center', value: <%= raw Caboose.json(v.allow_backorder     ) %>, width: 50, fixed_placeholder: false } <% end %>     
+    ]
+  });
+  <% end %>
+  
+  $('#variants_tbody').sortable({
+    handle: '.sort_handle',
+    update: function(event, ui) {
+      $.ajax({
+        url: '/admin/products/<%= p.id %>/variants/sort-order',
+        type: 'put',
+        data: $('#variants_tbody').sortable('serialize', { key: 'variant_ids[]' }),
+        success: function(resp) {}
+      });        
+    }    
+  });
+});
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal('100%');
+});
+
+</script>
+<% end %>

data/app/views/caboose/products/admin_index.html.erb

@@ -1,8 +1,7 @@
 <h1>Products</h1>
 
 <p style="margin: 12px 0">
-  <a href="/admin/vendors/new">New Vendor</a><span style="margin: 0 3px">|</span>
-  <a href="/admin/products/new">New Product</a><span style="margin: 0 3px">|</span>
+  <a href="/admin/vendors/new">New Vendor</a><span style="margin: 0 3px">|</span>  
   <a href="/admin/products/sort">Sort Products</a><span style="margin: 0 3px">|</span>
   <a href='#'>Search Form</a>
 </p>

data/config/routes.rb

@@ -303,7 +303,7 @@ Caboose::Engine.routes.draw do
   get  '/admin/orders/:id/refund'              => 'orders#admin_refund'
   post '/admin/orders/:id/resend-confirmation' => 'orders#admin_resend_confirmation'
   
-  post    "/reviews/add"                                => "reviews#add"  
+  post    "/reviews/add"                                => "reviews#add"                                                                         
 
   get     "/admin/products"                                 => "products#admin_index"
   get     "/admin/products/json"                            => "products#admin_json"
@@ -317,14 +317,22 @@ Caboose::Engine.routes.draw do
   get     "/admin/products/:id/categories"                  => "products#admin_edit_categories"
   post    "/admin/products/:id/categories"                  => "products#admin_add_to_category"
   delete  "/admin/products/:id/categories/:category_id"     => "products#admin_remove_from_category"
-  get     "/admin/products/:id/variants"                    => "products#admin_edit_variants"
-  get     "/admin/products/:id/variants/json"               => "products#admin_variants_json"
-  get     "/admin/products/:id/variant-cols"                => "products#admin_edit_variant_columns"
-  put     "/admin/products/:id/variant-cols"                => "products#admin_update_variant_columns"
-  get     "/admin/products/:id/variants/sort-order"         => "products#admin_edit_variant_sort_order"
-  put     '/admin/products/:id/variants/option1-sort-order' => 'products#admin_update_variant_option1_sort_order'
-  put     '/admin/products/:id/variants/option2-sort-order' => 'products#admin_update_variant_option2_sort_order'
-  put     '/admin/products/:id/variants/option3-sort-order' => 'products#admin_update_variant_option3_sort_order'
+  
+  get     "/admin/products/:product_id/variants"                         => "variants#admin_index"
+  get     "/admin/products/:product_id/variants/json"                    => "variants#admin_json"  
+  get     "/admin/products/:product_id/variants/sort-order"              => "products#admin_edit_variant_sort_order"
+  put     '/admin/products/:product_id/variants/option1-sort-order'      => 'products#admin_update_option1_sort_order'
+  put     '/admin/products/:product_id/variants/option2-sort-order'      => 'products#admin_update_option2_sort_order'
+  put     '/admin/products/:product_id/variants/option3-sort-order'      => 'products#admin_update_option3_sort_order'
+  get     "/admin/products/:product_id/variants/:variant_id/edit"        => "variants#admin_edit"    
+  put     "/admin/products/:product_id/variants/:id/attach-to-image"     => "variants#admin_attach_to_image"
+  put     "/admin/products/:product_id/variants/:id/unattach-from-image" => "variants#admin_unattach_from_image"
+  put     "/admin/products/:product_id/variants/:id"                     => "variants#admin_update"  
+  get     "/admin/products/:id/variants/new"                             => "variants#admin_new"  
+  post    "/admin/products/:id/variants"                                 => "variants#admin_add"
+  delete  "/admin/variants/:id"                                          => "variants#admin_delete"
+  get     "/admin/variants/status-options"                               => "variants#admin_status_options"
+  
   get     "/admin/products/:id/images"                      => "products#admin_edit_images"
   post    "/admin/products/:id/images"                      => "products#admin_add_image"
   get     "/admin/products/:id/collections"                 => "products#admin_edit_collections"
@@ -338,16 +346,6 @@ Caboose::Engine.routes.draw do
   delete  "/admin/products/:id"                             => "products#admin_delete"
   put     "/admin/products/:id/update-vendor"               => "products#admin_update_vendor"
   
-  get     "/admin/products/:product_id/variants/:variant_id/edit"   => "variants#admin_edit"
-  get     "/admin/variants/status-options"            => "variants#admin_status_options"
-  get     "/admin/variants/:variant_id/edit"          => "variants#admin_edit"
-  put     "/admin/variants/:id/attach-to-image"       => "variants#admin_attach_to_image"
-  put     "/admin/variants/:id/unattach-from-image"   => "variants#admin_unattach_from_image"
-  put     "/admin/variants/:id"                       => "variants#admin_update"  
-  get     "/admin/products/:id/variants/new"          => "variants#admin_new"  
-  post    "/admin/products/:id/variants"              => "variants#admin_add"
-  delete  "/admin/variants/:id"                       => "variants#admin_delete"
-  
   get    "/admin/stackable-groups/options"            => "stackable_groups#admin_options"  
   get    "/admin/stackable-groups/json"               => "stackable_groups#admin_json"
   get    "/admin/stackable-groups/:id/json"           => "stackable_groups#admin_json_single"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.55'
+  VERSION = '0.5.56'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.55
+  version: 0.5.56
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -757,6 +757,7 @@ files:
 - app/views/caboose/products/admin_edit_variant_columns.html.erb
 - app/views/caboose/products/admin_edit_variant_sort_order.html.erb
 - app/views/caboose/products/admin_edit_variants.html.erb
+- app/views/caboose/products/admin_edit_variants_old.html.erb
 - app/views/caboose/products/admin_edit_variants_single.html.erb
 - app/views/caboose/products/admin_group_variants.html.erb
 - app/views/caboose/products/admin_index.html.erb