caboose-cms 0.4.68 → 0.4.69

data/app/models/caboose/schema.rb

@@ -84,6 +84,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :parent_id                       , :integer ],
         [ :name                            , :string  ],
         [ :description                     , :string  ],
+        [ :icon                            , :string  ],
         [ :is_global                       , :boolean , { :default => false }],
         [ :block_type_category_id          , :integer , { :default => 2 }],
         [ :render_function                 , :text    ],

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

@@ -46,6 +46,13 @@ 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" : '' %>';" />
@@ -53,9 +60,16 @@ bt = @block_type
 </p>
 
 <% 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 %>
@@ -84,7 +98,25 @@ function delete_block_type(block_type_id, confirm)
   });
 }
 
+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');      
+    }
+  });
+}
+
 $(document).ready(function() {
+  $('div.icons a').click(function(e) {
+    e.preventDefault();    
+    select_icon($(this).attr('id').substr(5));
+  });
+    
   m = new ModelBinder({
     name: 'BlockType',
     id: <%= @block_type.id %>,

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

@@ -12,12 +12,29 @@ end
 b = @block
 
 %>
+<!--
 <h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
 <h1>New Block</h1>
-<form action='/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>' method='post' id='new_block_form' onsubmit="add_child_block(); return false;">
+-->
+<form action='/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>' method='post' id='new_block_form' onsubmit="return false;">
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<input type='hidden' name='block_type_id' id='block_type_id' value='' />
 <% if @before_id %><input type='hidden' name='before_id' value='<%= @before_id %>' /><% end %>
 <% if @after_id  %><input type='hidden' name='after_id'  value='<%= @after_id  %>' /><% end %>
+<div class='icons'>
+  <% Caboose::BlockTypeCategory.reorder(:name).all.each do |cat| %>
+    <% next if cat.parent_id.nil? && cat.name == 'Layouts' %>
+    <h2 onclick="$('#cat<%= cat.id %>_container').slideToggle();"><%= cat.name %></h3>
+    <div id='cat<%= cat.id %>_container'>
+      <% cat.block_types.where("parent_id is null").reorder(:name).all.each do |bt| %>
+        <a href='#' onclick="add_child_block(<%= bt.id %>);"><span class='icon icon-<%= bt.icon %>'></span><span class='name'><%= bt.description %></span></a>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+</form>
+
+<!--
 <p><select name='block_type_id'>
 <option value=''>-- Select a block type --</option>
 <% Caboose::BlockType.where("parent_id is null").reorder(:name).all.each do |bt| %>
@@ -29,22 +46,37 @@ b = @block
   <input type='submit' value='Add Block' />
   <input type='button' value='Cancel' onclick="modal.close();" />
 </p>
+-->
 
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/icomoon_fonts' %>
+<style>
+#modal_content div.icons { height: 400px; overflow-y: scroll; }
+#modal_content div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
+#modal_content div.icons a { display: block; float: left; margin: 4px; border: #fff 0px solid; width: 120px; height: 100px; text-align: center; vertical-align: middle; border: #666 4px solid; }
+#modal_content div.icons a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
+#modal_content div.icons a span.name { display: block; }               
+#modal_content div.icons a:hover { background: #fff69f; color: #000; border: #666 0px solid; border: #666 4px solid; }
+#modal_content div.icons a:hover span.icon { color: #000; }
+#modal_content div.icons a:hover span.name { color: #000; }
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
 var modal = false;
 $(window).load(function() {
-  modal = new CabooseModal(800);  
-});
+  modal = new CabooseModal(550);  
+});                         
 
 $(document).ready(function() {
-  modal = new CabooseModal(800);  
+  modal = new CabooseModal(550);  
 });
 
-function add_child_block()
+function add_child_block(block_type_id)
 {
   modal.autosize("<p class='loading'>Adding block...</p>");
+  $('#block_type_id').val(block_type_id);
   $.ajax({
     url: '/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>',
     type: 'post',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.68'
+  VERSION = '0.4.69'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.68
+  version: 0.4.69
 platform: ruby
 authors:
 - William Barry
@@ -174,6 +174,10 @@ extra_rdoc_files: []
 files:
 - app/assets/fonts/avenir-medium.eot
 - app/assets/fonts/avenir-medium.ttf
+- app/assets/fonts/icomoon.eot
+- app/assets/fonts/icomoon.svg
+- app/assets/fonts/icomoon.ttf
+- app/assets/fonts/icomoon.woff
 - app/assets/images/caboose/caboose_logo.png
 - app/assets/images/caboose/caboose_logo_small.png
 - app/assets/images/caboose/caboose_nav.png
@@ -236,6 +240,8 @@ files:
 - 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
+- app/assets/stylesheets/caboose/icomoon_fonts.css
+- app/assets/stylesheets/caboose/icons.txt
 - app/assets/stylesheets/caboose/login.css
 - app/assets/stylesheets/caboose/modal.css
 - app/assets/stylesheets/caboose/model_binder.css
@@ -286,6 +292,7 @@ files:
 - app/models/caboose/block.rb
 - app/models/caboose/block_type.rb
 - app/models/caboose/block_type_category.rb
+- app/models/caboose/block_type_icons.rb
 - app/models/caboose/block_type_source.rb
 - app/models/caboose/block_type_summary.rb
 - app/models/caboose/caboose_plugin.rb