caboose-cms 0.4.37 → 0.4.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmY0NjI2OTNmZDIxZDhkYjFhYWE1NTliZTNlY2ZmODQ2NTBkNTBkMw==
+    MjE4YTAxZTM2NTRlZDg5OTMzYWNjNmJlYjgzZDRmOGNiNjUzYzJkYg==
   data.tar.gz: !binary |-
-    YWY2ZWFkOTUyOTZjOTUxODBiZDcwMGJiYTQyOWQzNDUxZjNiNjU0OA==
+    NmRhMDdiMjM2MzMxMTcxMGVjZGMyMWMwNmFhYzM5MTQyMDg4YjBhMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGI5OTM1MDkzZDY2NmNhZDMxY2JiMjM2NGFiMDFjNzI5NzJlZTljZGFkY2Ex
-    YmQ2YzJiYzk4MDZjMmY5YmIzYzZkNmRhMjJhZTE3OTA5M2Y4ZTViN2EyMzRh
-    YTUzOTRlMmVkYzRhMzUwMmFkMmE4YTYwOTYzNzZlZTU0MTBkZmQ=
+    N2M1ZDYzNjQzNzFkZjY2OWNjNzczYmM0ZThjZjNmZTc3ODhlMDAyOWQzNGNk
+    MzE3NTNkYTc1ODNkMGQwOGNlNmU4YmYxZWYwZTlmMmJhNjEwOTRmZmYzZTZi
+    ZTM5NzUyNWUxNzFmMTBiYjA1MjAxY2MzM2Q4MDhkYjZkNWM1ZTU=
   data.tar.gz: !binary |-
-    Y2IxMWJmN2ZiMTFjYzUyMDk0ZTA4Mzg3Y2UxODc1MGM2ODVhMzE0NGU5OWVl
-    ZjZkNjZjMjgzN2NiMzcwZjMzMmQyMTg2NTAxYTU5M2U4ODMxYzg0MjhiOWQz
-    NzgwN2VjMDRhYjc4YTNjYzcyMjVlODQ4OGRiNDM2Yjc3NTI4Y2M=
+    NWYxMTkwZjYzMTNkYjMyZTMzNTgxMDdiMjM1MzBhOTFlZGFmMWY3MjBjM2I1
+    YzJlZGU2N2Y5MGQ3MzdiZGU3ZGEwYmY0ZWZhNjNiYzRlOGY0Yjk2YmFmNzU3
+    Mjk2NDViMmIyYzk0MTNlNzQyMzI4ODIyOGM4ZjAwNTJmZmJmMTk=

data/app/models/caboose/schema.rb

@@ -351,7 +351,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
     end
     if !Caboose::BlockType.where(:name => 'richtext').exists?      
-      Caboose::BlockType.create(:name => 'richtext', :description => 'Text', :field_type => 'richtext', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text', :field_type => 'richtext', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
     else
       bt = Caboose::BlockType.where(:name => 'richtext').first
       bt.field_type = 'richtext'

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

@@ -1,7 +1,4 @@
 <%
-Caboose.log(@block.block_type.field_type)
-
-  
 update_on_close = false
 @block.block_type.children.each do |bt|
   update_on_close = true if bt.field_type == 'image' || bt.field_type == 'file'
@@ -99,15 +96,11 @@ $(document).ready(function() {
 
 </script>
 <% if @block.block_type.field_type == 'richtext' %>
-  <script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>
-  <%
-  #<script src="/assets/tinymce.js" type="text/javascript"></script>
-  #<script type='text/javascript'>
-  #document.domain = "
-  #= raw @document_domain ";
-  #</script>
-  %>  
-  <%= tinymce :caboose, width: '800px', height:'300px' %>
+  <script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>    
+  <%= tinymce :caboose, 
+    :width => '800px', 
+    :height => '300px' 
+  %>
 <% end %>
 
 <% end %>

data/lib/caboose/engine.rb

@@ -18,17 +18,22 @@ end
 module Caboose
 
   def Caboose.log(message, title = nil)
-    if (Rails.logger.nil?)
-      puts "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-      puts title.to_s unless title.nil?
-      puts message
-      puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
-    else
-      Rails.logger.debug("\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
-      Rails.logger.debug(title.to_s) unless title.nil?
-      Rails.logger.debug(message)
-      Rails.logger.debug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n")
-    end
+    #if (Rails.logger.nil?)
+    #  puts "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    #  puts title.to_s unless title.nil?
+    #  puts message
+    #  puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
+    #else
+    #  Rails.logger.debug("\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+    #  Rails.logger.debug(title.to_s) unless title.nil?
+    #  Rails.logger.debug(message)
+    #  Rails.logger.debug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n")
+    #end
+        
+    puts "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    puts title.to_s unless title.nil?
+    puts message
+    puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"    
   end
   
   def Caboose.plugin_hook(*args)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.37'
+  VERSION = '0.4.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.37
+  version: 0.4.38
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails