caboose-cms 0.4.7 → 0.4.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTVlNmIwMzQ5ZDlhYTMyNTAxNzQ3NDhhY2Y0NzBhNjA2Mzg4YWUxMA==
+    YWRkMDE4MzQwODc3N2YyMTQ5ZmY4Mzc3MjkyNjFjNzJlYjBmNDBhNA==
   data.tar.gz: !binary |-
-    NThkNWI1NTI5ODhmMGEzNTM5Yzg5ZjU5MmNkOTEyZThhMGM0MjE0NA==
+    MWRmMzJmNjEyNjdkZGNjNDM0MTAwNzFjZWVhZGUwNmU2MzRlMmNiMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTQwN2MyZmIyMmJkZjFhZGRhMzIyZDg5ZDRiMGU1MzA4Mjc0OTQ5NGRlYjdh
-    MzFlNjg0YzQyYTBkNzIxMjZiMmNhYzUzNzRkNmNjMTNkMzY5MGNhNWZmNzZi
-    NWRlY2VkZTljOTA5MTg1MTk4ZmZlNWRhM2MzOGY3NTUwNjM5Yzk=
+    NzhhNGFlMmU1NDE1NzFmZjNhMDMwNGIwZjk0ZjA5MDQzM2ZmMDEyY2QzOTdj
+    MTg2ZmIyOWFjZTkxNjgxNGFiN2UwMTBjMjQ4OWQ4OTNiNjE0YmQ2ZDI0ZDM2
+    MDIxY2Q1Yjg3YmI4YTQxYmYxYzM0MGQ4N2JlYmViN2M1YmYyODI=
   data.tar.gz: !binary |-
-    MDk1NjhiNjU5Zjg3ZGE4YmM4ZTZkMWQwN2MwOTZlM2M2YzY5MWUyMDRmNDE5
-    NzczMzdhYmNjMDQzYmQ3YWIyZjk2ZTk5MTBmMzIxZjY4N2MxMTI0YzIyZTM4
-    YzliMzhhMDFlYzNkMWVkNzFhN2E2NGNhOWJlM2IzODc4ZTY4NGY=
+    NGMyODJlYWI0YjZlODkzYThkNjFkZGJiYjZlMTQ5NmM0NzFjN2EyN2JjNDI1
+    ZjQzM2JhODQ4ZjU1MGI1ODU0MzE2NGI3NmE0ZjMwOWUzYTFjODJjYWVhZTI2
+    NmY4ZDBlNWJiZjg3NDNhNGZhZDI2MWViMDkyOTJiODUyNmI0NDM=

data/app/controllers/caboose/pages_controller.rb

@@ -131,11 +131,31 @@ module Caboose
     def admin_edit_content
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
-      #@block_types = Caboose::BlockType.reorder(:name).all
-      #render :layout => 'caboose/admin'
+      #if @page.top_level_blocks.nil? || @page.top_level_blocks.count == 0      
+      #  redirect_to '/admin/page/:id/layout'
+      #  return
+      #end
       @editing = true
     end
     
+    # GET /admin/pages/:id/layout
+    def admin_edit_layout
+      return unless user_is_allowed('pages', 'edit')      
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # PUT /admin/pages/:id/layout
+    def admin_update_layout
+      return unless user_is_allowed('pages', 'edit')      
+      bt = BlockType.find(params[:block_type_id])
+      Block.create(:page_id => params[:id], :block_type_id => params[:block_type_id], :name => bt.name)
+      resp = Caboose::StdClass.new({
+        'redirect' => "/admin/pages/#{params[:id]}/content"
+      })
+      render :json => resp
+    end
+    
     # GET /admin/pages/:id/block-order
     def admin_edit_block_order
       return unless user_is_allowed('pages', 'edit')

data/app/models/caboose/block.rb

@@ -142,6 +142,25 @@ class Caboose::Block < ActiveRecord::Base
     return erb.result(locals.instance_eval { binding })
   end
   
