caboose-cms 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU3YTc2ZGNkYTM1NWY2NjBhN2Y4ZWMxNWIyY2RlMGY1Njc3MTY4Mw==
+    ODVkYTdlZTk0ZWE0ZGYwOGZhMjZmNTVhY2FiYjBlMmU3OWJmZTllZQ==
   data.tar.gz: !binary |-
-    M2M3YTBjNzdjNmFhMjRkMTk4OGNiYzZiOGQ0NmFkZDI0ZWViNDMxOQ==
+    NjE4NWNhNTU3MmQ3YjEzZDY2ZDYyMDU2NjNhMmEzNWFjYzU0MTk2Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2U1M2NjZjQ0M2RkN2Q4ZmYxM2JiN2I1N2YxOTQzNmI4NjI1MjI4ODUyNTM1
-    MjAwYTE1MjNmNDc0MjA1MTI1N2JkZTczNzZiNzM3YTRkNjhkZDI1YTFlMTg5
-    YjZkM2M1NjVkODNjZjFmMGMzNjk5MjNmYTA4ZjM0OWI5N2YzMDA=
+    ZjQ1NzI1ZWQ1MDhlN2ExNDBlN2VmZmIzMDgzZDI0ZjEzZGY2ODlkNGU5YjFl
+    MjAyNmY2MjNmZjUzZTQxNzNiYTk1YWU4MWNhOTgyZjQ1YzA1ZmVkNjk0OGUy
+    MTYzNTkwM2UxMjliMjQ0YjBjOTljOGQwN2YxOGE0ZjQ2ZjE2YmE=
   data.tar.gz: !binary |-
-    NjQxY2UxZjNiZmY3ZmUxZmY5ODk3OTJiNzVkNzljMjYzN2M5ZjJhNjcxZmE2
-    MjU0NjUxMzNhMDE1M2Y4NGVkNDY2Njk1N2M5NGY2ODc5MWZiMDFjYWNhYTZh
-    ZWMxYTI3ZTMwYjk0NDY4ZGNhMzJkMDUyNWJkOWViZjNiNzMwMDA=
+    OGFmYjEyNDJmNzY5ZGJmNmQ4NjVkNTJiZDFlNThkMzA0MjAyMDdjOWY3YzBk
+    MTlmZmZjMDE3ZjkzYjY3MjhhZDBhZjRlODEzZTA5MTEyM2JhMTY1ZmU4MDY3
+    MjEyYzU2NzJlMmMzYmRhNmUwMjExNGYwZmQ0NzUzYjkzZWM2OTE=

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

