caboose-cms 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIzNzA4ZDY1OGM5YmNjOWRiMGU4NjQxYjE1OWQ1YmJlNGRlNTA5ZA==
+    ODM4ZDFiZWFmZDkxZDgxZWZhOWFhN2ZjNjg5Zjk5NTUyMDliNmEwNA==
   data.tar.gz: !binary |-
-    NWYxODMxNTQ0YzE1ZWQ2MjkwY2I4NWE0ZWM3Y2M4Yzg0MTAyN2E1OQ==
+    ZDFiNTRmZTVlOGZmZmZkYWU3YjhlYmE0OTQyODcyYWY5ZDY5ZmY4Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmMyNjFmZDYxYjcyMWM3ZmQyZTE0NWQ0ZDljODkwMjQ2ZmUyZDNmZDE5ZTg3
-    YThlN2VlNWNlMDc4NWM0YjlkYWNlODZjNzBmNzE5ODVjNTRiNzBkOWNjNWE4
-    NDZiNzIyMjU5NjYwNDgyZmMyMjY5MTMzZmIyMjIzZDA2MjE2M2M=
+    MjZkZGZlMWRmNjZjMmJhOGIyY2NiMTFiNmI4YjY3NzFkZTk0ZDZlZmE2NjUy
+    ZGY2NjdiNTcwNjlkMjcxNDA1OTM4YzVhMzcyZDY4NTJjYTM2ZDZiNzdhYWZm
+    MjdhNmMxMjRhN2Y2YTg1ZmFhNGFjMTI0YTllZmE5OWE1OWU3YWI=
   data.tar.gz: !binary |-
-    NTgxYjgxMDM2ZWQwZGVkNTg2NjdjMDg3ZGM3ZjliMmJlNDIyMmYyODE0ZWU2
-    ZTU3NDY5OThhNjhhMDZiZTdlZGQ2NWM3ZjZmOWY3ODBlMTUxMDM0NWVkYzhk
-    MjY4M2M2ZDFjOTM4NTU1YTFmNzEwNTJhZTA2NjI3OGExZTMxZmE=
+    ZWMyNDZmYzVjNzQ0ZWUwZDlmNTMxN2MxYjEzNTU4NGE0ODFmZGVmNjk1YTgz
+    MTNlZTgwY2E2ZjA5Mzc3NDBiNjJmMjZhNmY3YTc1N2U4ZjNlMWVmZTcwMzIy
+    Njk3NzI4MDRkYjgwNmRkZTg0ZTZiNmJkNjRmNTc1ZDYzYzM4ODA=

data/app/assets/javascripts/caboose/admin.js

@@ -14,3 +14,4 @@
 //= require jquery_ujs
 //= require colorbox-rails
 //= require caboose/modal_integration
+//= require caboose/placeholder

data/app/assets/javascripts/caboose/application.js

@@ -15,3 +15,4 @@
 //= require colorbox-rails
 //= require caboose/modal_integration
 //= require application
+//= require caboose/placeholder

data/app/assets/javascripts/caboose/modal.js

@@ -14,3 +14,5 @@
 //= require jquery_ujs
 //= require colorbox-rails
 //= require caboose/modal_integration
+//= require caboose/placeholder
+

data/app/assets/javascripts/caboose/placeholder.js

@@ -0,0 +1,25 @@
+// Placeholder IE Fix
+
+$(document).ready(function() {
+	$('[placeholder]').focus(function() {
+	  console.log("PH"); 
+	  var input = $(this);
+	  if (input.val() == input.attr('placeholder')) {
+	    input.val('');
+	    input.removeClass('placeholder_js');
+	  }
+	}).blur(function() {
+	  var input = $(this);
+	  if (input.val() == '' || input.val() == input.attr('placeholder')) {
+	    input.addClass('placeholder_js');
+	    input.val(input.attr('placeholder'));
+	  }
+	}).blur().parents('form').submit(function() {
+	  $(this).find('[placeholder]').each(function() {
+	    var input = $(this);
+	    if (input.val() == input.attr('placeholder')) {
+	      input.val('');
+	    }
+	  })
+	});
+}); 

data/app/assets/stylesheets/caboose/caboose.css

@@ -2,3 +2,7 @@
 body {
   font-family: Helvetica, Tahoma, Arial;  
 }
+
+.placeholder_js {
+  color: #aaa;
+}

