caboose-cms 0.7.42 → 0.7.43

data/app/controllers/caboose/variants_controller.rb

@@ -123,10 +123,12 @@ module Caboose
           when 'alternate_id'                  then v.alternate_id                  = value
           when 'sku'                           then v.sku                           = value
           when 'barcode'                       then v.barcode                       = value
+          when 'cost'                          then v.cost                          = 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 'clearance'                     then v.clearance                     = value
           when 'status'                        then v.status                        = value
           when 'weight'                        then v.weight                        = value
           when 'length'                        then v.length                        = value
@@ -261,6 +263,30 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
+    # GET /admin/products/:product_id/variants/option1-media  
+    def admin_edit_option1_media
+      return if !user_is_allowed('products', 'edit')    
+      @product = Product.find(params[:product_id])
+      @variants = Variant.where(:product_id => @product.id, :option1 => params[:option_value]).reorder(:option1_sort_order).all      
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /admin/products/:product_id/variants/option2-media  
+    def admin_edit_option2_media
+      return if !user_is_allowed('products', 'edit')    
+      @product = Product.find(params[:product_id])
+      @variants = Variant.where(:product_id => @product.id, :option2 => params[:option_value]).reorder(:option2_sort_order).all      
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /admin/products/:product_id/variants/option3-media  
+    def admin_edit_option3_media
+      return if !user_is_allowed('products', 'edit')    
+      @product = Product.find(params[:product_id])
+      @variants = Variant.where(:product_id => @product.id, :option3 => params[:option_value]).reorder(:option3_sort_order).all      
+      render :layout => 'caboose/modal'
+    end
+    
     # PUT /admin/products/:product_id/variants/option1-sort-order
     def admin_update_option1_sort_order
       product_id = params[:product_id]
@@ -425,6 +451,9 @@ module Caboose
           when 'option1'            then variants.each { |v| v.option1            = value }
           when 'option2'            then variants.each { |v| v.option2            = value }
           when 'option3'            then variants.each { |v| v.option3            = value }
+          when 'option1_media_id'   then variants.each { |v| v.option1_media_id   = value }
+          when 'option2_media_id'   then variants.each { |v| v.option2_media_id   = value }
+          when 'option3_media_id'   then variants.each { |v| v.option3_media_id   = value }
           when 'requires_shipping'  then variants.each { |v| v.requires_shipping  = value }
           when 'taxable'            then variants.each { |v| v.taxable            = value }
           when 'downloadable'       then variants.each { |v| v.downloadable       = value }

data/app/models/caboose/authenticator.rb

@@ -27,8 +27,8 @@ module Caboose
         fail_count = Caboose::LoginLog.fail_count(user)
         if (fail_count+1) >= user.site.login_fail_lock_count
           user.locked = true
-          user.save        
-          LoginMailer.locked_account(user).deliver
+          user.save                      
+          LoginMailer.configure_for_site(user.site.id).locked_account(user).deliver
           resp.error = "Too many failed login attempts. Your account has been locked and the site administrator has been notified."
           ll.success = false
         else

data/app/models/caboose/comment_routes.rb

@@ -1,11 +1,16 @@
 module Caboose
   class CommentRoutes
   
-    def CommentRoutes.parse_controllers    
+    def CommentRoutes.parse_controllers
+      return CommentRoutes.controller_routes
+    end
+      
+    def CommentRoutes.controller_routes(controller = nil)
           
       classes = {'zzz_all_domains' => []}            
       Rails.application.config.paths['app/controllers'].each do |controller_path|
-        files = Dir.glob(Rails.root.join(controller_path, '*.rb'))
+        #files = Dir.glob(Rails.root.join(controller_path, '*.rb'))        
+        files = controller ? Dir.glob(Rails.root.join(controller_path, "#{controller}_controller.rb")) : Dir.glob(Rails.root.join(controller_path, '*.rb'))        
         for file in files    
           f = Rails.root.join('app', 'controllers', file)
           f2 = File.open(f, "r")