@@ -0,0 +1,123 @@
+
+var PageContentEditor = function(page_id, auth_token) {
+  this.page_id = page_id;
+  this.auth_token = auth_token;
+  this.render_blocks();
+};
+
+PageContentEditor.prototype = {
+
+  page_id: false,
+  current_block_id: false,
+  
+  render_blocks: function()
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks',
+      success: function(blocks) {
+        $(blocks).each(function(i,b) { that.render_block(b.id); });                
+      }
+    });    
+  },
+  
+  render_block: function(block_id, after)
+  {    
+    var that = this;
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/render?empty_text=[Empty, click to edit]',
+      success: function(html) {
+        $('#pageblock_' + block_id).empty().html(html);
+        $('#pageblock_' + block_id).attr('onclick','').unbind('click');
+        $('#pageblock_' + block_id).click(function(e) { that.edit_block(block_id); });
+        if (that.current_block_id == block_id) that.current_block_id = false;
+        if (after) after();
+      }
+    });
+  },
+  
+  edit_block: function(block_id)
+  {
+    var that = this;
+    if (this.current_block_id && this.current_block_id != block_id)
+    {
+      this.render_block(this.current_block_id, function() { that.edit_block(block_id); });
+      return;
+    }
+      
+    this.current_block_id = block_id;
+    $('#pageblock_' + block_id).attr('onclick','').unbind('click');  
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id,
+      success: function(block) {
+        $('#pageblock_' + block.id).empty().append($('<div/>').attr('id', 'pageblock_' + block.id + '_value'));
+        that["edit_" + block.block_type + "_block"](block);
+      }            
+    });
+  },
+
+  edit_h1_block: function(block) { return this.edit_text_block(block); },
+  edit_h2_block: function(block) { return this.edit_text_block(block); },
+  edit_h3_block: function(block) { return this.edit_text_block(block); },
+  edit_h4_block: function(block) { return this.edit_text_block(block); },
+  edit_h5_block: function(block) { return this.edit_text_block(block); },
+  edit_h6_block: function(block) { return this.edit_text_block(block); },
+  
+  edit_text_block: function(block) {
+    var that = this;
+    m = new ModelBinder({
+      name: 'PageBlock',
+      id: block.id,
+      update_url: '/admin/pages/' + this.page_id + '/blocks/' + block.id,
+      authenticity_token: this.auth_token,
+      attributes: [{ 
+        name: 'value', 
+        nice_name: 'Content', 
+        type: 'text', 
+        value: block.value, 
+        width: 800, 
+        fixed_placeholder: false,
+        after_update: this.after_block_update,          
+        after_cancel: this.after_block_cancel
+      }],    
+    });  
+  },
+  
+  edit_richtext_block: function(block) {
+    var that = this;
+    m = new ModelBinder({
+      name: 'PageBlock',
+      id: block.id,
+      update_url: '/admin/pages/' + this.page_id + '/blocks/' + block.id,
+      authenticity_token: this.auth_token,
+      attributes: [{ 
+        name: 'value', 
+        nice_name: 'Content', 
+        type: 'richtext', 
+        value: block.value, 
+        width: 800, 
+        height: 300,
+        fixed_placeholder: false,
+        after_update: function() { 
+          //that.after_block_update(that);
+          that.render_block(that.current_block_id);
+          ModelBinder.remove_from_all_model_binders('PageBlock', that.current_block_id);
+          that.current_block_id = false;
+        },          
+        after_cancel: function() { that.after_block_cancel(that); }
+      }],    
+    });  
+  },
+  
+  after_block_update: function(pce) {
+    pce.render_block(pce.current_block_id);
+    ModelBinder.remove_from_all_model_binders('PageBlock', pce.current_block_id);
+    pce.current_block_id = false;
+  },
+
+  after_block_cancel: function(pce) {
+    pce.render_block(pce.current_block_id);
+    ModelBinder.remove_from_all_model_binders('PageBlock', pce.current_block_id);
+    pce.current_block_id = false;            
+  }
+}

data/app/assets/javascripts/caboose/model/attribute.js

