caboose-cms 0.4.66 → 0.4.67

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU4MjVlNzQyYTQyM2RkY2NkZjY5YTljYWY0YjVjOTNiYTMzMjMwNw==
+    NDI3Y2JhNzJiNjFmODc0MjE1NTFhZjczZTgyNjFjYzZlZmE2N2M3ZQ==
   data.tar.gz: !binary |-
-    NzE3MmM0MjZhYTdkMzdiNzBiMmQwYmRmMzI2OGRkNGQ5MDJkNWE2OQ==
+    ZTU5YmViMTViMDRiYTMwOTQxMTMwMTAwMmMzNWRkNGYyYTY2Yzc3Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzQwNmE0YTUzMzYwZmQzMGQ5Y2I5MmY3YjMxY2YxN2M5YTZhNjFmY2ZhNmY3
-    YWMwNzBjZmMzZDdlZWQ2NTVmNDUzMjRiYzc2ODIwZWQ2MDNkYWYxNTY4NWNj
-    YWQ2ZDkxYWJiY2I0N2M3ODFkMGI0MmNiNmI4YzgxY2ZmNTVjODI=
+    YjU4ZmFiMzk2YThkYWJlYjdlOWM4MTU4NTk0YzExZmI0ZTQ4MDQ3ODcwYjdl
+    N2Y2YmNmYTAzZmE1N2Q5MzA5Nzg1M2MxMmQyMzQ3NGUzNTFmYzY5ZDEwYTFi
+    NjY1MjExNzczYjc2NThiZDVjN2U1YjVlZjJlYTUyZGY3YTY5NDA=
   data.tar.gz: !binary |-
-    N2ZhMzJhNGE4N2JhNmRmZDM3NjE3NjkzNTVkOWUzMDk1M2ZmZGZiODhmOGU1
-    MzZkYmEyMDE0ZWZkZjc1OThiZmJiN2RiNmMzY2ZkYTNmYjUzYjQ0NjU4NDE0
-    Y2FkODY5MDNhM2QzNzMyNTY1MTVhODc2ZTRkOWQ0MWU2M2Y5Y2Y=
+    YmYwOGU2YzgwM2NmNjk5OWM5MTI3OTViMjg0OGUxOWQyMmQ5NDMwZTFhZThm
+    MGRjY2IxNTU3MmFlZmI0MDFjYjZkYTE0MWM2YmMxNDJhM2UwMGY5YjY5ZjM4
+    MDU4N2I3MDM3M2NhY2M2NTBmMGJjZTc1OWI2MGFlZmZhYTMzZDM=

data/app/assets/javascripts/caboose/#Untitled-1#

@@ -0,0 +1,6 @@
+<h1>RELOCATING TO BOZEMAN</h1>
+<p>Relocating to Bozeman? Moving a Business? The Chamber is here to answer all of your questions to make your move as successful and painless as possible. Business owners considering moving or starting a business in Bozeman will find many helpful resources on our&nbsp;<a href="http://www.bozemanchamber.com/business/index.asp">Business Services</a>&nbsp;Page. For general information about Bozeman and the surrounding communities, please visit our&nbsp;<a href="http://www.bozemancvb.com/" target="_blank">Convention and Visitor Bureau</a>&nbsp;site.<br /><br />Bozeman's economy is largely supported by agriculture but tourism and the high tech industry are making a big splash in the area. One in every 10 new businesses formed in Montana was formed in Gallatin County which makes this area 2nd in business growth in the state. Bozeman is also home to Montana State University which was established in 1893. Because of these two things, Bozeman and the Gallatin Valley remains a strong community for large and small business alike. We also have a wide diversity of the different types of businesses we support from retail and tourism to manufacturing and agriculture.</p>
+<div id="relocationGuide">
+<p><a title="Download 2014 Relocation Guide" href="http://www.bozemanchamber.com/images/mc_temp/2014-bacc-relocation-guide.pdf"><img src="http://www.bozemanchamber.com/images/mc_temp/relocation-guide-web-badge.png" alt="Download PDF version of 2014 Bozeman Relocation Guide" /></a></p>
+<h3>Read the 2014 Bozeman Relocation Guide Online&hellip;</h3>
+</div>

