caboose-cms 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc1NzBhYTU1YjlmNzA1YzExZWUwNzkzZThjNDQxNGQ5ODhjN2VjOA==
+    ODUzNTBkMWYxM2RiNTYzOTZjNGQ1Y2IwNDk2YjYwNTNhMDIzNzFiOQ==
   data.tar.gz: !binary |-
-    YWZlMGQ1ZmZjZWE4OTdhMWQxNzEzMDJhNjI3MDZlY2ZhMzY0ZjQzNg==
+    NDFkOGNiOTIzOGRjMmQ1NGNlMWMxNTYxZTk3Yzg0MjAwZGYwMjMzMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTJlNjk2ZTZjOWJjZmEwZTQ4ZGM2NjUwYzhjNDExYmM0ZmM0ZGIzOTEwZjc2
-    ODIxMjY1OTMyZTcyYTM3NzgxNzAxMzQ3MDAwYWQ4NzVhMjg3MTc2ZmVhYjNl
-    MDVjZmZlNGM3MjIxYjlkNzQzMGRhZDZmZGYyN2EzYTY3OWUzZmQ=
+    NTYwMGMyZjI4N2YzNGI3MTNmYWM1M2Y1MjQ3NWRjOGQ5ZTZmNjVkNDFkN2Rm
+    YTYxOTYyNDA2MjZmODI0MjJlZDY3ZjgzZGQ4MTdkYjUyNTQ2OTM2ODQ0Mjdi
+    NWYxNmY5NTY0N2QxNTI3MTIyOGFlN2YyY2QyZTg0M2UwNzgzMDI=
   data.tar.gz: !binary |-
-    NmYzZDk0YWEzNTJiMzMzNmExNTI4MDQ0MWYzNDA1NWU2MjdlZDgwNDJhNzhh
-    ZmJmNDcxYzc0MDhkZmJhODM2ZjYxMDQ2ZDk3YzkwNzY4MDU3YTcyNTU2MWMy
-    MzllZmU2NmE4NjQ1YzUzMDA5ZjhjZGY5Yzc1YjFhY2E3Njk5NDE=
+    MTk3ZjU1MDM5NDQ1ZjE4ZGRhZGZjODczMzc4MWE3MGJiMGM1M2NkYTY0ZTAy
+    Y2YyMTYxNWE5N2MwYWIzY2JkNDdmMzEyY2YxMWQzZDMyNGFjNjY1YWQ4OWQ1
+    YWFjNDZkZTdkNTlhNjM4N2VjZjQyZTNmYjY4MmI1ZTVjZmI0NDc=

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

@@ -16,10 +16,23 @@
  */
 
 #cboxLoadedContent { margin-bottom: 0; }
+
  
 body {
   margin: 0;
   padding: 0;  
+  font-family: "Avenir", serif;
+}
+
+#cboxOverlay {
+  opacity: 0.85 !important;
+  background: url('/assets/caboose/modal_overlay.png') !important;
+}
+
+#cboxWrapper {
+  -webkit-border-radius: 7px !important;
+  -moz-border-radius: 7px !important;
+  border-radius: 7px !important;
 }
 
 #top_nav {

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

@@ -4,5 +4,5 @@ body {
 }
 
 .placeholder_js {
-  color: #aaa;
+  color: #fff;
 }

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

@@ -3,3 +3,14 @@
 	font-family: 'BigNoodleTitling';
 	src: local('Big Noodle Titling'), url('/assets/caboose/fonts/big_noodle_titling.ttf') format('truetype');
 }
+
+@font-face {
+  font-family: 'Avenir';
+  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot');
+  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot') format('embedded-opentype'),
+       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.woff')       format('woff'),
+       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.ttf')        format('truetype'),
+       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.svg')        format('svg');
+  font-weight: normal;
+  font-style: normal;
+}

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

@@ -11,6 +11,26 @@
 	padding: 12px 0;
 	position: relative;
 	width: 100%;
