caboose-cms 0.3.129 → 0.4.1

data/app/models/caboose/utilities/schema.rb

@@ -40,7 +40,8 @@ class Caboose::Utilities::Schema
     return if self.schema.nil?
     
     rename_tables
-    rename_columns    
+    rename_columns
+    remove_columns    
     
     c = ActiveRecord::Base.connection
     self.schema.each do |model, columns|
@@ -74,8 +75,7 @@ class Caboose::Utilities::Schema
         end
       end
     end
-    
-    remove_columns
+        
     create_indexes
     
     self.schema.each do |model, columns|

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

@@ -0,0 +1,111 @@
+<%
+bt = @block_type
+%>
+
+<h1>Edit Block Type</h1>
+<p><div id='blocktype_<%= bt.id %>_parent_id'></div></p>
+<p><div id='blocktype_<%= bt.id %>_name'></div></p>
+<p><div id='blocktype_<%= bt.id %>_description'></div></p>
+<p><div id='blocktype_<%= bt.id %>_field_type'></div></p>
+
+
+<p><div id='blocktype_<%= bt.id %>_default'></div></p>
+<p><div id='blocktype_<%= bt.id %>_width'></div></p>
+<p><div id='blocktype_<%= bt.id %>_height'></div></p>
+<p><div id='blocktype_<%= bt.id %>_fixed_placeholder'></div></p>
+<p><div id='blocktype_<%= bt.id %>_options_url'></div></p>
+<p><div id='blocktype_<%= bt.id %>_options'></div></p>
+
+<p><div id='blocktype_<%= bt.id %>_use_render_function'></div></p>
+<p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'></div></p>
+<p><div id='blocktype_<%= bt.id %>_allow_child_blocks'></div></p>
+<p><div id='blocktype_<%= bt.id %>_render_function'></div></p>
+<p><div id='blocktype_<%= bt.id %>_options_function'></div></p>
+
+<h2>Children</h2>
+<p><a href='/admin/block-types/<%= @block_type.id %>/new'>New Child Block</a></p>
+<% if @block_type.children.count > 0 %>
+  <table class='data'>
+    <tr>
+      <th>Short Name</th>
+      <th>Long Name</th>
+      <th>Field Type</th>      
+    </tr>
+  <% bt.children.each do |bt2| %>
+    <tr onclick="window.location='/admin/block-types/<%= bt2.id %>/edit';">
+      <td><%= bt2.name        %></td>
+      <td><%= bt2.description %></td>
+      <td><%= bt2.field_type  %></td>    
+    </tr>
+  <% end %>
+  </table><br />
+<% else %>
+  <p>This type of page block doesn't have any fields.</p>
+<% end %>
+
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/block-types<%= bt.parent_id && bt.parent_id > 0 ? "/#{bt.parent_id}/edit" : '' %>';" />
+<input type='button' value='Delete Block Type' onclick="delete_block_type(<%= @block_type.id %>);" />
+</p>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#blocktype_<%= bt.id %>_render_function  { font-family: Courier; font-size: 80%; width: 100%; }
+#blocktype_<%= bt.id %>_options_function { font-family: Courier; font-size: 80%; width: 100%; }
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+function delete_block_type(block_type_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append('Are you sure you want to delete the block type? ')
+      .append($('<input/>').attr('type', 'button').val('Yes').click(function() { delete_block_type(block_type_id, true); })).append(" ")
+      .append($('<input/>').attr('type', 'button').val('No' ).click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').empty().append($('<p/>').addClass('loading').html('Deleting block type...'));
+  $.ajax({
+    url: '/admin/block-types/' + block_type_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'BlockType',
+    id: <%= @block_type.id %>,
+    update_url: '/admin/block-types/<%= @block_type.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'parent_id'                      , nice_name: 'Parent'                         , type: 'select'   , value: <%= raw Caboose.json(bt.parent_id)                       %>, width: 400, options_url: '/admin/block-types/tree-options' },
+      { name: 'name'                           , nice_name: 'Name'                           , type: 'text'     , value: <%= raw Caboose.json(bt.name)                            %>, width: 400 },
+      { name: 'description'                    , nice_name: 'Description'                    , type: 'text'     , value: <%= raw Caboose.json(bt.description)                     %>, width: 400 },
+      { name: 'use_render_function'            , nice_name: 'Use Render Function'            , type: 'checkbox' , value: <%= bt.use_render_function            ? 'true' : 'false' %>, width: 400 },
+      { name: 'use_render_function_for_layout' , nice_name: 'Use Render Function for Layout' , type: 'checkbox' , value: <%= bt.use_render_function_for_layout ? 'true' : 'false' %>, width: 400 },
+      { name: 'allow_child_blocks'             , nice_name: 'Allow Child Blocks'             , type: 'checkbox' , value: <%= bt.allow_child_blocks             ? 'true' : 'false' %>, width: 400 },
+      { name: 'render_function'                , nice_name: 'Render Function'                , type: 'textarea' , value: <%= raw Caboose.json(bt.render_function)                 %>, width: 800, height: 200 },      
+      { name: 'field_type'                     , nice_name: 'Field type'                     , type: 'select'   , value: <%= raw Caboose.json(bt.field_type)                      %>, text: <%= raw Caboose.json(bt.field_type) %>, width: 400, options_url: '/admin/block-types/field-type-options' },
+      { name: 'default'                        , nice_name: 'Default value'                  , type: 'text'     , value: <%= raw Caboose.json(bt.default)                         %>, width: 400 },
+      { name: 'width'                          , nice_name: 'Width'                          , type: 'text'     , value: <%= raw Caboose.json(bt.width)                           %>, width: 400 },
+      { name: 'height'                         , nice_name: 'Height'                         , type: 'text'     , value: <%= raw Caboose.json(bt.height)                          %>, width: 400 },
+      { name: 'fixed_placeholder'              , nice_name: 'Fixed placeholder'              , type: 'checkbox' , value: <%= raw Caboose.json(bt.fixed_placeholder)               %>, width: 400 },
+      { name: 'options_url'                    , nice_name: 'Options URL'                    , type: 'text'     , value: <%= raw Caboose.json(bt.options_url)                     %>, width: 400 },
+      { name: 'options_function'               , nice_name: 'Options Function'               , type: 'textarea' , value: <%= raw Caboose.json(bt.options_function)                %>, width: 400, height: 100 },
+      { name: 'options'                        , nice_name: 'Options'                        , type: 'textarea' , value: <%= raw Caboose.json(bt.options)                         %>, width: 400, height: 100 }      
+    ]
+  });
+});
+
+</script>
+<% end %>