data/app/assets/javascripts/caboose/admin_page_edit_content.js

@@ -196,12 +196,12 @@ PageContentController.prototype = {
      
     var show_mouseover = true;
     if (b.children && b.children.length > 0)
-    {
-      $.each(b.children, function(i, b2) {
-        if (b2.block_type_id = 34)
+    {      
+      $.each(b.children, function(i, b2) {        
+        if (b2.field_type == 'block')
           show_mouseover = false;
         that.set_clickable_helper(b2, b.id, b.allow_child_blocks);
-      });      
+      });            
     }
     if (b.allow_child_blocks)
     {

data/app/controllers/caboose/blocks_controller.rb

@@ -57,10 +57,10 @@ module Caboose
       blocks = []
       if params[:id]
         b = Block.find(params[:id])
-        blocks << { 'id' => b.id, 'children' => admin_tree_helper(b) }
+        blocks << { 'id' => b.id, 'children' => admin_tree_helper(b), 'field_type' => b.block_type.field_type }
       else
         Block.where("parent_id is null and page_id = ?", params[:page_id]).reorder(:sort_order).all.each do |b|      
-          blocks << { 'id' => b.id, 'allow_child_blocks' => b.block_type.allow_child_blocks, 'children' => admin_tree_helper(b) }
+          blocks << { 'id' => b.id, 'allow_child_blocks' => b.block_type.allow_child_blocks, 'children' => admin_tree_helper(b), 'field_type' => b.block_type.field_type }
         end
       end
       render :json => blocks
@@ -69,7 +69,7 @@ module Caboose
     def admin_tree_helper(b)
       arr = []
       b.children.each do |b2|
-        arr << { 'id' => b2.id, 'allow_child_blocks' => b2.block_type.allow_child_blocks, 'children' => admin_tree_helper(b2) }
+        arr << { 'id' => b2.id, 'allow_child_blocks' => b2.block_type.allow_child_blocks, 'children' => admin_tree_helper(b2), 'field_type' => b2.block_type.field_type }
       end
       return arr
     end      

data/app/controllers/caboose/pages_controller.rb

@@ -20,7 +20,7 @@ module Caboose
       end
 
       user = logged_in_user            
-      if !user.is_allowed(page, 'view')        
+      if !user.is_allowed(page, 'view')                
         if user.id == User::LOGGED_OUT_USER_ID	
           redirect_to "/modal/login?return_url=" + URI.encode(request.fullpath)		  		
           return
@@ -35,7 +35,7 @@ module Caboose
         return
       end
 
-      page = Caboose.plugin_hook('page_content', page)
+      page = Caboose.plugin_hook('page_content', page)      
       @page = page
       @user = user
       @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false

data/app/models/caboose/block_type.rb

@@ -10,6 +10,7 @@ class Caboose::BlockType < ActiveRecord::Base
     :parent_id,
     :name, 
     :description,
+    :is_global,
     :block_type_category_id,
     :use_render_function,
     :use_render_function_for_layout,

data/app/models/caboose/core_plugin.rb

@@ -21,13 +21,14 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
       'children' => []
     }
         
-    item['children'] << { 'id' => 'users'            , 'text' => 'Users'              , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'        , 'view')
-    item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'              , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'        , 'view')
-    item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'        , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'  , 'view')
-    item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'              , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view')
-    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'AB Test Variants'   , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'   , 'view')
-    item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'          , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'     , 'view')
-    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'        , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'   , 'view')    
+    item['children'] << { 'id' => 'users'            , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'        , 'view')
+    item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'               , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'        , 'view')
+    item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'         , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'  , 'view')
+    item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view')
+    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'AB Test Variants'    , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'   , 'view')
+    item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'     , 'view')
+    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'   , 'view')
+    item['children'] << { 'id' => 'redirects'        , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'    , 'view')    
         
     nav << item if item['children'].count > 0
     

data/app/models/caboose/page.rb

@@ -7,30 +7,30 @@ class Caboose::Page < ActiveRecord::Base
   has_many :children, :class_name => 'Caboose::Page', :foreign_key => 'parent_id', :order => 'sort_order, title'
   has_many :page_permissions  
   has_many :blocks, :order => 'sort_order'
-  attr_accessible :id,
-    :site_id,
-    :parent_id, 
-    :title, 
-    :menu_title, 
-    # :content, # Changed from column in pages to blocks
-    :blocks,
-    :slug, 
-    :alias, 
-    :uri, 
-    :redirect_url, 
-    :hide, 
-    :content_format, 
-    :custom_css, 
-    :custom_js,
-    :linked_resources, 
-    :layout,
-    :seo_title, # 70 chars
-    :meta_keywords,
-    :meta_description, # 156 chars
-    :meta_robots, # Multi-select options: none, noindex, nofollow, nosnippet, noodp, noarchive
-    :canonical_url,
-    :facebook_description, # defaults to meta_description
-    :googleplus_description # defaults to meta_description      
+  attr_accessible :id      ,        
+    :site_id               ,
+    :parent_id             ,
+    :title                 ,
+    :menu_title            ,
+    :slug                  ,
+    :alias                 ,
+    :uri                   ,
+    :redirect_url          ,
+    :hide                  ,
+    :content_format        ,
+    :custom_css            ,
+    :custom_js             ,
+    :linked_resources      ,
+    :layout                ,
+    :sort_order            ,
+    :custom_sort_children  ,
+    :seo_title             ,
+    :meta_keywords         ,
+    :meta_description      ,
+    :meta_robots           ,
+    :canonical_url         ,
+    :fb_description        ,
+    :gp_description
    
   CONTENT_FORMAT_HTML  = 1 
   CONTENT_FORMAT_TEXT  = 2

data/app/models/caboose/rich_text_block_parser.rb

@@ -4,8 +4,9 @@ module Caboose
     
     def self.parse(block, html, domain)
       
+      random_string = (0...10).map { ('a'..'z').to_a[rand(26)] }.join
       html = html.strip
-      page = Nokogiri::HTML("<div>#{html}</div>")
+      page = Nokogiri::HTML("<div class='#{random_string}'>#{html}</div>")
       if page.css('div').children.count == 1
         block.value = html
         block.save
@@ -13,7 +14,8 @@ module Caboose
       end
       
       nodes = []
-      page.css('div').children.each do |node|
+      page.css("div.#{random_string}").children.each do |node|
+        #Caboose.log(node.to_s)
         case node.name.downcase
           when 'h1'    then nodes << node           
           when 'h2'    then nodes << node

data/app/models/caboose/schema.rb

@@ -84,6 +84,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :parent_id                       , :integer ],
         [ :name                            , :string  ],
         [ :description                     , :string  ],