+	padding-bottom: 0;
+}
+
+#login-form .header {
+	width: 100%; 
+	text-align: center; 
+}
+
+#login-form .header h1 {
+	position: relative;
+	bottom: 7px;
+	margin-bottom: 0;
+}
+#login-form .header p {
+	margin: 0; 
+	position: relative;
+	bottom: 8px;
+	font-style: italic;
+	font-size: 14px;
+	margin-bottom: 10px;
 }
 
 @media all and (max-width: 400px) {
@@ -23,24 +43,92 @@
 #login-form #login-options {
 	margin: 0;
 	padding: 0;
-	position: absolute;
-	top: 12px;
-	right: 0;
+	float: right;
+	list-style-type: none;
+	position: relative;
+	right: 13px;
+}
+#login-options li {
+	text-align: right; 
 }
 
+#login-options li a {
+	color: #387a8f;
+	font-size: 0.9em;
+	border-bottom: 0;
+}
+
+#login-form input#username {
+	background-image: url('/assets/caboose/login_image.png');
+	background-position: 8px center;
+}
+#login-form input#password {
+	background-image: url('/assets/caboose/password_image.png');
+	background-position: 12px center;
+}
+
+
 #login-form input#username,
 #login-form input#password {
 	font-size: 18px;
-	margin: 0 0 8px 0;
+	margin: 0 auto;
 	max-width: 100%;
+	display: block;
+	margin-bottom: 12px;
 	padding: 7px;
-	width: 386px; /* 400 - 14:padding */
+	width: 315px;
+	background-repeat: no-repeat;
+	padding-left: 42px;
 }
 
 #login-form label {
 	cursor: pointer;
 	display: block;
+	float: left;
+	position: relative;
+	left: 13px;
+	font-size: 0.9em;
+	color: #a58a32;
+	bottom: 18px;
+}
+
+p.buttons {
+	clear: both;
+	margin-top: 80px;
+	overflow: auto;
+	padding: 0 16px;
+	margin-bottom: 0;
 }
 	
 #login-form input[type=checkbox] { top: 8px; }
-#login-form .btn { font-size: 18px; }
+
+#login-form .btn { 
+	font-size: 18px; 
+	display: block;
+	width: 48%;
+	padding: 13px 1%;
+	height: auto;
+	border: 0;
+	border-radius: 4px;
+	cursor: pointer;
+}
+
+#login-form input.btn[type=button] {
+	background: #d34f46;
+	float: left;
+}
+
+#login-form input.btn[type=button]:hover {
+	background: #b53c34;
+}
+
+#login-form input[type=submit] {
+	background: #1c9a7f;
+	float: right;
+}
+
+#login-form input[type=submit]:hover {
+	background: #096652;
+}
+
+

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

@@ -16,13 +16,24 @@
 
 html { width: 100%; }
 
+@font-face {
+  font-family: 'Avenir';
+  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot');
+  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot') format('embedded-opentype'),
+       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.woff')       format('woff'),
+       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.ttf')        format('truetype'),
+       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.svg')        format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
 body {
   background: #111111;
   margin: 0;
   padding: 0;
   color: #fff;
   width: 100%;  
-  font-family: Helvetica, Arial;
+  font-family: "Avenir", Arial;
 }
 
 #modal_wrapper {
@@ -94,11 +105,14 @@ div.model_attribute_text {
 }
 
 input, select, textarea {
-  font-family: Helvetica, arial;
-  border: 1px solid #ccc;
+  font-family: "Avenir", Arial;
+  border: 2px solid #ccc;
+  background: none;
+  color: #fff;
+  /*
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
-  border-radius: 2px;
+  border-radius: 2px; */
   padding: 4px 8px;
   height: 34px;
   font-size: 20px;

data/app/controllers/caboose/block_type_categories_controller.rb

@@ -0,0 +1,12 @@
+
+module Caboose
+  class BlockTypeCategoriesController < ApplicationController
+    
+    # GET /admin/block-type-categories/tree-options
+    def admin_tree_options
+      return unless user_is_allowed('pages', 'edit')
+      render :json => BlockTypeCategory.tree
+    end
+    		
+  end  
+end

data/app/controllers/caboose/block_types_controller.rb

@@ -72,6 +72,7 @@ module Caboose
           when 'parent_id'                       then bt.parent_id                      = v
           when 'name'                            then bt.name                           = v
           when 'description'                     then bt.description                    = v
+          when 'block_type_category_id'          then bt.block_type_category_id         = v
           when 'render_function'                 then bt.render_function                = v
           when 'use_render_function'             then bt.use_render_function            = v
           when 'use_render_function_for_layout'  then bt.use_render_function_for_layout = v

data/app/controllers/caboose/pages_controller.rb

@@ -217,7 +217,7 @@ module Caboose
       })
 
       parent_id = params[:parent_id]
