caboose-cms 0.5.201 → 0.5.202

data/app/controllers/caboose/posts_controller.rb

@@ -8,13 +8,33 @@ module Caboose
     	@posts = Post.where(:published => true).limit(5).order('created_at DESC')
     end
     
+    ## GET /posts/:id
+    #def detail
+    #	@post = Post.find_by_id(params[:id])
+    #	unless @post.present?
+    #		flash[:notice] = 'The posts post you tried to access does not exist.'
+    #		redirect_to action: :index
+    #	end
+    #end
+    
     # GET /posts/:id
-    def detail
-    	@post = Post.find_by_id(params[:id])
-    	unless @post.present?
-    		flash[:notice] = 'The posts post you tried to access does not exist.'
-    		redirect_to action: :index
-    	end
+    # GET /posts/:year/:month/:day/:slug
+    def show
+      
+      # Make sure we're not under construction or on a forwarded domain
+      return if under_construction_or_forwarding_domain?
+      
+      if params[:id]
+        @post = Post.where(:id => params[:id]).first
+      else      
+        # Find the page with an exact URI match        
+        uri = "#{params[:year]}/#{params[:month]}/#{params[:day]}/#{params[:slug]}"
+        @post = Post.where(:site_id => @site.id, :uri => request.fullpath).first
+      end      
+      render :file => "caboose/extras/error404" and return if @post.nil?                 
+
+      @post = Caboose.plugin_hook('post_content', @post)
+      @editmode = !params['edit'].nil? && user.is_allowed('posts', 'edit') ? true : false  
     end
   
     #=============================================================================
@@ -37,6 +57,13 @@ module Caboose
       @posts = @gen.items    
       render :layout => 'caboose/admin'
     end
+    
+    # GET /admin/posts/:id/json
+    def admin_json_single
+      return if !user_is_allowed('posts', 'edit')    
+      @post = Post.find(params[:id])
+      render :json => @post
+    end
   
     # GET /admin/posts/:id/edit
     def admin_edit_general
@@ -45,11 +72,27 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
+    # GET /admin/posts/:id/preview
+    def admin_edit_preview
+      return if !user_is_allowed('posts', 'edit')    
+      @post = Post.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
     # GET /admin/posts/:id/content
     def admin_edit_content
       return if !user_is_allowed('posts', 'edit')    
       @post = Post.find(params[:id])
-      render :layout => 'caboose/admin'
+      if @post.body
+        @post.preview = @post.body
+        @post.body = nil
+        @post.save
+      end
+      if @post.block.nil?      
+        redirect_to "/admin/posts/#{@post.id}/layout"
+        return
+      end
+      @editing = true
     end
     
     # GET /admin/posts/:id/categories
@@ -63,10 +106,28 @@ module Caboose
       end
       render :layout => 'caboose/admin'
     end
+    
+    # GET /admin/posts/:id/layout
+    def admin_edit_layout
+      return unless user_is_allowed('posts', 'edit')      
+      @post = Post.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # PUT /admin/posts/:id/layout
+    def admin_update_layout
+      return unless user_is_allowed('posts', 'edit')      
+      bt = BlockType.find(params[:block_type_id])
+      Block.where(:post_id => params[:id]).destroy_all
+      Block.create(:post_id => params[:id], :block_type_id => params[:block_type_id], :name => bt.name)
+      resp = Caboose::StdClass.new({
+        'redirect' => "/admin/posts/#{params[:id]}/content"
+      })
+      render :json => resp
+    end
   
     # POST /admin/posts/:id
-    def admin_update
-      #Caboose.log(params)
+    def admin_update      
       return if !user_is_allowed('posts', 'edit')
       
       resp = Caboose::StdClass.new({'attributes' => {}})
@@ -74,18 +135,22 @@ module Caboose
       
       save = true
       params.each do |name, value|    