+        [ :is_global                       , :boolean , { :default => false }],
         [ :block_type_category_id          , :integer , { :default => 2 }],
         [ :render_function                 , :text    ],
         [ :use_render_function             , :boolean , { :default => false }],

data/app/views/caboose/pages/admin_edit_content.html.erb

@@ -24,12 +24,12 @@
 .select_handle { display: none; }
 .sort_handle   { display: none; }
 .delete_handle { display: none; }
-.block_over .select_handle { display: block; position: relative; }
-.block_over .sort_handle   { display: block; position: relative; }
-.block_over .delete_handle { display: block; position: relative; }
-.block_over .select_handle span { position: absolute; top: 0; right: 36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
-.block_over .sort_handle   span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
-.block_over .delete_handle span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .select_handle { display: block; position: relative; }
+.block_over > .sort_handle   { display: block; position: relative; }
+.block_over > .delete_handle { display: block; position: relative; }
+.block_over > .select_handle span { position: absolute; top: 0; right: 36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .sort_handle   span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .delete_handle span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 
 .selected { background: #fff799; }
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.66'
+  VERSION = '0.4.67'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.66
+  version: 0.4.67
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -188,6 +188,7 @@ files:
 - app/assets/images/caboose/modal_overlay.png
 - app/assets/images/caboose/password_image.png
 - app/assets/images/caboose/search.png
+- app/assets/javascripts/caboose/#Untitled-1#
 - app/assets/javascripts/caboose/admin.js
 - app/assets/javascripts/caboose/admin_block_edit.js
 - app/assets/javascripts/caboose/admin_page_edit_content.js