data/app/controllers/caboose/application_controller.rb

@@ -6,6 +6,9 @@ module Caboose
     
     def before_before_action
       
+      # Modify the built-in params array with URL params if necessary 
+      parse_url_params if Caboose.use_url_params
+      
       # Try to find the page 
       @page = Page.page_with_uri(request.fullpath)
       
@@ -24,6 +27,22 @@ module Caboose
       before_action
     end
     
+    # Parses any parameters in the URL and adds them to the params
+    def parse_url_params      
+      return if !Caboose.use_url_params      
+      url = "#{request.fullpath}"
+      url[0] = "" if url.starts_with?('/')      
+      url = url.split('?')[0] if url.include?('?')      
+      arr = url.split('/')      
+      i = arr.count - 1
+      while i >= 1 do
+        k = arr[i-1]
+        v = arr[i]
+        params[k] = v if v && v.length > 0
+        i = i-2
+      end      
+    end
+    
     # To be overridden by the child controllers
     def before_action      
     end

data/app/controllers/caboose/page_blocks_controller.rb

@@ -0,0 +1,117 @@
+
+module Caboose
+  class PagesBlocksController < ApplicationController
+    
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
+    # GET /admin/pages/:page_id/blocks
+    def admin_index
+      return if !user_is_allowed('pages', 'view')
+      blocks = PageBlock.where(:page_id => params[:page_id]).reorder(:sort_order)
+      render :json => blocks      
+    end
+
+    # GET /admin/pages/:page_id/blocks/new
+    def admin_new
+      return unless user_is_allowed('pages', 'add')
+      @page = Page.find(params[:page_id])
+      @block = PageBlock.new(:page_id => params[:page_id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/pages/:page_id/blocks/:id
+    def admin_show
+      return unless user_is_allowed('pages', 'edit')      
+      block = PageBlock.find(params[:id])
+      render :json => block
+    end
+    
+    # GET /admin/pages/:page_id/blocks/:id/edit
+    def admin_edit
+      return unless user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:page_id])
+      @block = PageBlock.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/pages/:page_id/blocks
+    def admin_create
+      return unless user_is_allowed('pages', 'add')
+
+      resp = Caboose::StdClass.new({
+          'error' => nil,
+          'redirect' => nil
+      })
+
+      b = PageBlock.new            
+      b.page_id     = params[:page_id]
+      b.block_type  = params[:block_type]
+      b.sort_order  = params[:sort_order].to_i
+      b.name        = params[:name]
+      b.value       = params[:value]
+            
+      # Set the new page block order
+      p = Page.find(b.page_id)
+      if p.blocks && p.blocks.count > b.sort_order
+        i = b.sort_order + 1
+        PageBlock.where("sort_order >= ?", b.sort_order).reorder(:sort_order).each do |b2|
+          b2.sort_order = i
+          b2.save
+          i = i + 1
+        end
+      end
+      
+      # Save the block
+      b.save
+
+      # Send back the response
+      resp.redirect = "/admin/pages/#{page.id}/edit"
+      render json: resp
+    end
+    
+    # PUT /admin/pages/:page_id/blocks/:id
+    def admin_update
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      b = PageBlock.find(params[:id])
+      
+      save = true
+      user = logged_in_user
+      params.each do |name, value|
+        case name          
+        when 'block_type'
+          b.block_type = value
+        when 'sort_order'          
+          b.sort_order = value.to_i
+          i = b.sort_order + 1
+          PageBlock.where("page_id = ? and sort_order >= ?", b.page_id, b.sort_order).reorder(:sort_order).each do |b2|
+            b2.sort_order = i
+            b2.save
+            i = i + 1          
+          end        
+        when 'name'
+          b.name = value          
+        when 'value'    
+          b.value = value      
+        end
+      end
+    
+      resp.success = save && b.save
+      render :json => resp
+    end
+    
+    # DELETE /admin/pages/:page_id/blocks/:id
+    def admin_delete
+      return unless user_is_allowed('pages', 'delete')
+      PageBlock.find(params[:id]).destroy            
+      resp = StdClass.new({
+        'redirect' => "/admin/pages/#{params[:page_id]}/edit"
+      })
+      render :json => resp
+    end
+		
+  end
+end

data/app/models/caboose/page_bar_generator.rb