+  def partial(name, options)    
+    defaults = { :modal => false, :empty_text => '', :editing => false, :css => nil, :js => nil }
+    options2 = nil
+    if options.is_a?(Hash)
+      options2 = defaults.merge(options)
+    else
+      options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }        
+    end
+    options2[:block] = self
+    
+    view = ActionView::Base.new(ActionController::Base.view_paths)
+    begin
+      str = view.render(:partial => "caboose/blocks/#{name}", :locals => options2)
+    rescue
+      Caboose.log("Partial caboose/blocks/#{name} doesn't exist.")
+    end
+    return str
+  end
+        
   def child_block_link        
     return "<div class='new_block' id='new_block_#{self.id}'>New Block</div>"    
   end    

data/app/models/caboose/block_type.rb

@@ -21,7 +21,9 @@ class Caboose::BlockType < ActiveRecord::Base
     :fixed_placeholder, 
     :options,
     :options_function,
-    :options_url
+    :options_url,
+    :share,      # Whether or not to share the block type in the existing block store.
+    :downloaded  # Whether the full block type has been download or just the name and description.
     
   def render_options(empty_text = nil)    
     return eval(self.options_function)    
@@ -52,5 +54,23 @@ class Caboose::BlockType < ActiveRecord::Base
     return nil if self.children.nil? || self.children.count == 0    
     return self.children.collect { |bt| bt.api_hash }
   end
+  
+  def parse_api_hash(h)    
+    self.name                            = h['name']
+    self.description                     = h['description']
+    self.block_type_category_id          = h['block_type_category_id']
+    self.render_function                 = h['render_function']
+    self.use_render_function             = h['use_render_function']
+    self.use_render_function_for_layout  = h['use_render_function_for_layout']
+    self.allow_child_blocks              = h['allow_child_blocks']
+    self.field_type                      = h['field_type']
+    self.default                         = h['default']
+    self.width                           = h['width']
+    self.height                          = h['height']
+    self.fixed_placeholder               = h['fixed_placeholder']
+    self.options                         = h['options']
+    self.options_function                = h['options_function']
+    self.options_url                     = h['options_url']
+  end
 
 end

data/app/models/caboose/block_type_source.rb

@@ -11,10 +11,11 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
     :priority,
     :active    
 
-  def refresh
+  # Just get the names and descriptions of all block types from the source
+  def refresh_names
     resp = nil
-    begin
-      resp = HTTParty.get("#{self.url}/block-types?token=#{self.token}")
+    begin                             
+      resp = HTTParty.get("#{self.url}/caboose/block-types?token=#{self.token}")
     rescue HTTParty::Error => e
       Caboose.log(e.message)
       return false
@@ -28,37 +29,61 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
       return false
     end
     
-    #block_types.each do |bt|
-    #  Caboose.log(
-    #  next if Caboose::BlockType.where(:name => bt.name).exists?
-    #  #self.recursive_add(bt)
-    #end
+    block_types.each do |h|      
+      next if Caboose::BlockType.where(:name => bt.name).exists?
+      Caboose::BlockType.create(:name => h['name'], :description => h['description'])      
+    end
     
     return true
   end
   
-  def recursive_add(bt, parent_id = nil)
-    bt2 = Caboose::BlockType.create(
-      :parent_id                       => parent_id,
-      :name                            => bt.name,
-      :description                     => bt.description,
-      :block_type_category_id          => bt.block_type_category_id,
-      :render_function                 => bt.render_function,
-      :use_render_function             => bt.use_render_function,
-      :use_render_function_for_layout  => bt.use_render_function_for_layout,
-      :allow_child_blocks              => bt.allow_child_blocks,
-      :field_type                      => bt.field_type,
-      :default                         => bt.default,
-      :width                           => bt.width,
-      :height                          => bt.height,
-      :fixed_placeholder               => bt.fixed_placeholder,
-      :options                         => bt.options,
-      :options_function                => bt.options_function,
-      :options_url                     => bt.options_url
-    )
-    bt.children.each do |bt3|
-      self.recursive_add(bt3, bt2.id)
+  # Get the full block type (including children)
+  def refresh(name, force = false)
+    bt = Caboose::BlockType.where(:name => name).first
+    bt = Caboose::BlockType.create(:name => name) if bt.nil?
+    return if bt.downloaded && !force    
+    if force
+      bt.children.each { |bt2| bt2.destroy }
     end
