caboose-cms 0.9.175 → 0.9.176

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0a529a96546461dd9dd06c99957920ef45376e
-  data.tar.gz: 448b88d7a143789b44d6666fd91b4186c0a63518
+  metadata.gz: 77b7f6fbe0c4a3b8cbd71873442bb59f127d72a9
+  data.tar.gz: 13160daa29cfe8226439a4259b54593e54336915
 SHA512:
-  metadata.gz: 736542cd5eefc38277124a89d7b9a9142c1631046ae8e8db711a6c5c01eafc3ceff573396899d29b74fe812e6c950d6dbe9d30964c040074425f2dc140e52133
-  data.tar.gz: b7783da727fe6fa769a035104cb7f51492df776d30034d2de5c54281fd7ac6810a66729c44156d138f59b9d45a0d7da29bb572d41552bb30eeeddd71ba7541da
+  metadata.gz: 0ffe7c11ff7ad97c1d4fdc78cd33dbdf5018ad9cc17d174aefbfe30604dada4d6654ccb5ba0cfd43a4415e827e138a595731b523dde7be5c7ec06dd1cf0938bb
+  data.tar.gz: 6bd5e9268af909139c26ef8452bd27020a28dd613d87e7ca80289932ddeecdd00c87c72c22e45845819457e823f667eccf6596dd1687eff33f811bab371f9f20

data/app/controllers/caboose/block_types_controller.rb

@@ -84,6 +84,52 @@ module Caboose
       @block_type = BlockType.find(params[:id])
       render :layout => 'caboose/admin'
     end
+
+    # @route GET /admin/block-types/:id/render-function
+    def admin_edit_render_function
+      return unless user_is_allowed('sites', 'edit')      
+      @block_type = BlockType.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+
+    # @route PUT /admin/block-types/:id/render-function
+    def admin_update_render_function
+      return if !user_is_allowed('sites', 'edit')
+      resp = StdClass.new  
+      @block_type = BlockType.find(params[:id])
+      code = params['code'].blank? ? '' : params['code'].gsub('<%==','<%= raw')
+      @block_type.render_function = code
+      @block_type.save
+      resp.success = true
+      resp.message = "Render function has been saved!"
+      render :json => resp
+    end
+
+    # @route GET /admin/block-types/:id/sass
+    def admin_edit_sass
+      return unless user_is_allowed('sites', 'edit')      
+      @block_type = BlockType.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+
+    # @route PUT /admin/block-types/:id/sass
+    def admin_update_sass
+      return if !user_is_allowed('sites', 'edit')
+      resp = StdClass.new  
+      @block_type = BlockType.find(params[:id])
+      @block_type.custom_sass = params['code']
+      @block_type.save
+      resp.success = true
+      resp.message = "Code has been saved!"
+      render :json => resp
+    end
+
+    # @route GET /admin/block-types/:id/errors
+    def admin_error_log
+      return unless user_is_allowed('sites', 'edit')      
+      @block_type = BlockType.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
     
     # @route POST /admin/block-types
     def admin_create
@@ -98,8 +144,9 @@ module Caboose
         :parent_id           => params[:parent_id] ? params[:parent_id] : nil,
         :name                => params[:name].downcase.gsub(' ', '_'),
         :description         => params[:name],                                                                
-        :field_type          => params[:field_type],
-        :allow_child_blocks  => true        
+        :field_type          => params[:parent_id] ? 'text' : 'block',
+        :allow_child_blocks  => false,
+        :icon => 'checkbox-unchecked'        
       )       
       bt.save      
       
@@ -141,7 +188,7 @@ 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 'site_id'                         then bt.toggle_site(v[0], v[1])
+          when 'site_id'                         then resp.btsm_id = bt.toggle_site(v[0], v[1])
         end
       end
       
@@ -242,7 +289,53 @@ module Caboose
       bt.children.each do |bt2|
         admin_tree_options_helper(options, bt2, " - #{prefix}")
       end      
