caboose-cms 0.8.44 → 0.8.45

data/app/views/caboose/blocks/tinymce.js.erb

@@ -0,0 +1 @@
+<%= raw caboose_tinymce %>

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

@@ -4,6 +4,7 @@
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
 <%= stylesheet_link_tag "caboose/modal_inline" %>
 <style type='text/css'>
+
 #tiny_header {
   display: block;  
   color: #fff;
@@ -60,11 +61,13 @@
 <%= javascript_include_tag "caboose/clipboard" %>
 <%= javascript_include_tag 'caboose/admin_page_edit_content' %>
 <%= javascript_include_tag "caboose/class" %>
-<%= javascript_include_tag "caboose/modal_controllers/modal_controller" %>
-<%= javascript_include_tag "caboose/modal_controllers/modal_block_controller" %>
-<%= javascript_include_tag "caboose/modal_controllers/modal_media_controller" %>
+<%= javascript_include_tag "caboose/modal_controller" %>
+<%= javascript_include_tag "caboose/block_modal_controllers/default_block_modal_controller" %>
+<%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
+<%= javascript_include_tag "caboose/block_modal_controllers/media_modal_controller" %>
+<%= javascript_include_tag "caboose/block_modal_controllers/richtext_modal_controller" %>
 <% @page.block.modal_js_block_names.each do |s| %>
-  <%= javascript_include_tag "caboose/modal_controllers/modal_#{s}_controller" %>
+  <%= javascript_include_tag "caboose/block_modal_controllers/#{s}_modal_controller" %>
 <% end %>   
 <script type='text/javascript'>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.44'
+  VERSION = '0.8.45'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.44
+  version: 0.8.45
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -524,6 +524,12 @@ files:
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/authorize.net.js
 - app/assets/javascripts/caboose/block_media_controller.js
+- app/assets/javascripts/caboose/block_modal_controllers/#Untitled-1#
+- app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js
+- app/assets/javascripts/caboose/block_modal_controllers/button_modal_controller.js
+- app/assets/javascripts/caboose/block_modal_controllers/default_block_modal_controller.js
+- app/assets/javascripts/caboose/block_modal_controllers/media_modal_controller.js
+- app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js
 - app/assets/javascripts/caboose/card.js
 - app/assets/javascripts/caboose/cart.js
 - app/assets/javascripts/caboose/cart_old.js
@@ -563,10 +569,7 @@ files:
 - app/assets/javascripts/caboose/main.js
 - app/assets/javascripts/caboose/media_browser.js
 - app/assets/javascripts/caboose/modal.js
-- app/assets/javascripts/caboose/modal_controllers/modal_block_controller.js
-- app/assets/javascripts/caboose/modal_controllers/modal_button_controller.js
-- app/assets/javascripts/caboose/modal_controllers/modal_controller.js
-- app/assets/javascripts/caboose/modal_controllers/modal_media_controller.js
+- app/assets/javascripts/caboose/modal_controller.js
 - app/assets/javascripts/caboose/modal_integration.js
 - app/assets/javascripts/caboose/model.form.page.js
 - app/assets/javascripts/caboose/model.form.user.js
@@ -606,6 +609,7 @@ files:
 - app/assets/javascripts/caboose/spectrum.js
 - app/assets/javascripts/caboose/station.js
 - app/assets/javascripts/caboose/testing.js
+- app/assets/javascripts/caboose/tinymce_init.js
 - app/assets/javascripts/caboose/united_states.js
 - app/assets/javascripts/caboose/variant_children_controller.js
 - app/assets/javascripts/chartjs/Chart.min.js
@@ -1005,6 +1009,7 @@ files:
 - app/views/caboose/blocks/admin_edit_richtextold.html.erb
 - app/views/caboose/blocks/admin_new.html.erb
 - app/views/caboose/blocks/admin_render_second_level.json.erb