@@ -21,8 +21,9 @@ module Caboose
     #		itemsPerPage:	Number of items you want to show per page. Defaults to 10 if not present.
     #		page: Current page number.  Defaults to 0 if not present.
     #
-    attr_accessor :params, :options
+    attr_accessor :params, :options, :custom_url_vars
   	
+    #def initialize(post_get, params = nil, options = nil, &custom_url_vars = nil)
   	def initialize(post_get, params = nil, options = nil)
   	  
   	  params  = {} if params.nil?
@@ -38,20 +39,29 @@ module Caboose
   			'base_url'		    => '',
   			'page'			      => 1,
   			'item_count'		  => 0,
-  			'items_per_page'  => 10,
+  			'items_per_page'  => 10,  			
+  			'abbreviations'   => {},
+  			'skip'            => [], # params to skip when printing the page bar  			
   			'includes'        => nil # Hash of association includes
   			                         # {
   			                         #   search_field_1 => [association_name, join_table, column_name],
   			                         #   search_field_2 => [association_name, join_table, column_name]
-  			                         # }
+  			                         # }  			
   		}      
   		params.each   { |key, val| @params[key]  = val }
-  		options.each  { |key, val| @options[key] = val }
-  		@params.each  { |key, val| @params[key]  = post_get[key].nil? ? val : post_get[key] }			
+  		options.each  { |key, val| @options[key] = val }  		
+  		@params.each  { |key, val|
+  		  k = @options['abbreviations'].include?(key) ? @options['abbreviations'][key] : key 
+  		  @params[key] = post_get[key].nil? ? (post_get[k].nil? ? val : post_get[k]) : post_get[key] 
+  		}			
   		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] }
+  		#@custom_url_vars = custom_url_vars if !custom_url_vars.nil?
   		fix_desc
-  		   		
-  		@options['item_count'] = model_with_includes.where(where).count  		  		
+  		set_item_count  		  		  		
+  	end
+  	
+  	def set_item_count
+  	  @options['item_count'] = model_with_includes.where(where).count
   	end
   	
   	def model_with_includes
@@ -124,8 +134,6 @@ module Caboose
   		@options['items_per_page'] = 10  if @options["items_per_page"].nil?
   		@options['page']           = 1   if @options["page"].nil?		
   		
-  		# Variables to make the search form work 
-  		vars = get_vars()
   		page = @options["page"].to_i
   				
   		# Max links to show (must be odd) 
@@ -149,24 +157,28 @@ module Caboose
   			end
   		end
   		
-  		base_url = @params['base_url']
+  		base_url = url_with_vars      
+      base_url << (Caboose.use_url_params ? "/" : (base_url.include?("?") ? "&" : "?"))      
+      keyval_delim = Caboose.use_url_params ? "/" : "="
+  		var_delim    = Caboose.use_url_params ? "/" : "&"            
+  		
   		str = ''
   		str << "<p>Results: showing page #{page} of #{total_pages}</p>\n"
   		
   		if (total_pages > 1)
   		  str << "<div class='page_links'>\n"
   		  if (page > 1)
-  		    str << "<a href='#{base_url}?#{vars}&page=#{prev_page}'>Previous</a>"
+  		    str << "<a href='#{base_url}page#{keyval_delim}#{prev_page}'>Previous</a>"
   	    end
   		  for i in start..stop
   		  	if (page != i)
-  		  	  str << "<a href='#{base_url}?#{vars}&page=#{i}'>#{i}</a>"
+  		  	  str << "<a href='#{base_url}page#{keyval_delim}#{i}'>#{i}</a>"
   		  	else
   		  		str << "<span class='current_page'>#{i}</span>"
   		  	end
   		  end
   		  if (page < total_pages)
-  		  	str << "<a href='#{base_url}?#{vars}&page=#{next_page}'>Next</a>"
+  		  	str << "<a href='#{base_url}page#{keyval_delim}#{next_page}'>Next</a>"
   		  end
   		  str << "</div>\n"
       end
@@ -174,29 +186,50 @@ module Caboose
   		return str
   	end
   	
-  	def get_vars()  
+  	def url_with_vars()
+  	  if !@custom_url_vars.nil?
+  	    return @custom_url_vars.call @options['base_url'], @params
+  	  end
   	  vars = []
   	  @params.each do |k,v|
