caboose-cms 0.3.12 → 0.3.13

data/app/views/caboose/page_block_types/admin_index.html.erb

@@ -0,0 +1,24 @@
+<h1>Page Block Types</h1>
+
+<p><a href='/admin/page-block-types/new'>New Block Type</a></p>
+
+<% if (@block_types.count > 0) %>
+
+  <table class='data'>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>      
+    </tr>
+  <% @block_types.each do |bt| %>
+    <tr onclick="window.location='/admin/page-block-types/<%= bt.id %>/edit';">
+      <td><%= bt.name        %></td>
+      <td><%= bt.description %></td>    
+    </tr>
+  <% end %>
+  </table>  
+
+<% else %>
+
+  <p>There are no block types.</p>
+
+<% end %>

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

@@ -0,0 +1,30 @@
+
+<h1>New Block Type</h1>
+<p><input type='text' id='name' name='name' placeholder='Name' /></p>
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/page-block-types';" />
+<input type='button' value='Add Field' onclick="add_block_type();" />
+</p>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+function add_block_type()
+{
+  $('#message').empty().append($('<p/>').addClass('loading').html('Adding block type...'));
+  $.ajax({
+    url: '/admin/page-block-types',
+    type: 'post',
+    data: {
+      name: $('#name').val()
+    },      
+    success: function(resp) {
+      if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%
+size = block.field_value('size')
+text = block.field_value('text')
+size = 1 if size.nil?
+text = (empty_text ? empty_text : "") if text.nil? || text == ""
+
+%><h<%= size %>><%= raw text %></h<%= size %>>

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

@@ -0,0 +1,8 @@
+<%
+text = block.field_value('text')
+Caboose.log("text = #{text}")
+if text.nil? || text == ""
+  text = (empty_text ? "<p>#{empty_text}</p>" : "") 
+end
+
+%><%= raw text %>

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

@@ -1,9 +1,12 @@
+<h2 style='margin-top: 0; padding-top: 0;'>Edit <%= @block.page_block_type.description %></h2>
+<% @block.page_block_type.fields.each do |f| %>  
+  <% fv = @block.field_value_object(f.name) %>  
+  <div id='pageblockfieldvalue_<%= fv.id %>_value'></div>
+<% end %>
+<p><input type='button' value='Close' onclick="modal.close();" /></p>
 
-<p>Page block type: <%= @block.block_type %></p>
-<div id='pageblock_<%= @block.id %>_value'></div>  
-
-<%= render :partial => 'caboose/pages/admin_footer' %>
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type='text/javascript'>
 
 var modal = false;
@@ -11,22 +14,38 @@ $(window).load(function() {
   modal = new CabooseModal(800);
 });
 
-$(document).ready(function() {  
-  <% @page.blocks.each do |b| %>
+$(document).ready(function() {
+  <% use_tinymce = false %>
+  <% @block.page_block_type.fields.each do |f| %>
+    <% fv = @block.field_value_object(f.name) %>
+    <% use_tinymce = true if f.field_type == 'richtext' %>
     m = new ModelBinder({
-      name: 'PageBlock',
-      id: <%= b.id %>,
-      update_url: '/admin/page-blocks/<%= b.id %>',
+      name: 'PageBlockFieldValue',
+      id: <%= fv.id %>,
+      update_url: '/admin/page-block-field-values/<%= fv.id %>',
       authenticity_token: '<%= form_authenticity_token %>',
-      attributes: [
-        { name: 'name' , nice_name: 'Name'   , type: 'text'    , value: <%= raw Caboose.json(b.name)  %>, width: 784 },
-        { name: 'value', nice_name: 'Content', type: 'richtext', value: <%= raw Caboose.json(b.value) %>, width: 800, height: 300 }             
-      ]
+      attributes: [{      
+        name: 'value',
+        type: <%=  raw Caboose.json(f.field_type) %>,
+        value: <% if f.field_type == 'checkbox' %><%= fv.value ? 'true' : 'false' %><% else %><%= raw Caboose.json(fv.value) %><% end %>,
+        <% if f.field_type == 'select' %>text: <%= raw Caboose.json(fv.value) %>,<% end %>        
+        nice_name: <%= raw Caboose.json(f.nice_name ? f.nice_name : f.name) %>,
+        width: <% if f.width %><%= raw Caboose.json(f.width) %><% else %>780<% end %>,
+        <% if f.height            %>height: <%=            raw Caboose.json(f.height)            %>,<% end %>
+        <% if f.fixed_placeholder %>fixed_placeholder: <%= raw Caboose.json(f.fixed_placeholder) %>,<% end %>
+        <% if f.options           %>options_url: '/admin/page-block-fields/<%= f.id %>/options',<%
+           elsif f.options_url    %>options_url: <%=       raw Caboose.json(f.options_url)       %>,<% end %>        
+        after_update: function() { parent.controller.render_blocks(); },
+        after_cancel: function() { parent.controller.render_blocks(); }
+      }]
     });
   <% end %>
 });
 
 </script>
+<% if use_tinymce %>
 <%= tinymce_assets %>
 <%= tinymce :caboose, width: '800px', height:'300px' %>
 <% end %>
+<% end %>
+

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

@@ -0,0 +1,35 @@
+<%
+obj = block.value && block.value != "" ? JSON.parse(block.value) : nil
+%>
+<div id='pageblock_<%= @block.id %>_value'></div>  
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {  
+  m = new ModelBinder({
+    name: 'PageBlock',
+    id: <%= @block.id %>,
+    update_url: '/admin/pages/<%= @page.id %>/blocks/<%= @block.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [{
+      name: 'value',
+      nice_name: 'Content',
+      type: 'text',
+      value: <%= raw Caboose.json(@block.value) %>,
+      width: 800,
+      fixed_placeholder: false,
+      after_update: function() { parent.controller.render_blocks(); modal.close(); },
+      after_cancel: function() { parent.controller.render_blocks(); modal.close(); }
+    }]
+  });  
+});
+
+</script>
+<% end %>

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

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

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

@@ -5,13 +5,7 @@
 <div id='new_blocks_container2'>
 <p class='note'>Drag a new block onto the page:</p>
 <ul id='new_blocks'>
-<li id='new_block_h1'>H1</li>
-<li id='new_block_h2'>H2</li>
-<li id='new_block_h3'>H3</li>
-<li id='new_block_h4'>H4</li>
-<li id='new_block_h5'>H5</li>
-<li id='new_block_h6'>H6</li>
-<li id='new_block_richtext'>Rich Text</li>
+<% @block_types.each do |block_type| %><li id='new_block_<%= block_type.id %>'><%= block_type.description %></li><% end %>
 </ul>
 </div>
 </div>

data/config/routes.rb

@@ -80,6 +80,25 @@ Caboose::Engine.routes.draw do
   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"
+    
+  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     "posts"                                 => "posts#index"
   get     "posts/:id"                             => "posts#detail"
   get     "admin/posts/category-options"          => "posts#admin_category_options"

data/lib/caboose/engine.rb

@@ -35,7 +35,7 @@ module Caboose
     resp = nil
     args[0] = args[0].to_sym 
     Caboose.plugins.each do |mod|
-      #resp = mod.constantize.send(*args)
+      #resp = mod.constantize.send(*args)      
       if (mod.constantize.respond_to?(args[0]))
         resp = mod.constantize.send(*args)
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.12'
+  VERSION = '0.3.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,6 +170,9 @@ files:
 - app/controllers/caboose/application_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_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/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
@@ -193,6 +196,17 @@ files:
 - 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
@@ -212,7 +226,15 @@ files:
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/login/index.html.erb
+- app/views/caboose/page_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/_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
@@ -222,6 +244,7 @@ files:
 - 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/admin_delete_form.html.erb
 - app/views/caboose/pages/admin_edit_content.html.erb
 - app/views/caboose/pages/admin_edit_css.html.erb