caboose-cms 0.5.214 → 0.5.215

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFiYmRlZWU5Zjg3YTViMjZmNzZjZmEyMmFhZDQ3Zjc2MWI4Nzk3ZA==
+    ZDA4ODMwZTZhOGNhYTU0NGJlMzk2NmRlMmIzM2Q0ZGQ3ODk5YzY1OQ==
   data.tar.gz: !binary |-
-    MDQ1MzI3NTM2OTRmNzUxNzg0YjEyMWVhMjUzNzcyMzkxZDI1NWQ0Zg==
+    ZTQxOWYwNTVmZTgyMDhlYjJiOGY3YjlhNGI0NDc4NmYyZjEyYjdhZA==
 SHA512:
   metadata.gz: !binary |-
-    ZWY2Y2NkYjE1YjQ3YmY2ZjhjZWEyZTBkOWI0NjM5MDczOTVkYWU2MmE0YjVh
-    MTUxMzc0NmVhNGZhOTZhMzU3NzI4Zjc2Nzc3Mjc1ZjRiOTE2YjgzYjZkNWYz
-    OGFkMGNhYTdmMmQ5M2FmYTMzZTI2NzA3MGQzZmUzYWIxMzk4MGU=
+    MmZiOTNkZTQzZjI4ZmUyMzNjYWI1Y2ZjNTU2NGQxZGYxZGViM2E1NTVjNmNl
+    Yjc0YTViMDFkNDBmOTg5NDFhNTY2MjNiOGIxOGNjZWVjYzM5NzZhNGVhZTc4
+    M2MxYmNhNDFjZWVkZDg2MDU3MDc3NWI4ZDU3MGVhMTNiMzIzOWM=
   data.tar.gz: !binary |-
-    MWJiM2MxZGFiNGNhMmFjMjM0OTc0Y2Y5OTA5NjgxYjM1OWY0MTMyYmYxODlk
-    ZDBiZTVhZmNiNjcxZGMyZWYzYmEzMjNkNjZhZjE4MjJjM2I5MzBiNjdiN2Y1
-    Nzg1ZTU5N2FiYjU3NTg4MzMwZjcyZDlkMzhhZTE4ZjNiYWViM2E=
+    NGI2NzEyODFlOWY1MDQ1OTUwZTZlMzlhNTE2OWQyNTM0OTBlMThkMDI0NDhl
+    NWUxMjBkODMxMzE2ZmQ2NmZmMGQ4NTg0NzJmNzVlNmRjODhhZjA0YWQ2M2Qz
+    MjkxMzc5NGFiZDM2NWU2NWY3N2JkZTcyYmE0MWZhMTY0NGI5ODk=

data/app/controllers/caboose/post_categories_controller.rb

@@ -0,0 +1,98 @@
+module Caboose
+  class PostCategoriesController < Caboose::ApplicationController  
+    
+    #=============================================================================
+    # Admin actions
+    #=============================================================================
+    
+    # GET /admin/post-categories
+    def admin_index
+      return unless user_is_allowed('post_categories', 'view')
+      
+      @main_cat = PostCategory.where("site_id = ?", @site.id).first      
+      if @main_cat.nil?
+        @main_cat = PostCategory.create(:site_id => @site.id, :name => 'General News')
+      end
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/post-categories/new
+    def admin_new
+      return unless user_is_allowed('post_categories', 'add')
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/post-categories
+    def admin_add
+      return unless user_is_allowed('post_categories', 'add')
+      
+      resp = Caboose::StdClass.new
+    
+      if params[:name].nil? || params[:name].empty?
+        resp.error = 'The category name cannot be empty.'
+      else        
+        cat = PostCategory.new(
+          :site_id   => @site.id,
+          :name      => params[:name]
+        )
+        
+        if cat.save
+          resp.redirect = "/admin/post-categories/#{cat.id}"
+        else
+          resp.error = 'There was an error saving the category.'
+        end
+      end
+      
+      render :json => resp
+    end
+      
+    # GET /admin/post-categories/:id
+    def admin_edit
+      return unless user_is_allowed('post_categories', 'edit')    
+      @category = PostCategory.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # PUT /admin/post-categories/:id
+    def admin_update
+      return unless user_is_allowed('post_categories', 'edit')
+      
+      # Define category and initialize response
+      cat = PostCategory.find(params[:id])
+      resp = Caboose::StdClass.new({ :attributes => {} })
+      
+      # Iterate over params and update relevant attributes
+      params.each do |key, value|
+        case key
+          when 'site_id' then cat.name   = value
+          when 'name'    then cat.name   = value
+        end
+      end
+      
+      # Try and save category
+      resp.success = cat.save
+      
+      # Respond to update request
+      render :json => resp
+    end
+    
+    # DELETE /admin/post-categories/:id
+    def admin_delete
+      return unless user_is_allowed('post_categories', 'delete')
+      
+      resp = Caboose::StdClass.new
+      cat = PostCategory.find(params[:id])
+      
+      if cat.posts.any?
+        resp.error = "Can't delete a post category that has posts in it."
+      else
+        resp.success = cat.destroy
+        resp.redirect = '/admin/post-categories'
+      end
+      render :json => resp
+    end
+        
+    
+  end
+end
+