@@ -67,18 +72,100 @@ module Caboose
           actions.sort_by{ |arr| arr[2] }.each do |arr|
             action = arr[0]
             uris = arr[1]
-            uris.each do |uri|
-              #puts "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\""
-              routes << "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\"" 
+            uris.each do |uri|              
+              # puts "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\""              
+              routes << "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\""              
             end
           end
-          puts ""          
+          #puts ""
+          routes << ""          
         end
         routes << "end" if domain != 'zzz_all_domains'
       end      
-      puts routes
+      #puts routes
       return routes.join("\n")      
     end
+  
+    def CommentRoutes.split_route(line)
+      return nil if line.nil?
+      line = line.strip
+      
+      #return ['get'    , line.gsub(/^get (.*?)=>(.*?)$/    , '\1').strip.gsub('"', '').gsub("'", ''), line.gsub(/^get (.*?)=>(.*?)$/    , '\2').strip.gsub('"', '').gsub("'", '')] if line =~ /^get (.*?)=>(.*?)$/
+      #return ['post'   , line.gsub(/^post (.*?)=>(.*?)$/   , '\1').strip.gsub('"', '').gsub("'", ''), line.gsub(/^post (.*?)=>(.*?)$/   , '\2').strip.gsub('"', '').gsub("'", '')] if line =~ /^post (.*?)=>(.*?)$/
+      #return ['put'    , line.gsub(/^put (.*?)=>(.*?)$/    , '\1').strip.gsub('"', '').gsub("'", ''), line.gsub(/^put (.*?)=>(.*?)$/    , '\2').strip.gsub('"', '').gsub("'", '')] if line =~ /^put (.*?)=>(.*?)$/
+      #return ['delete' , line.gsub(/^delete (.*?)=>(.*?)$/ , '\1').strip.gsub('"', '').gsub("'", ''), line.gsub(/^delete (.*?)=>(.*?)$/ , '\2').strip.gsub('"', '').gsub("'", '')] if line =~ /^delete (.*?)=>(.*?)$/
+      
+      if line =~ /^get (.*?)=>(.*?)$/ || line =~ /^post (.*?)=>(.*?)$/ || line =~ /^put (.*?)=>(.*?)$/ || line =~ /^delete (.*?)=>(.*?)$/
+        arr = [
+          line.gsub(/^(\w*?) (.*?)=>(.*?)$/    , '\1').strip.gsub('"', '').gsub("'", ''), 
+          line.gsub(/^(\w*?) (.*?)=>(.*?)$/    , '\2').strip.gsub('"', '').gsub("'", ''), 
+          line.gsub(/^(\w*?) (.*?)=>(.*?)$/    , '\3').strip.gsub('"', '').gsub("'", '')
+        ]
+        arr[1] = "/#{arr[1]}" if !arr[1].starts_with?('/')
+        return arr
+      end               
+      return nil
+    end
+    
+    def CommentRoutes.in_routes_array(route, routes_array)
+      return false if route.nil? || route.count < 3
+      routes_array.each do |route2|
+        next if route2.nil? || route2.count < 3        
+        return true if route[0] == route2[0] && route[1] == route2[1] && route[2] == route2[2]
+      end
+      return false
+    end
+    
+    def CommentRoutes.compare_routes                              
+        
+      routes_in_routes_file = []
+      file = File.open(Rails.root.join('config', 'routes.rb'), "r")
+      file.each_line do |line|        
+        line = line.strip
+        routes_in_routes_file << self.split_route(line)        
+      end
+      
+      routes_in_controllers = []
+      self.controller_routes.split("\n").each do |route|
+        route = route.strip
+        next if route.length == 0
+        routes_in_controllers << self.split_route(route)
+      end
+      
+      all_routes = []
+      
+      # See what routes are in the controller routes but not in routes file
+      routes_not_in_routes_file = []
+      routes_in_controllers.each do |route|
+        next if route.nil? || route.count != 3
+        all_routes << [route[0], route[1], route[2], 'Y', self.in_routes_array(route, routes_in_routes_file) ? 'Y' : '']
+      end
+      
+      # See what routes are in the routes file but not in the controllers
+      routes_not_in_controllers = []
+      routes_in_routes_file.each do |route|
+        next if route.nil? || route.count != 3
+        if !self.in_routes_array(route, all_routes)
+          all_routes << [route[0], route[1], route[2], '', 'Y']
+        end        
+      end
+      
+      lengths = [0, 0, 0]      
+      all_routes.each do |route|
+        lengths[0] = route[0].length if route[0].length > lengths[0]
+        lengths[1] = route[1].length if route[1].length > lengths[1]
+        lengths[2] = route[2].length if route[2].length > lengths[2]        
+      end                    
+                                  
+      puts "#{"Verb".ljust(lengths[0], ' ')} #{"URI".ljust(lengths[1], ' ')} #{"Action".ljust(lengths[2], ' ')} #{"In Controller".ljust(14, ' ')} #{"In Routes File".ljust(14, ' ')}"
+      puts "#{"".ljust(lengths[0], '-')} #{"".ljust(lengths[1], '-')} #{"".ljust(lengths[2], '-')} #{"".ljust(14, '-')} #{"".ljust(14, '-')}"
+      all_routes.each do |route|          
+        next if route[3] == 'Y' && route[4] == 'Y'        
+        puts "#{route[0].ljust(lengths[0], ' ')} #{route[1].ljust(lengths[1], ' ')} #{route[2].ljust(lengths[2], ' ')} #{route[3].ljust(14, ' ')} #{route[4].ljust(14, ' ')}"
+      end              
+      puts "\n"
+                                                  
+    end
     
   end
 end