+- app/views/caboose/blocks/tinymce.js.erb
 - app/views/caboose/calendars/admin_edit.html.erb
 - app/views/caboose/calendars/admin_index.html.erb
 - app/views/caboose/cart/index.html.erb

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

@@ -1,325 +0,0 @@
-
-var ModalBlockController = ModalController.extend({
-
-  block_types: false,
-    
-  after_refresh: function()
-  {
-    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; 
-    });    
-    that.print();        
-  },
-  
-  /*****************************************************************************
-  Printing
-  *****************************************************************************/
-  
-  print: function()
-  {
-    var that = this;    
-    if (!that.block)
-    {          
-      var div = $('<div/>')
-        .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.after_refresh() });
-      return;
-    }
-    
-    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) {          
-          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($('<div/>').css('margin-bottom', '10px').append($('<div/>').attr('id', 'block_' + b.id)));            
-          }
-        });
-      }              
-      else
-      {
-        div.append($('<p/>').append("This block doesn't have any content yet."));
-      }
-      if (that.block.block_type.allow_child_blocks)
-      {
-        div.append($('<p/>').css('clear', 'both').append($('<a/>').attr('href', '#').html("Add a child block!").click(function(e) {
-          e.preventDefault();
-          that.add_block();
-        })));            
-      }
-    }
-    $('#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
-  *****************************************************************************/
-
-  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;       
-    
-    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.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);          
-    //    })
-    //  );
-    //} 
-    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(b2);
-      });
-    }    
-    if (show_mouseover)
-    {
-      $('#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_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 (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() { 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.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;      
-    if (bt.options || bt.options_function) h['options_url'] = '/admin/block-types/' + bt.id + '/options';
-    else if (bt.options_url)               h['options_url'] = bt.options_url;
-    if (bt.field_type == 'file')           h['update_url'] = that.block_url(b) + '/file';
-    if (bt.field_type == 'image')
-    {
-      h['update_url'] = that.block_url(b) + '/image'
-      h['image_refresh_delay'] = 100;
-    }
-        
-    m = new ModelBinder({
-      name: 'Block',
-      id: b.id,
-      update_url: that.block_url(b),
-      authenticity_token: that.authenticity_token,
-      attributes: [h]            
-    });
-  },
-  
-  /****************************************************************************/
-
-  delete_block: function(confirm)
-  {
-    var that = this;
-    if (!confirm)
-    {
-      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() { $('#modal_message').empty(); that.autosize(); }));
-      that.autosize(p);
-      return;
-    }
-    that.autosize("<p class='loading'>Deleting block...</p>");
-    $.ajax({
-      url: that.block_url(that.block),
-      type: 'delete',    
-      success: function(resp) {
-        if (resp.error) that.autosize("<p class='note error'>" + resp.error + "</p>");
-        if (resp.redirect) 
-        {
-          that.close();
-          that.parent_controller.render_blocks();          
-        }
-      }
-    });
-  },
-  
-  move_up: function()
-  {
-    var that = this;
-    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) that.autosize("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) 
-        {
-          that.autosize("<p class='note success'>" + resp.success + "</p>");          
-          that.parent_controller.render_blocks();
-        }
-      }
-    });    
-  },
-  
-  move_down: function()
-  {
-    var that = this;
-    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) that.autosize("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) 
-        {
-          that.autosize("<p class='note success'>" + resp.success + "</p>");          
-          that.parent_controller.render_blocks();
-        }
-      }
-    });    
-  }
-
-});

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

