caboose-cms 0.4.59 → 0.4.60

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNhY2I4YjdjYzk4Nzg3MGM4MWVjMTM3YzFmMjE2Nzc2MThkNWI0Yg==
+    ZDc1OWUzYTQ0YTY3MmNhNDAwODJjNTRhM2VjMTBiNTlkOGYxN2M2Nw==
   data.tar.gz: !binary |-
-    MjZkOWVlNjAwZTgyY2I4YTUxODBhNjgwMjkxMzQ2NGY0NzQ3MjU0YQ==
+    ODNjNmFlNjYxODhjMzJhODVjYjExYmVlYWJiMzA4MGExOGZmYzI4Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTEzYzUwODYxZWMyZmM0MDY0YzIwY2Y0MmMxYTgwZDUwODlkMzNjNjdlZDQx
-    MzUzNDA3MWNiYTQ0ZDQ5ZTljMWRmNDRlMDk0NGIxNzRkMTdlNGZlN2Y1OTM1
-    YTk0ZWNiZWI4YjRjY2ExNjU4NWM3NjVjZjM2OWUyOTY3NTFlYTM=
+    M2E4ZjgzNjg3MjJkNDYwMTY2ZDVjYmI1YjY2M2FhNGNhZGE3M2NlZjJkOGY5
+    MTNjNTI0ZWJiMTg3ODk1MzRjMWE2MTEzMmJhYmVlNTk2OWYzNzc3MDQ0ZjQ5
+    MjhhNzAzZmMxNjhiMGZkMjFlNGEwZTEyMTcyMjUxNTJiZWViNzQ=
   data.tar.gz: !binary |-
-    MTAyZDA4ZGI4MWRmMThiMTIzZjRmYzc0ZmZkNjk0ODdhNmU3M2YzZWUzMTY5
-    ODQxZTJmNDVhMzRmOTU0NzJlZTQ1YWI4NGI3YmJkM2YwY2Q1NjNjMTM4Njhk
-    YzQ1YWEzMjcxZjM4Njg4MjhlZDhkOTY3NmQ5NWU3ZGRkM2FjNDE=
+    NGMzYzVkZmQ1OTFmNmQ1OWZjOWI0NzJjMmE2MmViZDE1MzI1MDhmZDI5Yzkx
+    YmI3ZjhkZDM3MjdkNTEwOTc5NDVlZTQ5MDIzNzQwYzU2YmY3YTkwOTRmM2Jl
+    ODRjYmZiNWE4MjJlMjZhOTdmMmViZDNkYmI0ZGQ4MjFhN2UzMDI=

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