-      title = params[:title] 
+      title = params[:title]      
 
       if (title.strip.length == 0)
         resp.error = "A page title is required."
@@ -235,7 +235,7 @@ module Caboose
       		
       page = Caboose::Page.new
       page.title = title
-      page.parent_id = parent_id
+      page.parent_id = parent_id      
       page.hide = true
       page.content_format = Caboose::Page::CONTENT_FORMAT_HTML
 
@@ -248,6 +248,9 @@ module Caboose
 
       page.save
       
+      # Create the top level block for the page             
+      Block.create(:page_id => page.id, :block_type_id => params[:block_type_id])
+      
       # Set the new page's permissions		  
       viewers = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'view' }).pluck(:role_id)
       editors = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'edit' }).pluck(:role_id)

data/app/models/caboose/block.rb

@@ -51,6 +51,11 @@ class Caboose::Block < ActiveRecord::Base
     end
   end
   
+  def full_name
+    return name if parent_id.nil?
+    return "#{parent.full_name}_#{name}"
+  end
+  
   def child_value(name)
     b = child(name)
     return nil if b.nil?
@@ -84,7 +89,7 @@ class Caboose::Block < ActiveRecord::Base
   end
                                             
   def render(block, options)    
-    Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\noptions.class = #{options.class}\noptions = #{options}")
+    #Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\noptions.class = #{options.class}\noptions = #{options}")
     
     if block && block.is_a?(String)
       Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")
@@ -101,68 +106,30 @@ class Caboose::Block < ActiveRecord::Base
     end        
     str = ""
 
-    defaults = {
-      :modal      => false,
-      :empty_text => "",
-      :editing    => false,
-      :css        => nil,
-      :js         => nil,
-      :block      => block
-    }
+    defaults = { :modal => false, :empty_text => '', :editing => false, :css => nil, :js => nil, :block => block }
     options2 = nil
-    #Caboose.log(options.class)
     if options.is_a?(Hash)
-      options2 = defaults.merge(options)      
-    #elsif options.is_a?(ActionView::Base)
-    #  options2 = {        
-    #    :modal      => options.modal,
-    #    :empty_text => options.empty_text,
-    #    :editing    => options.editing,
-    #    :css        => options.css,
-    #    :js         => options.js        
-    #  }
+      options2 = defaults.merge(options)
     else
-      options2 = {        
-        :modal      => options.modal,
-        :empty_text => options.empty_text,
-        :editing    => options.editing,
-        :css        => options.css,
-        :js         => options.js        
-      }        
+      options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }        
     end
     options2[:block] = block
-          
-    #options2.modal      = false if options2.modal.nil? 
-    #options2.empty_text = ""    if options2.empty_text.nil? 
-    #options2.editing    = false if options2.editing.nil?
-    #options[:css => nil, 
-    #options[:js => nil 
-    #}.merge(options)
-    #options2.block = block
-       
-    if block.block_type.use_render_function && block.block_type.render_function
-      #Caboose.log("Rendering from function")      
+
+    if block.block_type.use_render_function && block.block_type.render_function            
       str = block.render_from_function(options2)
     else
       view = ActionView::Base.new(ActionController::Base.view_paths)
       begin
-        #Caboose.log("Rendering caboose/blocks/#{block.name}")
-        str = view.render(:partial => "caboose/blocks/#{block.name}", :locals => options2)
+        #str = view.render(:partial => "caboose/blocks/#{block.name}", :locals => options2)
+        str = view.render(:partial => "caboose/blocks/#{block.full_name}", :locals => options2)
       rescue
-        #Caboose.log("Error rendering caboose/blocks/#{block.name}")
-        begin          
-          #Caboose.log("Rendering caboose/blocks/#{block.block_type.name}")
-          str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
-        rescue                    
-          #Caboose.log("Error rendering caboose/blocks/#{block.block_type.name}")
-          #Caboose.log("Rendering caboose/blocks/#{block.block_type.field_type}")
+        #begin
+        #  str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
+        #rescue
           str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
-        end
+        #end
       end        
-    end     
-    #return str if block.parent_id.nil?    
-    #return str if options[:editing].nil? || options[:editing] == false
-    #return "<div id='block_#{block.id}' class='block'>#{str}</div>"
+    end
     return str
   end
 