-        case name
-          when 'category_id'    then post.category_id = value
-          when 'title'          then post.title = value
-          when 'body'           then post.body = value          
-          when 'published'      then post.published = value.to_i == 1
-          when 'created_at'     then post.created_at = DateTime.parse(value)
+        case name                      
+          when 'site_id'    then post.site_id    = value.to_i
+          when 'slug'       then post.set_slug_and_uri(value)                        
+          when 'title'      then post.title      = value            
+          when 'subtitle'   then post.subtitle   = value
+          when 'author'     then post.author     = value
+          when 'body'       then post.body       = value
+          when 'preview'    then post.preview    = value
+          when 'hide'       then post.hide       = value
+          when 'image_url'  then post.image_url  = value
+          when 'published'  then post.published  = value
+          when 'created_at' then post.created_at = DateTime.parse(value)
+          when 'updated_at' then post.updated_at = DateTime.parse(value)
         end
       end
-      resp.success = save && post.save
-      if params[:image]
-        resp.attributes['image'] = { 'value' => post.image.url(:thumb) }
-      end
+      resp.success = save && post.save      
       render :json => resp
     end
     
@@ -120,13 +185,14 @@ module Caboose
     
       post = Post.new
       post.site_id = @site.id
-      post.title = params[:title]      
+      post.title = params[:title]                  
       post.published = false
   
       if post.title == nil || post.title.length == 0
         resp.error = 'A title is required.'      
       else
-        post.save
+        post.save        
+        post.set_slug_and_uri(post.title)                
         resp.redirect = "/admin/posts/#{post.id}/edit"
       end
       

data/app/controllers/caboose/sites_controller.rb

@@ -148,7 +148,8 @@ module Caboose
           when 'use_store'                then site.use_store               = value
           when 'use_retargeting'          then site.use_retargeting         = value
           when 'custom_css'               then site.custom_css              = value            
-          when 'custom_js'                then site.custom_js               = value                        
+          when 'custom_js'                then site.custom_js               = value
+          when 'default_layout_id'        then site.default_layout_id       = value
     	  end
     	end
     	
@@ -215,5 +216,16 @@ module Caboose
       render :json => options
     end
     
+    # GET /admin/sites/:id/default-layout-options
+    def admin_default_layout_options
+      return if !user_is_allowed('sites', 'view')
+      cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id }
+      block_types = Caboose::BlockType.includes(:block_type_site_memberships).where("block_type_category_id in (?) and block_type_site_memberships.site_id = ?", cat_ids, params[:id]).reorder(:description).all
+      options = block_types.collect do |bt|
+        { 'value' => bt.id, 'text' => bt.description } 
+      end      
+      render :json => options
+    end
+    
   end
 end

data/app/models/caboose/block.rb

@@ -79,6 +79,7 @@ class Caboose::Block < ActiveRecord::Base
       #end      
       if self.child(bt2.name).nil?
         b = Caboose::Block.create(
+          :post_id => self.post_id,
           :page_id => self.page_id,
           :parent_id => self.id, 
           :block_type_id => bt_id,
@@ -284,7 +285,8 @@ class Caboose::Block < ActiveRecord::Base
     kids = self.children.collect { |b| b.js_hash }
     bt = self.block_type    
     return {
-      'id'             => self.id,           
+      'id'             => self.id,     
+      'post_id'        => self.post_id,      
       'page_id'        => self.page_id,      
       'parent_id'      => self.parent_id,
       'parent_title'   => self.parent ? self.parent.title : '',
@@ -347,10 +349,18 @@ class Caboose::Block < ActiveRecord::Base
     return if !self.block_type.is_global    
     return if !Caboose::Block.includes(:page).where("blocks.id <> ? and block_type_id = ? and pages.site_id = ?", self.id, self.block_type_id, site_id).exists?        
     
-    sql = ["update blocks set value = ? where id in (
-        select B.id from blocks B left join pages P on B.page_id = P.id
+    sql = nil
+    if self.page_id
+      sql = ["update blocks set value = ? where id in (
+          select B.id from blocks B left join pages P on B.page_id = P.id
+          where B.id <> ? and B.block_type_id = ? and P.site_id = ?
+        )", value, self.id, self.block_type_id, site_id]
+    elsif self.post_id      
+      sql = ["update blocks set value = ? where id in (
+        select B.id from blocks B left join posts P on B.post_id = P.id
         where B.id <> ? and B.block_type_id = ? and P.site_id = ?
-      )", value, self.id, self.block_type_id, site_id]       
+      )", value, self.id, self.block_type_id, site_id]
+    end
     ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, sql))            
   end
   

data/app/models/caboose/caboose_plugin.rb