@@ -17,6 +17,8 @@ Attribute.prototype = {
   align: 'left',
   before_update: false,
   after_update: false,
+  before_cancel: false,
+  after_cancel: false,
   debug: false,
   
   update_url: false,
@@ -30,16 +32,16 @@ Attribute.prototype = {
       url: this.update_url,
       type: 'put',
       data: this.name + '=' + encodeURIComponent(this.value),
-			success: function(resp) {			  
+			success: function(resp) {        			  
 				if (resp.success)
 				{
 				  if (resp.attributes && resp.attributes[this2.name])
 				    for (var thing in resp.attributes[this2.name])
 				      this2[thing] = resp.attributes[this2.name][thing];				  
 				  this2.value_clean = this2.value;
-				}
-				if (after) after(resp);
-				if (this2.after_update) this2.after_update();
+				}				
+				if (after) after(resp);        				
+				if (this2.after_update) this2.after_update();				
 			},
 			error: function() { 
 			  if (after) after(false);

data/app/assets/javascripts/caboose/model/bound_richtext.js

@@ -37,8 +37,16 @@ BoundRichText = BoundControl.extend({
         $('#'+this2.el).removeClass('dirty');
     });
     
-    setTimeout(function() { 
-      var ed = tinymce.EditorManager.get(this2.el);
+    setTimeout(function() {
+      tinymce.execCommand("mceAddEditor", false, this2.el);
+      var ed = tinymce.EditorManager.createEditor(this2.el);      
+      
+      //var ed = tinymce.EditorManager.get(this2.el);
+      //if (!ed)
+      //{        
+      //  tinymce.execCommand("mceAddEditor", false, this2.el);
+      //  ed = tinymce.EditorManager.createEditor(this2.el);
+      //}
       ed.on('blur', function(e) { this2.save(); });
       ed.on('keyup', function(e) {
         tinymce.triggerSave();        
@@ -48,7 +56,7 @@ BoundRichText = BoundControl.extend({
         else
           ed.getBody().style.backgroundColor = "#fff";
       });
-    }, 1500);    
+    }, 100);    
   },
   
   show_controls: function() {
@@ -115,7 +123,7 @@ BoundRichText = BoundControl.extend({
   },
   
   cancel: function() {
-    
+    if (this.attribute.before_cancel) this.attribute.before_cancel();
     if ($('#'+this.el).val() != this.attribute.value_clean)
     {
       if (confirm('This box has unsaved changes.  Hit OK to save changes, Cancel to discard.'))
@@ -124,13 +132,15 @@ BoundRichText = BoundControl.extend({
         this.attribute.value_clean = $('#'+this.el).val();
         this.save();
       }
-    }    
+    }        
     this.attribute.value = this.attribute.value_clean;
     $('#'+this.el).val(this.attribute.value);
     $('#'+this.el).removeClass('dirty');
     
     if ($('#'+this.el+'_check').length)
-      this.hide_check();
+      this.hide_check();    
+    tinymce.execCommand("mceRemoveEditor", false, this.el);    
+    if (this.attribute.after_cancel) this.attribute.after_cancel();
   },
     
   error: function(str) {

data/app/assets/javascripts/caboose/model/model_binder.js

@@ -1,5 +1,30 @@
 
-var ModelBinder = function(params) { this.init(params); };
+var all_model_binders = [];
+var ModelBinder = function(params) { 
+  this.init(params);
+  all_model_binders[all_model_binders.length] = this;
+};
+
+ModelBinder.remove_from_all_model_binders = function(model_name, id) {
+  var arr = [];
+  $.each(all_model_binders, function(i, mb) {
+   if (mb.model.name != model_name || mb.model.id != id)
+     arr[arr.length] = mb;      
+  });
+  all_model_binders = arr;  
+};
+
+ModelBinder.tinymce_current_control = function() {
+  var id = tinymce.activeEditor.id.toLowerCase();
+  var control = false;
+  $.each(all_model_binders, function(i, mb) {
+    $.each(mb.controls, function(i, c) {        
+      if (id == (mb.model.name + "_" + mb.model.id + "_" + c.attribute.name).toLowerCase())
+      { control = c; return false; }
+    });
+  });
+  return control;
+};
 
 ModelBinder.prototype = {
   model: false,
@@ -40,11 +65,24 @@ ModelBinder.prototype = {
       else if (attrib.type == 'textarea')          control = new BoundTextarea(opts);
       else if (attrib.type == 'richtext')          control = new BoundRichText(opts);
       else if (attrib.type == 'image')             control = new BoundImage(opts);
-
-      this2.controls.push();    
+      this2.controls.push(control);    
     });
     
     if (this.on_load)
       this.on_load();
   },
+  
+  control_with_id: function(id)
+  {
+    attrib = false
+    var this2 = this;
+    $.each(this.controls, function(i, c) {        
+      if (id == (this2.model.name + "_" + this2.model.id + "_" + c.attribute.name).toLowerCase())
+      {        
+        attrib = c.attribute; 
+        return false;
+      }
+    });
+    return attrib;
+  }
 };

data/app/assets/javascripts/tinymce/plugins/caboose/plugin.js

@@ -0,0 +1,47 @@
+
+tinymce.PluginManager.add('caboose', function(editor, url) {
+  
+  editor.addButton('caboose_save', {
+    text: 'Save',
+    icon: false,
+    onclick: function() {
+      tinymce.activeEditor.plugins.autosave.storeDraft();
+              
+      var control = ModelBinder.tinymce_current_control();  
+      if (!control) return;
+      control.save();
+      control.cancel();
+    }
+  });
+  
+  editor.addButton('caboose_cancel', {
+    text: 'Cancel',
+    icon: false,
+    onclick: function() {
+      tinymce.activeEditor.plugins.autosave.storeDraft();
+      
+      var control = ModelBinder.tinymce_current_control();  
+      if (!control) return;  
+      control.cancel();                      
+    }
+  });
+  
+  // Adds a menu item to the tools menu
+  //editor.addMenuItem('example', {
+  //    text: 'Example plugin',
+  //    context: 'tools',
+  //    onclick: function() {
+  //        // Open window with a specific url
+  //        editor.windowManager.open({
+  //            title: 'TinyMCE site',
+  //            url: 'http://www.tinymce.com',
+  //            width: 800,
+  //            height: 600,
+  //            buttons: [{
+  //                text: 'Close',
+  //                onclick: 'close'
+  //            }]
+  //        });
+  //    }
+  //});
+});

data/app/assets/stylesheets/caboose/admin_page_edit_content.css

@@ -0,0 +1 @@
+

data/app/controllers/caboose/page_blocks_controller.rb

@@ -1,6 +1,6 @@
 
 module Caboose
-  class PagesBlocksController < ApplicationController
+  class PageBlocksController < ApplicationController
     
     #===========================================================================
     # Admin actions
@@ -28,12 +28,19 @@ module Caboose
       render :json => block
     end
     
+    # GET /admin/pages/:page_id/blocks/:id/render
+    def admin_render
+      return unless user_is_allowed('pages', 'edit')      
+      block = PageBlock.find(params[:id])             
+      render :text => block.render(params[:empty_text])
+    end
+    
     # GET /admin/pages/:page_id/blocks/:id/edit
     def admin_edit
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:page_id])
       @block = PageBlock.find(params[:id])
-      render :layout => 'caboose/admin'
+      render "caboose/page_blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/admin'
     end
     
     # POST /admin/pages/:page_id/blocks

data/app/models/caboose/page_block.rb

@@ -5,8 +5,10 @@ class Caboose::PageBlock < ActiveRecord::Base
   belongs_to :page  
   attr_accessible :id, :page_id, :block_type, :sort_order, :name, :value
   
-  def render
-    return self["render_#{self.block_type.downcase}".to_sym]
+  def render(empty_text = nil)    
+    str = self.send("render_#{self.block_type.downcase}")
+    return empty_text if empty_text && (str.nil? || str.length == 0)
+    return str
   end
   
   def render_richtext() return self.value               end

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

@@ -0,0 +1,34 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p>Page block type: <%= @block.block_type %></p>
+<div id='pageblock_<%= @block.id %>_value'></div>  
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {  
+  <% @page.blocks.each do |b| %>
+    m = new ModelBinder({
+      name: 'PageBlock',
+      id: <%= b.id %>,
+      update_url: '/admin/page-blocks/<%= b.id %>',
+      authenticity_token: '<%= form_authenticity_token %>',
+      attributes: [
+        { name: 'name' , nice_name: 'Name'   , type: 'text'    , value: <%= raw Caboose.json(b.name)  %>, width: 784 },
+        { name: 'value', nice_name: 'Content', type: 'richtext', value: <%= raw Caboose.json(b.value) %>, width: 800, height: 300 }             
+      ]
+    });
+  <% end %>
+});
+
+</script>
+<%= tinymce_assets %>
+<%= tinymce :caboose, width: '800px', height:'300px' %>
+<% end %>

data/app/views/caboose/page_blocks/admin_edit_h1.html.erb

@@ -0,0 +1,35 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p>Page block type: <%= @block.block_type %></p>
+<div id='pageblock_<%= @block.id %>_value'></div>  
+<p><input type='button' value='Back to page' onclick="window.location='/admin/pages/<%= @page.id %>/content';" /></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {  
+  m = new ModelBinder({
+    name: 'PageBlock',
+    id: <%= @block.id %>,
+    update_url: '/admin/pages/<%= @page.id %>/blocks/<%= @block.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [{
+      name: 'value',
+      nice_name: 'Content',
+      type: 'text',
+      value: <%= raw Caboose.json(@block.value) %>,
+      width: 800,
+      fixed_placeholder: false 
+    }]
+  });  
+});
+
+</script>
+<% end %>