data/app/models/caboose/block_type.rb

@@ -2,12 +2,14 @@
 class Caboose::BlockType < ActiveRecord::Base
   self.table_name = "block_types"
 
+  belongs_to :block_type_category
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType'
   has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType', :dependent => :destroy    
   attr_accessible :id,
     :parent_id,
     :name, 
-    :description, 
+    :description,
+    :block_type_category_id,
     :use_render_function,
     :use_render_function_for_layout,
     :allow_child_blocks,

data/app/models/caboose/block_type_category.rb

@@ -0,0 +1,41 @@
+
+class Caboose::BlockTypeCategory < ActiveRecord::Base
+  self.table_name = "block_type_categories"
+
+  belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockTypeCategory'  
+  has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockTypeCategory', :dependent => :destroy, :order => :name
+  has_many :block_types
+  attr_accessible :id,
+    :parent_id,
+    :name 
+    
+  def self.layouts
+    self.where("name = ? and parent_id is null", 'Layouts').reorder(:name).all
+  end
+  
+  def self.content
+    self.where("name = ? and parent_id is null", 'Content').reorder(:name).all
+  end
+  
+  def self.rows
+    cat = self.content
+    return false if cat.nil?
+    self.where("name = ? and parent_id = ?", 'Rows', cat.id).reorder(:name).all
+  end
+  
+  def self.tree
+    arr = []
+    self.where("parent_id is null").reorder(:name).all.each do |cat|
+      self.tree_helper(arr, cat, '')
+    end
+    return arr
+  end
+  
+  def self.tree_helper(arr, cat, prefix)
+    arr << { 'value' => cat.id, 'text' => "#{prefix}#{cat.name}" }
+    cat.children.each do |kid|
+      self.tree_helper(arr, kid, "#{prefix} - ")
+    end
+  end
+  
+end

data/app/models/caboose/schema.rb

@@ -134,6 +134,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :parent_id                       , :integer ],
         [ :name                            , :string  ],
         [ :description                     , :string  ],
+        [ :block_type_category_id          , :integer , { :default => 2 }],
         [ :render_function                 , :text    ],
         [ :use_render_function             , :boolean , { :default => false }],        
         [ :use_render_function_for_layout  , :boolean , { :default => false }],
@@ -148,6 +149,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :options                         , :text    ],
         [ :options_function                , :text    ],
         [ :options_url                     , :string  ]
+      ],
+      Caboose::BlockTypeCategory => [      
+        [ :parent_id  , :integer ],
+        [ :name       , :string  ]        
       ],      
       #Caboose::Field => [
       #  [ :block_id             , :integer    ],
@@ -243,17 +248,6 @@ class Caboose::Schema < Caboose::Utilities::Schema
     #  end      
     #  c.remove_column(:pages, :content)
     #end