-    end        
+    end  
+
+    # @route GET /admin/block-type-site-memberships/:id/html
+    def admin_edit_btsm_html
+      return if !user_is_allowed_to('edit', 'sites')
+      @btsm = BlockTypeSiteMembership.find(params[:id])
+      if (@site.id != @btsm.site_id && !@site.is_master)
+        @error = "You are not allowed to edit this site."
+        render :file => 'caboose/extras/error' and return
+      end
+      render :layout => 'caboose/admin'  
+    end
+
+    # @route PUT /admin/block-type-site-memberships/:id/html
+    def admin_update_btsm_html
+      return if !user_is_allowed_to('edit', 'sites')
+      resp = StdClass.new  
+      @btsm = BlockTypeSiteMembership.find(params[:id])
+      @btsm.custom_html = params['code']
+      @btsm.save
+      resp.success = true
+      resp.message = "Code has been saved!"
+      render :json => resp
+    end   
+
+    # @route GET /admin/block-type-site-memberships/:id/css
+    def admin_edit_btsm_css
+      return if !user_is_allowed_to('edit', 'sites')
+      @btsm = BlockTypeSiteMembership.find(params[:id])  
+      if (@site.id != @btsm.site_id && !@site.is_master)
+        @error = "You are not allowed to edit this site."
+        render :file => 'caboose/extras/error' and return
+      end
+      render :layout => 'caboose/admin'  
+    end
+
+    # @route PUT /admin/block-type-site-memberships/:id/css
+    def admin_update_btsm_css
+      return if !user_is_allowed_to('edit', 'sites')
+      resp = StdClass.new  
+      @btsm = BlockTypeSiteMembership.find(params[:id])
+      @btsm.custom_css = params['code']
+      @btsm.save
+      resp.success = true
+      resp.message = "Code has been saved!"
+      render :json => resp
+    end   
             
     #===========================================================================
     # Public Repo Actions

data/app/controllers/caboose/sites_controller.rb

@@ -111,6 +111,16 @@ module Caboose
       end   
       @site = Site.find(params[:id])      
     end
+
+    # @route GET /admin/sites/:id/contact
+    def admin_edit_contact
+      return if !user_is_allowed('sites', 'edit')
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
+        render :file => 'caboose/extras/error' and return
+      end   
+      @site = Site.find(params[:id])      
+    end
             
     # @route GET /admin/sites/:id/delete
     def admin_delete_form
@@ -186,6 +196,15 @@ module Caboose
           when 'allow_self_registration'  then site.allow_self_registration = value
           when 'theme_color'  then site.theme_color = value
           when 'assets_url'  then site.assets_url = value
+          when 'main_phone' then site.main_phone = value
+          when 'alt_phone' then site.alt_phone = value
+          when 'address1' then site.address1 = value
+          when 'address2' then site.address2 = value
+          when 'city' then site.city = value
+          when 'state' then site.state = value
+          when 'zip' then site.zip = value
+          when 'fax' then site.fax = value
+          when 'contact_email' then site.contact_email = value
     	  end
     	end
     	resp.success = save && site.save

data/app/controllers/caboose/theme_files_controller.rb

@@ -0,0 +1,110 @@
+module Caboose
+class ThemeFilesController < ApplicationController
+  layout 'caboose/admin'
+
+  # @route GET /admin/theme-files
+  def admin_index
+    return unless (user_is_allowed_to 'view', 'theme_files')            
+  end
+
+  # @route POST /admin/theme-files
+  def admin_add
+    return unless (user_is_allowed_to 'edit', 'theme_files')
+    resp = Caboose::StdClass.new
+    c = Caboose::ThemeFile.new
+    c.nice_name = params[:nice_name]
+    c.save
+    resp.redirect = "/admin/theme-files/#{c.id}"
+    render :json => resp
+  end
+
+  # @route GET /admin/theme-files/json
+  def admin_json 
+    render :json => false and return if !user_is_allowed_to 'view', 'theme_files'
+    pager = Caboose::Pager.new(params, {
+      'nice_name_like' => ''
+    }, {
+      'model' => 'Caboose::ThemeFile',
+      'sort'  => 'nice_name',
+      'desc'  => 'false',
+      'base_url' => '/admin/theme-files',
+      'items_per_page' => 50
+    })
+    render :json => {
+      :pager => pager,
+      :models => pager.items
+    } 
+  end
+
+  # @route GET /admin/theme-files/:id/json
+  def admin_json_single
+    render :json => false and return if !user_is_allowed_to 'edit', 'theme_files'
+    prop = Caboose::ThemeFile.find(params[:id])
+    render :json => prop
+  end
+  
+  # @route GET /admin/theme-files/:id
+  def admin_edit
+    if !user_is_allowed_to 'edit', 'theme_files'
+      Caboose.log("invalid permissions")
+    else
+      @themefile = Caboose::ThemeFile.where(:id => params[:id]).first
+    end
+  end
+
+  # @route PUT /admin/theme-files/:id/sass
+  def admin_update_sass
+    return if !user_is_allowed('edit', 'theme_files')
+    resp = StdClass.new  
+    @themefile = ThemeFile.find(params[:id])
+    @themefile.code = params['code']
+    @themefile.save
+    resp.success = true
+    resp.message = "Code has been saved!"
+    render :json => resp
+  end
+    
+  # @route PUT /admin/theme-files/:id
+  def admin_update
+    return unless (user_is_allowed_to 'edit', 'theme_files')
+    resp = Caboose::StdClass.new
+    theme_files = params[:id] == 'bulk' ? params[:model_ids].collect{ |rid| Caboose::ThemeFile.find(rid) } : [Caboose::ThemeFile.find(params[:id])] 
+    user = logged_in_user
+    if user
+      params.each do |k,v|
+        case k
+          when "filename" then theme_files.each { |r| r.filename = v }
+          when "nice_name" then theme_files.each { |r| r.nice_name = v }
+          when "default_included" then theme_files.each { |r| r.default_included = v }
+        end
+      end
+      theme_files.each do |r|
+        r.save
+      end
+      resp.success = true
+    end
+    render :json => resp
+  end
+
+  # @route DELETE /admin/theme-files/bulk
+  def admin_bulk_delete
+    return unless user_is_allowed_to 'delete', 'theme_files'
+    params[:model_ids].each do |rc_id|
+      prop = Caboose::ThemeFile.where(:id => rc_id).first
+      prop.destroy
+    end
+    resp = Caboose::StdClass.new('success' => true)
+    render :json => resp
+  end
+  
+  # @route DELETE /admin/theme-files/:id
+  def admin_delete
+    return unless user_is_allowed_to 'delete', 'theme_files'
+    prop = Caboose::ThemeFile.find(params[:id])    
+    resp = Caboose::StdClass.new('redirect' => "/admin/theme-files")
+    prop.destroy
+    render :json => resp
+  end
+
+end
+end