-  end        
 
+    # Try to contact the source URL
+    resp = nil
+    begin                             
+      resp = HTTParty.get("#{self.url}/caboose/block-types/#{bt.name}?token=#{self.token}")
+    rescue HTTParty::Error => e
+      Caboose.log(e.message)
+      return false
+    end
+                
+    # Try to parse the response
+    h = nil
+    begin
+      h = JSON.parse(resp.body)
+    rescue
+      Caboose.log("Response body isn't valid JSON.")
+      return false
+    end     
+    
+    # Grab all the fields from the hash for the top-level block
+    bt.parse_api_hash(h)
+    bt.save
+    
+    # Now add all the children
+    h['children'].each do |h2|
+      recursive_add(h2, bt.id)
+    end
+    
+    return true
+  end
+  
+  def self.recursive_add(h, parent_id = nil)
+    bt = Caboose::BlockType.new(:parent_id => parent_id)
+    bt.parse_api_hash(h)
+    bt.save
+          
+    h['children'].each do |h2|
+      self.recursive_add(h2, bt.id)
+    end
+    return bt
+  end
 end

data/app/models/caboose/schema.rb

@@ -138,7 +138,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :render_function                 , :text    ],
         [ :use_render_function             , :boolean , { :default => false }],        
         [ :use_render_function_for_layout  , :boolean , { :default => false }],
-        [ :allow_child_blocks              , :boolean , { :default => false }],
+        [ :allow_child_blocks              , :boolean , { :default => false }],        
         
         # Used for field values
         [ :field_type                      , :string  ],        
@@ -148,7 +148,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :fixed_placeholder               , :boolean ],
         [ :options                         , :text    ],
         [ :options_function                , :text    ],
-        [ :options_url                     , :string  ]
+        [ :options_url                     , :string  ],
+        
+        # Used for sharing block types
+        [ :share                           , :boolean , { :default => true  }],
+        [ :downloaded                      , :boolean , { :default => false }]
       ],
       Caboose::BlockTypeCategory => [      
         [ :parent_id  , :integer ],

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

@@ -50,7 +50,7 @@ function refresh_block_types(bts_id)
     type: 'get',
     success: function(resp) {
       if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
-      if (resp.success) $('#message').empty().append($('<p/>').addClass('note success').html(resp.error));      
+      if (resp.success) $('#message').empty().append($('<p/>').addClass('note success').html(resp.success));      
     }
   });
 }

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

@@ -21,7 +21,7 @@ page = block.page
     <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]-->      
+      <![endif]-->
       <%= raw block.render('header' , local_assigns) %>
       <%= raw block.render('content', local_assigns) %>
       <%= raw block.render('footer' , local_assigns) %>      

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

@@ -1,18 +1,23 @@
 
 <% content_for :caboose_css do %>
 <style type='text/css'>
-#back_to_admin {
+#tiny_header {
   display: block;  
   color: #fff;
   background-image: url(/assets/caboose/caboose_logo_small.png);
   background-color: #000;  
   background-repeat: no-repeat;
-  background-position: 116px 0;  
-  padding: 16px 50px 14px 10px;
+  background-position: right 0;
+  padding: 0 50px 0 10px;
   position: absolute;
   top: 0px;
   right: 0px;
