caboose-cms 0.4.144 → 0.4.145

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFiMGQwYWEzNjk4OGYxNTk2MzYwMTJkZGM0OTZiNjQ5M2M5MWJjNQ==
+    M2VjNzUxMTk0ZmYxNGUwMzMyNjI2MGQ4YTgyMzVkNjM5NWU1NmRlNg==
   data.tar.gz: !binary |-
-    MDg4OGFlYmU5ODM0MzEzNjAwZTI1MDEwM2MyOGJjZDdjYzMzNWJkNQ==
+    MWRjZjczNGU2NmUxMDA2OTM0OTI4NTdjNTMwMmEyN2MxOTI1ZjY3MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTI1YzM3Mzc1N2IyZWNjNzU3ZDNkZDI5ZGRiYzQ3MWE1NzBjMjdlMTBlMjI2
-    Y2FjNzlhODYzMDg3YzdjYzAxNTA2ZWU1ZDM2OWRlNjQzODI0ZmU3OTk5MWQx
-    ZDZmZGIzOWRlYWY5MzRmYjNlMTBlNDg2MzA4NDgxNWIxOWQwNDk=
+    OTFhNjIwYWVmMjllMWQyODNkMGE3ZjVjY2U5YWVjOTM5YzEzOGZkZGJiZGNl
+    ZDBiMWI4OWZhNDU5MDUzY2VjMzQyZDBhNmUzMjY4NmMxNzliNDBlNTc4YzU3
+    M2QyYzNlN2NlMWI4MWNmMTUzMTg4ZTk5MmEzM2I2ZjZhYWI4ZTY=
   data.tar.gz: !binary |-
-    YmE4YjUzYmNmOGEzZGUxNGQwZWRjNWQ3YzBmNzA3MGUyMmM4MzI2MjA5NDI2
-    Nzk1YTFiMzI5MTY2MGVkYTFkOTVhZTJlMTY5YTQ1MWM5MWJhZGI2YzU4NDk2
-    YjJkYjdmZDVjZmZlNzJmYzBjODdmM2E4N2MyZDc3YWYzMzAwYmE=
+    YmVmYjQxNjRjYmIwNzIxNGQ1ZWFhOWIxODZjNGRjNDAwYzRkZWUxOWMxOWI0
+    ODdkOTA2YTY3MTYxNDhhZTRlNDdiYjgxODQ4MzVlMGU5ZDlkZWVlZmMzNzc1
+    ODViZGExMjZkMGY5M2E4Y2MzOWI2NjdiYWUxZjJiNzVhODQ0ODA=

data/app/controllers/caboose/block_types_controller.rb

@@ -36,6 +36,13 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
+    # GET /admin/block-types/:id/icon
+    def admin_edit_icon
+      return unless user_is_allowed('pages', 'edit')      
+      @block_type = BlockType.find(params[:id])
+      render :layout => 'caboose/modal'
+    end
+    
     # POST /admin/block-types
     def admin_create
       return unless user_is_allowed('pages', 'add')
@@ -69,6 +76,7 @@ module Caboose
 
       params.each do |k,v|
         case k
+          when 'site_id'                         then bt.site_id                        = v
           when 'parent_id'                       then bt.parent_id                      = v
           when 'name'                            then bt.name                           = v
           when 'description'                     then bt.description                    = v
@@ -123,6 +131,19 @@ module Caboose
       render :json => options
     end
     
+    # GET /admin/block-types/site-options
+    def admin_site_options
+      return unless user_is_allowed('pages', 'edit')
+      options = [{ 'value' => -1, 'text' => 'Global'}]
+      Site.reorder("description, name").all.each do |s| 
+        options << { 
+          'value' => s.id, 
+          'text' => s.description && s.description.strip.length > 0 ? s.description : s.name
+        }
+      end                  
+      render :json => options
+    end
+    
     # GET /admin/block-types/:id/options
     def admin_value_options
       return unless user_is_allowed('pages', 'edit')

data/app/models/caboose/block_type.rb