data/app/views/caboose/{page_block_types → block_types}/admin_index.html.erb

@@ -1,6 +1,6 @@
 <h1>Page Block Types</h1>
 
-<p><a href='/admin/page-block-types/new'>New Block Type</a></p>
+<p><a href='/admin/block-types/new'>New Block Type</a></p>
 
 <% if (@block_types.count > 0) %>
 
@@ -10,7 +10,7 @@
       <th>Description</th>      
     </tr>
   <% @block_types.each do |bt| %>
-    <tr onclick="window.location='/admin/page-block-types/<%= bt.id %>/edit';">
+    <tr onclick="window.location='/admin/block-types/<%= bt.id %>/edit';">
       <td><%= bt.name        %></td>
       <td><%= bt.description %></td>    
     </tr>

data/app/views/caboose/{page_block_types → block_types}/admin_new.html.erb

@@ -1,11 +1,16 @@
 
 <h1>New Block Type</h1>
+<form action='/admin/block-types' method='post' id='new_block_type_form'>
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<input type='hidden' name='parent_id' value='<%= @parent_id %>' />
+<input type='hidden' name='field_type' value='block' />
 <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();" />
+<input type='button' value='< Back' onclick="window.location='/admin/block-types';" />
+<input type='button' value='Add Block Type' onclick="add_block_type();" />
 </p>