@@ -14,7 +14,7 @@ BlockController.prototype = {
     for (var thing in options)
       this[thing] = options[thing];
 
-    this.set_block_type_editable();
+    //this.set_block_type_editable();
     this.set_block_value_editable(this.block);
     this.set_child_blocks_editable();
     this.set_clickable();
@@ -77,31 +77,43 @@ BlockController.prototype = {
 
   /****************************************************************************/
 
-  set_block_type_editable: function()
-  {        
-    var that = this;
-    var b = this.block;    
-    m = new ModelBinder({
-      name: 'Block',
-      id: b.id,
-      update_url: '/admin/pages/' + b.page_id + '/blocks/' + b.id,
-      authenticity_token: that.authenticity_token,
-      attributes: [{      
-        name: 'block_type_id',
-        nice_name: 'Block type',
-        type: 'select',
-        value: b.block_type_id,             
-        text: b.block_type.name,                  
-        width: 200,
-        fixed_placeholder: true,
-        options_url: '/admin/block-types/options',
-        after_update: function() { parent.controller.render_blocks(); window.location.reload(true); },
-        after_cancel: function() { parent.controller.render_blocks(); window.location.reload(true); },
-        on_load: function() { that.modal.autosize(); }
-      }]
-    });
-    $('#block_' + b.id + '_block_type_id_container').hide();
-  },
+  //set_block_type_editable: function()
+  //{        
+  //  var that = this;
+  //  var b = this.block;    
+  //  m = new ModelBinder({
+  //    name: 'Block',
+  //    id: b.id,
+  //    update_url: '/admin/pages/' + b.page_id + '/blocks/' + b.id,
+  //    authenticity_token: that.authenticity_token,
+  //    attributes: [{      
+  //      name: 'block_type_id',
+  //      nice_name: 'Block type',
+  //      type: 'select',
+  //      value: b.block_type_id,             
+  //      text: b.block_type.name,                  
+  //      width: 400,
+  //      fixed_placeholder: true,
+  //      options_url: '/admin/block-types/options',
+  //      after_update: function() { parent.controller.render_blocks(); window.location.reload(true); },
+  //      after_cancel: function() { parent.controller.render_blocks(); window.location.reload(true); },
+  //      on_load: function() { that.modal.autosize(); }
+  //    },{      
+  //      name: 'parent_id',
+  //      nice_name: 'Parent ID',
+  //      type: 'select',
+  //      value: b.parent_id,
+  //      text: b.parent_title,        
+  //      width: 400,
+  //      fixed_placeholder: true,        
+  //      options_url: '/admin/pages/' + b.page_id + '/block-options',        
+  //      after_update: function() { parent.controller.render_blocks(); },
+  //      after_cancel: function() { parent.controller.render_blocks(); },
+  //      on_load: function() { that.modal.autosize(); }
+  //    }]
+  //  });
+  //  $('#advanced').hide();
+  //},
   
   set_block_value_editable: function(b)
   {

data/app/controllers/caboose/block_types_controller.rb

@@ -77,6 +77,7 @@ module Caboose
           when 'use_render_function'             then bt.use_render_function            = v
           when 'use_render_function_for_layout'  then bt.use_render_function_for_layout = v
           when 'allow_child_blocks'              then bt.allow_child_blocks             = v
+          when 'default_child_block_type_id'     then bt.default_child_block_type_id    = v
           when 'name'                            then bt.name                           = v
           when 'field_type'                      then bt.field_type                     = v                       
           when 'default'                         then bt.default                        = v

data/app/controllers/caboose/blocks_controller.rb

@@ -18,11 +18,28 @@ module Caboose
     # GET /admin/pages/:page_id/blocks/new
     def admin_new
       return unless user_is_allowed('pages', 'add')
+                  
+      if params[:id]
+        block_type_id = params[:block_type_id]
+        block_type_id = Block.find(params[:id]).block_type.default_child_block_type_id if block_type_id.nil?                 
+        if block_type_id                                  
+          b = Block.new
+          b.page_id = params[:page_id].to_i
+          b.parent_id = params[:id]
+          b.block_type_id = block_type_id
+          b.sort_order = Block.where(:parent_id => params[:id]).count              
+          b.save
+          b.create_children        
+          redirect_to "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
+          return
+        end
+      end
+    
       @page = Page.find(params[:page_id])
       @block = params[:id] ? Block.find(params[:id]) : Block.new(:page_id => params[:page_id])
       @after_id = params[:after_id] ? params[:after_id] : nil
       @before_id = params[:before_id] ? params[:before_id] : nil
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/modal'                
     end
     
     # GET /admin/pages/:page_id/blocks/:id
@@ -149,6 +166,15 @@ module Caboose
       end
     end
     
+    # GET /admin/pages/:page_id/blocks/:id/advanced
+    def admin_edit_advanced
+      return unless user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:page_id])
+      @block = Block.find(params[:id])
+      @block.create_children      
+      render :layout => 'caboose/modal'      
+    end
+    
     # POST /admin/pages/:page_id/blocks
     # POST /admin/pages/:page_id/blocks/:id
     def admin_create
@@ -223,7 +249,9 @@ module Caboose
       params.each do |k,v|
         case k
           #when 'page_id'       then b.page_id       = v
-          when 'parent_id'     then b.parent_id     = v
+          when 'parent_id'     then 
+            b.parent_id  = v
+            b.sort_order = Block.where(:parent_id => v).count
           when 'block_type_id' then b.block_type_id = v
           when 'sort_order'    then b.sort_order    = v
           when 'name'          then b.name          = v
@@ -304,10 +332,21 @@ module Caboose
       if b.sort_order == 0
         resp.error = "The block is already at the top."
       else
-        b2 = Block.where("parent_id = ? and sort_order = ?", b.parent_id, b.sort_order - 1).first
-        b2.sort_order = b.sort_order
-        b2.save
-        b.sort_order = b.sort_order - 1
+        b2 = nil
+        
+        new_sort_order = b.sort_order - 1
+        while new_sort_order > 0 do
+          b2 = Block.where("parent_id = ? and sort_order = ?", b.parent_id, new_sort_order).first
+          break if b2
+          new_sort_order = new_sort_order - 1
+        end
+        if b2
+          b2.sort_order = new_sort_order + 1
+          b2.save
+        else
+          new_sort_order = 1
+        end
+        b.sort_order = new_sort_order
         b.save
         resp.success = "The block has been moved up successfully."
       end

data/app/controllers/caboose/pages_controller.rb

@@ -331,7 +331,7 @@ module Caboose
           page[name.to_sym] = value
 
         when 'title', 'menu_title', 'hide', 'layout', 'redirect_url',
-          'seo_title', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
+          'seo_title', 'meta_keywords', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
           page[name.to_sym] = value
 
         when 'linked_resources'
@@ -482,5 +482,23 @@ module Caboose
       render :json => { 'uri' => p.uri }
 		end
 		
+		# GET /admin/pages/:id/block-options        
+    def admin_block_options
+      return unless user_is_allowed('pages', 'edit')      
+      
+      options = []
+      Block.where("parent_id is null and page_id = ?", params[:id]).reorder(:sort_order).all.each do |b|
+        admin_block_options_helper(options, b, "") 
+      end      
+      render :json => options
+    end        
+      
+    def admin_block_options_helper(options, b, prefix)
+      options << { 'value' => b.id, 'text' => "#{prefix}#{b.title}" }      
+      b.children.each do |b2|
+        admin_block_options_helper(options, b2, "#{prefix} - ")        
+      end      
+    end
+		
   end
 end

data/app/models/caboose/block.rb

@@ -52,8 +52,8 @@ class Caboose::Block < ActiveRecord::Base
   end
   
   def full_name
-    return name if parent_id.nil?
-    return "#{parent.full_name}_#{name}"
+    return self.name if parent_id.nil?
+    return "#{parent.full_name}_#{self.name}"
   end
   
   def child_value(name)
@@ -161,8 +161,8 @@ class Caboose::Block < ActiveRecord::Base
       #view = ActionView::Base.new(ActionController::Base.view_paths, options2, )      
       #view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)      
       begin        
-        full_name = block.full_name
-        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0                
+        full_name = block.block_type.full_name
+        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0        
         str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)        
       rescue ActionView::MissingTemplate
         begin          
