caboose-cms 0.9.229 → 1.0.1

data/app/controllers/caboose/cart_controller.rb

@@ -176,7 +176,7 @@ module Caboose
           :invoice_action => InvoiceLog::ACTION_LINE_ITEM_CREATED                                                                          
         )
       end
-      GA.delay(:queue => 'general', :priority => 20).event(@site.id, 'cart', 'add', "Product #{v.product.id}, Variant #{v.id}")
+      GA.delay(:queue => 'caboose_store').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 => 'general', :priority => 20).event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
+        GA.delay(:queue => 'caboose_store').event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
       end
       render :json => resp
     end

data/app/controllers/caboose/fonts_controller.rb

@@ -16,12 +16,6 @@ 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
@@ -31,15 +25,13 @@ 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
@@ -49,137 +41,8 @@ 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,8 +24,7 @@ module Caboose
         'invoice_number'       => '',
         'total_lte'            => '',
         'total_gte'            => ''
-      },
-      {
+      }, {
         'model'          => 'Caboose::Invoice',
         'sort'           => 'id',
         'desc'           => 1,
@@ -337,7 +336,7 @@ module Caboose
     def admin_send_for_authorization
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
-      invoice.delay(:queue => 'general', :priority => 12).send_payment_authorization_email
+      invoice.delay(:queue => 'caboose_store').send_payment_authorization_email
     #  invoice.send_payment_authorization_email
       render :json => { :success => true }
     end
@@ -346,7 +345,7 @@ module Caboose
     def admin_send_receipt
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
-      invoice.delay(:queue => 'general', :priority => 12).send_receipt_email
+      invoice.delay(:queue => 'caboose_store').send_receipt_email
     #  invoice.send_receipt_email        
       render :json => { :success => true }
     end

data/app/controllers/caboose/login_logs_controller.rb

@@ -1,3 +1,4 @@
+
 module Caboose
   class LoginLogsController < ApplicationController
     layout 'caboose/admin'
@@ -8,7 +9,7 @@ module Caboose
 
     # @route GET /admin/login-logs/user/:userid
     def admin_index_for_user
-      return if !user_is_allowed_to 'view', 'login_logs'
+      return if !user_is_allowed_to 'view', 'loginlogs'
       @pager = self.login_logs_pager
       @edituser = Caboose::User.find(params[:userid]) if !params[:userid].blank?
       render :layout => 'caboose/admin'    
@@ -16,14 +17,14 @@ module Caboose
     
     # @route GET /admin/login-logs
     def admin_index
-      return if !user_is_allowed_to 'view', 'login_logs'
+      return if !user_is_allowed_to 'view', 'loginlogs'
       @pager = self.login_logs_pager
       render :layout => 'caboose/admin'    
     end
     
     # @route GET /admin/login-logs/json
     def admin_json
-      return if !user_is_allowed_to 'view', 'login_logs'
+      return if !user_is_allowed_to 'view', 'loginlogs'
       pager = self.login_logs_pager        
       render :json => {
         :pager => pager,
@@ -52,17 +53,18 @@ module Caboose
     
     # @route GET /admin/login-logs/:id/json
     def admin_json_single
-      return if !user_is_allowed_to 'view', 'login_logs'
+      return if !user_is_allowed_to 'view', 'loginlogs'
       login_log = LoginLog.find(params[:id])      
       render :json => login_log
     end
     
     # @route GET /admin/login-logs/:id
     def admin_edit
-      return if !user_is_allowed_to 'edit', 'login_logs'
+      return if !user_is_allowed_to 'edit', 'loginlogs'
       @login_log = LoginLog.find(params[:id])
 	    render :layout => 'caboose/admin'
     end
     
   end
 end
+

data/app/controllers/caboose/media_categories_controller.rb

@@ -61,7 +61,6 @@ module Caboose
       if !cat.save
         resp.error = cat.errors.first[1]
       else
-        Caboose::ChangeLog.create(:site_id => @site.id, :description => "Media Category: #{cat.name}", :is_field => true, :user_id => logged_in_user.id, :media_id => cat.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
         resp.new_id = cat.id
         resp.refresh = true
       end
@@ -99,14 +98,8 @@ module Caboose
     def admin_delete
       return unless user_is_allowed('mediacategories', 'delete')
       cat = MediaCategory.find(params[:id])
-      if MediaCategory.top_category(@site.id).id != cat.id
-        Media.where(:media_category_id => cat.id).update_all(:deleted => true)
-        cat.parent_id = 0
-        cat.save
-        if @site.use_change_logs
-          Caboose::ChangeLog.create(:site_id => @site.id, :description => "Media Category: #{cat.name}", :is_field => true, :user_id => logged_in_user.id, :media_id => cat.id, :timestamp => DateTime.now, :action => 'deleted') if @site.use_change_logs
-        end
-      end
+      Media.where(:media_category_id => cat.id).destroy_all
+      cat.destroy            
       render :json => { :success => true }
     end
     
@@ -120,13 +113,6 @@ module Caboose
       ids.each do |id|
         m = Media.where(:id => id).first
         next if m.nil?
-        if @site.use_change_logs
-          mc1 = Caboose::MediaCategory.where(:id => m.media_category_id).first
-          mc2 = Caboose::MediaCategory.where(:id => media_category_id).first
-          ov = mc1 ? mc1.name : "N/A"
-          nv = mc2 ? mc2.name : "N/A"
-          Caboose::ChangeLog.create(:site_id => @site.id, :description => "Category", :user_id => logged_in_user.id, :media_id => m.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => nv)
-        end
         m.update_attribute(:media_category_id, media_category_id)
         p = Product.where(:media_category_id => media_category_id).last
         if p

data/app/controllers/caboose/media_controller.rb

@@ -72,8 +72,8 @@ module Caboose
     # @route GET /admin/media/json
     def admin_json
       return if !user_is_allowed('media', 'view')
-      render :json => false and return if @site.nil? || params[:media_category_id].blank?
-      arr = Media.where(:media_category_id => params[:media_category_id], :deleted => false).reorder(:sort_order).all
+      render :json => false and return if @site.nil?
+      arr = Media.where(:media_category_id => params[:media_category_id]).reorder(:sort_order).all
       render :json => arr.collect{ |m| m.api_hash }                  
     end
     
@@ -131,7 +131,7 @@ module Caboose
           when 'sort_order'   then m.sort_order   = value
           when 'image_url'    then
             m.processed = false
-            m.delay(:queue => 'general', :priority => 2).download_image_from_url(value)
+            m.delay(:queue => 'caboose_media', :priority => 2).download_image_from_url(value)
         end
       end
       
@@ -163,14 +163,12 @@ module Caboose
     # @route DELETE /admin/media/:id
     def admin_delete
       return unless user_is_allowed('media', 'delete')
+      
       model_ids = params[:id] == 'bulk' ? params[:ids] : [params[:id]]             
       model_ids.each do |media_id|
-        if @site.use_change_logs
-          on = Media.title_for_id(media_id)
-          Caboose::ChangeLog.create(:site_id => @site.id, :description => on, :user_id => logged_in_user.id, :media_id => media_id, :timestamp => DateTime.now, :action => 'deleted')
-        end
-        Media.where(:id => media_id).update_all(:deleted => true)
-      end
+        ProductImage.where(:media_id => media_id).destroy_all
+        Media.where(:id => media_id).destroy_all
+      end                  
       render :json => { :success => true }
     end
     
@@ -187,12 +185,11 @@ module Caboose
       else
         file_content_type = file_type
       end
-      #m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name, :deleted => false).first
-      #if m.nil?
+      m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
+      if m.nil?
         max = Media.where(:media_category_id => media_category_id).maximum(:sort_order)
-        m = Media.create(:media_category_id => media_category_id, :description => desc, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false, :deleted => false)
-        Caboose::ChangeLog.create(:site_id => @site.id, :description => original_name, :user_id => logged_in_user.id, :media_id => m.id, :timestamp => DateTime.now, :action => 'uploaded') if @site.use_change_logs
-      #end
+        m = Media.create(:media_category_id => media_category_id, :description => desc, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
+      end
       p = Product.where(:media_category_id => media_category_id).last
       if p
         pi = ProductImage.create(:product_id => p.id, :media_id => m.id)

data/app/controllers/caboose/pages_controller.rb

@@ -5,8 +5,7 @@ module Caboose
     helper :application
     
     def before_action
-      # removing temporarily - looks like not needed:
-      #@page = Page.page_with_uri(request.host_with_port, '/admin')      
+      @page = Page.page_with_uri(request.host_with_port, '/admin')      
     end
     
     # @route GET /pages/:id/redirect
@@ -138,48 +137,25 @@ module Caboose
       #header("Content-Disposition: inline filename=\"$asset->filename\"")
 
     end
-
-    # @route GET /api/sitemap
-    def api_sitemap
-      siteid = params[:site_id].blank? ? @site.id : params[:site_id]
-      render :json => Caboose::Page.select([:id, :title, :menu_title, :parent_id, :redirect_url, :uri, :sort_order]).where(:site_id => siteid, :hide => false).order(:id).all
-    end
     
     #===========================================================================
     # Admin actions
     #===========================================================================
 
-    # @route PUT /admin/pages/:id/publish
+    # @route GET /admin/pages/:id/publish
     def admin_publish
-      resp = Caboose::StdClass.new
-      resp.success = false
-      @page = Page.find(params[:id])
-      condition = @page && @logged_in_user && (@logged_in_user.is_super_admin? || (@logged_in_user.site_id == @page.site_id && ( @logged_in_user.is_allowed('all','all') || @logged_in_user.is_allowed('pages','edit') && Page.permissible_actions(@logged_in_user, @page.id).include?('edit'))))
-      render :json => resp and return unless condition
-      resp.success = true
-      @page.delay(:queue => 'caching', :priority => 2).publish(logged_in_user.id)
-      render :json => resp
-    end
-
-    # @route GET /admin/pages/:id/status
-    def admin_status
-      resp = Caboose::StdClass.new
-      resp.status = 'pending'
-      @page = Page.find(params[:id])
-      if @page && @page.is_published
-        resp.status = 'published'
-      end
-      render :json => resp
+      return unless user_is_allowed('pages', 'edit')
+      page = Page.find(params[:id])
+      page.publish
+      redirect_to "/admin/pages/#{page.id}/content"
     end
 
     # @route GET /admin/pages/:id/revert
     def admin_revert
       return unless user_is_allowed('pages', 'edit')
-      @page = Page.find(params[:id])
-      condition = @page && @logged_in_user && (@logged_in_user.is_super_admin? || (@logged_in_user.site_id == @page.site_id && ( @logged_in_user.is_allowed('all','all') || @logged_in_user.is_allowed('pages','edit') && Page.permissible_actions(@logged_in_user, @page.id).include?('edit'))))
-      redirect_to '/admin/pages' and return unless condition
-      @page.revert
-      redirect_to "/admin/pages/#{@page.id}/content"
+      page = Page.find(params[:id])
+      page.revert
+      redirect_to "/admin/pages/#{page.id}/content"
     end
     
     # @route GET /admin/pages
@@ -379,35 +355,6 @@ module Caboose
         render :layout => 'caboose/admin'
       end
     end
-
-    # @route GET /api/page_:id
-    def compiled_asset
-      @page = Page.find(params[:id])
-      respond_to do |format|
-        format.css { render :layout => 'caboose/css', :content_type => "text/css" }
-        format.js { render :layout => 'caboose/js', :content_type => "text/javascript" }
-      end
-    end
-
-    # @route GET /api/pages/:id/refresh-cache
-    def refresh_cached_blocks
-      render :json => false and return unless (user_is_allowed('pages', 'edit') && @site.use_caching)
-      resp = Caboose::StdClass.new
-      @page = Page.find(params[:id])
-      content = @page.block.child('content')
-      home_page = Caboose::Page.index_page(@site.id)
-      footer = home_page.block.child('footer')
-      block_ids = Caboose::Block.where("parent_id = ? OR parent_id = ?", content.id, footer.id).pluck(:id)
-      @page.update_cached_blocks(block_ids)
-      @page.delay(:queue => 'caching', :priority => 8).update_css_file
-      @page.delay(:queue => 'caching', :priority => 8).update_js_file
-      if home_page && @page.id == home_page.id
-        @site.delay(:queue => 'caching', :priority => 8).update_footer_css_file
-        @site.delay(:queue => 'caching', :priority => 8).update_footer_js_file
-      end
-      resp.success = true
-      render :json => resp
-    end
     
     # @route GET /admin/pages/:id/js
     def admin_edit_js
@@ -485,7 +432,7 @@ module Caboose
       elsif site_id.nil?   then resp.error = "Invalid site"
       elsif parent_id.nil? then resp.error = "Invalid parent"
       else
-        resp.new_id = Rails.env.production? ? p.delay(:queue => 'general', :priority => 20).duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id, logged_in_user.id) : p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id, logged_in_user.id)
+        resp.new_id = Rails.env.production? ? p.delay(:priority => 20).duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id) : p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id)
         resp.success = true
       end
       