+</form>
 
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
@@ -14,11 +19,9 @@ function add_block_type()
 {
   $('#message').empty().append($('<p/>').addClass('loading').html('Adding block type...'));
   $.ajax({
-    url: '/admin/page-block-types',
+    url: '/admin/block-types',
     type: 'post',
-    data: {
-      name: $('#name').val()
-    },      
+    data: $('#new_block_type_form').serialize(),          
     success: function(resp) {
       if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
       if (resp.redirect) window.location = resp.redirect;

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

@@ -0,0 +1,8 @@
+<div id='block_<%= block.id %>'>
+  <% if block.children.count > 0 %>
+    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>  
+  <% elsif editing %>  
+    <%= raw empty_text %>
+  <% end %>
+  <% if editing && !modal %><%= raw block.child_block_link %><% end %>
+</div>

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

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

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

@@ -0,0 +1,7 @@
+<%
+html = block.value
+if html.nil? || html == ""
+  html = (empty_text ? "<p>#{empty_text}</p>" : "") 
+end
+
+%><%= raw html %>

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

@@ -0,0 +1,33 @@
+<%
+page = block.page
+%><!DOCTYPE html>
+<!--[if lt IE 7]><html class="no-js ie lt-ie9 lt-ie8 lt-ie7" lang="en"><![endif]-->
+<!--[if IE 7]><html class="no-js ie ie7 lt-ie9 lt-ie8" lang="en"><![endif]-->
+<!--[if IE 8]><html class="no-js ie ie8 lt-ie9" lang="en"><![endif]-->
+<!--[if IE 9]><html class="no-js ie ie9" lang="en"><![endif]-->
+<!--[if !IE]><!--> <html class="no-js" lang="en"><!--<![endif]-->
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
+    <title><%= !page.title.nil? && page.title.strip.length > 0 ? "#{page.title} | " : "" %>Truesouth</title>
+    <meta name="description" content="" />
+    <meta name="viewport" content="width=device-width" />
+    <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAzhmPHU-MEhWXbpvAdZRjd0-ZmVy-KYA8&sensor=false"></script>
+    <%= raw css %>
+    <%= stylesheet_link_tag 'print', :media => 'print' %>
+    <%
+    #= csrf_meta_tags 
+    %>
+  </head>  
+  <body>
+    <div class="container" id='block_<%= block.id %>'>
+      <!--[if lt IE 7]>
+        <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+      <![endif]-->      
+      <%= raw block.render('layout_default_header' , local_assigns) %>
+      <%= raw block.render('layout_default_content', local_assigns) %>
+      <%= raw block.render('layout_default_footer' , local_assigns) %>      
+    </div>
+<%= raw js %>
+  </body>
+</html>

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

@@ -0,0 +1,16 @@
+      <div class="page_wrap" id='block_<%= block.id %>'>          
+        <div class="page_body">      
+          <div class="page_content">
+            <div class="icons-social">
+              <ul>
+                <li><a class="icon-twitter" href="https://twitter.com/truesouthprop"></a></li>
+                <li><a class="icon-facebook" href="https://www.facebook.com/pages/TrueSouth-Properties/144790345550944"></a></li>
+              </ul>
+            </div>
+            <% if block.children.count > 0 %>
+              <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>
+            <% end %>                          
+            <% if editing %><%= raw block.child_block_link %><% end %>
+          </div>
+        </div>
+      </div>

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

@@ -0,0 +1,20 @@
+      <div class="footer" id='block_<%= block.id %>'>
+        <div class="constrain">
+          <div class="nav">
+            <ul>
+              <li><a href="/">Home</a></li>
+              <li><a href="/about">About</a></li>
+              <li><a href="/services">Services</a></li>
+              <li><a href="/properties/category/land">Land</a></li>
+              <li><a href="/properties/category/commercial">Commercial</a></li>
+              <li><a href="/properties/category/residential">Residential</a></li>
+              <li><a href="/properties/category/rural">Rural</a></li>
+              <li><a href="/contact/montgomery">Contact</a></li>
+            </ul>
+          </div>
+          <div class="nine">
+            <span>site designed, built and loved by:</span>
+            <a href="http://www.nine.is" target="_blank"><div class="logo"></div></a>
+          </div>
+        </div>
+      </div>

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

@@ -0,0 +1,32 @@
+      <div class="header" id="block_<%= block.id %>">
+        <div class="constrain">
+          <a href="/"><div class="logo" style="width: <%= block.child('logo_size').value %>;"></div></a>
+          <a href="/"><div class="mobile_logo"></div></a>
+          <div class='register'><a href='/newsletter'>Sign up for our newsletter</a></div>          
+          <div class="nav">
+          	<ul>
+          		<li><a href="/">Home</a></li>
+          		<li><a href="/about">About</a></li>
+          		<li><a href="/properties/category/land">Land</a></li>
+          		<li><a href="/properties/category/commercial">Commercial</a></li>
+          		<li><a href="/properties/category/rural">Rural</a></li>
+          		<li><a href="/properties/category/residential">Residential</a></li>
+          		<li><a href="/services">Services</a></li>
+          		<li><a href="/contact/montgomery">Contact Us</a></li>
+          	</ul>
+          </div>
+          <a id="show_menu" href="#sidr"><img src="//d323vxen8l6os.cloudfront.net/assets/icons/sidr.png"></a>	
+          <div id="sidr" style="display:none;">
+            <ul>
+              <li><a href="/">Home</a></li>
+              <li><a href="/about">About</a></li>
+              <li><a href="/services">Services</a></li>
+              <li><a href="/properties/category/land">Land</a></li>
+              <li><a href="/properties/category/commercial">Commercial</a></li>
+              <li><a href="/properties/category/residential">Residential</a></li>
+              <li><a href="/properties/category/rural">Rural</a></li>
+              <li><a href="/contact/montgomery">Contact</a></li>
+            </ul>
+          </div>
+        </div>
+      </div>

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

@@ -0,0 +1,7 @@
+<%
+text = block.value
+if text.nil? || text == ""
+  text = (empty_text ? "<p>#{empty_text}</p>" : "") 
+end
+
+%><div id='block_<%= block.id %>'><%= raw text %></div>

data/app/views/caboose/{page_blocks/_richtext.html.erb → blocks/_text.html.erb}

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

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

@@ -0,0 +1,106 @@
+<%
+update_on_close = false
+@block.block_type.children.each do |bt|
+  update_on_close = true if bt.field_type == 'image' || bt.field_type == 'file'
+end
+
+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
+
+%>
+<!--<h2 style='margin-top: 0; padding-top: 0;'>Edit <%= @block.name ? @block.name : @block.block_type.description %></h2>-->
+<h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
+<p id='block_type_container'><div id='block_<%= @block.id %>_block_type_id'></div></p>
+                                         
+<% if @block.block_type.use_render_function_for_layout %>
+  <!-- Start -->
+  <%= raw @block.render(@block, {
+    :modal => true,
+    :empty_text => '[Empty, click to edit]',
+    :editing => true
+  }) %>
+  <!-- Stop -->
+<% elsif @block.block_type.field_type != 'block' %>
+  <p><div id='block_<%= @block.id %>_value'></div></p>
+<% else %>  
+  <% if @block.children.count > 0 %>  
+    <% @block.children.each do |b| %>
+      <% if b.block_type.field_type != 'block' && b.block_type.field_type != 'richtext' %>
+        <p><div id='block_<%= b.id %>_value'></div></p>
+      <% else %>
+        <%= raw @block.render(b, {
+          :modal => true,
+          :empty_text => '[Empty, click to edit]',
+          :editing => true
+        }) %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <p>This block doesn't have any content yet. 
+      <% if @block.block_type.allow_child_blocks %>
+        <a href='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.id %>/new'>Add a child block!</a>
+      <% end %>
+    </p>
+  <% end %>
+<% end %>
+<div id='message'></div>
+<p>  
+<input type='button' value='Close' onclick="<% if update_on_close %>parent.controller.render_blocks();<% end %>modal.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();" />
+</p>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+.block { border: #ccc 1px dotted; }
+#block_<%= @block.id %>_block_type_id_container { }
+</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() {
+  modal = new CabooseModal(800);
+});
+
+<%
+#b = @block, nil, { 
+#  :include => [
+#    :block_type, 
+#    :children => { :include => :block_type } 
+#  ]
+#})
+#b.image
+%>
+    
+var controller = false;
+$(document).ready(function() {
+  controller = new BlockController({
+    block: <%= raw Caboose.json(@block.js_hash) %>,    
+    authenticity_token: '<%= form_authenticity_token %>'    
+  });                  
+});    
+
+</script>
+<% if @block.block_type.field_type == 'richtext' %>
+  <%= tinymce_assets %>
+  <script type='textjavascript'>
+  document.domain = "<%= Rails.application.config.action_controller.asset_host %>";
+  </script>
+  <%= tinymce :caboose, width: '800px', height:'300px' %>
+<% end %>
+
+<% end %>