caboose-cms 0.3.12 → 0.3.13

data/app/controllers/caboose/pages_controller.rb

@@ -122,8 +122,9 @@ module Caboose
      
     # GET /admin/pages/:id/content
     def admin_edit_content
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
+      @block_types = Caboose::PageBlockType.reorder(:name).all
       render :layout => 'caboose/admin'
     end
     

data/app/models/caboose/core_plugin.rb

@@ -21,10 +21,11 @@ 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' => 'variables'    , 'text' => 'Variables'   , 'href' => '/admin/settings'     , 'modal' => false } if user.is_allowed('settings'    , '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' => 'variables'    , 'text' => 'Variables'        , 'href' => '/admin/settings'         , 'modal' => false } if user.is_allowed('settings'       , 'view')
+    item['children'] << { 'id' => 'blocktypes'   , 'text' => 'Page Block Types' , 'href' => '/admin/page-block-types' , 'modal' => false } if user.is_allowed('pageblocktypes' , 'view')
         
     nav << item if item['children'].count > 0
     
@@ -53,5 +54,24 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
   #      });
   #    });"
   #end
-  
+
+  def self.block_types(block_types)
+    block_types << {
+      :id => 'heading',
+      :name => "Heading",
+      :attributes => [        
+        { name: 'text' , nice_name: 'Text' , type: 'text'  , default: '', width: 800, fixed_placeholder: false },
+        { name: 'size' , nice_name: 'Size' , type: 'select', default: 1, width: 800, fixed_placeholder: false, options: ["1 - Largest", "2", "3", "4", "5", "6"]}        
+      ]
+    }
+    block_types << {
+      :id => 'richtext',
+      :name => "Rich Text",
+      :attributes => [        
+        { name: 'text' , nice_name: 'Text' , type: 'richtext', default: '', width: 800, height: 400, fixed_placeholder: false }                
+      ]
+    }
+    return block_types
+  end
+
 end

data/app/models/caboose/page.rb

@@ -43,10 +43,10 @@ class Caboose::Page < ActiveRecord::Base
     self.page_blocks
   end
   
-  def content
-    return "" if self.blocks.nil? || self.blocks.count == 0
-    self.blocks.collect { |b| b.render }.join("\n")     
-  end
+  #def content
+  #  return "" if self.blocks.nil? || self.blocks.count == 0
+  #  self.blocks.collect { |b| b.render }.join("\n")     
+  #end
     
   def self.find_with_fields(page_id, fields)
     return self.where(:id => page_id).select(fields).first

data/app/models/caboose/page_block.rb

@@ -2,22 +2,43 @@
 class Caboose::PageBlock < ActiveRecord::Base
   self.table_name = "page_blocks"
   
-  belongs_to :page  
-  attr_accessible :id, :page_id, :block_type, :sort_order, :name, :value
+  belongs_to :page
+  belongs_to :page_block_type  
+  has_many :page_block_field_values
+  attr_accessible :id, :page_id, :page_block_type_id, :sort_order
+    
+  def fields
+    return page_block_type.fields
+  end
   
-  def render(empty_text = nil)    
-    str = self.send("render_#{self.block_type.downcase}", empty_text)
-    #return empty_text if empty_text && (str.nil? || str.length == 0)
-    return str
+  def field_value(name)    
+    page_block_field_values.each do |fv|
+      return fv.value if fv.page_block_field.name == name
+    end
+    return nil
   end
   
-  def render_richtext(empty_text = nil) return (self.value.nil? || self.value == "") && empty_text ? "<p>#{empty_text}</p>"   : self.value                end
-  def render_p(empty_text = nil)        return (self.value.nil? || self.value == "") && empty_text ? "<p>#{empty_text}</p>"   : "<p>#{self.value}</p>"    end
-  def render_h1(empty_text = nil)       return (self.value.nil? || self.value == "") && empty_text ? "<h1>#{empty_text}</h1>" : "<h1>#{self.value}</h1>"  end
-  def render_h2(empty_text = nil)       return (self.value.nil? || self.value == "") && empty_text ? "<h2>#{empty_text}</h2>" : "<h2>#{self.value}</h2>"  end
-  def render_h3(empty_text = nil)       return (self.value.nil? || self.value == "") && empty_text ? "<h3>#{empty_text}</h3>" : "<h3>#{self.value}</h3>"  end
-  def render_h4(empty_text = nil)       return (self.value.nil? || self.value == "") && empty_text ? "<h4>#{empty_text}</h4>" : "<h4>#{self.value}</h4>"  end
-  def render_h5(empty_text = nil)       return (self.value.nil? || self.value == "") && empty_text ? "<h5>#{empty_text}</h5>" : "<h5>#{self.value}</h5>"  end
-  def render_h6(empty_text = nil)       return (self.value.nil? || self.value == "") && empty_text ? "<h6>#{empty_text}</h6>" : "<h6>#{self.value}</h6>"  end
-    
+  def field_value_object(name)    
+    page_block_field_values.each do |fv|
+      #Caboose.log("fv = #{fv}")
+      return fv if fv.page_block_field.name == name      
+    end
+    return nil
+  end
+  
+  def self.create_field_values(block_id)
+    block = self.find(block_id)
+    block.page_block_type.fields.each do |f| 
+      if block.field_value_object(f.name).nil?
+        Caboose::PageBlockFieldValue.create(:page_block_id => block.id, :page_block_field_id => f.id, :value => f.default)
+      end
+    end
+  end
+  
+  def render_from_function(empty_text = nil) 
+    locals = OpenStruct.new(:block => self, :empty_text => empty_text)
+    erb = ERB.new(page_block_type.render_function)
+    return erb.result(locals.instance_eval { binding })
+  end
+
 end