@@ -4,6 +4,10 @@ class Caboose::CaboosePlugin
     return str    
   end
   
+  def self.post_content(post)
+    return post
+  end
+  
   def self.admin_nav(nav, user, page, site)
     return nav
   end

data/app/models/caboose/core_plugin.rb

@@ -10,7 +10,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'blocktypes'       , 'text' => 'AB Test Variants'    , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'   , 'view')    
     item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'   , 'view')
     item['children'] << { 'id' => 'redirects'        , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'    , 'view')
-    item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'         , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'  , 'view')
+    item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'         , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'  , 'view')    
     item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'               , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'        , 'view')
     item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view') if site.is_master == true        
     item['children'] << { 'id' => 'smtp'             , 'text' => 'SMTP (Mail)'         , 'href' => '/admin/smtp'               , 'modal' => false } if user.is_allowed('smtp'         , 'view')

data/app/models/caboose/post.rb

@@ -6,13 +6,19 @@ class Caboose::Post < ActiveRecord::Base
   has_many :post_categories, :through => :post_category_memberships
   belongs_to :site
   
-  attr_accessible :id,
-    :site_id,
-    :category_id, 
-    :title, 
-    :body, 
-    :published,
-    :created_at
+  attr_accessible :id,        
+    :site_id     ,
+    :title       ,
+    :subtitle    ,
+    :author      ,
+    :body        ,
+    :preview     ,
+    :hide        ,
+    :image_url   ,
+    :published   ,
+    :created_at  ,
+    :updated_at
+    
   has_attached_file :image, 
     :path => ':path_prefixposts/:id_:style.:extension',
     :default_url => 'http://placehold.it/300x300',
@@ -22,5 +28,43 @@ class Caboose::Post < ActiveRecord::Base
       :large => '400x400>'
     }
   do_not_validate_attachment_file_type :image
+  
+  def block
+    Caboose::Block.where("post_id = ? and parent_id is null", self.id).first
+  end
+  
+  def top_level_blocks
+    Caboose::Block.where("post_id = ? and parent_id is null", self.id).reorder(:sort_order).all
+  end
+  
+  def self.slug(str)    
+    return str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')        
+  end
+  
+  def self.uri(post)
+    str = "/posts/#x{post.created_at.strftime('%Y/%m/%d')}/#{post.slug}"
+    i = 2
+    while Caboose::Post.where("site_id = ? and id <> ? and uri = ?", post.site_id, post.id, str).exists?
+      str = "/posts/#{post.created_at.strftime('%Y/%m/%d')}/#{post.slug}-#{i}"
+      i = i + 1
+    end      
+    return str
+  end
+  
+  def set_slug_and_uri(str)
+    d = self.created_at.strftime('%Y/%m/%d')
+    s = Caboose::Post.slug(str)
+    new_slug = "#{s}"
+    new_uri = "/posts/#{d}/#{new_slug}"
+    i = 2
+    while Caboose::Post.where("site_id = ? and id <> ? and uri = ?", self.site_id, self.id, new_uri).exists?
+      new_slug = "#{s}-#{i}"
+      new_uri = "/posts/#{d}/#{new_slug}"      
+      i = i + 1
+    end
+    self.slug = new_slug
+    self.uri = new_uri
+    self.save        
+  end  
 
 end

data/app/models/caboose/schema.rb

@@ -147,6 +147,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::Block => [
         [ :page_id               , :integer ],
+        [ :post_id               , :integer ],
         [ :parent_id             , :integer ],
         [ :block_type_id         , :integer ],
         [ :sort_order            , :integer , { :default => 0 }],
@@ -446,14 +447,19 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Post => [
         [ :site_id              , :integer    ],
         [ :title                , :text       ],
+        [ :subtitle             , :text       ],
+        [ :author               , :text       ],
         [ :body                 , :text 		  ],
+        [ :preview              , :text       ],
         [ :hide                 , :boolean    ],
         [ :image_url            , :text 		  ],
         [ :published            , :boolean    ],
         [ :created_at           , :datetime   ],
         [ :updated_at           , :datetime   ],
-        [ :image                , :attachment ]
-      ],
+        [ :image                , :attachment ],
+        [ :slug                 , :string     ],        
+        [ :uri                  , :string     ]
+      ],      
       Caboose::PostCategory => [
         [ :site_id  , :integer ],
         [ :name     , :string  ]
@@ -586,7 +592,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :analytics_id            , :string     ],
         [ :use_retargeting         , :boolean     , { :default => false }],
         [ :date_js_updated         , :datetime   ],
