caboose-cms 0.9.228 → 0.9.229

data/app/assets/stylesheets/caboose/application.css

@@ -7,12 +7,17 @@
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
- * 
- *= require colorbox-rails
- *= require caboose/page_bar_generator
- *= require caboose/model_binder  
+ *
  */
 
+
+
+/* Removed:; */
+/*
+require colorbox-rails
+require caboose/page_bar_generator
+require caboose/model_binder  
+
 #cboxLoadedContent { margin-bottom: 0; }
 
 #cboxTopLeft,
@@ -24,4 +29,5 @@
 #cboxTopCenter,
 #cboxBottomCenter,
 #cboxClose { background: #111; }
-#cboxWrapper { border-radius: 7px !important; }
+#cboxWrapper { border-radius: 7px !important; }
+*/

data/app/assets/stylesheets/caboose/login.scss

@@ -82,6 +82,7 @@
         border-radius: 0;
         line-height: 40px;
         text-align: left;
+        color: #000;
         &:focus {
           outline-width: 0;
           border-color: #b1d9f5;

data/app/assets/stylesheets/caboose/model_binder.css

@@ -1,7 +1,16 @@
-/*    
-require caboose/spectrum 
-*/
- 
+#cboxLoadedContent { margin-bottom: 0; }
+
+#cboxTopLeft,
+#cboxTopRight,
+#cboxBottomLeft,
+#cboxBottomRight,
+#cboxMiddleLeft,
+#cboxMiddleRight,
+#cboxTopCenter,
+#cboxBottomCenter,
+#cboxClose { background: #111; }
+#cboxWrapper { border-radius: 7px !important; }
+
 .mb_container {
   width: 100%;
   overflow: hidden;

data/app/assets/stylesheets/caboose/page_bar_generator.css

@@ -1,4 +1,4 @@
-
+/* DEPRECATED
 .page_links {
   
 }
@@ -32,3 +32,4 @@
   color: #fff;
   text-decoration: none;
 }
+*/

data/app/controllers/caboose/admin_controller.rb

@@ -1,12 +1,11 @@
-
 module Caboose
   class AdminController < ApplicationController
       
     # @route GET /admin
-    def index      
-      return if !user_is_allowed('admin', 'view')
+    def index
+      return if !user_is_allowed_to('view', 'admin')
       @return_url = params[:return_url].nil? ? '/admin/pages' : params[:return_url]
     end
     
   end
-end
+end

data/app/controllers/caboose/application_controller.rb

@@ -12,9 +12,7 @@ module Caboose
       
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
-      
-   #   @use_page_cache = !request.fullpath.starts_with?('/admin')
-            
+                  
       # Get the site we're working with      
       @domain = Domain.where(:domain => request.host_with_port).first      
       @site = @domain ? @domain.site : nil      
@@ -26,15 +24,17 @@ module Caboose
       CabooseMailer.site = @site
         
       # Make sure someone is logged in
-      if !logged_in? && @site                
-        elo = User.logged_out_user(@site.id)        
+      if !logged_in? && @site
+        elo_id = cookies[:caboose_elo_id]
+        if elo_id.blank?
+          elo_id = User.logged_out_user_id(@site.id)
+          cookies[:caboose_elo_id] = elo_id  # Cache the site's ELO id in browser to prevent multiple lookups
+        end
+        elo = User.find(elo_id)        
         login_user(elo) if elo
       end
       
-      session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
-      
-      # Initialize AB Testing
-      AbTesting.init(request.session_options[:id]) if Caboose.use_ab_testing            
+      session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?            
       
       # Try to find the page
       @request = request      
@@ -47,13 +47,8 @@ module Caboose
       @is_real_page = false
       @ga_events    = []      
       
-      #if @find_page
-        @page = Page.page_with_uri(request.host_with_port, request.fullpath)
-    #    @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
-      #end
-
+      @page = Page.page_with_uri(request.host_with_port, request.fullpath)
 
-      
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user  
 
@@ -155,7 +150,12 @@ module Caboose
     def logged_in?
       validate_token
       validate_cookie
-      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id != User.logged_out_user_id(@site.id)
+      elo_id = cookies[:caboose_elo_id]
+      if elo_id.blank?
+        elo_id = User.logged_out_user_id(@site.id)
+        cookies[:caboose_elo_id] = elo_id  # Cache the site's ELO id in browser to prevent multiple lookups
+      end
+      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id.to_s != elo_id.to_s
       return false
     end
     
@@ -164,10 +164,8 @@ module Caboose
     def validate_token
       token = params[:token]
       return false if token.nil?
-      
       user = User.validate_token(token)
       return false if user.nil?
-     
       login_user(user)
       return true
     end
@@ -242,7 +240,6 @@ module Caboose
         end
         return false
       end
-
       @user = logged_in_user
       unless @user.is_allowed(resource, action)
         if json

data/app/controllers/caboose/block_types_controller.rb

@@ -155,7 +155,8 @@ module Caboose
     
     # @route PUT /admin/block-types/:id
     def admin_update
-      render :json => false and return if !logged_in_user.is_super_admin?
+      can_edit = (params[:site_id] && params[:site_id][0] && params[:site_id][0] == @site.id.to_s && logged_in_user.is_allowed('site_settings', 'edit')) || logged_in_user.is_super_admin?
+      render :json => false and return if !can_edit
       
       resp = StdClass.new({'attributes' => {}})
       bt = BlockType.find(params[:id])
@@ -186,7 +187,8 @@ module Caboose
           when 'options_url'                     then bt.options_url                    = v
           when 'default_constrain'               then bt.default_constrain              = v
           when 'default_full_width'              then bt.default_full_width             = v
-          when 'default_included'                 then bt.default_included             = v
+          when 'is_dynamic'                      then bt.is_dynamic                     = v
+          when 'default_included'                then bt.default_included               = v
           when 'site_id'                         then resp.btsm_id = bt.toggle_site(v[0], v[1])
         end
       end
@@ -293,7 +295,7 @@ module Caboose
 
     # @route GET /admin/block-type-site-memberships/:id/html
     def admin_edit_btsm_html
-      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
+      redirect_to '/admin' and return if !logged_in_user.is_allowed('site_settings', 'edit')  
       @btsm = BlockTypeSiteMembership.find(params[:id])
       if (@site.id != @btsm.site_id && !@site.is_master)
         @error = "You are not allowed to edit this site."
@@ -304,7 +306,7 @@ module Caboose
 
     # @route PUT /admin/block-type-site-memberships/:id/html
     def admin_update_btsm_html
-      render :json => false and return if !logged_in_user.is_super_admin?      
+      render :json => false and return if !logged_in_user.is_allowed('site_settings', 'edit')      
       resp = StdClass.new  
       @btsm = BlockTypeSiteMembership.find(params[:id])
       code = params['code'].blank? ? '' : params['code'].gsub('<%==','<%= raw')
@@ -317,7 +319,7 @@ module Caboose
 
     # @route GET /admin/block-type-site-memberships/:id/css
     def admin_edit_btsm_css
-      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
+      redirect_to '/admin' and return if !logged_in_user.is_allowed('site_settings', 'edit')  
       @btsm = BlockTypeSiteMembership.find(params[:id])  
       if (@site.id != @btsm.site_id && !@site.is_master)
         @error = "You are not allowed to edit this site."
@@ -328,7 +330,7 @@ module Caboose
 
     # @route PUT /admin/block-type-site-memberships/:id/css
     def admin_update_btsm_css
-      render :json => false and return if !logged_in_user.is_super_admin?      
+      render :json => false and return if !logged_in_user.is_allowed('site_settings', 'edit')      
       resp = StdClass.new  
       @btsm = BlockTypeSiteMembership.find(params[:id])
       @btsm.custom_css = params['code']

data/app/controllers/caboose/cart_controller.rb

@@ -176,7 +176,7 @@ module Caboose
           :invoice_action => InvoiceLog::ACTION_LINE_ITEM_CREATED                                                                          
         )
       end
-      GA.delay(:queue => 'caboose_store').event(@site.id, 'cart', 'add', "Product #{v.product.id}, Variant #{v.id}")
+      GA.delay(:queue => 'general', :priority => 20).event(@site.id, 'cart', 'add', "Product #{v.product.id}, Variant #{v.id}")
       
       resp.success = true
       resp.item_count = @invoice.item_count
@@ -320,7 +320,7 @@ module Caboose
         
         resp.success = true
         resp.invoice_total = @invoice.total
-        GA.delay(:queue => 'caboose_store').event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
+        GA.delay(:queue => 'general', :priority => 20).event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
       end
       render :json => resp
     end

data/app/controllers/caboose/change_logs_controller.rb

@@ -0,0 +1,13 @@
+module Caboose
+  class ChangeLogsController < Caboose::ApplicationController  
+
+    # @route GET /admin/logs
+    def admin_index
+      return unless user_is_allowed('logs', 'view')
+      mc = "Media Category"
+      @logs = ChangeLog.where(:site_id => @site.id).where('(is_field = false and (action = ? OR action = ?)) OR (action != ? and action != ?) OR (is_field = true AND description ILIKE (?))','added','deleted','added','deleted',"%#{mc}%").order('timestamp desc, id desc').limit(500)
+      render :layout => 'caboose/admin'
+    end
+
+  end
+end

data/app/controllers/caboose/fonts_controller.rb

@@ -16,6 +16,12 @@ module Caboose
       if !@bfbi then @bfbi = Font.create(:site_id => @site.id, :name => "body-font-bold-italic", :family => "Open Sans", :variant => "600italic", :url => "http://fonts.gstatic.com/s/opensans/v13/PRmiXeptR36kaC0GEAetxpZ7xm-Bj30Bj2KNdXDzSZg.ttf") end
       @btn = Font.where(:site_id => @site.id, :name => "button-font").last
       if !@btn then @btn = Font.create(:site_id => @site.id, :name => "button-font", :family => "Open Sans", :variant => "regular", :url => "http://fonts.gstatic.com/s/opensans/v13/IgZJs4-7SA1XX_edsoXWog.ttf") end
+      @custom1 = Font.where(:site_id => @site.id, :name => "custom1-font").last
+      if !@custom1 then @custom1 = Font.create(:site_id => @site.id, :name => "custom1-font", :family => "Open Sans", :variant => "regular", :url => "http://fonts.gstatic.com/s/opensans/v13/IgZJs4-7SA1XX_edsoXWog.ttf") end
+      @custom2 = Font.where(:site_id => @site.id, :name => "custom2-font").last
+      if !@custom2 then @custom2 = Font.create(:site_id => @site.id, :name => "custom2-font", :family => "Open Sans", :variant => "regular", :url => "http://fonts.gstatic.com/s/opensans/v13/IgZJs4-7SA1XX_edsoXWog.ttf") end
+      @custom3 = Font.where(:site_id => @site.id, :name => "custom3-font").last
+      if !@custom3 then @custom3 = Font.create(:site_id => @site.id, :name => "custom3-font", :family => "Open Sans", :variant => "regular", :url => "http://fonts.gstatic.com/s/opensans/v13/IgZJs4-7SA1XX_edsoXWog.ttf") end
     end
 
     # @route PUT /admin/fonts
@@ -25,13 +31,15 @@ module Caboose
       name = params[:name]
       url = params[:url]
       variant = params[:variant]
-
       if !family.blank? && !name.blank? && !url.blank? && !variant.blank?
         font = Font.where(:site_id => @site.id, :name => name).last
         if font
+          fam = FontFamily.where(:name => family).first
+          var = fam ? FontVariant.where(:font_family_id => fam.id).where("CONCAT(style,weight) = ?", variant).first : nil
           font.family = family
           font.url = url
           font.variant = variant
+          font.variant_id = var.id if var
           font.save
           resp.success = "Font saved!"
         else
@@ -41,8 +49,137 @@ module Caboose
         resp.error = "Error saving font"
       end
       render :json => resp
+    end
+
+
+    # Font Families
+
+    # @route GET /admin/font-families
+    def admin_family_index
+      return if !user_is_allowed('fonts', 'view')            
+    end
+
+    # @route GET /admin/font-families/json
+    def admin_family_json
+      return if !user_is_allowed('fonts', 'view')
+      pager = PageBarGenerator.new(params, {
+          'name_like' => ''
+        },{
+          'model'          => 'Caboose::FontFamily',
+          'sort'           => 'name',
+          'desc'           => false,
+          'base_url'       => '/admin/font-families',
+          'items_per_page' => 50
+      })                  
+      render :json => {
+        :pager => pager,
+        :models => pager.items.as_json     
+      }
+    end
+        
+    # @route GET /admin/font-families/:id/json
+    def admin_family_json_single
+      return if !user_is_allowed('fonts', 'view')    
+      ff = FontFamily.find(params[:id])
+      render :json => ff.as_json
+    end
+
+    # @route POST /admin/font-families
+    def admin_family_add
+      return if !user_is_allowed('fonts', 'add')
+      resp = StdClass.new
+      if params[:name].blank?
+        resp.error = "Name is required."
+        render :json => resp and return
+      end
+      ff = FontFamily.new
+      ff.name = params[:name]
+      ff.save
+      resp.redirect = "/admin/font-families/#{ff.id}"
+      render :json => resp
+    end
+
+
+    # @route GET /admin/font-families/:id
+    def admin_family_edit
+      return if !user_is_allowed('fonts', 'add')
+      @ff = FontFamily.find(params[:id])
+    end
+
+    # @route GET /admin/font-variants/:id
+    def admin_variant_edit
+      return if !user_is_allowed('fonts', 'edit')
+      @variant = FontVariant.find(params[:id])
+    end
+
+    # @route POST /admin/font-variants
+    def admin_variant_add
+      return if !user_is_allowed('fonts', 'add')
+      resp = StdClass.new
+      if params[:variant].blank?
+        resp.error = "Variant Name is required."
+        render :json => resp and return
+      end
+      ff = FontVariant.new
+      ff.font_family_id = params[:family_id]
+      ff.weight = 'regular'
+      ff.variant = params[:variant]
+      ff.sort_order = 10
+      ff.save
+      resp.redirect = "/admin/font-variants/#{ff.id}"
+      render :json => resp
+    end
+         
+    # @route PUT /admin/font-variants/:id
+    def admin_variant_update
+      return unless user_is_allowed_to 'edit', 'fonts'
+      resp = Caboose::StdClass.new
+      variant = FontVariant.find(params[:id])
+      params.each do |k,v|
+        case k
+          when "variant" then variant.variant = v
+          when "ttf_url" then (variant.ttf_url = v if (v.blank? || (v.include?('.ttf') && v.include?('http'))))
+          when "weight" then variant.weight = v
+          when "style" then variant.style = v
+          when "sort_order" then variant.sort_order = v
+        end
+      end
+      resp.success = variant.save
+      render :json => resp
+    end
+
+    # @route POST /admin/font-variants/:id/ttf-file
+    def admin_variant_update_ttf_file
+      return unless user_is_allowed_to 'edit', 'fonts'
+      resp = Caboose::StdClass.new
+      var = FontVariant.find(params[:id])
+      var.ttf_file = params[:ttf_file]
+      var.save
+      resp.success = true
+      resp.attributes = { 'ttf_file' => { 'value' => var.ttf_file.url }}
+      render :json => resp
+    end
 
+    # @route POST /admin/font-variants/:id/woff-file
+    def admin_variant_update_woff_file
+      return unless user_is_allowed_to 'edit', 'fonts'
+      resp = Caboose::StdClass.new
+      var = FontVariant.find(params[:id])
+      var.woff_file = params[:woff_file]
+      var.save
+      resp.success = true
+      resp.attributes = { 'woff_file' => { 'value' => var.woff_file.url }}
+      render :json => resp
     end
-            
+
+    # @route DELETE /admin/font-variants/:id
+    # def admin_variant_delete
+    #   return unless user_is_allowed_to 'delete', 'fonts'
+    #   var = FontVariant.find(params[:id])   
+    #   resp = Caboose::StdClass.new('redirect' => "/admin/font-variants/#{var.font_family_id}")
+    #   var.destroy    
+    #   render :json => resp
+    # end
+
   end
 end

data/app/controllers/caboose/invoices_controller.rb

@@ -13,7 +13,7 @@ module Caboose
       end
 
       status = request.fullpath == '/admin/invoices' ? Caboose::Invoice::STATUS_PENDING : ''
-      
+      #Caboose.log(params)
       @pager = Caboose::PageBarGenerator.new(params, {
         'site_id'              => @site.id,
         'customer_id'          => params[:user_id] ? params[:user_id] : '',  
@@ -24,7 +24,8 @@ module Caboose
         'invoice_number'       => '',
         'total_lte'            => '',
         'total_gte'            => ''
-      }, {
+      },
+      {
         'model'          => 'Caboose::Invoice',
         'sort'           => 'id',
         'desc'           => 1,
@@ -336,7 +337,7 @@ module Caboose
     def admin_send_for_authorization
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
-      invoice.delay(:queue => 'caboose_store').send_payment_authorization_email
+      invoice.delay(:queue => 'general', :priority => 12).send_payment_authorization_email
     #  invoice.send_payment_authorization_email
       render :json => { :success => true }
     end
@@ -345,7 +346,7 @@ module Caboose
     def admin_send_receipt
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
-      invoice.delay(:queue => 'caboose_store').send_receipt_email
+      invoice.delay(:queue => 'general', :priority => 12).send_receipt_email
     #  invoice.send_receipt_email        
       render :json => { :success => true }
     end