data/app/models/caboose/page_block_field.rb

@@ -0,0 +1,9 @@
+
+class Caboose::PageBlockField < ActiveRecord::Base
+  self.table_name = "page_block_fields"
+
+  belongs_to :page_block_type
+  has_many :page_block_field_values, :dependent => :destroy
+  attr_accessible :id, :page_block_type_id, :name, :field_type, :nice_name, :default, :width, :height, :fixed_placeholder, :options, :options_url 
+  
+end

data/app/models/caboose/page_block_field_value.rb

@@ -0,0 +1,9 @@
+
+class Caboose::PageBlockFieldValue < ActiveRecord::Base
+  self.table_name = "page_block_field_values"
+
+  belongs_to :page_block
+  belongs_to :page_block_field
+  attr_accessible :id, :page_block_id, :page_block_field_id, :value
+    
+end

data/app/models/caboose/page_block_renderers/h1.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::H1
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<h1>#{empty_text}</h1>" : "<h1>#{block.value}</h1>"
+  end
+end

data/app/models/caboose/page_block_renderers/h2.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::H2
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<h2>#{empty_text}</h2>" : "<h2>#{block.value}</h2>"
+  end
+end

data/app/models/caboose/page_block_renderers/h3.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::H3
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<h3>#{empty_text}</h3>" : "<h3>#{block.value}</h3>"
+  end
+end

data/app/models/caboose/page_block_renderers/h4.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::H4
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<h4>#{empty_text}</h4>" : "<h4>#{block.value}</h4>"
+  end
+end

data/app/models/caboose/page_block_renderers/h5.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::H5
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<h5>#{empty_text}</h5>" : "<h5>#{block.value}</h5>"  
+  end
+end

data/app/models/caboose/page_block_renderers/h6.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::H6
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<h6>#{empty_text}</h6>" : "<h6>#{block.value}</h6>"  
+  end
+end

data/app/models/caboose/page_block_renderers/p.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::P
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<p>#{empty_text}</p>"   : block.value                
+  end
+end

data/app/models/caboose/page_block_renderers/richtext.rb

@@ -0,0 +1,5 @@
+class Caboose::PageBlockRenderers::Richtext  
+  def self.render(block, empty_text = nil)
+    return (block.value.nil? || block.value == "") && empty_text ? "<p>#{empty_text}</p>"   : "<p>#{block.value}</p>"    
+  end
+end

data/app/models/caboose/page_block_type.rb

@@ -0,0 +1,12 @@
+
+class Caboose::PageBlockType < ActiveRecord::Base
+  self.table_name = "page_block_types"
+
+  has_many :page_block_fields, :dependent => :destroy  
+  attr_accessible :id, :name, :description, :use_render_function, :render_function  
+
+  def fields
+    return page_block_fields
+  end
+  
+end

data/app/models/caboose/schema.rb

@@ -9,6 +9,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
     }
   end
   