data/app/controllers/caboose/themes_controller.rb

@@ -87,11 +87,19 @@ module Caboose
     	render :json => resp
     end
 
-    # @route GET /admin/themes/:id/compile
+    # @route PUT /admin/themes/:id/compile
     def admin_compile
       return if !user_is_allowed('theme', 'edit')
       resp = StdClass.new     
       theme = @site.theme
+      if params['code']
+        theme.custom_sass = params['code']
+        theme.save
+      elsif params['btsm_id']
+        btsm = Caboose::BlockTypeSiteMembership.find(params['btsm_id'])
+        btsm.custom_css = params['custom_css']
+        btsm.save
+      end
       theme.compile(@site.id) if Rails.env.development?
       theme.delay(:queue => 'general', :priority => 5).compile(@site.id) if Rails.env.production?
       resp.success = true
@@ -99,6 +107,24 @@ module Caboose
       render :json => resp
     end
 
+    # @route GET /admin/theme/sass
+    def admin_sass
+      return if !user_is_allowed('theme', 'edit')
+      @theme = @site.theme
+    end
+
+    # @route PUT /admin/theme/sass
+    def admin_update_sass
+      return if !user_is_allowed('theme', 'edit')
+      resp = StdClass.new  
+      @theme = @site.theme
+      @theme.custom_sass = params['code']
+      @theme.save
+      resp.success = true
+      resp.message = "Theme has been saved!"
+      render :json => resp
+    end
+
     # @route POST /admin/themes/:id/default-banner-image
     def admin_update_default_banner_image
       return if !user_is_allowed('theme', 'edit')

data/app/models/caboose/block.rb

@@ -213,13 +213,17 @@ class Caboose::Block < ActiveRecord::Base
     view = options2[:view]     
     view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?
       
-    if block.block_type.use_render_function && block.block_type.render_function
+    if (block.block_type.use_render_function && block.block_type.render_function) || Caboose::BlockTypeSiteMembership.where(:site_id => options2[:site].id, :block_type_id => block.block_type.id).where('custom_html IS NOT NULL and custom_html != ?', '').exists?
       begin
         str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
       rescue Exception => ex
         msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
         Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
         str = "<p class='note error'>#{msg}</p>"
+        if block && block.block_type
+          block.block_type.latest_error = "#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}"
+          block.block_type.save
+        end
       end            
     else
       
@@ -233,7 +237,7 @@ class Caboose::Block < ActiveRecord::Base
       end
               
       #begin str = view.render(:partial => "../../sites/#{site.name}/blocks/#{full_name}", :locals => options2) 
-      #rescue ActionView::MissingTemplate => ex        
+      #rescue ActionView::MissingTemplate => ex
       #  begin str = view.render(:partial => "../../sites/#{site.name}/blocks/#{block.block_type.name}", :locals => options2) 
       #  rescue ActionView::MissingTemplate => ex          
       #    begin str = view.render(:partial => "../../sites/#{site.name}/blocks/#{block.block_type.field_type}", :locals => options2) 

data/app/models/caboose/block_type.rb

@@ -29,6 +29,8 @@ class Caboose::BlockType < ActiveRecord::Base
     :options_url,
     :icon,
     :default_constrain,