data/app/models/caboose/core_plugin.rb

@@ -8,15 +8,16 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     
     item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }                        
     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' => 'fonts'            , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'        , 'view') if site.use_fonts
+    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'   , 'view') if site.is_master == true
+    item['children'] << { 'id' => 'fonts'            , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'        , 'view') if site.use_fonts == true
     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' => 'post_categories'  , 'text' => 'Post Categories'     , 'href' => '/admin/post-categories'    , 'modal' => false } if user.is_allowed('post_categories', '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')
     item['children'] << { 'id' => 'social'           , 'text' => 'Social Media'        , 'href' => '/admin/social'             , 'modal' => false } if user.is_allowed('social'       , 'view')
-    item['children'] << { 'id' => 'store'            , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'        , 'view')
+    item['children'] << { 'id' => 'store'            , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'        , 'view') if site.use_store == true
     item['children'] << { 'id' => 'users'            , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'        , 'view')      
     item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'     , 'view')    
     nav << item if item['children'].count > 0

data/app/models/caboose/role.rb

@@ -10,7 +10,11 @@ class Caboose::Role < ActiveRecord::Base
   has_many :permissions, :through => :role_permissions    
   has_many :page_permissions
 
-  attr_accessible :name, :description, :parent_id, :site_id
+  attr_accessible :id,
+    :name, 
+    :description,
+    :parent_id,
+    :site_id
   attr_accessor :children
      
   def self.admin_role

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

@@ -19,7 +19,10 @@ width = 200
     <% 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>
+    <li id='nav_item_<%= id %>'>
+      <% if href != "#" %><a href='<%= href %>'<%= raw (modal ? " rel='modal'" : "") %>><% end %>
+        <span class='icon'></span><span class='text'><%= item['text'] %></span>
+      <% if href != "#" %></a><% end %>
     <% if (!item['children'].nil? && item['children'].count > 0) %>
       <ul>
         <% item['children'].each do |item2| %>

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

@@ -46,7 +46,11 @@ $(document).ready(function() {
   m = new ModelBinder({
     name: 'Block',
     id: <%= b.id %>,
+  <% if b.post_id %>
+    update_url: '/admin/posts/<%= b.post_id %>/blocks/<%= b.id %>',
+  <% else %>
     update_url: '/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>',
+  <% end %>
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [{      
       name: 'block_type_id',

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

@@ -3,6 +3,7 @@
 
 <form action='/admin/pages/<%= @page.id %>' method='put' id='layout_form'>
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<h4 style="color:red;">WARNING: Changing the page layout will delete all existing content from the page.</h4>
 <p><select name='block_type_id'>
   <option value=''>-- Select a layout --</option>
   <% cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id } %>

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

@@ -0,0 +1,66 @@
+<h1>Edit Category</h1>
+
+<p><div class="push-below" id="postcategory_<%= @category.id %>_name"></div></p>
+
+<h2>Posts</h2>
+
+<% if @category.posts.any? %>
+  <ul>
+    <% @category.posts.each do |post| %>
+      <li><a href="/admin/posts/<%= post.id %>"><%= post.title %></a></li>
+    <% end %>
+  </ul>
+<% else %>
+  <p>This category has no associated posts.</p>
+<% end %>
+
+<div id="message"></div>
+<p>
+<input type="button" value="< Back" onclick="window.location='/admin/post-categories';" />
+<input type="button" value="Delete Category" onclick="delete_category(<%= @category.id %>)" />
+</p>
+
+<% content_for :caboose_css do %>
+  <style>
+    .push-below { margin-bottom: 24px; }
+  </style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'PostCategory',
+    id: <%= @category.id %>,
+    update_url: '/admin/post-categories/<%= @category.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+
+      { name: 'name'       , nice_name: 'Name'    , type: 'text'    , value: <%= raw Caboose.json(@category.name)               %> , width: 400 }
+    ]
+  });
+});
+
+function delete_category(cat_id, confirm) {
+  if (!confirm) {
+    var p = $('<p/>').addClass('note error').css('margin-bottom', '10px')
+      .append("Are you sure you want to delete the category?<br />This can't be undone.<br /><br />")
+      .append($('<input/>').attr('type', 'button').val('Yes').click(function() { delete_category(cat_id, true); })).append(' ')
+      .append($('<input/>').attr('type', 'button').val('No').click(function() { $('#message').empty(); }));          
+    $('#message').empty().append(p);    
+    return;
+  }
+  $('#message').html("<p class='loading'>Deleting the category...</p>");  
+  $.ajax({
+    url: '/admin/post-categories/' + cat_id,
+    type: 'delete',
+    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/app/views/caboose/post_categories/admin_index.html.erb

@@ -0,0 +1,16 @@
+<h1>Post Categories</h1>
+<a href='/admin/post-categories/new'>New Category</a>
+
+<% cats = Caboose::PostCategory.where(:site_id => @site.id).order(:name).all %>
+<ul>
+<% cats.each do |c| %>
+	<li><a href="/admin/post-categories/<%= c.id %>" title="<%= c.name %>"><%= c.name %></a>
+<% end %>
+</ul>
+
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+	
+</script>
+<% end %>

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

@@ -0,0 +1,43 @@
+<h1>New Category</h1>
+
+<form action="/admin/categories" method="post" id="new_form">
+  <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>" />
+	<p><input type="text" name="name" id='name' placeholder="Category Name" /></p>
+	<div id="message"></div>	
+	<input type="button" value="< Back" onclick="window.location='/admin/post-categories';" />
+	<input type="submit" value="Add Category"  onclick="add_category(); return false" />
+</form>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>	
+<script type='text/javascript'>
+
+function add_category() {
+  $('#message').html("<p class='loading'>Adding category...</p>");
+	var stay = $('#stay').prop('checked');
+	
+	$.ajax({
+		url: '/admin/post-categories',
+		type: 'post',
+		data: $('#new_form').serialize(),
+		success: function(resp) {
+			if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+			if (resp.redirect)
+			{
+			  if (stay)
+        {
+          $('#name').val('');          
+          get_category_options();
+          $('#message').html("<p class='note succes'>The category has been added successfully.</p>");
+          setTimeout(function() { $('#message').empty(); }, 2000);
+        }
+        else if (resp.redirect)
+          window.location = resp.redirect;
+      }
+		}
+	});
+}
+
+
+</script>
+<% end %>

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

@@ -46,7 +46,7 @@ user_ids = [] if user_ids.nil?
 <div id='members'>
 <table class='data'>
 <tr><th>User</th><th>None</th><th>User</th><th>Admin</th></tr>
-<% Caboose::User.reorder('last_name, first_name').all.each do |u| %>
+<% Caboose::User.where(:site_id => @site.id).reorder('last_name, first_name').all.each do |u| %>
   <tr>
     <td><%= u.first_name %> <%= u.last_name %> (<%= u.email %>)</td>
     <td align='center'><input type='radio' name='user<%= u.id %>' <%= !admin_ids.include?(u.id) && !user_ids.include?(u.id) ? "checked='true'" : '' %> onclick="remove_site_membership(<%= s.id %>, <%= u.id %>);" /></td>

data/config/routes.rb

@@ -372,6 +372,23 @@ Caboose::Engine.routes.draw do
   get     "/admin/posts"                           => "posts#admin_index"
   post    "/admin/posts"                           => "posts#admin_add"  
   delete  "/admin/posts/:id"                       => "posts#admin_delete"
+
+  #=============================================================================
+  # Post Categories
+  #=============================================================================
+
+  get     "/admin/post-categories"                         => "post-categories#admin_index"
+  get     "/admin/post-categories/new"                     => "post-categories#admin_new"
+  get     "/admin/post-categories/options"                 => "post-categories#admin_options"
+  get     '/admin/post-categories/status-options'          => 'post-categories#admin_status_options'
+  get     "/admin/post-categories/:id/sort-children"       => "post-categories#admin_sort_children"
+  put     "/admin/post-categories/:id/children/sort-order" => "post-categories#admin_update_sort_order"
+  get     "/admin/post-categories/:id/products/json"       => "post-categories#admin_category_products"  
+  get     "/admin/post-categories/:id"                     => "post-categories#admin_edit"  
+  put     "/admin/post-categories/:id"                     => "post-categories#admin_update"    
+  post    "/admin/post-categories/:id"                     => "post-categories#admin_update"  
+  post    "/admin/post-categories"                         => "post-categories#admin_add"
+  delete  "/admin/post-categories/:id"                     => "post-categories#admin_delete"
         
   #=============================================================================
   # Google Spreadsheets

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.214'
+  VERSION = '0.5.215'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.214
+  version: 0.5.215
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -554,6 +554,7 @@ files:
 - app/controllers/caboose/page_permissions_controller.rb
 - app/controllers/caboose/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
+- app/controllers/caboose/post_categories_controller.rb
 - app/controllers/caboose/posts_controller.rb
 - app/controllers/caboose/product_images_controller.rb
 - app/controllers/caboose/products_controller.rb
@@ -847,6 +848,9 @@ files:
 - app/views/caboose/permissions/edit.html.erb
 - app/views/caboose/permissions/index.html.erb
 - app/views/caboose/permissions/new.html.erb
+- app/views/caboose/post_categories/admin_edit.html.erb
+- app/views/caboose/post_categories/admin_index.html.erb
+- app/views/caboose/post_categories/admin_new.html.erb
 - app/views/caboose/posts/_admin_footer.html.erb
 - app/views/caboose/posts/_admin_header.html.erb
 - app/views/caboose/posts/admin_delete_form.html.erb