@@ -225,13 +225,22 @@ class Caboose::Block < ActiveRecord::Base
     return "<div class='new_block_after' id='new_block_after_#{self.id}'>New Block</div>"    
   end
   
+  def title    
+    str = "#{self.block_type.name}"
+    if self.name && self.name.strip.length > 0
+      str << " (#{self.name})"
+    end
+    return str
+  end
+  
   def js_hash
     kids = self.children.collect { |b| b.js_hash }
-    bt = self.block_type
+    bt = self.block_type    
     return {
       'id'             => self.id,           
       'page_id'        => self.page_id,      
-      'parent_id'      => self.parent_id,    
+      'parent_id'      => self.parent_id,
+      'parent_title'   => self.parent ? self.parent.title : '',
       'block_type_id'  => self.block_type_id,    
       'sort_order'     => self.sort_order,
       'name'           => self.name,

data/app/models/caboose/block_type.rb

@@ -2,6 +2,7 @@
 class Caboose::BlockType < ActiveRecord::Base
   self.table_name = "block_types"
 
+  belongs_to :default_child_block_type, :foreign_key => 'default_child_block_type_id', :class_name => 'Caboose::BlockType'
   belongs_to :block_type_category
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType'
   has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType', :dependent => :destroy    
@@ -13,6 +14,7 @@ class Caboose::BlockType < ActiveRecord::Base
     :use_render_function,
     :use_render_function_for_layout,
     :allow_child_blocks,
+    :default_child_block_type_id,
     :render_function,
     :field_type, 
     :default, 

data/app/models/caboose/page.rb

@@ -25,6 +25,7 @@ class Caboose::Page < ActiveRecord::Base
     :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,

data/app/models/caboose/schema.rb

@@ -89,6 +89,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :use_render_function             , :boolean , { :default => false }],
         [ :use_render_function_for_layout  , :boolean , { :default => false }],
         [ :allow_child_blocks              , :boolean , { :default => false }],