data/app/models/caboose/product.rb

@@ -32,7 +32,10 @@ module Caboose
       :category_id           ,      
       :option1               ,
       :option2               ,
-      :option3               ,      
+      :option3               ,
+      :option1_media         ,
+      :option2_media         ,
+      :option3_media         ,      
       :default1              ,
       :default2              ,
       :default3              ,
@@ -159,14 +162,32 @@ module Caboose
       self.variants.where(:status => 'Active').reorder(:option1_sort_order).pluck(:option1).uniq.reject { |x| x.nil? || x.empty? }
     end
     
+    def option1_values_with_media
+      h = {}
+      self.variants.where("status = ? and option1 is not null", 'Active').reorder(:option1_sort_order).each{ |v| h[v.option1] = v.option1_media }      
+      return h      
+    end
+    
     def option2_values
       self.variants.where(:status => 'Active').reorder(:option2_sort_order).pluck(:option2).uniq.reject { |x| x.nil? || x.empty? }
     end
     
+    def option2_values_with_media                                                               
+      h = {}
+      self.variants.where("status = ? and option2 is not null", 'Active').reorder(:option2_sort_order).each{ |v| h[v.option2] = v.option2_media }      
+      return h      
+    end
+    
     def option3_values
       self.variants.where(:status => 'Active').reorder(:option3_sort_order).pluck(:option3).uniq.reject { |x| x.nil? || x.empty? }
     end
     
+    def option3_values_with_media
+      h = {}
+      self.variants.where("status = ? and option3 is not null", 'Active').reorder(:option3_sort_order).each{ |v| h[v.option3] = v.option3_media }      
+      return h      
+    end
+    
     def toggle_category(cat_id, value)            
       if value.to_i > 0 # Add to category                   
         if cat_id == 'all'

data/app/models/caboose/schema.rb

@@ -562,6 +562,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :option1               , :string    ],
         [ :option2               , :string    ],
         [ :option3               , :string    ],
+        [ :option1_media         , :boolean    , { :default => false }],
+        [ :option2_media         , :boolean    , { :default => false }],
+        [ :option3_media         , :boolean    , { :default => false }],        
         [ :category_id           , :integer   ],
         [ :status                , :string    ],
         [ :default1              , :string    ],