@@ -1,217 +0,0 @@
-
-var ModalController = Class.extend({
-  
-  page_id: false,
-  block_id: false,
-  block: false,
-  modal_element: false,
-  authenticity_token: false,
-  parent_controller: false,
-  new_block_on_init: false,
-  assets_path: false,  
-    
-  init: function(params) 
-  {
-    var that = this;    
-    for (var i in params)
-      that[i] = params[i];    
-    that.include_assets();
-    if (that.new_block_on_init == true)
-      that.add_block();
-    else
-      that.print();    
-  },
-  
-  refresh: function(callback)
-  {
-    var that = this
-    $.ajax({
-      url: '/admin/pages/' + that.page_id + '/blocks/' + that.block_id + '/tree',
-      type: 'get',
-      success: function(arr) {
-        that.block = arr[0];
-        if (callback) callback();
-      }        
-    });
-  },
-
-  modal: function(el, width, height, callback)
-  {
-    var that = this;
-    if (!width) width = 400;
-    if (!height) 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_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);
-  },
-  
-  close: function()
-  {
-    $.colorbox.close();    
-  },
-  
-  block_with_id: function(block_id, b)
-  {
-    var that = this;
-    if (!b) b = that.block;
-    if (b.id == block_id) return b;
-    
-    var the_block = false;
-    $.each(b.children, function(i, b2) {
-      the_block = that.block_with_id(block_id, b2);
-      if (the_block)
-        return false;
-    });
-    return the_block;        
-  },
-  
-  base_url: function(b)
-  {
-    var that = this;
-    if (!b) b = that.block; 
-    return '/admin/' + (b.page_id ? 'pages/' + b.page_id : 'posts/' + b.post_id) + '/blocks';        
-  },
-  
-  block_url: function(b)
-  {
-    var that = this;
-    if (!b) b = that.block;
-    return this.base_url(b) + '/' + b.id;          
-  },
-  
-  add_block: function(block_type_id)
-  {
-    var that = this;
-    
-    that.include_assets([          
-      'caboose/icomoon_fonts.css',
-      'caboose/admin_new_block.css'
-    ]);
-    
-    if (!that.block_type_id)
-    {
-      that.new_block_types = false;
-      $.ajax({
-        url: '/admin/block-types/new-options',
-        type: 'get',
-        success: function(resp) { that.new_block_types = resp; },
-        async: false          
-      });
-      
-      var icons = $('<div/>').addClass('icons');
-      $.each(that.new_block_types, function(i, h) {        
-        if (h.block_types && h.block_types.length > 0)
-        {
-          var cat = h.block_type_category;          
-          icons.append($('<h2/>').click(function(e) { $('#cat_' + cat.id + '_container').slideToggle(); }).append(cat.name));
-          var cat_container = $('<div/>').attr('id', 'cat_' + cat.id + '_container');
-          $.each(h.block_types, function(j, bt) {            
-            cat_container.append($('<a/>').attr('href', '#')
-              .data('block_type_id', bt.id)
-              .click(function(e) { e.preventDefault(); that.add_block($(this).data('block_type_id')); })
-              .append($('<span/>').addClass('icon icon-' + bt.icon))
-              .append($('<span/>').addClass('name').append(bt.description))
-            );
-          });
-          icons.append(cat_container);
-        }
-      });
-          
-      var div = $('<div/>').append($('<form/>').attr('id', 'new_block_form')
-        .submit(function(e) { e.preventDefault(); return false; })
-        .append(icons)
-      );
-      that.modal(div, 800);
-      return;
-    }
-    
-    that.autosize("<p class='loading'>Adding block...</p>");    
-    var h = {                      
-      authenticity_token: that.authenticity_token,
-      block_type_id: block_type_id
-    };
-    if (that.before_id ) h['before_id'] = that.before_id;
-    if (that.after_id  ) h['after_id' ] = that.after_id;
-
-    $.ajax({
-      url: that.block_url(),
-      type: 'post',
-      data: h,
-      success: function(resp) {
-        if (resp.error)   that.autosize("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) that.parent_controller.edit_block(resp.new_id);        
-      }
-    });     
-  },
-
-  /*****************************************************************************
-  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;      
-      if (url.match(/\.js/))
-      {
-        var el = document.createElement('script');    
-        el.setAttribute('type', 'text/javascript');
-        el.setAttribute('src', that.assets_path + 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', that.assets_path + url);
-        document.getElementsByTagName('head')[0].appendChild(el)
-      }
-      that.parent_controller.included_assets.push(url);
-    });
-  }  
-});