caboose-cms 0.8.44 → 0.8.45

data/app/assets/javascripts/caboose/{modal_controllers/modal_media_controller.js → block_modal_controllers/media_modal_controller.js}

@@ -1,5 +1,5 @@
 
-var ModalMediaController = ModalController.extend({
+var MediaModalController = DefaultBlockModalController.extend({
     
   media_id: false,
   top_cat_id: false,
@@ -24,6 +24,20 @@ var ModalMediaController = ModalController.extend({
       'plupload/jquery.ui.plupload/css/jquery.ui.plupload.css'
     ];   
   },
+  
+  refresh: function(callback)
+  {
+    var that = this;
+    that.refresh_block(function() {        
+      that.refresh_categories(function() {                         
+        that.refresh_media(function() {
+          that.refresh_policy(function() {
+            that.print();
+          });
+        });
+      });
+    })
+  },
 
   refresh_categories: function(after) 
   {
@@ -74,31 +88,12 @@ var ModalMediaController = ModalController.extend({
     });
   },
   
-  print: function()
+  print_content: function()
   {
     var that = this;    
-    if (!that.block)
-    {
-      var div = $('<div/>')
-        .append($('<div/>').attr('id', 'top_controls'))        
-        .append($('<div/>').attr('id', 'media'      ))                  
-        .append($('<div/>').attr('id', 'controls')
-          .append($('<p/>').css('clear', 'both')
-            .append($('<input/>').attr('type', 'button').val('Close'        ).click(function(e) { that.parent_controller.render_blocks(); that.close(); }))
-          )
-        );        
-      that.modal(div, 800);
-      that.refresh(function() {
-        that.refresh_categories(function() {                         
-          that.refresh_media(function() {
-            that.refresh_policy(function() {
-              that.print();
-            });
-          });
-        });
-      })
-      return;
-    }
+    $('#modal_content').empty()    
+      .append($('<div/>').attr('id', 'top_controls' ))        
+      .append($('<div/>').attr('id', 'media'        ));    
     that.print_top_controls();    
     that.print_media();
     that.autosize();
@@ -214,9 +209,13 @@ var ModalMediaController = ModalController.extend({
       .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))
       .append($('<h2/>').append('Image URLs'))
       .append(image_urls);
-    $('#controls').empty()
+    $('#modal_controls').empty()
       .append($('<p/>').css('clear', 'both')
-        .append($('<input/>').attr('type', 'button').val('< Back'            ).click(function(e) { that.print_top_controls(); that.print_media();        }))
+        .append($('<input/>').attr('type', 'button').val('< Back'            ).click(function(e) { 
+          that.print_top_controls();
+          that.print_media();
+          that.print_controls();
+        }))
         .append($('<input/>').attr('type', 'button').val('Select this Image' ).click(function(e) { that.select_media(media_id)                           }))        
         .append($('<input/>').attr('type', 'button').val('Close'             ).click(function(e) { that.parent_controller.render_blocks(); that.close(); }))
       );
@@ -240,17 +239,17 @@ var ModalMediaController = ModalController.extend({
     $('#image_urls input.url'       ).css('width', '270px').css('border', '#ccc 1px solid');
     $('#image_urls button').css('width', '60px');
     
-    c = new Clipboard('.clippy');
-    c.on('success', function(e) {
-      console.info('Action:', e.action);
-      console.info('Text:', e.text);
-      console.info('Trigger:', e.trigger);
-      e.clearSelection();
-    });
-    c.on('error', function(e) {
-      console.error('Action:', e.action);
-      console.error('Trigger:', e.trigger);
-    });
+    //c = new Clipboard('.clippy');
+    //c.on('success', function(e) {
+    //  console.info('Action:', e.action);
+    //  console.info('Text:', e.text);
+    //  console.info('Trigger:', e.trigger);
+    //  e.clearSelection();
+    //});
+    //c.on('error', function(e) {
+    //  console.error('Action:', e.action);
+    //  console.error('Trigger:', e.trigger);
+    //});
            
     that.autosize();
   },

data/app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js

@@ -0,0 +1,94 @@
+
+var RichtextModalController = DefaultBlockModalController.extend({
+    
+  tinymce_initialized: false,
+  modal_width: 820,
+  modal_height: 500,
+
+  assets_to_include: function()
+  {
+    return [
+      '//cdn.tinymce.com/4/tinymce.min.js'
+      //'//tinymce.cachefly.net/4.0/tinymce.min.js',
+      //'caboose/tinymce_init.js'
+    ]
+  },
+  
+  print_content: function()
+  {
+    var that = this;
+    
+    $(document).bind('cbox_cleanup', function(){
+      if (tinymce.get('block_' + that.block_id + '_value'))    
+        tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'block_' + that.block_id + '_value');       
+    });
+        
+    var exists = true;
+    try { exists = tinymce && tinymce != null; } catch(err) { exists = false; }    
+    if (!exists)
+    {
+      $('#modal_content').html("<p class='loading'>Loading...</p>");
+      setTimeout(function() { that.print_content(); }, 100)
+      return;
+    }
+    that.init_tinymce();        
+    //if (tinymce.get('block_' + that.block_id + '_value'))    
+    //  tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'block_' + that.block_id + '_value');
+        
+    $('#modal_content').empty().append($('<div/>').attr('id', 'block_' + that.block_id + '_value'));      
+    $(document).ready(function() {  
+      m = new ModelBinder({
+        name: 'Block',
+        id: that.block.id,
+        update_url: that.block_url(),
+        authenticity_token: that.authenticity_token,
+        attributes: [{ 
+          name: 'value',
+          nice_name: 'Content',
+          type: 'richtext',
+          value: that.block.value,
+          width: 800,
+          height: 300,
+          fixed_placeholder: false,
+          after_update: function() {            
+            tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'block_' + that.block_id + '_value');
+            that.parent_controller.render_blocks();
+            that.close(); 
+          },
+          after_cancel: function() { that.parent_controller.render_blocks(); that.close(); }
+        }]
+      });
+    });
+    that.autosize();        
+  },
+  
+  before_crumbtrail_click: function() { var that = this; tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'block_' + that.block_id + '_value'); },  
+  before_close:            function() { var that = this; tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'block_' + that.block_id + '_value'); },  
+  before_print_advanced:   function() { var that = this; tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'block_' + that.block_id + '_value'); },
+  
+  init_tinymce: function(force)
+  {
+    var that = this;
+    if (force || that.parent_controller.tinymce_initialized == undefined)      
+    {
+      console.log("Initializing tinymce...");
+      
+      tinymce.init({
+        selector: 'textarea.tinymce',
+        width: '800px',
+        height: '300px',
+        convert_urls: false,
+        plugins: 'advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor caboose',
+        toolbar1: 'caboose_save caboose_cancel | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
+        image_advtab: true,
+        external_plugins: { 'caboose': '//d9hjv462jiw15.cloudfront.net/assets/tinymce/plugins/caboose/plugin.js' },
+        setup: function(editor) {
+          var control = ModelBinder.tinymce_control(editor.id);     
+          editor.on('keyup', function(e) { control.tinymce_change(editor); });
+        }
+      });
+      that.parent_controller.tinymce_initialized = true;
+    }    
+  }
+  
+});

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

@@ -0,0 +1,129 @@
+
+var ModalController = Class.extend({
+    
+  modal_width: false,
+  modal_height: false,
+  modal_element: false,  
+  parent_controller: false,
+
+  modal: function(el, width, height, callback)
+  {
+    var that = this;
+    if (!width) width = that.modal_width ? that.modal_width : 400;
+    if (!height) height = that.modal_height ? that.modal_height : $(el).outerHeight(true);
+    that.modal_element = el;    
+    el.attr('id', 'the_modal').addClass('modal').css('width', '' + width + 'px');      
+    $.colorbox({
+      html: el,           
+      initialWidth: width, 
+      //initialHeight: height, 
+      innerWidth: width, 
+      //innerHeight: height, 
+      scrolling: false,        
+      closeButton: false,
+      opacity: 0.50,
+      onComplete: function() {        
+        var arr = ['TopLeft','TopCenter','TopRight','BottomLeft','BottomCenter','BottomRight','MiddleLeft','MiddleRight'];
+        for (var i in arr) $('#cbox' + arr[i]).css('background-color', '#fff !important');        
+        $("#cboxClose").hide();
+        if (callback) callback();        
+      }       
+    });
+  },
+  
+  last_size: 0,
+  autosize: function(msg, msg_container, flag)
+  {    
+    var that = this;
+    if (!flag)
+      that.last_size = 0;
+    if (!that.modal_element) return;
+    if (msg) $('#' + (msg_container ? msg_container : 'modal_message')).html(msg);    
+    var h = that.modal_height ? that.modal_height : $(that.modal_element).outerHeight(true) + 20;    
+    if (h > 0 && h > that.last_size)    
+      $.colorbox.resize({ innerHeight: '' + h + 'px' });
+    that.last_size = h;
+    
+    if (!flag || flag < 2)
+      setTimeout(function() { that.autosize(false, false, flag ? flag + 1 : 1); }, 200);
+  },
+  
+  before_close: false,
+  close: function()
+  {
+    var that = this;
+    if (that.before_close) that.before_close();
+    $.colorbox.close();    
+  },
+
+  /*****************************************************************************
+  Asset management
+  *****************************************************************************/
+  
+  // To be overridden in each controller
+  assets_to_include: function() { return []; }, 
+  
+  // Called at the beginning of init to include modal assets,
+  // and can be called at anytime with more assets
+  include_assets: function(arr)
+  {
+    var that = this;    
+    if (!arr) arr = that.assets_to_include();
+    if (!arr) return;
+                
+    if (!that.parent_controller.included_assets || that.parent_controller.included_assets == undefined)
+      that.parent_controller.included_assets = [];
+    if (typeof arr == 'string') arr = [arr];
+    $.each(arr, function(i, url) {        
+      if (that.parent_controller.included_assets.indexOf(url) > -1) return;
+      var full_url = url.match(/^http:.*?/) || url.match(/^https:.*?$/) || url.match(/^\/\/.*?$/) ? url : that.assets_path + url;        
+      if (url.match(/\.js/))
+      {
+        var el = document.createElement('script');    
+        el.setAttribute('type', 'text/javascript');                  
+        el.setAttribute('src', full_url);        
+        document.getElementsByTagName('head')[0].appendChild(el)
+      }
+      else if (url.match(/\.css/))
+      {
+        var el = document.createElement('link');
+        el.setAttribute('rel', 'stylesheet');
+        el.setAttribute('type', 'text/css');
+        el.setAttribute('href', full_url);
+        document.getElementsByTagName('head')[0].appendChild(el)
+      }
+      that.parent_controller.included_assets.push(url);
+    });
+  },
+  
+  include_inline_css: function(str)  
+  {
+    var that = this;
+    
+    if (!that.parent_controller.included_css || that.parent_controller.included_css == undefined)
+      that.parent_controller.included_css = [];
+    var h = that.hashify(str);
+    if (that.parent_controller.included_css.indexOf(h) > -1)
+      return;
+    
+    var el = document.createElement('style');    
+    el.setAttribute('type', 'text/css');
+    el.innerHTML = str;
+    document.getElementsByTagName('head')[0].appendChild(el)
+    
+    that.parent_controller.included_css.push(h);
+  },
+  
+  hashify: function(str)
+  {    
+    var hash = 0, i, chr, len;
+    if (str.length === 0) return hash;
+    for (i=0, len=str.length; i<len; i++) {
+      chr   = str.charCodeAt(i);
+      hash  = ((hash << 5) - hash) + chr;
+      hash |= 0; // Convert to 32bit integer
+    }
+    return hash;    
+  }
+  
+});

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

@@ -43,6 +43,11 @@ BoundRichText = BoundControl.extend({
     setTimeout(function() {
       //tinymce.EditorManager.execCommand("mceAddEditor", false, this2.el);
       //tinymce.EditorManager.execCommand("mceAddEditor", false, this2.el);
+      
+      if (tinymce.get(this2.el))
+      {
+        try { tinymce.EditorManager.execCommand('mceRemoveEditor', true, this2.el); } catch(err) {}
+      }
       tinymce.execCommand("mceAddEditor", false, this2.el);      
       //var ed = tinymce.EditorManager.createEditor(this2.el);
       //alert(ed);

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

@@ -0,0 +1,15 @@
+
+tinymce.init({
+  selector: 'textarea.tinymce',
+  width: '800px',
+  height: '300px',
+  convert_urls: false,
+  plugins: 'advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor caboose',
+  toolbar1: 'caboose_save caboose_cancel | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
+  image_advtab: true,
+  external_plugins: { 'caboose': '//d9hjv462jiw15.cloudfront.net/assets/tinymce/plugins/caboose/plugin.js' },
+  setup: function(editor) {
+    var control = ModelBinder.tinymce_control(editor.id);     
+    editor.on('keyup', function(e) { control.tinymce_change(editor); });
+  }
+});

data/app/assets/stylesheets/caboose/admin_block_edit_image.css.scss

@@ -155,12 +155,3 @@
     }
   }  
 }
-
-#the_modal div.icons { height: 400px; overflow-y: scroll; }
-#the_modal div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
-#the_modal div.icons a { display: block; float: left; margin: 4px; border: #fff 0px solid; width: 120px; height: 100px; text-align: center; vertical-align: middle; border: #666 4px solid; }
-#the_modal div.icons a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
-#the_modal div.icons a span.name { display: block; }               
-#the_modal div.icons a:hover { background: #fff69f; color: #000; border: #666 0px solid; border: #666 4px solid; }
-#the_modal div.icons a:hover span.icon { color: #000; }
-#the_modal div.icons a:hover span.name { color: #000; }

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

@@ -1,3 +1,4 @@
+/*
 @font-face {
 	font-family: 'icomoon';
 	src:url('/assets/icomoon.eot?-tne7s4');
@@ -8,9 +9,16 @@
 	font-weight: normal;
 	font-style: normal;
 }
+*/
 
-[class^="icon-"], [class*=" icon-"] {
-	font-family: 'icomoon';
+#the_modal div.icons [class^="icon-"]:before,
+#the_modal div.icons [class*=" icon-"]:before {
+  font-family: 'icomoon' !important;  
+}
+
+#the_modal div.icons [class^="icon-"],
+#the_modal div.icons [class*=" icon-"] {
+	font-family: 'icomoon' !important;
 	speak: none;
 	font-style: normal;
 	font-weight: normal;

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

@@ -1,4 +1,13 @@
 
+#the_modal div.icons { max-height: 800px; overflow-y: scroll; }
+#the_modal div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
+#the_modal div.icons a { display: block; float: left; margin: 4px; width: 120px; height: 100px; text-align: center; vertical-align: middle; border: #000 1px solid; text-decoration: none; border-radius: 3px; overflow: hidden; }
+#the_modal div.icons a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #000 !important; }
+#the_modal div.icons a span.name { display: block; font-size: 12pt; color: #000 !important; }
+#the_modal div.icons a:hover           { color: #000 !important; background: #fff69f; border: #000 1px solid; }
+#the_modal div.icons a:hover span.icon { color: #000 !important; }
+#the_modal div.icons a:hover span.name { color: #000 !important; }
+
 #the_modal { box-sizing: border-box; }   
 #the_modal p { margin-bottom: 10px; }
 #the_modal .mb_container input { border: #ccc 1px solid; }                                                          
@@ -7,4 +16,7 @@
 #the_modal div.mb_container select { border: #ccc 1px solid; height: 36px; }
 #the_modal div.mb_container select option { font-size: 16px; }
 #the_modal div.mb_container input[type=checkbox] { top: 12px; }
+#the_modal #modal_crumbtrail,
+#the_modal #modal_crumbtrail h2,
+#the_modal #modal_crumbtrail h2 a { font-size: 16pt !important; }
 

data/app/controllers/caboose/blocks_controller.rb

@@ -82,18 +82,18 @@ module Caboose
           'id'                 => b.id,
           'parent_id'          => b.parent_id,
           'page_id'            => b.page_id,          
-          'post_id'            => b.post_id,
-          'block_type'         => bt,
-          'block_type_id'      => bt.id,
-          'children'           => admin_tree_helper(b), 
-          'field_type'         => bt.field_type,
-          'allow_child_blocks' => bt.allow_child_blocks,
-          'use_js_for_modal'   => bt.use_js_for_modal,
-          'name'               => b.name ? b.name : bt.name,
+          'post_id'            => b.post_id,          
+          'name'               => b.name,
           'value'              => b.value,
           'constrain'          => b.constrain,
           'full_width'         => b.full_width,
+          'block_type'         => bt,
+          'children'           => admin_tree_helper(b),
           'crumbtrail'         => self.crumbtrail(b)          
+          #'block_type_id'      => bt.id,           
+          #'field_type'         => bt.field_type,
+          #'allow_child_blocks' => bt.allow_child_blocks,
+          #'use_js_for_modal'   => bt.use_js_for_modal,                              
         }
       else
         q = params[:page_id] ? ["parent_id is null and page_id = ?", params[:page_id]] : ["parent_id is null and post_id = ?", params[:post_id]] 
@@ -103,17 +103,17 @@ module Caboose
             'id'                 => b.id,
             'parent_id'          => b.parent_id,
             'page_id'            => b.page_id,            
-            'post_id'            => b.post_id,
-            'block_type'         => bt,
-            'block_type_id'      => bt.id,
-            'children'           => admin_tree_helper(b), 
-            'field_type'         => bt.field_type,
-            'allow_child_blocks' => bt.allow_child_blocks,
-            'use_js_for_modal'   => bt.use_js_for_modal,
-            'name'               => b.name ? b.name : bt.name,
+            'post_id'            => b.post_id,                        
+            'name'               => b.name, 
             'value'              => b.value,
             'constrain'          => b.constrain,
-            'full_width'         => b.full_width
+            'full_width'         => b.full_width,
+            'block_type'         => bt,
+            'children'           => admin_tree_helper(b)            
+            #'block_type_id'      => bt.id,
+            #'field_type'         => bt.field_type,
+            #'allow_child_blocks' => bt.allow_child_blocks,
+            #'use_js_for_modal'   => bt.use_js_for_modal,                                    
           }
         end        
       end