-  	    if v.kind_of?(Array)  	      
-  	      v.each do |v2| 
-  	        vars.push("#{k}[]=#{v2}") if !v2.nil? && v2.length > 0
+  	    next if @options['skip'].include?(k)
+  	    k = @options['abbreviations'].include?(k) ? @options['abbreviations'][k] : k  	      	    
+  	    if v.kind_of?(Array)
+  	      v.each do |v2|  	        
+  	        if Caboose.use_url_params
+  	          vars.push("#{k}/#{v2}") if !v2.nil?
+  	        else
+  	          vars.push("#{k}[]=#{v2}") if !v2.nil?
+  	        end
   	      end
   	    else  	      
   	      next if v.nil? || (v.kind_of?(String) && v.length == 0)
-  	      vars.push("#{k}=#{v}")
+  	      if Caboose.use_url_params
+  	        vars.push("#{k}/#{v}")
+  	      else
+  	        vars.push("#{k}=#{v}")
+  	      end  	        
   	    end  	      	    
   	  end
-  	  return URI.escape(vars.join('&'))
+  	  return "#{@options['base_url']}" if vars.length == 0
+  	  if Caboose.use_url_params
+  	    vars = URI.escape(vars.join('/'))  	    
+  	    return "#{@options['base_url']}/#{vars}"
+  	  end
+  	  vars = URI.escape(vars.join('&'))
+  	  return "#{@options['base_url']}?#{vars}"
   	end
   	
     def sortable_table_headings(cols)
-      vars = get_vars()
+      base_url = url_with_vars
+      base_url << base_url.include?("?") ? "&" : "?"
     	str = ''
       
     	# key = sort field, value = text to display
     	cols.each do |sort, text|    		
-    		arrow = @options['sort'] == sort ? (@options['desc'] == 1 ? ' &uarr;' : ' &darr;') : ''    		
-    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=" + (@options['desc'] == 1 ? "0" : "1")
+    		arrow = @options['sort'] == sort ? (@options['desc'] == 1 ? ' &uarr;' : ' &darr;') : ''
+    		#link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=" + (@options['desc'] == 1 ? "0" : "1")
+        link = "#{base_url}sort=#{sort}&desc=" + (@options['desc'] == 1 ? "0" : "1")            		
     		str += "<th><a href='#{link}'>#{text}#{arrow}</a></th>\n"
     	end
     	return str  	
@@ -274,6 +307,6 @@ module Caboose
       end
       str << " desc" if @options['desc'] == 1       
       return str
-    end
+    end             
   end
 end

data/app/models/caboose/page_block.rb

@@ -18,53 +18,31 @@ class Caboose::PageBlock < ActiveRecord::Base
   def render_h5()       return "<h5>#{self.value}</h5>" end
   def render_h6()       return "<h6>#{self.value}</h6>" end
     
-  def render_posts    
-    obj = Caboose::StdClass(JSON.parse(self.value))
-    defaults = {
-      'limit' => 10,
-      'no_posts_message' => "<p>There are no posts right now.</p>",
-      'invalid_category_message' => "<p>Invalid post category.</p>",
-      'body_character_limit' => 0        
-    }
-    defaults.each { |k,v| obj[k] = v if obj[k].nil? }
-    
-    return obj.invalid_category_message if !Caboose::PostCategory.exists?(obj.category_id)
-    cat = Caboose::PostCategory.find(obj.category_id)            
-    posts = obj.limit == 0 ? cat.posts.reorder('created_at DESC') : cat.posts.reorder('created_at DESC').limit(obj.limit)      
-    return obj.no_posts_message posts.nil? || posts.count == 0
-    
-    str = ""
-    posts.each do |p|
-      str = "<div class='post'>"
-      str << "<h2>#{raw p.title}</h2>"
-      str << "<div class='created_at'>#{p.created_at.strftime('%F %T')}</div>"
-      str << "<div class='post_content'>"
-      str << obj.body_character_limit > 0 ? Caboose.teaser_text(p.body, obj.body_character_limit) : p.body
-      str << "</div>"
-      str << "</div>"
-    end
-  end
-      
-      assoc = cat
-      if Caboose
-      
-      
-      if Caboose::PostCategoryMembership.exists?(:post_category_id => cat.id)
-        Caboose::PostCategoryMembership.where(:post_category_id => cat.id)
-     
+  def render_posts
+    return ""    
+    #obj = Caboose::StdClass(JSON.parse(self.value))
+    #defaults = {
+    #  'limit' => 10,
+    #  'no_posts_message' => "<p>There are no posts right now.</p>",
+    #  'invalid_category_message' => "<p>Invalid post category.</p>",
+    #  'body_character_limit' => 0        
+    #}
+    #defaults.each { |k,v| obj[k] = v if obj[k].nil? }
+    #
+    #return obj.invalid_category_message if !Caboose::PostCategory.exists?(obj.category_id)
+    #cat = Caboose::PostCategory.find(obj.category_id)            
+    #posts = obj.limit == 0 ? cat.posts.reorder('created_at DESC') : cat.posts.reorder('created_at DESC').limit(obj.limit)      
+    #return obj.no_posts_message posts.nil? || posts.count == 0
+    #
+    #str = ""
+    #posts.each do |p|
+    #  str = "<div class='post'>"
+    #  str << "<h2>#{raw p.title}</h2>"
+    #  str << "<div class='created_at'>#{p.created_at.strftime('%F %T')}</div>"
+    #  str << "<div class='post_content'>"
+    #  str << obj.body_character_limit > 0 ? Caboose.teaser_text(p.body, obj.body_character_limit) : p.body
+    #  str << "</div>"
+    #  str << "</div>"
+    #end
   end
