caboose-cms 0.8.43 → 0.8.44

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

@@ -0,0 +1,7 @@
+/*!
+ * clipboard.js v1.5.12
+ * https://zenorocha.github.io/clipboard.js
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.Clipboard=t()}}(function(){var t,e,n;return function t(e,n,o){function i(a,c){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!c&&s)return s(a,!0);if(r)return r(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var u=n[a]={exports:{}};e[a][0].call(u.exports,function(t){var n=e[a][1][t];return i(n?n:t)},u,u.exports,t,e,n,o)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a<o.length;a++)i(o[a]);return i}({1:[function(t,e,n){var o=t("matches-selector");e.exports=function(t,e,n){for(var i=n?t:t.parentNode;i&&i!==document;){if(o(i,e))return i;i=i.parentNode}}},{"matches-selector":5}],2:[function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function i(t,e,n,o){return function(n){n.delegateTarget=r(n.target,e,!0),n.delegateTarget&&o.call(t,n)}}var r=t("closest");e.exports=o},{closest:1}],3:[function(t,e,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){var e=Object.prototype.toString.call(t);return"[object Function]"===e}},{}],4:[function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return i(t,e,n);if(c.nodeList(t))return r(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function i(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function r(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return s(document.body,t,e,n)}var c=t("./is"),s=t("delegate");e.exports=o},{"./is":3,delegate:2}],5:[function(t,e,n){function o(t,e){if(r)return r.call(t,e);for(var n=t.parentNode.querySelectorAll(e),o=0;o<n.length;++o)if(n[o]==t)return!0;return!1}var i=Element.prototype,r=i.matchesSelector||i.webkitMatchesSelector||i.mozMatchesSelector||i.msMatchesSelector||i.oMatchesSelector;e.exports=o},{}],6:[function(t,e,n){function o(t){var e;if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName)t.focus(),t.setSelectionRange(0,t.value.length),e=t.value;else{t.hasAttribute("contenteditable")&&t.focus();var n=window.getSelection(),o=document.createRange();o.selectNodeContents(t),n.removeAllRanges(),n.addRange(o),e=n.toString()}return e}e.exports=o},{}],7:[function(t,e,n){function o(){}o.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){i.off(t,o),e.apply(n,arguments)}var i=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,i=n.length;for(o;i>o;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],i=[];if(o&&e)for(var r=0,a=o.length;a>r;r++)o[r].fn!==e&&o[r].fn._!==e&&i.push(o[r]);return i.length?n[t]=i:delete n[t],this}},e.exports=o},{}],8:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","select"],r);else if("undefined"!=typeof o)r(n,e("select"));else{var a={exports:{}};r(a,i.select),i.clipboardAction=a.exports}}(this,function(t,e){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var i=n(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),c=function(){function t(e){o(this,t),this.resolveOptions(e),this.initSelection()}return t.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action=e.action,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""},t.prototype.initSelection=function t(){this.text?this.selectFake():this.target&&this.selectTarget()},t.prototype.selectFake=function t(){var e=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return e.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px",this.fakeElem.style.top=(window.pageYOffset||document.documentElement.scrollTop)+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,i.default)(this.fakeElem),this.copyText()},t.prototype.removeFake=function t(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)},t.prototype.selectTarget=function t(){this.selectedText=(0,i.default)(this.target),this.copyText()},t.prototype.copyText=function t(){var e=void 0;try{e=document.execCommand(this.action)}catch(n){e=!1}this.handleResult(e)},t.prototype.handleResult=function t(e){e?this.emitter.emit("success",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)}):this.emitter.emit("error",{action:this.action,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})},t.prototype.clearSelection=function t(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()},t.prototype.destroy=function t(){this.removeFake()},a(t,[{key:"action",set:function t(){var e=arguments.length<=0||void 0===arguments[0]?"copy":arguments[0];if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function t(){return this._action}},{key:"target",set:function t(e){if(void 0!==e){if(!e||"object"!==("undefined"==typeof e?"undefined":r(e))||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=e}},get:function t(){return this._target}}]),t}();t.exports=c})},{select:6}],9:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof o)r(n,e("./clipboard-action"),e("tiny-emitter"),e("good-listener"));else{var a={exports:{}};r(a,i.clipboardAction,i.tinyEmitter,i.goodListener),i.clipboard=a.exports}}(this,function(t,e,n,o){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}var l=i(e),u=i(n),f=i(o),d=function(t){function e(n,o){r(this,e);var i=a(this,t.call(this));return i.resolveOptions(o),i.listenClick(n),i}return c(e,t),e.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText},e.prototype.listenClick=function t(e){var n=this;this.listener=(0,f.default)(e,"click",function(t){return n.onClick(t)})},e.prototype.onClick=function t(e){var n=e.delegateTarget||e.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})},e.prototype.defaultAction=function t(e){return s("action",e)},e.prototype.defaultTarget=function t(e){var n=s("target",e);return n?document.querySelector(n):void 0},e.prototype.defaultText=function t(e){return s("text",e)},e.prototype.destroy=function t(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)},e}(u.default);t.exports=d})},{"./clipboard-action":8,"good-listener":4,"tiny-emitter":7}]},{},[9])(9)});

data/app/assets/javascripts/caboose/modal_controllers/modal_block_controller.js

@@ -3,100 +3,50 @@ var ModalBlockController = ModalController.extend({
 
   block_types: false,
     
-  init: function(options)
+  after_refresh: function()
   {
-    for (var thing in options)
-      this[thing] = options[thing];
-
-    //this.set_block_type_editable();
-    this.set_block_value_editable(this.block);
-    this.set_child_blocks_editable();
-    this.set_clickable();
-    
+    var that = this;
     that.update_on_close = false;
     $.each(that.block.children, function(i, b) {
       if (b.block_type.field_type == 'image' || b.block_type.field_type == 'file')
-        that.update_on_close = true 
-    });
-            
-  },
-  
-  base_url: function(b)
-  {
-    return '/admin/' + (b.page_id ? 'pages/' + b.page_id : 'posts/' + b.post_id) + '/blocks';        
-  },
-  
-  block_url: function(b)
-  {         
-    return this.base_url(b) + '/' + b.id;          
-  },
-    
-  edit_block: function(block_id)
-  {    
-    window.location = this.base_url(this.block) + '/' + block_id + '/edit';    
+        that.update_on_close = true; 
+    });    
+    that.print();        
   },
   
   /*****************************************************************************
   Printing
   *****************************************************************************/
   