-      
-    if !Caboose::BlockType.where(:name => 'heading').exists?
-      bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading')
-      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'text', :description => 'Text', :default => '', :width => 800, :fixed_placeholder => false)
-      Caboose::BlockType.create(:parent_id => bt.id, :name => 'size', :field_type => 'text', :description => 'Size', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
-    end
-    
-    if !Caboose::BlockType.where(:name => 'richtext').exists?
-      bt = Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text')
-      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'richtext', :description => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
-    end
     
     admin_user = nil
     if !Caboose::User.exists?(:username => 'admin')
@@ -321,5 +315,46 @@ class Caboose::Schema < Caboose::Utilities::Schema
     Caboose::Setting.create(:name => 'site_url'    , :value => 'www.mycaboosesite.com' ) if !Caboose::Setting.exists?(:name => 'site_url'    , :value => 'www.mycaboosesite.com' )
     Caboose::Setting.create(:name => 'admin_email' , :value => 'william@nine.is'       ) if !Caboose::Setting.exists?(:name => 'admin_email' , :value => 'william@nine.is'       )
     
+    # Create default block type categories
+    btc = Caboose::BlockTypeCategory
+    layouts = btc.exists?(:name => 'Layouts') ? btc.where(:name => 'Layouts').first : btc.create(:name => 'Layouts')
+    content = btc.exists?(:name => 'Content') ? btc.where(:name => 'Content').first : btc.create(:name => 'Content')
+    btc.create(:name => 'Rows', :parent_id => content.id) if !btc.where(:name => 'Rows', :parent_id => content.id).exists?
+    
+    # Create default block types
+    if !Caboose::BlockType.where(:name => 'layout_basic').exists?
+      bt = Caboose::BlockType.create(:name => 'layout_basic', :description => 'Basic', :block_type_category_id => layouts.id, :use_render_function_for_layout => true, :allow_child_blocks => false, :field_type => 'block')
+      Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
+      Caboose::BlockType.create(:name => 'content' , :description => 'Content' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      Caboose::BlockType.create(:name => 'footer'  , :description => 'Footer'  , :parent_id => bt.id, :field_type => 'block')
+    end
+    
+    if !Caboose::BlockType.where(:name => 'layout_left_sidebar').exists?
+      bt = Caboose::BlockType.create(:name => 'layout_left_sidebar', :description => 'Left Sidebar', :block_type_category_id => layouts.id, :use_render_function_for_layout => true, :allow_child_blocks => false, :field_type => 'block')
+      Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
+      Caboose::BlockType.create(:name => 'sidebar' , :description => 'Sidebar' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      Caboose::BlockType.create(:name => 'content' , :description => 'Content' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      Caboose::BlockType.create(:name => 'footer'  , :description => 'Footer'  , :parent_id => bt.id, :field_type => 'block')
+    end
+    
+    if !Caboose::BlockType.where(:name => 'layout_right_sidebar').exists?
+      bt = Caboose::BlockType.create(:name => 'layout_right_sidebar', :description => 'Right Sidebar', :block_type_category_id => layouts.id, :use_render_function_for_layout => true, :allow_child_blocks => false, :field_type => 'block')
+      Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
+      Caboose::BlockType.create(:name => 'sidebar' , :description => 'Sidebar' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      Caboose::BlockType.create(:name => 'content' , :description => 'Content' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      Caboose::BlockType.create(:name => 'footer'  , :description => 'Footer'  , :parent_id => bt.id, :field_type => 'block')
+    end
+    
+    if !Caboose::BlockType.where(:name => 'heading').exists?   
+      bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading')
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'size', :description => 'Size', :field_type => 'text', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
+    end
+    
+    if !Caboose::BlockType.where(:name => 'richtext').exists?
+      bt = Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text')
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'richtext', :description => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+    end
+    
   end
 end

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

@@ -3,12 +3,12 @@ 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 %>_name'></div></p>
+<p><div id='blocktype_<%= bt.id %>_parent_id'></div></p>
+<p><div id='blocktype_<%= bt.id %>_block_type_category_id'></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>
@@ -91,6 +91,7 @@ $(document).ready(function() {
       { 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: 'block_type_category_id'         , nice_name: 'Category'                       , type: 'select'   , value: <%= raw Caboose.json(bt.block_type_category_id)          %>, width: 400, options_url: '/admin/block-type-categories/tree-options' },
       { 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 },

data/app/views/caboose/blocks/{_layout_default.html.erb → _layout_basic.html.erb}

@@ -9,24 +9,22 @@ page = block.page
   <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>
+    <title><%= !page.title.nil? && page.title.strip.length > 0 ? "#{page.title} | " : "" %><%= Caboose::website_name %></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 
-    %>
+    <%= raw 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) %>      
+      <%= raw block.render('layout_basic_header' , local_assigns) %>
+      <%= raw block.render('layout_basic_content', local_assigns) %>
+      <%= raw block.render('layout_basic_footer' , local_assigns) %>      
     </div>
 <%= raw js %>
   </body>

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

@@ -0,0 +1,8 @@
+<div class="content_wrapper" id='block_<%= block.id %>'>          
+  <div class="content_body">                      
+    <% 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>

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

@@ -0,0 +1,3 @@
+<div class="footer" id='block_<%= block.id %>'>
+  <p>Please edit /app/views/caboose/blocks/_layout_basic_footer.html.erb</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="header" id='block_<%= block.id %>'>
+  <p>Please edit /app/views/caboose/blocks/_layout_basic_header.html.erb</p>
+</div>

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

@@ -0,0 +1,34 @@
+<%
+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} | " : "" %><%= Caboose::website_name %></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' %>
+    <%= raw 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_left_sidebar_header'  , local_assigns) %>
+      <div class='sidebar_content_wrapper'>
+        <%= raw block.render('layout_left_sidebar_sidebar' , local_assigns) %>
+        <%= raw block.render('layout_left_sidebar_content' , local_assigns) %>
+      </div>
+      <%= raw block.render('layout_left_sidebar_footer'  , local_assigns) %>      
+    </div>
+<%= raw js %>
+  </body>
+</html>

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

@@ -0,0 +1,8 @@
+<div class="content_wrapper" id='block_<%= block.id %>'>          
+  <div class="content_body">                      
+    <% 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>

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

@@ -0,0 +1,3 @@
+<div class="footer" id='block_<%= block.id %>'>
+  <p>Please edit /app/views/caboose/blocks/_layout_left_sidebar_footer.html.erb</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="header" id='block_<%= block.id %>'>
+  <p>Please edit /app/views/caboose/blocks/_layout_left_sidebar_header.html.erb</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="sidebar" id='block_<%= block.id %>'>                                  
+  <p>Please edit /app/views/caboose/_layout_left_sidebar_sidebar.html.erb</p>
+</div>

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

@@ -0,0 +1,34 @@
+<%
+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} | " : "" %><%= Caboose::website_name %></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' %>
+    <%= raw 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_right_sidebar_header'  , local_assigns) %>
+      <div class='sidebar_content_wrapper'>
+        <%= raw block.render('layout_right_sidebar_sidebar' , local_assigns) %>
+        <%= raw block.render('layout_right_sidebar_content' , local_assigns) %>
+      </div>
+      <%= raw block.render('layout_right_sidebar_footer'  , local_assigns) %>      
+    </div>
+<%= raw js %>
+  </body>
+</html>

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

@@ -0,0 +1,8 @@
+<div class="content_wrapper" id='block_<%= block.id %>'>          
+  <div class="content_body">                      
+    <% 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>

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

@@ -0,0 +1,3 @@
+<div class="footer" id='block_<%= block.id %>'>
+  <p>Please edit /app/views/caboose/blocks/_layout_right_sidebar_footer.html.erb</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="header" id='block_<%= block.id %>'>
+  <p>Please edit /app/views/caboose/blocks/_layout_right_sidebar_header.html.erb</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="sidebar" id='block_<%= block.id %>'>                                  
+  <p>Please edit /app/views/caboose/_layout_right_sidebar_sidebar.html.erb</p>
+</div>

data/app/views/caboose/login/index.html.erb

@@ -1,5 +1,9 @@
 <form action="/login" method="post" id="login-form">
-	<h1>Login</h1>
+	<div class="header">
+		<img src="/assets/caboose/caboose_logo.png" alt="Caboose">
+		<h1>caboose</h1>
+		<p>Coo Coo Ca Choo</p>
+	</div>
 	
 	<input type="hidden"   name="return_url" value="<%= @return_url %>" />
 	<input type="text"     name="username" id="username" placeholder="Login or email" />

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

@@ -1,12 +1,23 @@
-
 <h1>New Page</h1>
 <p>Parent: <%= @parent ? @parent.title : "Home" %></p>
-<input type='hidden' id='parent_id' name='parent_id' value='<%= @parent_id %>' />
-<p><input type='text' id='title' name='title' placeholder='Title' style="width: 400px;" /></p>
+
+<form action='/admin/pages' method='post' id='new_page_form' onsubmit="add_page(); return false;">
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<input type='hidden' name='parent_id' value='<%= @parent_id %>' />
+<p><input type='text' name='title' placeholder='Title' style="width: 400px;" /></p>
+<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';" />
-<input type='submit' value='Add Page' onclick='add_page();' />
+<input type='submit' value='Add Page' />
 </p>
+</form>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
@@ -23,15 +34,10 @@ function add_page()
   $.ajax({
     url: '/admin/pages',
     type: 'post',
-    data: {
-      parent_id: $('#parent_id').val(),
-      title: $('#title').val()
-    },
+    data: $('#new_page_form').serialize(),    
     success: function(resp) {
-      if (resp.error)
-        modal.autosize("<p class='note error'>" + resp.error + "</p>");
-      if (resp.redirect)
-        parent.window.location = resp.redirect
+      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) parent.window.location = resp.redirect
     }
   });
 }

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

@@ -25,7 +25,8 @@ elsif !@page.nil? && @page.title != 'Access Denied'
       :empty_text => '',
       :editing => defined?(@editing) ? @editing : false,
       :css => yield(:css),
-      :js => yield(:js)
+      :js => yield(:js),
+      :csrf_meta_tags => csrf_meta_tags
     }) %><%
   end
 end 

data/config/routes.rb

@@ -134,6 +134,8 @@ Caboose::Engine.routes.draw do
   put     "admin/block-types/:id"                  => "block_types#admin_update"
   delete  "admin/block-types/:id"                  => "block_types#admin_delete"
   
+  get     "admin/block-type-categories/tree-options" => "block_type_categories#admin_tree_options"
+  
   get     "posts"                                 => "posts#index"
   get     "posts/:id"                             => "posts#detail"
   get     "admin/posts/category-options"          => "posts#admin_category_options"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - William Barry
@@ -172,6 +172,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/fonts/avenir-medium.eot
+- app/assets/fonts/avenir-medium.ttf
+- app/assets/images/caboose/caboose_logo.png
 - app/assets/images/caboose/caboose_logo_small.png
 - app/assets/images/caboose/caboose_nav.png
 - app/assets/images/caboose/caboose_nav_black.png
@@ -181,6 +184,9 @@ files:
 - app/assets/images/caboose/loading_small_black_on_white.gif
 - app/assets/images/caboose/loading_small_white_on_black.gif
 - app/assets/images/caboose/loading_white_on_black.gif
+- app/assets/images/caboose/login_image.png
+- app/assets/images/caboose/modal_overlay.png
+- app/assets/images/caboose/password_image.png
 - app/assets/images/caboose/search.png
 - app/assets/javascripts/caboose/admin.js
 - app/assets/javascripts/caboose/admin_block_edit.js
@@ -221,6 +227,8 @@ files:
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/bound_input.css
 - app/assets/stylesheets/caboose/caboose.css
+- app/assets/stylesheets/caboose/fonts/avenir-medium.eot
+- app/assets/stylesheets/caboose/fonts/avenir-medium.ttf
 - app/assets/stylesheets/caboose/fonts/big_noodle_titling.ttf
 - app/assets/stylesheets/caboose/fonts/big_noodle_titling_oblique.ttf
 - app/assets/stylesheets/caboose/fonts.css
@@ -237,6 +245,7 @@ files:
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb
 - app/controllers/caboose/application_controller.rb
+- app/controllers/caboose/block_type_categories_controller.rb
 - app/controllers/caboose/block_types_controller.rb
 - app/controllers/caboose/blocks_controller.rb
 - app/controllers/caboose/login_controller.rb
@@ -265,6 +274,7 @@ files:
 - app/models/caboose/authenticator.rb
 - app/models/caboose/block.rb
 - app/models/caboose/block_type.rb
+- app/models/caboose/block_type_category.rb
 - app/models/caboose/caboose_plugin.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/database_session.rb
@@ -301,10 +311,20 @@ files:
 - 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/_layout_basic.html.erb
+- app/views/caboose/blocks/_layout_basic_content.html.erb
+- app/views/caboose/blocks/_layout_basic_footer.html.erb
+- app/views/caboose/blocks/_layout_basic_header.html.erb
+- app/views/caboose/blocks/_layout_left_sidebar.html.erb
+- app/views/caboose/blocks/_layout_left_sidebar_content.html.erb
+- app/views/caboose/blocks/_layout_left_sidebar_footer.html.erb
+- app/views/caboose/blocks/_layout_left_sidebar_header.html.erb
+- app/views/caboose/blocks/_layout_left_sidebar_sidebar.html.erb
+- app/views/caboose/blocks/_layout_right_sidebar.html.erb
+- app/views/caboose/blocks/_layout_right_sidebar_content.html.erb
+- app/views/caboose/blocks/_layout_right_sidebar_footer.html.erb
+- app/views/caboose/blocks/_layout_right_sidebar_header.html.erb
+- app/views/caboose/blocks/_layout_right_sidebar_sidebar.html.erb
 - app/views/caboose/blocks/_richtext.html.erb
 - app/views/caboose/blocks/_text.html.erb
 - app/views/caboose/blocks/admin_edit.html.erb

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

@@ -1,16 +0,0 @@
-      <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

@@ -1,20 +0,0 @@
-      <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

@@ -1,32 +0,0 @@
-      <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>