caboose-cms 0.3.129 → 0.4.1

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

@@ -0,0 +1,55 @@
+<%
+
+crumbs = []
+b = @block
+while b
+  href    = b.id == @block.id ? "#" : "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
+  onclick = b.id == @block.id ? " onclick=\"$('#block_#{@block.id}_block_type_id_container').slideToggle(100, function() { modal.autosize(); });\"" : ''
+  text = b.name ? "#{b.block_type.description} (#{b.name})" : b.block_type.description  
+  crumbs << "<a href=\"#{href}\"#{onclick}>#{text}</a>"     
+  b = b.parent
+end
+b = @block
+
+%>
+<h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
+<h1>New Block</h1>
+<form action='/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>' method='post' id='new_block_form' onsubmit="add_child_block(); return false;">
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<p><select name='block_type_id'>
+<option value=''>-- Select a block type --</option>
+<% Caboose::BlockType.where("parent_id is null").reorder(:name).all.each do |bt| %>
+  <option value="<%= bt.id %>"><%= bt.description %></option>
+<% end %>
+</select></p>
+<div id='message'></div>
+<p>
+  <input type='submit' value='Add Block' />
+  <input type='button' value='Cancel' onclick="modal.close();" />
+</p>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+function add_child_block()
+{
+  modal.autosize("<p class='loading'>Adding block...</p>");
+  $.ajax({
+    url: '/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>',
+    type: 'post',
+    data: $('#new_block_form').serialize(),
+    success: function(resp) {
+      if (resp.error)   modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.success) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

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

@@ -31,7 +31,7 @@ p.uri {
 <%= javascript_include_tag "caboose/model/bound_richtext" %>
 <% end %>
 
-<h1>Edit Page</h1>
+<h1 id='page_title'>Edit Page</h1>
 <ul id='tabs'>
 <%
 tabs = {

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

@@ -1,3 +1,3 @@
 <% page.blocks.each do |b| %>
-<%= render :partial => "caboose/page_blocks/#{b.block_type}", :locals => { :block => b, :empty_text => empty_text } %>
+<%= render :partial => "caboose/blocks/#{b.block_type}", :locals => { :block => b, :empty_text => empty_text } %>
 <% end %>

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

@@ -0,0 +1,13 @@
+<div id='new_blocks_container1'>
+  <p><input type='button' value='New Page Block' onclick='toggle_blocks();' /></p>
+</div>
+<div id='new_blocks_container2' style='display: none;'>
+  <input type='button' value='New Page Block' onclick='toggle_blocks();' />
+  <p>Drag a block onto the page.</p>
+  <ul id='new_blocks'>
+    <% @block_types.each do |block_type| %><li id='new_block_<%= block_type.id %>'><%= block_type.description %></li><% end %>
+  </ul>
+  <p><a href='#' onclick='toggle_blocks();'>Close</a></p>
+</div>
+<ul id='blocks'></ul>
+

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

@@ -1,33 +1,37 @@
 
-<%= render :partial => 'caboose/pages/admin_header' %>
-
-<div id='new_blocks_container1'>
-  <p><input type='button' value='New Page Block' onclick='toggle_page_blocks();' /></p>
-</div>
-<div id='new_blocks_container2' style='display: none;'>
-  <input type='button' value='New Page Block' onclick='toggle_page_blocks();' />
-  <p>Drag a block onto the page.</p>
-  <ul id='new_blocks'>
-    <% @block_types.each do |block_type| %><li id='new_block_<%= block_type.id %>'><%= block_type.description %></li><% end %>
-  </ul>
-  <p><a href='#' onclick='toggle_page_blocks();'>Close</a></p>
-</div>
-
-<ul id='pageblocks'></ul>
-
-<%= render :partial => 'caboose/pages/admin_footer' %>
-
 <% content_for :caboose_css do %>
-<%= stylesheet_link_tag 'caboose/admin_page_edit_content', :media => 'all' %>
+<style type='text/css'>
+#back_to_admin {
+  display: block;  
+  color: #fff;
+  background-image: url(/assets/caboose/caboose_logo_small.png);
+  background-color: #000;  
+  background-repeat: no-repeat;  
+  padding: 14px 10px 14px 50px;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  z-index: 100;
+}
+.block_over { background: #fff799; }
+</style>
 <% end %>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/admin" %>
+<%= javascript_include_tag "caboose/model/all" %>
 <%= javascript_include_tag 'caboose/admin_page_edit_content' %>
 <script type='text/javascript'>
 
 var controller = false;
 $(document).ready(function() {
-  controller = new PageContentController(<%= @page.id %>);  
+  controller = new PageContentController(<%= @page.id %>);
+
+  $('body').append($('<a/>')
+    .attr('id', 'back_to_admin')      
+    .attr('href', '/admin/pages/<%= @page.id %>/edit')
+    .html("Back to Admin")      
+  );  
 });
 
 </script>

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

@@ -1,33 +1,16 @@
 
-<% content_for :caboose_css do %>
-  <% @page.linked_resources_map[:css].each do |r| %>
-    <!--link type='text/css' rel='stylesheet' href="<%= r %>" /-->
-    <%= stylesheet_link_tag r %>
-  <% end %>
-<% end %>
-
+<% if params[:edit] %>
 <% content_for :caboose_js do %>
-  <% @page.linked_resources_map[:js].each do |r| %>
-    <!--script type='text/javascript' src="<%= r %>" ></script-->
-    <%= javascript_include_tag r %>
-  <% end %>
-<% end %>
+<%= javascript_include_tag "caboose/admin" %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag 'caboose/admin_page_edit_content' %>
+<script type='text/javascript'>
 
-<% content_for :page_title   do %><%= raw @page.title   %><% end %>
-<% content_for :page_content do %><% 
-  if @page.title != 'Access Denied'
-    @page.blocks.each do |b|  
-      bt = b.page_block_type
-      if bt.nil?
-        bt = PageBlockType.where(:name => 'heading').first 
-        b.page_block_type_id = bt.id
-        b.save
-      end
-      if bt.use_render_function && bt.render_function
-        %><%= raw b.render_from_function(params[:empty_text]) %><%        
-      else        
-        %><%= render :partial => "caboose/page_blocks/#{bt.name}", :locals => { :block => b, :empty_text => "", :editing => false } %><%
-      end
-    end
-  end
-%><% end %>
+var controller = false;
+$(document).ready(function() {
+  controller = new PageContentController(<%= @page.id %>);  
+});
+
+</script>
+<% end %>
+<% end %>

data/app/views/layouts/caboose/application.html.erb

@@ -1,21 +1,33 @@
 
 <%= content_for :js do %>
-<%= javascript_include_tag "caboose/application" %>
-<script>window.loggedIn = <%= logged_in?.to_json %></script>
-<% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
-<%= yield :caboose_js %>
+  <%= javascript_include_tag "caboose/application" %>
+  <script>window.loggedIn = <%= logged_in?.to_json %></script>
+  <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
+  <% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
+  <%= yield :caboose_js %>
 <% end %>
 
 <%= content_for :css do %>
-<%= stylesheet_link_tag('caboose/application') %>
-<% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
-<%= yield :caboose_css %>
+  <%= stylesheet_link_tag('caboose/application') %>
+  <% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
+  <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
+  <%= yield :caboose_css %>
 <% end %>
 
-<% if (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.erb") || File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.haml")) %>
-<%= render :file => "layouts/layout_#{@page.id}" %>
-<% elsif (!@page.layout.nil? && @page.layout.length > 0 && (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.erb") || File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.haml"))) %>
-<%= render :file => "layouts/layout_#{@page.layout}" %>
-<% else %>
-<%= render :file => "layouts/layout_default" %>
-<% end %>
+<%
+
+if yield && yield.strip.length > 0 
+  %><%= yield %><%
+elsif !@page.nil? && @page.title != 'Access Denied' 
+  @page.top_level_blocks.each do |b|    
+    %><%= raw b.render(b, {
+      :modal => false,
+      :empty_text => '',
+      :editing => defined?(@editing) ? @editing : false,
+      :css => yield(:css),
+      :js => yield(:js)
+    }) %><%
+  end
+end 
+
+%>

data/config/routes.rb

@@ -95,36 +95,44 @@ Caboose::Engine.routes.draw do
   delete  "admin/page-permissions"        => "page_permissions#admin_delete"
   delete  "admin/page-permissions/:id"    => "page_permissions#admin_delete"  
     
-  get     "admin/pages/:page_id/blocks/new"        => "page_blocks#admin_new"
-  get     "admin/pages/:page_id/blocks/render"     => "page_blocks#admin_render_all"
-  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"
-  
-  put     "admin/page-block-field-values/:id"       => "page_block_field_values#admin_update"
-  post    "admin/page-block-field-values/:id/image" => "page_block_field_values#admin_update_image"
-  post    "admin/page-block-field-values/:id/file"  => "page_block_field_values#admin_update_file"
-    
-  get     "admin/page-block-types/new"            => "page_block_types#admin_new"    
-  get     "admin/page-block-types/:id/edit"       => "page_block_types#admin_edit"
-  get     "admin/page-block-types/:id"            => "page_block_types#admin_show"
-  get     "admin/page-block-types"                => "page_block_types#admin_index"
-  post    "admin/page-block-types"                => "page_block_types#admin_create"  
-  put     "admin/page-block-types/:id"            => "page_block_types#admin_update"
-  delete  "admin/page-block-types/:id"            => "page_block_types#admin_delete"
-  
-  get     "admin/page-block-fields/field-type-options"            => "page_block_fields#admin_field_type_options"
-  get     "admin/page-block-fields/:id/options"                   => "page_block_fields#admin_field_options"
-  get     "admin/page-block-types/:block_type_id/fields/new"      => "page_block_fields#admin_new"    
-  get     "admin/page-block-types/:block_type_id/fields/:id/edit" => "page_block_fields#admin_edit"
-  get     "admin/page-block-types/:block_type_id/fields/:id"      => "page_block_fields#admin_index"
-  post    "admin/page-block-types/:block_type_id/fields"          => "page_block_fields#admin_create"  
-  put     "admin/page-block-types/:block_type_id/fields/:id"      => "page_block_fields#admin_update"
-  delete  "admin/page-block-types/:block_type_id/fields/:id"      => "page_block_fields#admin_delete"
+  get     "admin/pages/:page_id/blocks/new"                  => "blocks#admin_new"  
+  get     "admin/pages/:page_id/blocks/tree"                 => "blocks#admin_tree"
+  get     "admin/pages/:page_id/blocks/render"               => "blocks#admin_render_all"
+  get     "admin/pages/:page_id/blocks/render-second-level"  => "blocks#admin_render_second_level"
+  get     "admin/pages/:page_id/blocks/:id/render"           => "blocks#admin_render"
+  get     "admin/pages/:page_id/blocks/:id/tree"             => "blocks#admin_tree"
+  get     "admin/pages/:page_id/blocks/:id/render"           => "blocks#admin_render"  
+  get     "admin/pages/:page_id/blocks/:id/edit"             => "blocks#admin_edit"
+  put     "admin/pages/:page_id/blocks/:id/move-up"          => "blocks#admin_move_up"
+  put     "admin/pages/:page_id/blocks/:id/move-down"        => "blocks#admin_move_down"
+  get     "admin/pages/:page_id/blocks/:id"                  => "blocks#admin_show"
+  get     "admin/pages/:page_id/blocks"                      => "blocks#admin_index"  
+  post    "admin/pages/:page_id/blocks"                      => "blocks#admin_create"
+  get     "admin/pages/:page_id/blocks/:id/new"              => "blocks#admin_new"
+  post    "admin/pages/:page_id/blocks/:id"                  => "blocks#admin_create"  
+  put     "admin/pages/:page_id/blocks/:id"                  => "blocks#admin_update"
+  delete  "admin/pages/:page_id/blocks/:id"                  => "blocks#admin_delete"
+  
+  put     "admin/pages/:page_id/blocks/:id"        => "blocks#admin_update"
+  post    "admin/pages/:page_id/blocks/:id/image"  => "blocks#admin_update_image"
+  post    "admin/pages/:page_id/blocks/:id/file"   => "blocks#admin_update_file"
+  
+  #put     "admin/blocks/:id"                       => "fields#admin_update"
+  #post    "admin/blocks/:id/image"                 => "fields#admin_update_image"
+  #post    "admin/blocks/:id/file"                  => "fields#admin_update_file"    
+  
+  get     "admin/block-types/field-type-options"   => "block_types#admin_field_type_options"
+  get     "admin/block-types/tree-options"         => "block_types#admin_tree_options"
+  get     "admin/block-types/options"              => "block_types#admin_options"
+  get     "admin/block-types/new"                  => "block_types#admin_new"  
+  get     "admin/block-types/:id/new"              => "block_types#admin_new"  
+  get     "admin/block-types/:id/options"          => "block_types#admin_value_options"
+  get     "admin/block-types/:id/edit"             => "block_types#admin_edit"
+  get     "admin/block-types/:id"                  => "block_types#admin_show"
+  get     "admin/block-types"                      => "block_types#admin_index"
+  post    "admin/block-types"                      => "block_types#admin_create"  
+  put     "admin/block-types/:id"                  => "block_types#admin_update"
+  delete  "admin/block-types/:id"                  => "block_types#admin_delete"
   
   get     "posts"                                 => "posts#index"
   get     "posts/:id"                             => "posts#detail"

data/lib/caboose/engine.rb

@@ -43,9 +43,9 @@ module Caboose
     return resp
   end
   
-  def Caboose.json(obj, defaultvalue = "")
+  def Caboose.json(obj, defaultvalue = "", options = {})
     return defaultvalue.to_json if obj.nil?
-    return obj.to_json
+    return obj.to_json(options)
   end
   
   # Strips html and returns the text that breaks closest to the given length

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.129'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.129
+  version: 0.4.1
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,7 +183,9 @@ 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_block_edit.js
 - app/assets/javascripts/caboose/admin_page_edit_content.js
+- app/assets/javascripts/caboose/admin_page_edit_content_bak.js
 - app/assets/javascripts/caboose/admin_page_new_blocks.js
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/jquery.detect.js
@@ -235,13 +237,12 @@ files:
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb
 - app/controllers/caboose/application_controller.rb
+- app/controllers/caboose/block_types_controller.rb
+- app/controllers/caboose/blocks_controller.rb
+- app/controllers/caboose/edit_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_controller.rb
 - app/controllers/caboose/modal_controller.rb
-- app/controllers/caboose/page_block_field_values_controller.rb
-- app/controllers/caboose/page_block_fields_controller.rb
-- app/controllers/caboose/page_block_types_controller.rb
-- app/controllers/caboose/page_blocks_controller.rb
 - app/controllers/caboose/page_permissions_controller.rb
 - app/controllers/caboose/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
@@ -263,24 +264,14 @@ files:
 - app/models/caboose/approval_request.rb
 - app/models/caboose/asset.rb
 - app/models/caboose/authenticator.rb
+- app/models/caboose/block.rb
+- app/models/caboose/block_type.rb
 - app/models/caboose/caboose_plugin.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/database_session.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
-- app/models/caboose/page_block.rb
-- app/models/caboose/page_block_field.rb
-- app/models/caboose/page_block_field_value.rb
-- app/models/caboose/page_block_renderers/h1.rb
-- app/models/caboose/page_block_renderers/h2.rb
-- app/models/caboose/page_block_renderers/h3.rb
-- app/models/caboose/page_block_renderers/h4.rb
-- app/models/caboose/page_block_renderers/h5.rb
-- app/models/caboose/page_block_renderers/h6.rb
-- app/models/caboose/page_block_renderers/p.rb
-- app/models/caboose/page_block_renderers/richtext.rb
-- app/models/caboose/page_block_type.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/permission.rb
@@ -304,6 +295,29 @@ files:
 - app/views/caboose/ab_variants/admin_new.html.erb
 - app/views/caboose/admin/index.html.erb
 - app/views/caboose/application/show.html.erb
+- app/views/caboose/block_types/admin_edit.html.erb
+- app/views/caboose/block_types/admin_index.html.erb
+- app/views/caboose/block_types/admin_new.html.erb
+- app/views/caboose/blocks/_block.html.erb
+- app/views/caboose/blocks/_heading.html.erb
+- app/views/caboose/blocks/_html.html.erb
+- app/views/caboose/blocks/_image.html.erb
+- app/views/caboose/blocks/_layout_default.html.erb
+- app/views/caboose/blocks/_layout_default_content.html.erb
+- app/views/caboose/blocks/_layout_default_footer.html.erb
+- app/views/caboose/blocks/_layout_default_header.html.erb
+- app/views/caboose/blocks/_richtext.html.erb
+- app/views/caboose/blocks/_text.html.erb
+- app/views/caboose/blocks/admin_edit.html.erb
+- app/views/caboose/blocks/admin_edit_custom.html.erb
+- app/views/caboose/blocks/admin_edit_h1.html.erb
+- app/views/caboose/blocks/admin_edit_h2.html.erb
+- app/views/caboose/blocks/admin_edit_h3.html.erb
+- app/views/caboose/blocks/admin_edit_h4.html.erb
+- app/views/caboose/blocks/admin_edit_h5.html.erb
+- app/views/caboose/blocks/admin_edit_h6.html.erb
+- app/views/caboose/blocks/admin_edit_richtext.html.erb
+- app/views/caboose/blocks/admin_new.html.erb
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/login/forgot_password_form.html.erb
@@ -311,26 +325,10 @@ files:
 - app/views/caboose/login/reset_password_form.html.erb
 - app/views/caboose/login_mailer/forgot_password_email.html.erb
 - app/views/caboose/modal/index.html.erb
-- app/views/caboose/page_block_fields/admin_edit.html.erb
-- app/views/caboose/page_block_fields/admin_new.html.erb
-- app/views/caboose/page_block_types/admin_edit.html.erb
-- app/views/caboose/page_block_types/admin_index.html.erb
-- app/views/caboose/page_block_types/admin_new.html.erb
-- app/views/caboose/page_blocks/_heading.html.erb
-- app/views/caboose/page_blocks/_partial.html.erb
-- app/views/caboose/page_blocks/_richtext.html.erb
-- app/views/caboose/page_blocks/admin_edit.html.erb
-- app/views/caboose/page_blocks/admin_edit_custom.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_h3.html.erb
-- app/views/caboose/page_blocks/admin_edit_h4.html.erb
-- app/views/caboose/page_blocks/admin_edit_h5.html.erb
-- app/views/caboose/page_blocks/admin_edit_h6.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/_content.html.erb
+- app/views/caboose/pages/_new_block_header.html.erb
 - app/views/caboose/pages/admin_delete_form.html.erb
 - app/views/caboose/pages/admin_edit_child_sort_order.html.erb
 - app/views/caboose/pages/admin_edit_content.html.erb