-  z-index: 100;
+  z-index: 100;  
+}
+#tiny_header a {
+  display: inline-block;
+  color: #fff;
+  padding: 16px 10px;  
 }
 .block_over { background: #fff799; }
 </style>
@@ -28,11 +33,11 @@ var controller = false;
 $(document).ready(function() {
   controller = new PageContentController(<%= @page.id %>);
 
-  $('body').append($('<a/>')
-    .attr('id', 'back_to_admin')      
-    .attr('href', '/admin/pages/<%= @page.id %>/edit')
-    .html("Back to Admin")      
-  );  
+  $('body').append($('<div/>')        
+    .attr('id', 'tiny_header')    
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/edit').html("< Back"))    
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/layout').html("Layout"))    
+  );    
 });
 
 </script>

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

@@ -9,7 +9,6 @@
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_alias'                 ></div><span class='explanation'>Starts the URL over at the domain root.</span></div>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_redirect_url'          ></div><span class='explanation'>If the redirect URL field is set, then this page will simply redirect to that URL instead of showing the page itself.</span></div>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_hide'                  ></div><span class='explanation'>Whether or not this page is displayed in the menu.</span></div>
-<div class='field_with_explanation'><div id='page_<%= @page.id %>_layout'                ></div><span class='explanation'>Specify a specific layout file for this page.</span></div>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_custom_sort_children'  ></div><span class='explanation'>Sort child pages alphabetically or <a href='/admin/pages/<%= @page.id %>/child-order'>custom</a>.</span></div>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_content_format'        ></div><span class='explanation'>Specify whether or not you want to embed ruby code in your page.</span></div>
 
@@ -62,8 +61,7 @@ $(document).ready(function() {
       { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug         ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
       { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias        ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
       { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url ) %> , width: 400 },
-      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide %>                        , width: 400 },
-      { name: 'layout'                , nice_name: 'Layout'               , type: 'text'       , value: <%= raw Caboose.json(@page.layout       ) %> , width: 400 },
+      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide %>                        , width: 400 },      
       { name: 'custom_sort_children'  , nice_name: 'Custom sort children' , type: 'checkbox'   , value: <%= raw @page.custom_sort_children %>        , width: 400 },
       { name: 'content_format'        , nice_name: 'Content format'       , type: 'select'     , value: <%= raw Caboose.json(@page.content_format) %>, width: 400, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/pages/format-options' },       
     ]

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

@@ -0,0 +1,46 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<form action='/admin/pages/<%= @page.id %>' method='put' id='layout_form'>
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<p><select name='block_type_id'>
+  <option value=''>-- Select a layout --</option>
+  <% cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id } %>
+  <% Caboose::BlockType.where("block_type_category_id in (?)", cat_ids).reorder(:description).all.each do |bt| %>
+    <option value="<%= bt.id %>"><%= bt.description %></option>
+  <% end %>
+</select></p>
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/pages/<%= @page.id %>/edit';" />
+<input type='submit' value='Update Page Layout' />
+</p>
+</form>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  $('#layout_form').submit(function() {    
+    update_page_layout(<%= @page.id %>);
+    return false;
+  });
+});
+
+function update_page_layout(page_id)
+{
+  $('#message').html("<p class='loading'>Updating layout...</p>");
+  $.ajax({
+    url: '/admin/pages/' + page_id + '/layout',
+    type: 'put',
+    data: $('#layout_form').serialize(),    
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect
+    }
+  });
+}
+
+</script>
+<% end %>

data/config/routes.rb

@@ -83,7 +83,9 @@ Caboose::Engine.routes.draw do
   get     "admin/pages/:id/child-order"   => "pages#admin_edit_child_sort_order"
   put     "admin/pages/:id/child-order"   => "pages#admin_update_child_sort_order"
   get     "admin/pages/:id/new-blocks"    => "pages#admin_new_blocks"
-  get     "admin/pages/:id/content"       => "pages#admin_edit_content"    
+  get     "admin/pages/:id/content"       => "pages#admin_edit_content"
+  get     "admin/pages/:id/layout"        => "pages#admin_edit_layout"
+  put     "admin/pages/:id/layout"        => "pages#admin_update_layout"
   put     "admin/pages/:id/viewers"       => "pages#admin_update_viewers"
   put     "admin/pages/:id/editors"       => "pages#admin_update_editors"  
   put     "admin/pages/:id"               => "pages#admin_update"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -359,6 +359,7 @@ files:
 - app/views/caboose/pages/admin_edit_css.html.erb
 - app/views/caboose/pages/admin_edit_general.html.erb
 - app/views/caboose/pages/admin_edit_js.html.erb
+- app/views/caboose/pages/admin_edit_layout.html.erb
 - app/views/caboose/pages/admin_edit_permissions.html.erb
 - app/views/caboose/pages/admin_edit_seo.html.erb
 - app/views/caboose/pages/admin_index.html.erb