+    :custom_sass,
+    :latest_error,
     :share,      # Whether or not to share the block type in the existing block store.
     :downloaded  # Whether the full block type has been download or just the name and description.
     
@@ -112,9 +114,9 @@ class Caboose::BlockType < ActiveRecord::Base
     
   def toggle_site(site_id, value)          
     if value.to_i > 0
-      self.add_to_site(site_id)
+      return self.add_to_site(site_id)
     else
-      self.remove_from_site(site_id)
+      return self.remove_from_site(site_id)
     end
   end
     
@@ -126,7 +128,11 @@ class Caboose::BlockType < ActiveRecord::Base
       end                          
     else
       if !Caboose::BlockTypeSiteMembership.where(:block_type_id => self.id, :site_id => site_id.to_i).exists?
-        Caboose::BlockTypeSiteMembership.create(:block_type_id => self.id, :site_id => site_id.to_i)
+        btsm = Caboose::BlockTypeSiteMembership.new 
+        btsm.block_type_id = self.id
+        btsm.site_id = site_id.to_i
+        btsm.save
+        return btsm.id
       end      
     end
   end

data/app/models/caboose/block_type_site_membership.rb

@@ -2,5 +2,5 @@ class Caboose::BlockTypeSiteMembership < ActiveRecord::Base
   self.table_name = "block_type_site_memberships"
   belongs_to :site
   belongs_to :block_type  
-  attr_accessible :id, :site_id, :block_type_id    
+  attr_accessible :id, :site_id, :block_type_id, :custom_css, :custom_html 
 end

data/app/models/caboose/core_plugin.rb

@@ -15,7 +15,8 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     nav << item if item['children'].count > 0
     
     item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }   
-    item['children'] << { 'id' => 'settings'      , 'icon' => 'settings',        'text' => 'Site Settings'               , 'href' => "/admin/sites/#{site.id}"              , 'modal' => false } if user.is_super_admin?                   
+    item['children'] << { 'id' => 'settings'      , 'icon' => 'settings',        'text' => 'Site Settings'               , 'href' => "/admin/sites/#{site.id}"              , 'modal' => false } if user.is_super_admin?         
+    item['children'] << { 'id' => 'theme-files'             , 'icon' => 'custom', 'text' => 'Theme Files'               , 'href' => '/admin/theme-files'              , 'modal' => false } if user.is_super_admin? && site.is_master == true                  
     item['children'] << { 'id' => 'blocktypes'        , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'        , 'view') && site.is_master == true
     item['children'] << { 'icon' => 'star', 'id' => 'fonts'             , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'             , 'view') && site.use_fonts == true
     item['children'] << { 'id' => 'redirects'         , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'         , 'view')

data/app/models/caboose/schema.rb

@@ -197,7 +197,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :fixed_placeholder               , :boolean ],
         [ :options                         , :text    ],
         [ :options_function                , :text    ],
+        [ :custom_sass                     , :text    ],
         [ :options_url                     , :string  ],
+        [ :latest_error                    , :text    ],
         [ :default_constrain               , :boolean , { :default => false }],
         [ :default_full_width              , :boolean , { :default => false }],
         [ :share                           , :boolean , { :default => true  }],
@@ -205,7 +207,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::BlockTypeSiteMembership => [
         [ :site_id        , :integer ],
-        [ :block_type_id  , :integer ]
+        [ :block_type_id  , :integer ],
+        [ :custom_css, :text ],
+        [ :custom_html, :text ]
       ],      
       Caboose::BlockTypeCategory => [
         [ :parent_id  , :integer ],
@@ -810,7 +814,16 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :theme_id, :integer ],
         [ :favicon, :attachment ],
         [ :cl_logo_version         , :string ],
-        [ :cl_favicon_version      , :string ]
+        [ :cl_favicon_version      , :string ],
+        [ :main_phone, :string ],
+        [ :alt_phone, :string ],
+        [ :address1, :string ],
+        [ :address2, :string ],
+        [ :city, :string ],
+        [ :state, :string ],
+        [ :zip, :string ],
+        [ :fax, :string ],
+        [ :contact_email, :string ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
@@ -985,11 +998,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :footer_hover_color, :string ],
         [ :actual_footer_height, :string ],
         [ :actual_banner_height, :string ],
-        [ :dropdown_nav_padding, :string ]
+        [ :dropdown_nav_padding, :string ],
+        [ :custom_sass, :text ]
       ],
       Caboose::ThemeFile => [
         [ :filename, :string ],
         [ :nice_name, :string ],
+        [ :code, :text ],
         [ :default_included, :boolean     , { :default => false }]
       ],
       Caboose::ThemeFileMembership => [