-  crumbtrail: function()
-  {
-    var crumbs = $('<h2/>').css('margin-top', '0').css('padding-top', '0');
-    var b = that.block;
-    while (b)
-    {      
-      var href = b.id == that.block_id ? "#" : that.base_url + '/' + b.id;  
-      var text = b.block_type.description + (b.name ? ' (' + b.name + ')' : '');
-      crumbs.prepend($('<a/>').attr('href', href).html(text));      
-      b = b.parent
-      if (b) crumbs.prepend(' > ');
-    }
-    return crumbs;
-  },
-  
   print: function()
   {
-    var that = this;
-    
+    var that = this;    
     if (!that.block)
-    {
+    {          
       var div = $('<div/>')
-        .append($('<div/>').attr('id', 'crumbtrail'))
-        .append($('<div/>').attr('id', 'modal_content'));
-        .append($('<div/>').attr('id', 'modal_message'));        
-        .append($('<p/>')  
-          .append($('<input/>').attr('type', 'button').val('Close').click(function() {
-            if (that.update_on_close)
-              parent_controller.render_blocks();
-            that.close();
-          }))
-<% if @block.name.nil? %>
-  <input type='button' value='Delete Block' onclick="controller.delete_block();" />
-<% 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='<%= raw base_url %>/<%= @block.id %>/advanced';" />
-</p>
-
+        .append($('<div/>').attr('id', 'modal_crumbtrail' ))
+        .append($('<div/>').attr('id', 'modal_content'    ))
+        .append($('<div/>').attr('id', 'modal_message'    ))
+        .append($('<div/>').attr('id', 'modal_controls'   ));
       that.modal(div, 800);
-      that.refresh(function() { that.print(); });
+      that.refresh(function() { that.after_refresh() });
       return;
     }
     
-    var div = $('<div/>');
-    
+    var div = $('<div/>').attr('id', 'modal_content');      
     if (that.block.block_type.field_type != 'block')
       div.append($('<p/>').append($('<div/>').attr('id', 'block_' + that.block.id + '_value')));
     else
     {
       if (that.block.children.length > 0)
-      {
-        $.each(that.block.children, function(i, b) {      
+      {        
+        $.each(that.block.children, function(i, b) {          
           if (b.block_type.field_type != 'block' && b.block_type.field_type != 'richtext' && b.block_type.field_type != 'image' && b.block_type.field_type != 'file')        
             div.append($('<div/>').css('margin-bottom', '10px').append($('<div/>').attr('id', 'block_' + b.id + '_value')));
-          else          
-            div.append(b.rendered_value);
+          else
+          {
+            div.append($('<div/>').css('margin-bottom', '10px').append($('<div/>').attr('id', 'block_' + b.id)));            
+          }
         });
       }              
       else
@@ -105,157 +55,187 @@ var ModalBlockController = ModalController.extend({
       }
       if (that.block.block_type.allow_child_blocks)
       {
-        div.append($('<p/>').append($('<a/>').attr('href', '#').html("Add a child block!").click(function(e) {
+        div.append($('<p/>').css('clear', 'both').append($('<a/>').attr('href', '#').html("Add a child block!").click(function(e) {
           e.preventDefault();
-          that.add_child_block();            
+          that.add_block();
         })));            
       }
     }
-    div.append($('<div/>').
-  
-
-
-
-<% content_for :caboose_css do %>
-<style type='text/css'>
-.block { border: #ccc 1px dotted; }
-#block_<%= @block.id %>_block_type_id_container { }
-#modal_content .checkbox_multiple input[type=checkbox] { position: relative !important; }
-</style>
-<% end %>
-<% 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() {  
-  keep_modal_autosized();
-});
-
-var autosize_count = 0;
-function keep_modal_autosized()
-{
-  if (autosize_count > 3) return;
-  if (modal) modal.autosize();
-  else modal = new CabooseModal(800);
-  autosize_count = autosize_count + 1;
-  setTimeout(function() { keep_modal_autosized(); }, 1000);
-}
-
+    $('#modal_content').replaceWith(div);
+    $('#modal_crumbtrail').empty().append(that.crumbtrail());
+    $('#modal_controls').empty().append(that.controls());
 
+    that.render_blocks();    
+    that.set_editable();
+    that.autosize();    
+  },
+  
+  controls: function()
+  {
+    var that = this;
+    var p = $('<p/>').css('clear', 'both')
+      .append($('<input/>').attr('type', 'button').addClass('btn').val('Close').click(function() { that.close(); if (that.update_on_close) { that.parent_controller.render_blocks(); } })).append(' ');
+    if (!that.block.name)                        
+      p.append($('<input/>').attr('type', 'button').addClass('btn').val('Delete Block').click(function() { that.delete_block(); })).append(' ');      
+    p.append($('<input/>').attr('type', 'button').addClass('btn').val('Move Up'   ).click(function() { that.move_up();         })).append(' ');
+    p.append($('<input/>').attr('type', 'button').addClass('btn').val('Move Down' ).click(function() { that.move_down();       })).append(' ');
+    p.append($('<input/>').attr('type', 'button').addClass('btn').val('Advanced'  ).attr('id', 'btn_advanced').click(function() { that.print_advanced();  }));
+    return p;
+  },
+  
+  print_advanced: function()
+  {
+    var that = this;
+    var b = that.block;
     
+    $('#modal_content').empty()      
+      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_block_type_id' )))
+      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_parent_id'     )))
+      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_constrain'     )))
+      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_full_width'    )))      
+    $('#modal_controls').empty()
+      .append($('<p/>')
+        .append($('<input/>').attr('type', 'button').addClass('btn').val('Close').click(function() { that.close(); if (that.update_on_close) { that.parent_controller.render_blocks(); } })).append(' ')                              
+        .append($('<input/>').attr('type', 'button').addClass('btn').val('Back' ).click(function() { that.print(); }))
+      );
+              
+    var m = new ModelBinder({
+      name: 'Block',
+      id: b.id,
+      update_url: that.block_url(b),      
+      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() { that.parent_controller.render_blocks(); that.block.block_type_id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
+        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, options_url: '/admin/pages/' + that.page_id + '/block-options' , after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
+        { name: 'constrain'     , nice_name: 'Constrain'  , type: 'checkbox' , value: b.constrain     ? 1 : 0 ,                                        width: 400, fixed_placeholder: true,                                                                  after_update: function() { that.parent_controller.render_blocks(); that.block.constrain     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
+        { name: 'full_width'    , nice_name: 'Full Width' , type: 'checkbox' , value: b.full_width    ? 1 : 0 ,                                        width: 400, fixed_placeholder: true,                                                                  after_update: function() { that.parent_controller.render_blocks(); that.block.full_width    = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }}
+      ]
+    });
+    that.autosize();
+  },
+  
+  crumbtrail: function()
+  {    
+    var that = this;
+    var crumbs = $('<h2/>').css('margin-top', '0').css('padding-top', '0');
+    $.each(that.block.crumbtrail, function(i, h) {
+      if (i > 0) crumbs.append(' > ');
+      crumbs.append($('<a/>').attr('href', '#').html(h['text']).data('block_id', h['block_id']).click(function(e) { 
+        e.preventDefault();
+        that.parent_controller.edit_block(parseInt($(this).data('block_id')));
+      }));
+    });    
+    return crumbs;
   },
     
   /*****************************************************************************
   Block Rendering
   *****************************************************************************/
 
-  set_clickable: function()
-  {        
-    var that = this;                
-    $.ajax({      
-      url: that.base_url(that.block) + '/tree',
-      success: function(blocks) {        
-        $(blocks).each(function(i,b) {
-          that.set_clickable_helper(b);                      
-        });
+  render_blocks: function()
+  {
+    var that = this;    
+    if (that.block.block_type.field_type != 'block' && that.block.children.length == 0)
+      return;
+    
+    $.each(that.block.children, function(i, b) {      
+      var ft = b.block_type.field_type;      
+      if (ft == 'block' || ft == 'richtext' || ft == 'image' || ft == 'file')
+      {
+        if (!b.rendered_value)
+        {
+          $.ajax({
+            block_id: b.id, // Used in the success function
+            url: that.block_url(b) + '/render',
+            type: 'get',
+            success: function(html) {
+              $('#the_modal #block_' + this.block_id).replaceWith(html);
+              
+              var b2 = that.block_with_id(this.block_id);
+              b2.rendered_value = html;
+              that.set_clickable(b2);                            
+              that.autosize();
+            },            
+          });
+        }
+        else
+          $('#the_modal #block_' + b.id).replaceWith(b.rendered_value);
       }
-    });    
+    });        
   },
+  
+  /****************************************************************************/
+  
+  set_clickable: function(b)
+  {        
+    var that = this;       
     
-  set_clickable_helper: function(b)
-  {    
-    var that = this;        
-    $('#block_' + b.id).attr('onclick','').unbind('click');    
-    $('#block_' + b.id).click(function(e) {
+    if (!b)
+    {
+      $.each(that.block.children, function(i,b) {
+        that.set_clickable(b);                      
+      });
+    }
+
+    $('#the_modal #block_' + b.id).attr('onclick','').unbind('click');    
+    $('#the_modal #block_' + b.id).click(function(e) {
       e.stopPropagation();
-      that.edit_block(b.id); 
+      that.parent_controller.edit_block(b.id); 
     });
-    if (b.allow_child_blocks == true)
-    {
-      $('#new_block_' + b.id).replaceWith($('<input/>')
-        .attr('type', 'button')
-        .val('New Block')
-        .click(function(e) { e.stopPropagation(); that.new_block(b.id);          
-        })
-      );
-    } 
+    //if (b.allow_child_blocks == true)
+    //{
+    //  $('#new_block_' + b.id).replaceWith($('<input/>')
+    //    .attr('type', 'button')
+    //    .val('New Block')
+    //    .click(function(e) { e.stopPropagation(); that.new_block(b.id);          
+    //    })
+    //  );
+    //} 
     var show_mouseover = true;
     if (b.children && b.children.length > 0)
     {
       $.each(b.children, function(i, b2) {
         if (b2.block_type_id = 34)
           show_mouseover = false;
-        that.set_clickable_helper(b2);
+        that.set_clickable(b2);
       });
     }    
     if (show_mouseover)
     {
-      $('#block_' + b.id).mouseover(function(el) { $('#block_' + b.id).addClass(   'block_over'); });
-      $('#block_' + b.id).mouseout(function(el)  { $('#block_' + b.id).removeClass('block_over'); }); 
+      $('#the_modal #block_' + b.id).mouseover(function(el) { $('#the_modal #block_' + b.id).addClass(   'block_over'); });
+      $('#the_modal #block_' + b.id).mouseout(function(el)  { $('#the_modal #block_' + b.id).removeClass('block_over'); }); 
     }    
   },
 
   /****************************************************************************/
 
-  //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_editable: function()
+  {
+    var that = this;
+    that.set_block_value_editable(that.block);        
+    $.each(that.block.children, function(i, b) {
+      that.set_block_value_editable(b);                         
+    });        
+  },
   
   set_block_value_editable: function(b)
-  {
+  {    
     var that = this;    
-    var bt = b.block_type;
-    if (b.block_type.field_type == 'block') 
-      return;
-        
+    var bt = b.block_type;                      
+    if (bt.field_type == 'block' || bt.field_type == 'richtext')        
+      return;      
     var h = {
       name: 'value',
       type: bt.field_type,      
       nice_name: bt.description ? bt.description : bt.name,
       width: bt.width ? bt.width : 780,      
-      after_update: function() { parent.controller.render_blocks(); },
-      after_cancel: function() { parent.controller.render_blocks(); }
+      after_update: function() { that.parent_controller.render_blocks(); },
+      after_cancel: function() { that.parent_controller.render_blocks(); }
     };     
     h['value'] = b.value
     if (bt.field_type == 'checkbox')       h['value'] = b.value ? 'true' : 'false';
-    if (bt.field_type == 'image')          h['value'] = b.image.tiny_url;
-    if (bt.field_type == 'file')           h['value'] = b.image.url;                
+    //if (bt.field_type == 'image')          h['value'] = b.image.tiny_url;
+    //if (bt.field_type == 'file')           h['value'] = b.file.url;                
     if (bt.field_type == 'select')         h['text'] = b.value;
     if (bt.height)                         h['height'] = bt.height;
     if (bt.fixed_placeholder)              h['fixed_placeholder'] = bt.fixed_placeholder;      
@@ -276,67 +256,8 @@ function keep_modal_autosized()
       attributes: [h]            
     });
   },
-    
-  set_child_blocks_editable: function()
-  {
-    var that = this;
-    $.each(this.block.children, function(i, b) {
-      var bt = b.block_type;      
-      if (bt.field_type == 'block' || bt.field_type == 'richtext')
-      {
-        //$('#block_' + b.id).attr('onclick','').unbind('click');    
-        //$('#block_' + b.id).click(function(e) {
-        //  window.location = '/admin/pages/' + b.page_id + '/blocks/' + b.id + '/edit';               
-        //});
-      }
-      else
-        that.set_block_value_editable(b);           
-    });
-  },
   
-  add_child_block: function(block_type_id)
-  {
-    var that = this;
-    if (!this.block_types)
-    {
-      modal.autosize("<p class='loading'>Getting block types...</p>");
-      $.ajax({
-        url: '/admin/block-types/options',
-        type: 'get',
-        success: function(resp) {
-          that.block_types = resp;
-          that.add_child_block();
-        }
-      });
-      return;
-    }        
-    if (!block_type_id)
-    {
-      var select = $('<select/>').attr('id', 'new_block_type_id');
-      $.each(this.block_types, function(i, bt) {
-        var opt = $('<option/>').val(bt.value).html(bt.text);
-        select.append(opt);
-      });            
-      var p = $('<p/>').addClass('note warning')
-        .append("Select a type of page block: ")
-        .append(select)
-        .append("<br/>")
-        .append($('<input/>').attr('type','button').val('Confirm Add Block').click(function() { that.add_child_block($('#new_block_type_id').val()) })).append(' ')
-        .append($('<input/>').attr('type','button').val('Cancel').click(function() { $('#message').empty(); modal.autosize(); }));
-      modal.autosize(p);
-      return;
-    }
-    modal.autosize("<p class='loading'>Adding block...</p>");
-    $.ajax({
-      url: that.block_url(block),
-      type: 'post',
-      data: { block_type_id: block_type_id },
-      success: function(resp) {
-        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-        if (resp.block) window.location.reload(true);
-      }
-    });
-  },
+  /****************************************************************************/
 
   delete_block: function(confirm)
   {
@@ -346,20 +267,20 @@ function keep_modal_autosized()
       var p = $('<p/>').addClass('note warning')
         .append("Are you sure you want to delete the block? This can't be undone.<br />")      
         .append($('<input/>').attr('type','button').val('Yes').click(function() { that.delete_block(true); })).append(' ')
-        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
-      modal.autosize(p);
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#modal_message').empty(); that.autosize(); }));
+      that.autosize(p);
       return;
     }
-    modal.autosize("<p class='loading'>Deleting block...</p>");
+    that.autosize("<p class='loading'>Deleting block...</p>");
     $.ajax({
       url: that.block_url(that.block),
       type: 'delete',    
       success: function(resp) {
-        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.error) that.autosize("<p class='note error'>" + resp.error + "</p>");
         if (resp.redirect) 
         {
-          parent.controller.render_blocks();
-          modal.close();
+          that.close();
+          that.parent_controller.render_blocks();          
         }
       }
     });
@@ -368,16 +289,16 @@ function keep_modal_autosized()
   move_up: function()
   {
     var that = this;
-    modal.autosize("<p class='loading'>Moving up...</p>");
+    that.autosize("<p class='loading'>Moving up...</p>");
     $.ajax({
       url: that.block_url(that.block) + '/move-up',
       type: 'put',    
       success: function(resp) {
-        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.error) that.autosize("<p class='note error'>" + resp.error + "</p>");
         if (resp.success) 
         {
-          modal.autosize("<p class='note success'>" + resp.success + "</p>");          
-          parent.controller.render_blocks();
+          that.autosize("<p class='note success'>" + resp.success + "</p>");          
+          that.parent_controller.render_blocks();
         }
       }
     });    
@@ -386,18 +307,19 @@ function keep_modal_autosized()
   move_down: function()
   {
     var that = this;
-    modal.autosize("<p class='loading'>Moving down...</p>");
+    that.autosize("<p class='loading'>Moving down...</p>");
     $.ajax({
       url: that.block_url(that.block) + '/move-down',
       type: 'put',    
       success: function(resp) {
-        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.error) that.autosize("<p class='note error'>" + resp.error + "</p>");
         if (resp.success) 
         {
-          modal.autosize("<p class='note success'>" + resp.success + "</p>");          
-          parent.controller.render_blocks();
+          that.autosize("<p class='note success'>" + resp.success + "</p>");          
+          that.parent_controller.render_blocks();
         }
       }
     });    
   }
-};
+
+});