@@ -143,16 +143,16 @@ module Caboose
           'parent_id'          => b2.parent_id,
           'page_id'            => b2.page_id,
           'post_id'            => b2.post_id,
-          'block_type'         => bt,
-          'block_type_id'      => bt.id,
-          'children'           => admin_tree_helper(b2),
-          'field_type'         => bt.field_type,
-          'allow_child_blocks' => bt.allow_child_blocks,
-          'use_js_for_modal'   => bt.use_js_for_modal,
-          'name'               => b2.name ? b2.name : bt.name,
+          'name'               => b2.name,
           'value'              => b2.value,
           'constrain'          => b2.constrain,
-          'full_width'         => b2.full_width
+          'full_width'         => b2.full_width,
+          'block_type'         => bt,
+          'children'           => admin_tree_helper(b2)          
+          #'block_type_id'      => bt.id,          
+          #'field_type'         => bt.field_type,
+          #'allow_child_blocks' => bt.allow_child_blocks,
+          #'use_js_for_modal'   => bt.use_js_for_modal,          
         }
       end
       return arr
@@ -306,10 +306,7 @@ module Caboose
     def admin_create
       return unless user_is_allowed('pages', 'add')
 
-      resp = Caboose::StdClass.new({
-          'error' => nil,
-          'redirect' => nil
-      })
+      resp = Caboose::StdClass.new
 
       b = Block.new      
       if params[:page_id]
@@ -369,11 +366,9 @@ module Caboose
 
       # Send back the response
       #resp.block = b
-      if params[:page_id]
-        resp.redirect = "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
-      else
-        resp.redirect = "/admin/posts/#{b.post_id}/blocks/#{b.id}/edit"
-      end        
+      resp.success = true
+      resp.new_id = b.id
+      resp.redirect = params[:page_id] ? "/admin/pages/#{b.page_id}/blocks/#{b.id}" : "/admin/posts/#{b.post_id}/blocks/#{b.id}"              
       render :json => resp
     end