@@ -799,11 +802,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :alternate_id                  , :string   ],
         [ :sku                           , :string   ],
         [ :barcode                       , :string   ],
-        [ :price                         , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :cost                          , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :price                         , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
         [ :sale_price                    , :decimal   , { :precision => 8, :scale => 2 }],
         [ :date_sale_starts              , :datetime ],
         [ :date_sale_ends                , :datetime ],
         [ :date_sale_end                 , :datetime ],        
+        [ :clearance                     , :boolean   , { :default => false }],
         [ :available                     , :boolean   , { :default => true  }],
         [ :quantity_in_stock             , :integer   , { :default => 0     }],        
         [ :ignore_quantity               , :boolean   , { :default => false }],
@@ -816,7 +821,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :cylinder                      , :boolean   , { :default => false }],
         [ :option1                       , :string   ],
         [ :option2                       , :string   ],
-        [ :option3                       , :string   ],
+        [ :option3                       , :string   ],        
+        [ :option1_media_id              , :integer  ],
+        [ :option2_media_id              , :integer  ],
+        [ :option3_media_id              , :integer  ],
         [ :requires_shipping             , :boolean   , { :default => true  }],
         [ :taxable                       , :boolean   , { :default => true  }],        
         [ :shipping_unit_value           , :numeric  ],

data/app/models/caboose/variant.rb

@@ -13,15 +13,20 @@ module Caboose
     has_many :product_images, :through => :product_image_variants
     belongs_to :flat_rate_shipping_method, :class_name => 'Caboose::ShippingMethod'
     belongs_to :flat_rate_shipping_package, :class_name => 'Caboose::ShippingPackage'
+    belongs_to :option1_media, :class_name => 'Caboose::Media'
+    belongs_to :option2_media, :class_name => 'Caboose::Media'
+    belongs_to :option3_media, :class_name => 'Caboose::Media'
     
     attr_accessible :id,
       :alternate_id,
       :product_id,
       :barcode,            # Returns the barcode value of the variant.
+      :cost,               # Cost of goods (don't show to customer)
       :price,              # Variant’s price.
       :sale_price,
       :date_sale_starts,
       :date_sale_end,
+      :clearance,
       :ignore_quantity,
       :quantity,
       :quantity_in_stock,
@@ -33,7 +38,13 @@ module Caboose
       :height,             # Height of variant in inches
       :option1,            # Returns the value of option1 for given variant
       :option2,            # If a product has a second option defined, then returns the value of this variant's option2.
-      :option3,            # If a product has a third option defined, then returns the value of this variant's option3.  
+      :option3,            # If a product has a third option defined, then returns the value of this variant's option3.
+      :option1_color,      
+      :option2_color,      
+      :option3_color,
+      :option1_media_id,      
+      :option2_media_id,      
+      :option3_media_id,            
       :requires_shipping,  # Returns true if the variant is shippable or false if it is a service or a digital good.    
       :taxable,            # Returns true if the variant is taxable or false if it is not.
       :sku,

data/app/views/caboose/login_mailer/forgot_password_email.html.erb

@@ -1,8 +1,10 @@
-<% if @user %>
+<% if @user && @user.site %>
 <%
-url = "#{Caboose::website_domain}/modal/login/reset-password/#{@user.password_reset_id}"
+site = @user.site
+pd = site.primary_domain
+url = "#{pd.domain}/modal/login/reset-password/#{@user.password_reset_id}"
 %>
-<p>To reset your <%= Caboose::website_name %> website password, click the link below:</p>
+<p>To reset your <%= site.name %> website password, click the link below:</p>
 <p><a href='<%= url %>'><%= url %></p>
 <% end %>
 

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

@@ -18,9 +18,9 @@ may_delete3 = p.variants.collect{|v| v.option3 }.uniq.count == 1
 </p>
 
 <table>