@@ -2,11 +2,13 @@
 class Caboose::BlockType < ActiveRecord::Base
   self.table_name = "block_types"
 
+  belongs_to :site, :class_name => 'Caboose::Site'
   belongs_to :default_child_block_type, :foreign_key => 'default_child_block_type_id', :class_name => 'Caboose::BlockType'
   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,
+    :site_id,
     :parent_id,
     :name, 
     :description,

data/app/models/caboose/schema.rb

@@ -104,6 +104,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :image                 , :attachment ]
       ],
       Caboose::BlockType => [
+        [ :site_id                         , :integer ],
         [ :parent_id                       , :integer ],
         [ :name                            , :string  ],
         [ :description                     , :string  ],

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

@@ -9,6 +9,7 @@ bt = @block_type
 <h1>Edit Block Type</h1>
 <p><div id='blocktype_<%= bt.id %>_description'                     ></div></p>
 <p><div id='blocktype_<%= bt.id %>_name'                            ></div></p>
+<p><div id='blocktype_<%= bt.id %>_site_id'                         ></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>
@@ -47,30 +48,19 @@ bt = @block_type
   <p>This type of page block doesn't have any fields.</p>
 <% end %>
 
-<h2>Icon</h2>
-<div class='icons'>
-<% Caboose::BlockTypeIcons.names.each do |icon| %>
-  <a href='#' id='icon_<%= icon %>' <% if bt.icon == icon %>class='selected'<% end %>><span class='icon-<%= icon %>'></span></a>
-<% end %>
-</div>
-
 <div id='message'></div>
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/block-types<%= bt.parent_id && bt.parent_id > 0 ? "/#{bt.parent_id}/edit" : '' %>';" />
+<input type='button' value='Edit Icon' onclick="caboose_modal_url('/admin/block-types/<%= @block_type.id %>/icon');" />
 <input type='button' value='Delete Block Type' onclick="delete_block_type(<%= @block_type.id %>);" />
 </p>
+<br />
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'caboose/icomoon_fonts' %>
 <style type='text/css'>
 #blocktype_<%= bt.id %>_render_function  { font-family: Courier; font-size: 80%; width: 100%; }
 #blocktype_<%= bt.id %>_options_function { font-family: Courier; font-size: 80%; width: 100%; }
-div.icons { height: 400px; width: 80%; overflow-y: scroll; }
-div.icons span { display: block; float: left; padding: 10px 20px; font-size: 24pt; }
-div.icons a span { color: #000; border: #fff 1px solid; }
-div.icons a:hover span { background: #efefef; color: #000; border: #666 1px solid; }
-div.icons a.selected span, 
-div.icons a.selected:hover span { background: #fff69f; color: #000; border: #ff0000 1px solid; }
 </style>
 <% end %>
 <% content_for :caboose_js do %>
@@ -124,6 +114,7 @@ $(document).ready(function() {
     update_url: '/admin/block-types/<%= @block_type.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
+      { name: 'site_id'                        , nice_name: 'Site'                           , type: 'select'   , value: <%= raw Caboose.json(bt.site_id ? bt.site_id : -1)       %>, width: 400, options_url: '/admin/block-types/site-options' },
       { 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 },

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

@@ -0,0 +1,55 @@
+<%
+bt = @block_type
+%>
+
+<h1>Edit Block Type Icon</h1>
+<p><input type='button' value='Close' onclick="modal.close();" /></p>
+
+<div class='icons'>
+<% Caboose::BlockTypeIcons.names.each do |icon| %>
+  <a href='#' id='icon_<%= icon %>' <% if bt.icon == icon %>class='selected'<% end %>><span class='icon-<%= icon %>'></span></a>
+<% end %>
+</div>
+
+<div id='message'></div>
+<p><input type='button' value='Close' onclick="modal.close();" /></p>
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/icomoon_fonts' %>
+<style type='text/css'>
+div.icons { height: 500px; overflow-y: scroll; }
+div.icons span { display: block; float: left; width: 75px; margin: 1px; padding: 14px 0; font-size: 24pt; text-align: center; }
+div.icons a span { color: #fff; border: #fff 1px solid; }
+div.icons a:hover span { background: #efefef; color: #000; border: #666 1px solid; }
+div.icons a.selected span, 
+div.icons a.selected:hover span { background: #fff69f; color: #000; border: #ff0000 1px solid; }
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+function select_icon(icon)
+{  
+  $.ajax({
+    url: '/admin/block-types/<%= @block_type.id %>',
+    type: 'put',
+    data: { icon: icon },
+    success: function(resp) {
+      $('div.icons a.selected').removeClass('selected');
+      $('#icon_' + icon).addClass('selected');      
+    }
+  });
+}
+
+var modal = false;
+$(document).ready(function() {
+  modal = new CabooseModal(600);
+  $('div.icons a').click(function(e) {
+    e.preventDefault();    
+    select_icon($(this).attr('id').substr(5));
+  });  
+});
+
+</script>
+<% end %>

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

@@ -14,11 +14,13 @@
 
   <table class='data'>
     <tr>
+      <th>Site</th>
       <th>Name</th>
       <th>Description</th>      
     </tr>
   <% @block_types.each do |bt| %>
     <tr onclick="window.location='/admin/block-types/<%= bt.id %>/edit';">
+      <td><%= bt.site_id ? (bt.site.description && bt.site.description.strip.length > 0 ? bt.site.description : bt.site.name) : 'Global' %></td> 
       <td><%= bt.name        %></td>
       <td><%= bt.description %></td>    
     </tr>

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

@@ -24,7 +24,7 @@ b = @block
 <div class='icons'>
   <% Caboose::BlockTypeCategory.reorder(:name).all.each do |cat| %>
     <% next if cat.parent_id.nil? && cat.name == 'Layouts' %>
-    <% kids = cat.block_types.where("parent_id is null").reorder(:name).all %>
+    <% kids = cat.block_types.where("parent_id is null and (site_id is null or site_id = ?)", @site.id).reorder(:name).all %>
     <% if kids && kids.count > 0 %>
       <h2 onclick="$('#cat<%= cat.id %>_container').slideToggle();"><%= cat.name %></h3>
       <div id='cat<%= cat.id %>_container'>

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

@@ -9,6 +9,7 @@
   <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| %>
+    <% next if bt.site_id && bt.site_id != @site.id %>
     <option value="<%= bt.id %>"><%= bt.description %></option>
   <% end %>
 </select></p>

data/config/routes.rb

@@ -177,12 +177,14 @@ Caboose::Engine.routes.draw do
   get     "admin/block-types/store/:block_type_summary_id"           => "block_type_store#admin_details"  
   get     "admin/block-types/store"                                  => "block_type_store#admin_index"
       
+  get     "admin/block-types/site-options"         => "block_types#admin_site_options"
   get     "admin/block-types/field-type-options"   => "block_types#admin_field_type_options"
   get     "admin/block-types/tree-options"         => "block_types#admin_tree_options"
   get     "admin/block-types/options"              => "block_types#admin_options"
   get     "admin/block-types/new"                  => "block_types#admin_new"  
   get     "admin/block-types/:id/new"              => "block_types#admin_new"  
   get     "admin/block-types/:id/options"          => "block_types#admin_value_options"
+  get     "admin/block-types/:id/icon"             => "block_types#admin_edit_icon"
   get     "admin/block-types/:id/edit"             => "block_types#admin_edit"
   get     "admin/block-types/:id"                  => "block_types#admin_show"
   get     "admin/block-types"                      => "block_types#admin_index"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.144'
+  VERSION = '0.4.145'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.144
+  version: 0.4.145
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -355,6 +355,7 @@ files:
 - app/views/caboose/block_type_store/admin_details.html.erb
 - app/views/caboose/block_type_store/admin_index.html.erb
 - app/views/caboose/block_types/admin_edit.html.erb
+- app/views/caboose/block_types/admin_edit_icon.html.erb
 - app/views/caboose/block_types/admin_index.html.erb
 - app/views/caboose/block_types/admin_new.html.erb
 - app/views/caboose/blocks/_block.html.erb