+  def self.removed_columns
+    {
+      Caboose::PageBlock => [:block_type, :value, :name],      
+      Caboose::PageBlockField => [:model_binder_options]      
+    }
+  end
+  
   # Any column indexes that need to exist in the database
   def self.indexes
     {    
@@ -86,11 +93,34 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :gp_description        , :string  , :limit => 156 ]
       ],
       Caboose::PageBlock => [        
-        [ :page_id               , :integer ], 
-        [ :block_type            , :string  , :default => 'p' ],
+        [ :page_id               , :integer ],         
+        [ :page_block_type_id    , :integer ],
         [ :sort_order            , :integer , :default => 0   ],
         [ :name                  , :string  ],
         [ :value                 , :text    ]        
+      ],
+      Caboose::PageBlockType => [        
+        [ :name                  , :string  ],
+        [ :description           , :string  ],
+        [ :use_render_function   , :boolean , :default => false ],
+        [ :render_function       , :text    ] 
+      ],
+      Caboose::PageBlockField => [
+        [ :page_block_type_id   , :integer ],      
+        [ :name                 , :string  ],
+        [ :field_type           , :string  ],
+        [ :nice_name            , :string  ],
+        [ :default              , :text    ],
+        [ :width                , :integer ],
+        [ :height               , :integer ],
+        [ :fixed_placeholder    , :boolean ],
+        [ :options              , :text    ],
+        [ :options_url          , :string  ]
+      ],
+      Caboose::PageBlockFieldValue => [
+        [ :page_block_id        , :integer ],
+        [ :page_block_field_id  , :integer ],
+        [ :value                , :text    ]                
       ],      
       Caboose::Post => [  
         [ :title       , :text     ],  		 	 
@@ -131,11 +161,22 @@ class Caboose::Schema < Caboose::Utilities::Schema
   def self.load_data
 
     c = ActiveRecord::Base.connection    
-    if c.column_exists?(:pages, :content)
-      Caboose::Page.reorder(:id).all.each do |p|
-        Caboose::PageBlock.create( :page_id => p.id, :block_type => 'richtext', :value => p.content )        
-      end      
-      c.remove_column(:pages, :content)
+    #if c.column_exists?(:pages, :content)
+    #  Caboose::Page.reorder(:id).all.each do |p|
+    #    Caboose::PageBlock.create( :page_id => p.id, :block_type => 'richtext', :value => p.content )        
+    #  end      
+    #  c.remove_column(:pages, :content)
+    #end
+      
+    if !Caboose::PageBlockType.where(:name => 'heading').exists?
+      bt = Caboose::PageBlockType.create(:name => 'heading', :description => 'Heading')
+      Caboose::PageBlockField.create(:page_block_type_id => bt.id, :name => 'text', :field_type => 'text', :nice_name => 'Text', :default => '', :width => 800, :fixed_placeholder => false)
+      Caboose::PageBlockField.create(:page_block_type_id => bt.id, :name => 'size', :field_type => 'text', :nice_name => 'Size', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
+    end
+    
+    if !Caboose::PageBlockType.where(:name => 'richtext').exists?
+      bt = Caboose::PageBlockType.create(:name => 'richtext', :description => 'Rich Text')
+      Caboose::PageBlockField.create(:page_block_type_id => bt.id, :name => 'text', :field_type => 'richtext', :nice_name => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
     end
     
     admin_user = nil

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

@@ -0,0 +1,70 @@
+<%
+block_type_id = @field.page_block_type.id
+%>
+
+<h1>Edit Page Block Field</h1>
+<div id='pageblockfield_<%= @field.id %>_name'></div>
+<div id='pageblockfield_<%= @field.id %>_nice_name'></div>
+<div id='pageblockfield_<%= @field.id %>_field_type'></div>
+<div id='pageblockfield_<%= @field.id %>_default'></div>
+<div id='pageblockfield_<%= @field.id %>_width'></div>
+<div id='pageblockfield_<%= @field.id %>_height'></div>
+<div id='pageblockfield_<%= @field.id %>_fixed_placeholder'></div>
+<div id='pageblockfield_<%= @field.id %>_options_url'></div>
+<div id='pageblockfield_<%= @field.id %>_options'></div>
+<br />
+
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/page-block-types/<%= block_type_id %>/edit';" />
+<input type='button' value='Delete Field' onclick="delete_field(<%= @field.id %>);" />
+</p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+function delete_field(field_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append('Are you sure you want to delete the field? ')
+      .append($('<input/>').attr('type', 'button').val('Yes').click(function() { delete_field(field_id, true); })).append(" ")
+      .append($('<input/>').attr('type', 'button').val('No' ).click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').empty().append($('<p/>').addClass('loading').html('Deleting field...'));
+  $.ajax({
+    url: '/admin/page-block-types/<%= block_type_id %>/fields/' + field_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'PageBlockField',
+    id: <%= @field.id %>,
+    update_url: '/admin/page-block-types/<%= @field.page_block_type.id %>/fields/<%= @field.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'                , nice_name: 'Short name'         , type: 'text'     , value: <%= raw Caboose.json(@field.name)              %>, width: 400 },
+      { name: 'nice_name'           , nice_name: 'Long name'          , type: 'text'     , value: <%= raw Caboose.json(@field.nice_name)         %>, width: 400 },
+      { name: 'field_type'          , nice_name: 'Field type'         , type: 'select'   , value: <%= raw Caboose.json(@field.field_type)        %>, text: <%= raw Caboose.json(@field.field_type) %>, width: 400, options_url: '/admin/page-block-fields/field-type-options' },
+      { name: 'default'             , nice_name: 'Default value'      , type: 'text'     , value: <%= raw Caboose.json(@field.default)           %>, width: 400 },
+      { name: 'width'               , nice_name: 'Width'              , type: 'text'     , value: <%= raw Caboose.json(@field.width)             %>, width: 400 },
+      { name: 'height'              , nice_name: 'Height'             , type: 'text'     , value: <%= raw Caboose.json(@field.height)            %>, width: 400 },
+      { name: 'fixed_placeholder'   , nice_name: 'Fixed placeholder'  , type: 'checkbox' , value: <%= raw Caboose.json(@field.fixed_placeholder) %>, width: 400 },
+      { name: 'options_url'         , nice_name: 'Options URL'        , type: 'text'     , value: <%= raw Caboose.json(@field.options_url)       %>, width: 400 },
+      { name: 'options'             , nice_name: 'Options'            , type: 'textarea' , value: <%= raw Caboose.json(@field.options)           %>, width: 400, height: 100 }                         
+    ]
+  });
+});
+
+</script>
+<% end %>

data/app/views/caboose/page_block_fields/admin_new.html.erb

@@ -0,0 +1,30 @@
+
+<h1>New Field</h1>
+<p><input type='text' id='name' name='name' placeholder='Field name' /></p>
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/page-block-types/<%= @block_type.id %>/edit';" />
+<input type='button' value='Add Field' onclick="add_field();" />
+</p>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+function add_field()
+{
+  $('#message').empty().append($('<p/>').addClass('loading').html('Adding field...'));
+  $.ajax({
+    url: '/admin/page-block-types/<%= @block_type.id %>/fields',
+    type: 'post',
+    data: {
+      name: $('#name').val()
+    },      
+    success: function(resp) {
+      if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

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

@@ -0,0 +1,77 @@
+ 
+<h1>Edit Page Block Type</h1>
+<div id='pageblocktype_<%= @block_type.id %>_name'></div>
+<div id='pageblocktype_<%= @block_type.id %>_description'></div>
+<div id='pageblocktype_<%= @block_type.id %>_use_render_function'></div>
+<div id='pageblocktype_<%= @block_type.id %>_render_function'></div>
+
+<h2>Fields</h2>
+<p><a href='/admin/page-block-types/<%= @block_type.id %>/fields/new'>New Field</a></p>
+<% if @block_type.fields.count > 0 %>
+  <table class='data'>
+    <tr>
+      <th>Short Name</th>
+      <th>Long Name</th>
+      <th>Field Type</th>      
+    </tr>
+  <% @block_type.fields.each do |f| %>
+    <tr onclick="window.location='/admin/page-block-types/<%= @block_type.id %>/fields/<%= f.id %>/edit';">
+      <td><%= f.name       %></td>
+      <td><%= f.nice_name  %></td>
+      <td><%= f.field_type %></td>    
+    </tr>
+  <% end %>
+  </table><br />
+<% else %>
+  <p>This type of page block doesn't have any fields.</p>
+<% end %>
+
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/page-block-types';" />
+<input type='button' value='Delete Block Type' onclick="delete_block_type(<%= @block_type.id %>);" />
+</p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+function delete_block_type(block_type_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append('Are you sure you want to delete the block type? ')
+      .append($('<input/>').attr('type', 'button').val('Yes').click(function() { delete_block_type(block_type_id, true); })).append(" ")
+      .append($('<input/>').attr('type', 'button').val('No' ).click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').empty().append($('<p/>').addClass('loading').html('Deleting block type...'));
+  $.ajax({
+    url: '/admin/page-block-types/' + block_type_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'PageBlockType',
+    id: <%= @block_type.id %>,
+    update_url: '/admin/page-block-types/<%= @block_type.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'                , nice_name: 'Name'                , type: 'text'     , value: <%= raw Caboose.json(@block_type.name)            %> , width: 400 },
+      { name: 'description'         , nice_name: 'Description'         , type: 'text'     , value: <%= raw Caboose.json(@block_type.description)     %> , width: 400 },
+      { name: 'use_render_function' , nice_name: 'Use Render Function' , type: 'checkbox' , value: <%= @block_type.use_render_function ? 'true' : 'false' %> , width: 400 },
+      { name: 'render_function'     , nice_name: 'Render Function'     , type: 'textarea' , value: <%= raw Caboose.json(@block_type.render_function) %> , width: 800, height: 200 }
+    ]
+  });
+});
+
+</script>
+<% end %>