-
-end
-
-
-    @_renderer = "Caboose::PageBlock#{self.block_type.upcase}Renderer".constantize.new
-      @_renderer.page_block = self
-      @_renderer.page_block = self
-      
-    self.renderer.render
-  end 
-  
-  @_renderer = "Caboose::PageBlock#{self.block_type.upcase}Renderer".constantize.new
-      @_renderer.page_block = self
-
 end

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

@@ -1,27 +1,11 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
-
-<p><input type='button' value='Add Block' onclick="add_block_at_beginning();" /></p>
   
-<% @page.blocks.each do |b| %>
-  <div class='page_block'>   
-    <div id='pageblock_<%= b.id %>_name'></div>
-    <div id='pageblock_<%= b.id %>_value'></div>
-    <div id='page_block_<%= b.id %>_message'></div>
-    <p><input type='button' value='Delete Block' class='delete' onclick="delete_block(<%= b.id %>);" /></p>
-  </div>
-  <p><input type='button' value='Add Block' onclick="add_block_after(<%= b.id %>);" /></p>
+<% @page.blocks.each do |b| %>    
+  <div id='pageblock_<%= b.id %>_value'></div>  
 <% end %>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
-<% content_for :caboose_css do %>
-<style type='text/css'>
-
-div.page_block { padding: 20px; border: #ccc 1px solid; background: #efefef; }
-div.page_block p { padding-bottom: 0; margin-bottom: 0; }
-
-</style>
-<% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 

data/config/routes.rb

@@ -66,6 +66,14 @@ Caboose::Engine.routes.draw do
   get     "admin/pages"                   => "pages#admin_index"
   post    "admin/pages"                   => "pages#admin_create"  
   delete  "admin/pages/:id"               => "pages#admin_delete"
+    
+  get     "admin/pages/:page_id/blocks/new"       => "page_blocks#admin_new"
+  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"
   
   get     "posts"                                 => "posts#index"
   get     "posts/:id"                             => "posts#detail"

data/lib/caboose.rb

@@ -25,5 +25,9 @@ module Caboose
   # The login authenticator
   mattr_accessor :authenticator_class
   @@authenticator_class = 'Caboose::Authenticator'
+  
+  # Whether or not to use URL parameters (parameters embedded in the URL before the querystring)
+  mattr_accessor :use_url_params
+  @@use_url_params = true
 
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,7 @@ files:
 - app/assets/javascripts/caboose/model/model_binder.js
 - app/assets/javascripts/caboose/model.form.page.js
 - app/assets/javascripts/caboose/model.form.user.js
+- app/assets/javascripts/caboose/placeholder.js
 - app/assets/javascripts/caboose/shortcut.js
 - app/assets/javascripts/caboose/station.js
 - app/assets/stylesheets/caboose/admin.css
@@ -165,6 +166,7 @@ files:
 - app/controllers/caboose/application_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_controller.rb
+- app/controllers/caboose/page_blocks_controller.rb
 - app/controllers/caboose/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
 - app/controllers/caboose/posts_controller.rb