-<tr><td><div id='product_<%= p.id %>_option1'></div></td><td><div id='product_<%= p.id %>_default1'></div></td></tr>
-<tr><td><div id='product_<%= p.id %>_option2'></div></td><td><div id='product_<%= p.id %>_default2'></div></td></tr>
-<tr><td><div id='product_<%= p.id %>_option3'></div></td><td><div id='product_<%= p.id %>_default3'></div></td></tr>
+<tr><td><div id='product_<%= p.id %>_option1'></div></td><td><div id='product_<%= p.id %>_default1'></div></td><td><div id='product_<%= p.id %>_option1_media'></div></td></tr>
+<tr><td><div id='product_<%= p.id %>_option2'></div></td><td><div id='product_<%= p.id %>_default2'></div></td><td><div id='product_<%= p.id %>_option2_media'></div></td></tr>
+<tr><td><div id='product_<%= p.id %>_option3'></div></td><td><div id='product_<%= p.id %>_default3'></div></td><td><div id='product_<%= p.id %>_option3_media'></div></td></tr>
 </table>
 
 <h2>Modifications</h2>
@@ -41,18 +41,24 @@ may_delete3 = p.variants.collect{|v| v.option3 }.uniq.count == 1
 
 var mods_controller = false;
 $(document).ready(function() {
+  console.log(<%= raw p.option1_media %>);
+  console.log(<%= raw p.option2_media %>);
+  console.log(<%= raw p.option3_media %>);
   m = new ModelBinder({
     name: 'Product',
     id: <%= p.id %>,
     update_url: '/admin/products/<%= p.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'option1'  , nice_name: 'Option 1'      , type: 'text', value: <%= raw Caboose.json(p.option1)  %>, width: 250, fixed_placeholder: true },                         
-      { name: 'option2'  , nice_name: 'Option 2'      , type: 'text', value: <%= raw Caboose.json(p.option2)  %>, width: 250, fixed_placeholder: true }, 
-      { name: 'option3'  , nice_name: 'Option 3'      , type: 'text', value: <%= raw Caboose.json(p.option3)  %>, width: 250, fixed_placeholder: true },
-      { name: 'default1' , nice_name: 'Default value' , type: 'text', value: <%= raw Caboose.json(p.default1) %>, width: 285, fixed_placeholder: true },                         
-      { name: 'default2' , nice_name: 'Default value' , type: 'text', value: <%= raw Caboose.json(p.default2) %>, width: 285, fixed_placeholder: true }, 
-      { name: 'default3' , nice_name: 'Default value' , type: 'text', value: <%= raw Caboose.json(p.default3) %>, width: 285, fixed_placeholder: true } 
+      { name: 'option1'       , nice_name: 'Option 1'      , type: 'text'     , value: <%= raw Caboose.json(p.option1)        %>, width: 250, fixed_placeholder: true },                         
+      { name: 'option2'       , nice_name: 'Option 2'      , type: 'text'     , value: <%= raw Caboose.json(p.option2)        %>, width: 250, fixed_placeholder: true }, 
+      { name: 'option3'       , nice_name: 'Option 3'      , type: 'text'     , value: <%= raw Caboose.json(p.option3)        %>, width: 250, fixed_placeholder: true },            
+      { name: 'option1_media' , nice_name: 'Uses Image'    , type: 'checkbox' , value: <%= raw Caboose.json(p.option1_media)  %>, width: 150, fixed_placeholder: true, align: 'right' },                         
+      { name: 'option2_media' , nice_name: 'Uses Image'    , type: 'checkbox' , value: <%= raw Caboose.json(p.option2_media)  %>, width: 150, fixed_placeholder: true, align: 'right' }, 
+      { name: 'option3_media' , nice_name: 'Uses Image'    , type: 'checkbox' , value: <%= raw Caboose.json(p.option3_media)  %>, width: 150, fixed_placeholder: true, align: 'right' },
+      { name: 'default1'      , nice_name: 'Default value' , type: 'text'     , value: <%= raw Caboose.json(p.default1)       %>, width: 285, fixed_placeholder: true },                         
+      { name: 'default2'      , nice_name: 'Default value' , type: 'text'     , value: <%= raw Caboose.json(p.default2)       %>, width: 285, fixed_placeholder: true }, 
+      { name: 'default3'      , nice_name: 'Default value' , type: 'text'     , value: <%= raw Caboose.json(p.default3)       %>, width: 285, fixed_placeholder: true } 
     ]
   });
   

data/app/views/caboose/variants/admin_edit.html.erb

@@ -20,7 +20,8 @@ v = @variant
 <h2>Inventory</h2>
 <div id='variant_<%= v.id %>_alternate_id'       ></div>
 <div id='variant_<%= v.id %>_sku'                ></div>
-<div id='variant_<%= v.id %>_barcode'            ></div>                
+<div id='variant_<%= v.id %>_barcode'            ></div>
+<div id='variant_<%= v.id %>_cost'               ></div>
 <div id='variant_<%= v.id %>_price'              ></div>
 <div id='variant_<%= v.id %>_quantity_in_stock'  ></div>
 <div id='variant_<%= v.id %>_ignore_quantity'  ></div>
@@ -37,7 +38,8 @@ v = @variant
 <div id='variant_<%= v.id %>_date_sale_starts'   ></div>
 <div id='variant_<%= v.id %>_time_sale_starts'   ></div>
 <div id='variant_<%= v.id %>_date_sale_ends'     ></div>
-<div id='variant_<%= v.id %>_time_sale_ends'     ></div>          
+<div id='variant_<%= v.id %>_time_sale_ends'     ></div>
+<div id='variant_<%= v.id %>_clearance'          ></div>
     </td>
     <td valign='top' colspan='4'4>
 <h2>Flat Rate Shipping</h2>
@@ -75,11 +77,13 @@ $(document).ready(function() {
       <% if p.option3 %>{ name: 'option3'            , nice_name: <%= raw Caboose.json(p.option3) %> , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(v.option3                      ) %> },<% end %>
       { name: 'alternate_id'                         , nice_name: 'Alternate ID'                     , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(v.alternate_id                 ) %> },      
       { name: 'sku'                                  , nice_name: 'SKU'                              , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(v.sku                          ) %> },                         
-      { name: 'barcode'                              , nice_name: 'Barcode'                          , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(v.barcode                      ) %> }, 
+      { name: 'barcode'                              , nice_name: 'Barcode'                          , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(v.barcode                      ) %> },
+      { name: 'cost'                                 , nice_name: 'Cost of Goods'                    , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(sprintf("%.2f", v.cost)        ) %> },
       { name: 'price'                                , nice_name: 'Price'                            , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(sprintf("%.2f", v.price)       ) %> },
       { name: 'sale_price'                           , nice_name: 'Sale price'                       , type: 'text'     , align: 'right' , width: 175, value: <%= raw Caboose.json(v.sale_price                   ) %> },
       { name: 'date_sale_starts'                     , nice_name: 'Sale starts'                      , type: 'datetime' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.date_sale_starts ? v.date_sale_starts.in_time_zone(@logged_in_user.timezone).strftime('%m/%d/%Y %I:%M %P') : '') %> },      
-      { name: 'date_sale_ends'                       , nice_name: 'Sale ends'                        , type: 'datetime' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.date_sale_ends   ? v.date_sale_ends.in_time_zone(@logged_in_user.timezone).strftime('%m/%d/%Y %I:%M %P')   : '') %> },      
+      { name: 'date_sale_ends'                       , nice_name: 'Sale ends'                        , type: 'datetime' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.date_sale_ends   ? v.date_sale_ends.in_time_zone(@logged_in_user.timezone).strftime('%m/%d/%Y %I:%M %P')   : '') %> },
+      { name: 'clearance'                            , nice_name: 'On Clearance'                     , type: 'checkbox' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.clearance                    ) %> },      
       { name: 'quantity_in_stock'                    , nice_name: 'Quantity'                         , type: 'text'     , align: 'right' , width: 250, value: <%= raw Caboose.json(v.quantity_in_stock            ) %> }, 
       { name: 'ignore_quantity'                      , nice_name: 'Ignore Quantity'                  , type: 'checkbox' , align: 'right' , width: 250, value: <%= raw Caboose.json(v.ignore_quantity              ) %> },
       { name: 'weight'                               , nice_name: 'Weight (<%= sc.weight_unit %>)'   , type: 'text'     , align: 'right' , width: 175, value: <%= raw Caboose.json(v.weight                       ) %> }, 