+        [ :default_child_block_type_id     , :integer ],
         [ :field_type                      , :string  ],
         [ :default                         , :text    ],
         [ :width                           , :integer ],
@@ -160,6 +161,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :sort_order            , :integer , { :default => 0                }],
         [ :custom_sort_children  , :boolean , { :default => false            }],
         [ :seo_title             , :string  , { :limit => 70                 }],
+        [ :meta_keywords         , :text    ], 
         [ :meta_description      , :string  , { :limit => 156                }],
         [ :meta_robots           , :string  , { :default => 'index, follow'  }],
         [ :canonical_url         , :string  ],

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

@@ -7,24 +7,23 @@ bt = @block_type
 </div>
 
 <h1>Edit Block Type</h1>
-<p><div id='blocktype_<%= bt.id %>_description'></div></p>
-<p><div id='blocktype_<%= bt.id %>_name'></div></p>
-<p><div id='blocktype_<%= bt.id %>_parent_id'></div></p>
-<p><div id='blocktype_<%= bt.id %>_block_type_category_id'></div></p>
-<p><div id='blocktype_<%= bt.id %>_field_type'></div></p>
-
-<p><div id='blocktype_<%= bt.id %>_default'></div></p>
-<p><div id='blocktype_<%= bt.id %>_width'></div></p>
-<p><div id='blocktype_<%= bt.id %>_height'></div></p>
-<p><div id='blocktype_<%= bt.id %>_fixed_placeholder'></div></p>
-<p><div id='blocktype_<%= bt.id %>_options_url'></div></p>
-<p><div id='blocktype_<%= bt.id %>_options'></div></p>
-
-<p><div id='blocktype_<%= bt.id %>_use_render_function'></div></p>
-<p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'></div></p>
-<p><div id='blocktype_<%= bt.id %>_allow_child_blocks'></div></p>
-<p><div id='blocktype_<%= bt.id %>_render_function'></div></p>
-<p><div id='blocktype_<%= bt.id %>_options_function'></div></p>
+<p><div id='blocktype_<%= bt.id %>_description'                     ></div></p>
+<p><div id='blocktype_<%= bt.id %>_name'                            ></div></p>
+<p><div id='blocktype_<%= bt.id %>_parent_id'                       ></div></p>
+<p><div id='blocktype_<%= bt.id %>_block_type_category_id'          ></div></p>
+<p><div id='blocktype_<%= bt.id %>_field_type'                      ></div></p>
+<p><div id='blocktype_<%= bt.id %>_default'                         ></div></p>
+<p><div id='blocktype_<%= bt.id %>_width'                           ></div></p>
+<p><div id='blocktype_<%= bt.id %>_height'                          ></div></p>
+<p><div id='blocktype_<%= bt.id %>_fixed_placeholder'               ></div></p>
+<p><div id='blocktype_<%= bt.id %>_options_url'                     ></div></p>
+<p><div id='blocktype_<%= bt.id %>_options'                         ></div></p>
+<p><div id='blocktype_<%= bt.id %>_use_render_function'             ></div></p>
+<p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p>
+<p><div id='blocktype_<%= bt.id %>_allow_child_blocks'              ></div></p>
+<p><div id='blocktype_<%= bt.id %>_default_child_block_type_id'     ></div></p>
+<p><div id='blocktype_<%= bt.id %>_render_function'                 ></div></p>
+<p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p>
 
 <h2>Children</h2>
 <p><a href='/admin/block-types/<%= @block_type.id %>/new'>New Child Block</a></p>