@@ -521,24 +468,12 @@ module Caboose
       end
     end
 
-    # @route GET /admin/pages/:id/logs
-    def admin_change_logs
-      return unless user_is_allowed('logs', 'view')
-      @page = Page.find(params[:id])  
-      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
-        redirect_to '/admin/pages'
-      else
-        @logs = ChangeLog.where(:page_id => @page.id).where('(is_field is false and (action = ? OR action = ?)) OR (action != ? and action != ?)','added','deleted','added','deleted').order('timestamp desc, id desc').limit(500)
-        render :layout => 'caboose/admin'
-      end
-    end
-
     # @route GET /admin/pages/:id
     def admin_edit_general
       return if !user_is_allowed('pages', 'edit')
       #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
       @page = Page.find(params[:id])
-      @can_edit_home = logged_in_user.is_allowed(Caboose::Page.index_page(@site.id), 'edit')
+      @can_edit_home = user_is_allowed_to('edit', Caboose::Page.index_page(@site.id))
       if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
@@ -561,12 +496,11 @@ module Caboose
 
       parent = Caboose::Page.find(parent_id)
 
-      allowed_to_edit = Page.page_ids_with_permission(logged_in_user, 'edit')
-      allowed_to_edit = allowed_to_edit.count > 0 ? allowed_to_edit.include?(parent.id) : false
-
       if title.blank?
         resp.error = "Page Title is required."