-        [ :date_css_updated        , :datetime   ]
+        [ :date_css_updated        , :datetime   ],
+        [ :default_layout_id       , :integer    ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/app/models/caboose/site.rb

@@ -20,6 +20,11 @@ class Caboose::Site < ActiveRecord::Base
   do_not_validate_attachment_file_type :logo
   attr_accessible :id, :name, :description, :under_construction_html
   
+  def default_layout    
+    return Caboose::BlockType.where(:id => self.default_layout_id).first if self.default_layout_id
+    return Caboose::BlockType.where(:name => 'layout_basic').first
+  end
+  
   def smtp_config
     c = Caboose::SmtpConfig.where(:site_id => self.id).first
     c = Caboose::SmtpConfig.create(:site_id => self.id) if c.nil?

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

@@ -1,38 +1,51 @@
+<%
+@nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site)
+return_url = session[:caboose_station_return_url].nil? ? '/' : session[:caboose_station_return_url]
+return_url = '/' if return_url.starts_with?('/admin/') || return_url == '/admin'
+
+width = 200
+@nav.each {|item| width = 400 if item['id'] == @tab } if @tab
+%>
+
 <h1>Admin</h1>
 
+<ul>
+  <!--
+  <li id='nav_item_logout'><a href='/logout'><span class='icon'></span><span class='text'>Logout</span></a>
+  <li id='nav_item_myaccount'><a href='/my-account'><span class='icon'></span><span class='text'>My Account</span></a>
+  -->
+  <% i = 0 %>
+  <% @nav.each do |item| %>
+    <% id = item['id'].nil? ? i.to_s : item['id'] %>
+    <% href = item['href'].nil? ? '#' : item['href'] %>
+    <% modal = item['modal'].nil? ? false : item['modal'] %>
+    <li id='nav_item_<%= id %>'><a href='<%= href %>'<%= raw (modal ? " rel='modal'" : "") %>><span class='icon'></span><span class='text'><%= item['text'] %></span></a>
+    <% if (!item['children'].nil? && item['children'].count > 0) %>
+      <ul>
+        <% item['children'].each do |item2| %>
+          <% modal = item2['modal'].nil? ? false : item2['modal'] %>
+          <li><a href='<%= item2['href'] %>'<%= raw (modal ? " rel='modal'" : "") %>><%= item2['text'] %></a></li>
+        <% end %>
+      </ul>
+    <% end %>
+    </li>
+    <% i + 1 %>
+  <% end %>
+</ul>
+
 <%= content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/station" %>
 <script type='text/javascript'>
-
+var modal = false;
+var station = false;
 $(document).ready(function() {
-  open_colorbox();  
+  modal = new CabooseModal(<%= width %>);
+  station = new CabooseStation(modal<%= raw @tab ? ", '#{@tab}'" : '' %>);
 });
-
-function open_colorbox() {
-  $.colorbox({
-    href: '/login?modal=1&return_url=<%= @return_url %>',
-    iframe: true,
-    innerWidth: 200,
-    innerHeight:  50,
-    scrolling: false,
-    transition: 'fade',
-    closeButton: false,
-    onComplete: fix_colorbox,
-    opacity: 0.50,
-    onClosed: function() { open_colorbox(); }   
-  });
-}
-
-function fix_colorbox() {
-  $("#cboxTopLeft"      ).css('background', '#111');
-  $("#cboxTopRight"     ).css('background', '#111');
-  $("#cboxBottomLeft"   ).css('background', '#111');
-  $("#cboxBottomRight"  ).css('background', '#111');
-  $("#cboxMiddleLeft"   ).css('background', '#111');
-  $("#cboxMiddleRight"  ).css('background', '#111');
-  $("#cboxTopCenter"    ).css('background', '#111');
-  $("#cboxBottomCenter" ).css('background', '#111');
-  $("#cboxClose"        ).hide(); 
-}
-
 </script>
+<% end %>
+<%= content_for :caboose_css do %>
+<style type='text/css'>
+
+</style>
 <% end %>