data/app/views/caboose/page_blocks/admin_edit_h2.html.erb

@@ -0,0 +1,35 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p>Page block type: <%= @block.block_type %></p>
+<div id='pageblock_<%= @block.id %>_value'></div>  
+<p><input type='button' value='Back to page' onclick="window.location='/admin/pages/<%= @page.id %>/content';" /></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {  
+  m = new ModelBinder({
+    name: 'PageBlock',
+    id: <%= @block.id %>,
+    update_url: '/admin/pages/<%= @page.id %>/blocks/<%= @block.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [{
+      name: 'value',
+      nice_name: 'Content',
+      type: 'text',
+      value: <%= raw Caboose.json(@block.value) %>,
+      width: 800,
+      fixed_placeholder: false 
+    }]
+  });  
+});
+
+</script>
+<% end %>

data/app/views/caboose/page_blocks/admin_edit_richtext.html.erb

@@ -0,0 +1,37 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p>Page block type: <%= @block.block_type %></p>
+<div id='pageblock_<%= @block.id %>_value'></div>
+<p><input type='button' value='Back to page' onclick="window.location='/admin/pages/<%= @page.id %>/content';" /></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {  
+  m = new ModelBinder({
+    name: 'PageBlock',
+    id: <%= @block.id %>,
+    update_url: '/admin/pages/<%= @page.id %>/blocks/<%= @block.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [{ 
+      name: 'value',
+      nice_name: 'Content',
+      type: 'richtext',
+      value: <%= raw Caboose.json(@block.value) %>,
+      width: 800,
+      fixed_placeholder: false 
+    }]
+  });
+});
+
+</script>
+<%= tinymce_assets %>
+<%= tinymce :caboose, width: '800px', height:'300px' %>
+<% end %>

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