-      elsif (!logged_in_user.is_allowed('all', 'all') && !allowed_to_edit)
+      elsif (!logged_in_user.is_allowed('all', 'all') && 
+        !Page.page_ids_with_permission(logged_in_user, 'edit'   ).include?(parent_id) &&
+        !Page.page_ids_with_permission(logged_in_user, 'approve').include?(parent_id))
         resp.error = "You don't have permission to add a page there."
       end
       if (!resp.error.nil?)
@@ -586,6 +520,7 @@ module Caboose
         page.title = title
         page.parent_id = parent_id      
         page.hide = true
+        page.content_format = Caboose::Page::CONTENT_FORMAT_HTML
         page.save
         i = 0
         begin 
@@ -603,14 +538,13 @@ module Caboose
         Caboose::Page.update_authorized_for_action(page.id, 'view', viewers)
         Caboose::Page.update_authorized_for_action(page.id, 'edit', editors)
         resp.redirect = "/admin/pages/#{page.id}/content"
-        Caboose::ChangeLog.create(:site_id => @site.id, :description => page.title, :user_id => logged_in_user.id, :page_id => page.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
 
       # Copy from an existing page
       elsif !params[:copy_from_id].blank? && params[:use_copy] == 'yes'
         source = Caboose::Page.find(params[:copy_from_id])
         if source
           Caboose.log("copying from source page: #{source.id}")
-          new_page = source.duplicate(@site.id, parent_id, false, layout_id, nil, logged_in_user.id)
+          new_page = source.duplicate(@site.id, parent_id, false, layout_id, nil)
           new_page.title = params[:title]
           new_page.hide = true
           i = 0
@@ -626,7 +560,6 @@ module Caboose
           Caboose::Page.update_authorized_for_action(new_page.id, 'view', viewers)
           Caboose::Page.update_authorized_for_action(new_page.id, 'edit', editors)
           resp.redirect = "/admin/pages/#{new_page.id}/content"
-          Caboose::ChangeLog.create(:site_id => @site.id, :description => new_page.title, :user_id => logged_in_user.id, :page_id => new_page.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
         else
           resp.redirect = "/admin/pages/new"
         end
@@ -635,7 +568,7 @@ module Caboose
       elsif !params[:template_id].blank? && params[:use_template] == 'yes'
         template = Caboose::PageTemplate.find(params[:template_id])
         if template && template.page
-          new_page = template.page.duplicate(@site.id, parent_id, false, layout_id, nil, logged_in_user.id)
+          new_page = template.page.duplicate(@site.id, parent_id, false, layout_id, nil)
           new_page.title = params[:title]
           new_page.hide = true
           i = 0
@@ -651,7 +584,6 @@ module Caboose
           Caboose::Page.update_authorized_for_action(new_page.id, 'view', viewers)
           Caboose::Page.update_authorized_for_action(new_page.id, 'edit', editors)
           resp.redirect = "/admin/pages/#{new_page.id}/content"
-          Caboose::ChangeLog.create(:site_id => @site.id, :description => new_page.title, :user_id => logged_in_user.id, :page_id => new_page.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
         else
           resp.redirect = "/admin/pages/new"
         end
@@ -670,7 +602,6 @@ module Caboose
       save = true
       user = logged_in_user
       params.each do |name, value|
-        old_value = page[name]
         case name
         when 'parent_id'
           value = value.to_i
@@ -696,10 +627,30 @@ module Caboose
         when 'custom_css', 'custom_css_files', 'custom_js', 'custom_js_files'
           value.strip!
           page[name.to_sym] = value
-        
-        when 'title', 'menu_title', 'hide', 'redirect_url',
+
+        when 'title', 'menu_title', 'hide', 'layout', 'redirect_url',
           'seo_title', 'meta_keywords', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
           page[name.to_sym] = value
+
+        when 'linked_resources'
+          result = []
+          value.each_line do |line|
+            line.chomp!
+            line.strip!
+            next if line.empty?
+
+            if !(line.ends_with('.js') || line.ends_with('.css'))
+              resp.error = "Resource '#{line}' has an unsupported file type ('#{comps.last}')."
+              save = false
+            end
+
+            result << line
+          end
+          page.linked_resources = result.join("\n")
+          
+        when 'content_format'
+          page.content_format = value
+          resp.attributes['content_format'] = { 'text' => value }
           
         when 'meta_robots'
           arr = value.split(',').collect { |v| v.strip }
@@ -744,8 +695,8 @@ module Caboose
           Page.update_authorized_for_action(page.id, 'view', value)
         when 'editors'
           Page.update_authorized_for_action(page.id, 'edit', value)
-        # when 'approvers'
-        #   Page.update_authorized_for_action(page.id, 'approve', value)
+        when 'approvers'
+          Page.update_authorized_for_action(page.id, 'approve', value)
         when 'tags'
           current_tags = page.page_tags.collect{ |t| t.tag }
           new_tags = value.split(',').collect{ |v| v.strip.downcase }.reject{ |t| t.nil? || t.strip.length == 0 }          
@@ -756,22 +707,10 @@ module Caboose
           # Add any new tags not in current_tags
           new_tags.each{ |t| PageTag.create(:page_id => page.id, :tag => t) if !current_tags.include?(t) }        
         end
-
-        if @site.use_change_logs && !['id','action','controller'].include?(name)
-          ov = name == 'parent_id' ? Caboose::Page.title_for_id(old_value) : old_value
-          nv = name == 'parent_id' ? Caboose::Page.title_for_id(value) : value
-          ov = ['hide','custom_sort_children'].include?(name) ? (ov ? 'yes' : 'no') : ov
-          nv = ['hide','custom_sort_children'].include?(name) ? ( ['1',1,true,'true'].include?(nv) ? 'yes' : 'no') : nv
-          cl = Caboose::ChangeLog.create(:site_id => @site.id, :description => "Page #{name.titleize}", :user_id => user.id, :page_id => page.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => nv)
-        end
-
+        
       end
     
       resp.success = save && page.save
-
-      page.delay(:queue => 'caching', :priority => 8).update_css_file if params[:custom_css] && @site.use_caching
-      page.delay(:queue => 'caching', :priority => 8).update_js_file if params[:custom_js] && @site.use_caching
-
       render json: resp
     end
     
@@ -779,7 +718,6 @@ module Caboose
     def admin_delete
       return unless user_is_allowed('pages', 'delete')
       p = Page.find(params[:id])
-      Caboose::ChangeLog.create(:site_id => @site.id, :description => p.title, :user_id => logged_in_user.id, :page_id => p.id, :timestamp => DateTime.now, :action => 'deleted') if @site.use_change_logs
       p.destroy
       resp = StdClass.new({
         'redirect' => '/admin/pages'