data/app/views/caboose/variants/admin_edit_option1_media.html.erb

@@ -0,0 +1,94 @@
+<%  
+config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]      
+access_key = config['access_key_id']
+secret_key = config['secret_access_key']
+bucket     = config['bucket']      
+policy = {        
+  "expiration" => 1.hour.from_now.utc.xmlschema,
+  "conditions" => [
+    { "bucket" => "#{bucket}-uploads" },          
+    { "acl" => "public-read" },
+    [ "starts-with", "$key", '' ],
+    #[ "starts-with", "$Content-Type", 'image/' ],          
+    [ 'starts-with', '$name', '' ], 	
+    [ 'starts-with', '$Filename', '' ],          
+  ]
+}
+@policy = Base64.encode64(policy.to_json).gsub(/\n/,'')      
+@signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret_key, @policy)).gsub("\n","")
+@s3_upload_url = "https://#{bucket}-uploads.s3.amazonaws.com/"
+@aws_access_key_id = access_key                                                
+@top_media_category = Caboose::MediaCategory.top_category(@site.id)      
+
+%>
+<div id='left_content'>
+  <div id='categories'></div>  
+</div>
+<div id='right_content'>
+  <div id='controls'></div>
+  <div id='uploader'></div>
+  <div id='media'></div>
+</div>
+
+<p style='clear: both;'>&nbsp;</p>
+<p>
+<input type='button' value='Close'        onclick="parent.location.reload(true); modal.close();" />
+<input type='button' value='Manage Media' onclick="parent.window.location='/admin/media';" />
+</p>
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+<%= stylesheet_link_tag 'plupload/jquery.ui.plupload/css/jquery.ui.plupload.css' %>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag "caboose/media_browser" %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+
+<%= javascript_include_tag 'plupload/plupload.full.min.js' %> 
+<%= javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js' %>
+<%
+#javascript_include_tag 'plupload/moxie.js'
+#javascript_include_tag 'plupload/plupload.dev.js'
+#javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js'
+%>
+
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {  
+  modal = new CabooseModal(900);
+});
+
+var controller = false;
+$(document).ready(function() {
+  b = new MediaBrowser({                
+    media_id: <% if @media %><%= @media.id %><% else %>false<% end %>, 
+    authenticity_token: '<%= form_authenticity_token %>',    
+    top_cat_id: <%= raw Caboose.json(@top_media_category.id) %>,
+    cat_id: <% if @media %><%= @media.media_category_id %><% else %><%= @top_media_category.id %><% end %>,
+    s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
+	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
+	  policy: '<%= raw @policy %>',
+	  signature: '<%= raw @signature %>',
+	  refresh_unprocessed_images: false,
+	  select_media: function(browser, media_id) {
+      $.ajax({
+        url: '/admin/products/<%= @product.id %>/variants/bulk',
+        type: 'put',
+        data: {
+          model_ids: <%= raw Caboose.json(@variants.collect{ |v| v.id }) %>, 
+          option1_media_id: media_id 
+        },
+        success: function(resp) {
+          parent.location.reload(true);
+          modal.close();                  
+        }
+      });        
+    },
+  });	
+});
+
+</script>
+<% end %>