@@ -99,6 +98,7 @@ $(document).ready(function() {
       { name: 'use_render_function'            , nice_name: 'Use Render Function'            , type: 'checkbox' , value: <%= bt.use_render_function            ? 'true' : 'false' %>, width: 400 },
       { name: 'use_render_function_for_layout' , nice_name: 'Use Render Function for Layout' , type: 'checkbox' , value: <%= bt.use_render_function_for_layout ? 'true' : 'false' %>, width: 400 },
       { name: 'allow_child_blocks'             , nice_name: 'Allow Child Blocks'             , type: 'checkbox' , value: <%= bt.allow_child_blocks             ? 'true' : 'false' %>, width: 400 },
+      { name: 'default_child_block_type_id'    , nice_name: 'Default Child Block Type'       , type: 'select'   , value: <%= raw Caboose.json(bt.default_child_block_type_id)     %>, text: <%= raw Caboose.json(bt.default_child_block_type) %>, width: 400, options_url: '/admin/block-types/options' },
       { name: 'render_function'                , nice_name: 'Render Function'                , type: 'textarea' , value: <%= raw Caboose.json(bt.render_function)                 %>, width: 800, height: 200 },      
       { name: 'field_type'                     , nice_name: 'Field type'                     , type: 'select'   , value: <%= raw Caboose.json(bt.field_type)                      %>, text: <%= raw Caboose.json(bt.field_type) %>, width: 400, options_url: '/admin/block-types/field-type-options' },
       { name: 'default'                        , nice_name: 'Default value'                  , type: 'text'     , value: <%= raw Caboose.json(bt.default)                         %>, width: 400 },

data/app/views/caboose/blocks/_file.html.erb

@@ -1,11 +1,11 @@
 <%
-file  = block.child('file')
-text  = block.child('text').value
+file  = block.child_value('file')
+text  = block.child_value('text')
 
-if editing && file && file.file && file.file.url.include?('missing.png')  
+if editing && file && file.url.include?('missing.png')  
   %><div id='block_<%= block.id %>'><p>Please upload a file.</p></div><%  
-elsif file && file.file
-  %><p><a href="<%= raw file.file.url %>"><%= raw text %></p><%
+elsif file
+  %><div id='block_<%= block.id %>'><p><a href="<%= raw file.url %>"><%= raw text %></a></p></div><%
 end
 
 %>

data/app/views/caboose/blocks/_selector_switch_one.html.erb

@@ -0,0 +1,11 @@
+<div id='block_<%= block.id %>'>  
+  <% if block.children.count > 0 %>
+    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>  
+  <% elsif editing %>
+    <%= raw empty_text %>
+  <% end %>
+  <% if editing && modal %>
+    <br style='clear: both;' />
+    <p><a href='/admin/pages/<%= block.page_id %>/blocks/<%= block.id %>/new'>Add a child block!</a></p>
+  <% end %>
+</div>

data/app/views/caboose/blocks/_selector_switch_three.html.erb

@@ -0,0 +1,11 @@
+<div id='block_<%= block.id %>'>  
+  <% if block.children.count > 0 %>
+    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>  
+  <% elsif editing %>
+    <%= raw empty_text %>
+  <% end %>
+  <% if editing && modal %>
+    <br style='clear: both;' />
+    <p><a href='/admin/pages/<%= block.page_id %>/blocks/<%= block.id %>/new'>Add a child block!</a></p>
+  <% end %>
+</div>

data/app/views/caboose/blocks/_selector_switch_two.html.erb

@@ -0,0 +1,11 @@
+<div id='block_<%= block.id %>'>  
+  <% if block.children.count > 0 %>
+    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>  
+  <% elsif editing %>
+    <%= raw empty_text %>
+  <% end %>
+  <% if editing && modal %>
+    <br style='clear: both;' />
+    <p><a href='/admin/pages/<%= block.page_id %>/blocks/<%= block.id %>/new'>Add a child block!</a></p>
+  <% end %>
+</div>

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

@@ -8,16 +8,16 @@ crumbs = []
 b = @block
 while b
   href    = b.id == @block.id ? "#" : "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
-  onclick = b.id == @block.id ? " onclick=\"$('#block_#{@block.id}_block_type_id_container').slideToggle(100, function() { modal.autosize(); });\"" : ''
+  #onclick = b.id == @block.id ? " onclick=\"$('#advanced').slideToggle(100, function() { modal.autosize(); });\"" : ''  
   text = b.name ? "#{b.block_type.description} (#{b.name})" : b.block_type.description  
-  crumbs << "<a href=\"#{href}\"#{onclick}>#{text}</a>"     
+  #crumbs << "<a href=\"#{href}\"#{onclick}>#{text}</a>"
+  crumbs << "<a href=\"#{href}\">#{text}</a>"
   b = b.parent
 end
 
 %>
 <!--<h2 style='margin-top: 0; padding-top: 0;'>Edit <%= @block.name ? @block.name : @block.block_type.description %></h2>-->
 <h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
-<p id='block_type_container'><div id='block_<%= @block.id %>_block_type_id'></div></p>
 
 <% if @block.block_type.use_render_function_for_layout %>
   <!-- Start -->
@@ -57,6 +57,7 @@ end
 <% end %>
 <input type='button' value='Move Up'   onclick="controller.move_up();" />
 <input type='button' value='Move Down' onclick="controller.move_down();" />
+<input type='button' value='Advanced'  onclick="window.location='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.id %>/advanced';" />
 </p>
 
 <% content_for :caboose_css do %>
@@ -86,7 +87,7 @@ $(window).load(function() {
 %>
     
 var controller = false;
-$(document).ready(function() {
+$(document).ready(function() {  
   modal = new CabooseModal(800);
   controller = new BlockController({
     block: <%= raw Caboose.json(@block.js_hash) %>,    

data/app/views/caboose/blocks/admin_edit_advanced.html.erb

@@ -0,0 +1,78 @@
+<%
+update_on_close = false
+@block.block_type.children.each do |bt|
+  update_on_close = true if bt.field_type == 'image' || bt.field_type == 'file'
+end
+
+crumbs = []
+b = @block
+while b
+  href    = b.id == @block.id ? "#" : "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
+  onclick = b.id == @block.id ? " onclick=\"$('#advanced').slideToggle(100, function() { modal.autosize(); });\"" : ''
+  text = b.name ? "#{b.block_type.description} (#{b.name})" : b.block_type.description  
+  crumbs << "<a href=\"#{href}\"#{onclick}>#{text}</a>"     
+  b = b.parent
+end
+
+%>
+<!--<h2 style='margin-top: 0; padding-top: 0;'>Edit <%= @block.name ? @block.name : @block.block_type.description %></h2>-->
+<h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
+<div id='advanced'>
+  <p><div id='block_<%= @block.id %>_block_type_id' ></div></p>
+  <p><div id='block_<%= @block.id %>_parent_id'     ></div></p>
+</div>
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.id %>/edit';" />
+<input type='button' value='Close' onclick="<% if update_on_close %>parent.controller.render_blocks();<% end %>modal.close();" />
+</p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag "caboose/admin_block_edit" %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+    
+var controller = false;
+<% b = @block %>
+$(document).ready(function() {  
+  modal = new CabooseModal(800);       
+  m = new ModelBinder({
+    name: 'Block',
+    id: <%= b.id %>,
+    update_url: '/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [{      
+      name: 'block_type_id',
+      nice_name: 'Block type',
+      type: 'select',
+      value: <%= raw Caboose.json(b.block_type_id) %>,             
+      text:  <%= raw Caboose.json(b.block_type.name) %>,                  
+      width: 400,
+      fixed_placeholder: true,
+      options_url: '/admin/block-types/options',
+      after_update: function() { parent.controller.render_blocks(); },
+      after_cancel: function() { parent.controller.render_blocks(); },
+      on_load: function() { that.modal.autosize(); }
+    },{      
+      name: 'parent_id',
+      nice_name: 'Parent ID',
+      type: 'select',
+      value: <%= raw Caboose.json(b.parent_id) %>,
+      text:  <%= raw Caboose.json(b.parent ? b.parent.title : '') %>,        
+      width: 400,
+      fixed_placeholder: true,        
+      options_url: '/admin/pages/<%= b.page_id %>/block-options',        
+      after_update: function() { parent.controller.render_blocks(); },
+      after_cancel: function() { parent.controller.render_blocks(); },
+      on_load: function() { that.modal.autosize(); }
+    }]
+  });
+});    
+
+</script>
+<% end %>

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

@@ -2,6 +2,7 @@
 <%= render :partial => 'caboose/pages/admin_header' %>
 
 <p><div id='page_<%= @page.id %>_seo_title'></div></p>
+<p><div id='page_<%= @page.id %>_meta_keywords'></div></p>
 <p><div id='page_<%= @page.id %>_meta_description'></div></p>
 <p><div id='page_<%= @page.id %>_meta_robots'></div></p>
 <p><div id='page_<%= @page.id %>_canonical_url'></div></p>
@@ -24,6 +25,7 @@ $(document).ready(function() {
       { name: 'seo_title'         , nice_name: 'SEO Title'            , type: 'text'      , value: <%= raw Caboose.json(@page.seo_title)        %>, width: 580 },        
       { name: 'meta_robots'       , nice_name: 'Meta Robots'          , type: 'text'      , value: <%= raw Caboose.json(@page.meta_robots)      %>, width: 580 },
       { name: 'canonical_url'     , nice_name: 'Canonical URL'        , type: 'text'      , value: <%= raw Caboose.json(@page.canonical_url)    %>, width: 580 },
+      { name: 'meta_keywords'     , nice_name: 'Meta Keywords'        , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_keywords)    %>, width: 580, height: 80 },
       { name: 'meta_description'  , nice_name: 'Meta Description'     , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_description) %>, width: 580, height: 80 },
       { name: 'fb_description'    , nice_name: 'Facebook Description' , type: 'textarea'  , value: <%= raw Caboose.json(@page.fb_description)   %>, width: 580, height: 80 },
       { name: 'gp_description'    , nice_name: 'Google+ Description'  , type: 'textarea'  , value: <%= raw Caboose.json(@page.gp_description)   %>, width: 580, height: 80 }

data/config/routes.rb

@@ -92,11 +92,12 @@ Caboose::Engine.routes.draw do
   
   #get     "pages"                           => "pages#index"
   get     "pages/:id"                     => "pages#show"
-  get     "pages/:id/redirect"            => "pages#redirect"
+  get     "pages/:id/redirect"            => "pages#redirect"    
   get     "admin/pages/sitemap-options"   => "pages#admin_sitemap_options"
   get     "admin/pages/robots-options"    => "pages#admin_robots_options"
   get     "admin/pages/format-options"    => "pages#admin_content_format_options"
   get     "admin/pages/new"               => "pages#admin_new"
+  get     "admin/pages/:id/block-options" => "pages#admin_block_options"
   get     "admin/pages/:id/uri"           => "pages#admin_page_uri"
   get     "admin/pages/:id/delete"        => "pages#admin_delete_form"  
   get     "admin/pages/:id/sitemap"       => "pages#admin_sitemap"
@@ -132,6 +133,7 @@ Caboose::Engine.routes.draw do
   get     "admin/pages/:page_id/blocks/:id/tree"             => "blocks#admin_tree"
   get     "admin/pages/:page_id/blocks/:id/render"           => "blocks#admin_render"  
   get     "admin/pages/:page_id/blocks/:id/edit"             => "blocks#admin_edit"
+  get     "admin/pages/:page_id/blocks/:id/advanced"         => "blocks#admin_edit_advanced"
   put     "admin/pages/:page_id/blocks/:id/move-up"          => "blocks#admin_move_up"
   put     "admin/pages/:page_id/blocks/:id/move-down"        => "blocks#admin_move_down"
   get     "admin/pages/:page_id/blocks/:id"                  => "blocks#admin_show"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.59'
+  VERSION = '0.4.60'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.59
+  version: 0.4.60
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -353,8 +353,12 @@ files:
 - app/views/caboose/blocks/_layout_right_sidebar_sidebar.html.erb
 - app/views/caboose/blocks/_render_function.html.erb
 - app/views/caboose/blocks/_richtext.html.erb
+- app/views/caboose/blocks/_selector_switch_one.html.erb
+- app/views/caboose/blocks/_selector_switch_three.html.erb
+- app/views/caboose/blocks/_selector_switch_two.html.erb
 - app/views/caboose/blocks/_text.html.erb
 - app/views/caboose/blocks/admin_edit.html.erb
+- app/views/caboose/blocks/admin_edit_advanced.html.erb
 - app/views/caboose/blocks/admin_edit_custom.html.erb
 - app/views/caboose/blocks/admin_edit_h1.html.erb
 - app/views/caboose/blocks/admin_edit_h2.html.erb