@@ -1,12 +1,18 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
-  
-<% @page.blocks.each do |b| %>    
-  <div id='pageblock_<%= b.id %>_value'></div>  
+ 
+<% @page.blocks.each do |b| %>
+  <div id='pageblock_<%= b.id %>'></div>    
 <% end %>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/admin_page_edit_content', :media => 'all' %>
+<% end %>
+
 <% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/admin_page_edit_content' %>
 <script type='text/javascript'>
 
 var modal = false;
@@ -14,19 +20,8 @@ $(window).load(function() {
   modal = new CabooseModal(800);
 });
 
-$(document).ready(function() {  
-  <% @page.blocks.each do |b| %>
-    m = new ModelBinder({
-      name: 'PageBlock',
-      id: <%= b.id %>,
-      update_url: '/admin/page-blocks/<%= b.id %>',
-      authenticity_token: '<%= form_authenticity_token %>',
-      attributes: [
-        { name: 'name' , nice_name: 'Name'   , type: 'text'    , value: <%= raw Caboose.json(b.name)  %>, width: 784 },
-        { name: 'value', nice_name: 'Content', type: 'richtext', value: <%= raw Caboose.json(b.value) %>, width: 800, height: 300 }             
-      ]
-    });
-  <% end %>
+$(document).ready(function() {
+  var ed = new PageContentEditor(<%= @page.id %>);  
 });
 
 </script>

data/config/routes.rb

@@ -67,13 +67,14 @@ Caboose::Engine.routes.draw do
   post    "admin/pages"                   => "pages#admin_create"  
   delete  "admin/pages/:id"               => "pages#admin_delete"
     
-  get     "admin/pages/:page_id/blocks/new"       => "page_blocks#admin_new"
-  get     "admin/pages/:page_id/blocks/:id/edit"  => "page_blocks#admin_edit"
-  get     "admin/pages/:page_id/blocks/:id"       => "page_blocks#admin_show"
-  get     "admin/pages/:page_id/blocks"           => "page_blocks#admin_index"  
-  post    "admin/pages/:page_id/blocks"           => "page_blocks#admin_create"
-  put     "admin/pages/:page_id/blocks/:id"       => "page_blocks#admin_update"
-  delete  "admin/pages/:page_id/blocks/:id"       => "page_blocks#admin_delete"
+  get     "admin/pages/:page_id/blocks/new"        => "page_blocks#admin_new"
+  get     "admin/pages/:page_id/blocks/:id/render" => "page_blocks#admin_render"
+  get     "admin/pages/:page_id/blocks/:id/edit"   => "page_blocks#admin_edit"
+  get     "admin/pages/:page_id/blocks/:id"        => "page_blocks#admin_show"
+  get     "admin/pages/:page_id/blocks"            => "page_blocks#admin_index"  
+  post    "admin/pages/:page_id/blocks"            => "page_blocks#admin_create"
+  put     "admin/pages/:page_id/blocks/:id"        => "page_blocks#admin_update"
+  delete  "admin/pages/:page_id/blocks/:id"        => "page_blocks#admin_delete"
   
   get     "posts"                                 => "posts#index"
   get     "posts/:id"                             => "posts#detail"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,6 +127,7 @@ files:
 - app/assets/images/caboose/loading_white_on_black.gif
 - app/assets/images/caboose/search.png
 - app/assets/javascripts/caboose/admin.js
+- app/assets/javascripts/caboose/admin_page_edit_content.js
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/modal.js
 - app/assets/javascripts/caboose/modal_integration.js
@@ -148,7 +149,9 @@ files:
 - app/assets/javascripts/caboose/placeholder.js
 - app/assets/javascripts/caboose/shortcut.js
 - app/assets/javascripts/caboose/station.js
+- app/assets/javascripts/tinymce/plugins/caboose/plugin.js
 - app/assets/stylesheets/caboose/admin.css
+- app/assets/stylesheets/caboose/admin_page_edit_content.css
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/bound_input.css
 - app/assets/stylesheets/caboose/caboose.css
@@ -189,8 +192,6 @@ files:
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
 - app/models/caboose/page_block.rb
-- app/models/caboose/page_block_renderer.rb
-- app/models/caboose/page_block_renderer_richtext.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/permission.rb
@@ -210,6 +211,10 @@ files:
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/login/index.html.erb
+- app/views/caboose/page_blocks/admin_edit.html.erb
+- app/views/caboose/page_blocks/admin_edit_h1.html.erb
+- app/views/caboose/page_blocks/admin_edit_h2.html.erb
+- app/views/caboose/page_blocks/admin_edit_richtext.html.erb
 - app/views/caboose/pages/_admin_footer.html.erb
 - app/views/caboose/pages/_admin_header.html.erb
 - app/views/caboose/pages/admin_delete_form.html.erb

data/app/models/caboose/page_block_renderer.rb

@@ -1,12 +0,0 @@
-
-class Caboose::PageBlockRenderer
-  
-  @page_block = nil
-  
-  # Renders the view for the given page block  
-  def self.render(block)
-    return "" if @page_block.nil?
-    return @page_block.value    
-  end
-  
-end

data/app/models/caboose/page_block_renderer_richtext.rb

@@ -1,68 +0,0 @@
-
-class Caboose::PageBlockRendererRichtext
-  
-  self.table_name = "page_blocks"
-  
-  belongs_to :page  
-  attr_accessible :id, :page_id, :block_type, :sort_order, :name, :value
-  
-  @_renderer  
-  def renderer
-    if @_renderer.nil?
-      @_renderer = "Caboose::PageBlock#{self.block_type.upcase}Renderer".constantize.new
-      @_renderer.page_block = self
-    end
-    return @_renderer       
-  end
-  
-  def render
-    self.renderer.render
-  end
-  
-  def content
-    a = self.name.nil? || self.name.length == 0 ? '' : "<a name='#{self.name}'></a>"
-    return "#{a}#{self.value}"          if self.block_type == 'richtext'
-    return "#{a}<p>#{self.value}</p>"   if self.block_type == 'p'
-    return "#{a}<h1>#{self.value}</h1>" if self.block_type == 'h1'
-    return "#{a}<h2>#{self.value}</h2>" if self.block_type == 'h2'
-    return "#{a}<h3>#{self.value}</h3>" if self.block_type == 'h3'
-    return "#{a}<h4>#{self.value}</h4>" if self.block_type == 'h4'
-    return "#{a}<h5>#{self.value}</h5>" if self.block_type == 'h5'
-    return "#{a}<h6>#{self.value}</h6>" if self.block_type == 'h6'
-    
-    if self.block_type == 'posts'
-      obj = Caboose::StdClass(JSON.parse(self.value))
-      defaults = {
-        'limit' => 10,
-        'no_posts_message' => "<p>There are no posts right now.</p>",
-        'invalid_category_message' => "<p>Invalid post category.</p>",
-        'body_character_limit' => 0        
-      }
-      defaults.each { |k,v| obj[k] = v if obj[k].nil? }
-      
-      return obj.invalid_category_message if !Caboose::PostCategory.exists?(obj.category_id)
-      cat = Caboose::PostCategory.find(obj.category_id)            
-      posts = obj.limit == 0 ? cat.posts.reorder('created_at DESC') : cat.posts.reorder('created_at DESC').limit(obj.limit)      
-      return obj.no_posts_message posts.nil? || posts.count == 0
-      
-      str = ""
-      posts.each do |p|
-        str = "<div class='post'>"
-        str << "<h2>#{raw p.title}</h2>"
-        str << "<div class='created_at'>#{p.created_at.strftime('%F %T')}</div>"
-        str << "<div class='post_content'>"
-        str << obj.body_character_limit > 0 ? Caboose.teaser_text(p.body, obj.body_character_limit) : p.body
-        str << "</div>"
-        str << "</div>"
-      end
-      
-      assoc = cat
-      if Caboose
-      
-      
-      if Caboose::PostCategoryMembership.exists?(:post_category_id => cat.id)
-        Caboose::PostCategoryMembership.where(:post_category_id => cat.id)
-     
-  end
-
-end