caboose-cms 0.4.28 → 0.4.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjFiZTY1NzlkZWJmYTlkMDFjZDNkYzNjMmNhNTQ2ZmNlYTg1N2RmMg==
+    MTRlMGFmZjY3MGI4NTFhYzgxNWY1YmIyZmYyMmJlYjRiNzBmNzc5ZQ==
   data.tar.gz: !binary |-
-    NDBkYTg1YTFjZTRhN2I0OTViZjQzY2YxMzE0MGMxMTViYzc5YThhYQ==
+    OGQwNmI5MDlhYTc5MmQwMzMyNDQzYzkzY2E4NzcxZWJlN2NmYTgyZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjMzY2IyMjE3OGU0MWMyNjYyMzFiNzU3ZDA0NjE1ODVhYzg3MTg2MWE5OTBl
-    ZWRkYzMxMzNjYTI1YWViMThkZDg5ZDljNWQzZGUyMGNjOTFlMzU5YmY1YTkx
-    Zjc4ZjU2OGY2NGIzYjc1YmFmMDc0NGI3OGI4N2U4NzA3YzNhY2U=
+    YzBlZDU0NGVlOTIzM2Q3N2ZiYjZiZmI0NDk4NDZmM2ZhOWZhN2FjNDhiYzc1
+    NDQ3MmRjMzlkYjkwOGJkOGIxZjk1MjdmMjE0MzJiNzY1ZDIxODFkZmZjMzQ4
+    ZTc3M2IxM2RlNTUxYmY5MzY4Y2I2MjNjMjE3MzU5MWJlMzc0YjQ=
   data.tar.gz: !binary |-
-    ZjQxZjYyZjg4ZjFiZTIxZWQ4YWFlYzRjMmYyNzMzZWJiMGRlYjc3MTQxODVh
-    MDg4NjI1ZmIyMzA4ZjkzMzhjN2RkMDFiZGFmMzAzMmMzZTNjMThmNTQxNzVl
-    YjUzMjY4ODE0ZGY0OGFmNjdiMmYxMzI3Mjc4NThmZjhmN2E0MDA=
+    NTg5NjBlY2Q5ODdlZjNmMjY3OTg5MTYxZGU3ODMyY2M1OTI0MDc4M2QzNGQw
+    Y2I5NTFlNWJhNjg4M2I5MzBmODU4OWZkZjMxMzJkYmU2ZWRmYTFmZmQxODE0
+    YTI2ZGJmMjE2ZTM1MjhiNDZlOGI5YTQ5ZTgyYzUwM2VjMzgwNGM=

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

@@ -1,7 +1,5 @@
 <%
 text = block.value
-if text.nil? || text == ""
-  text = (empty_text ? "<p>#{empty_text}</p>" : "") 
-end
-
-%><div id='block_<%= block.id %>'><%= raw text %></div>
+text = "<p>#{empty_text}</p>" if editing && (text.nil? || text.strip.length == 0)
+%>
+<div id='block_<%= block.id %>'><%= raw text %></div>

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

@@ -99,10 +99,14 @@ $(document).ready(function() {
 
 </script>
 <% if @block.block_type.field_type == 'richtext' %>
-  <script src="/assets/tinymce.js" type="text/javascript"></script>
-  <script type='text/javascript'>
-  document.domain = "<%= raw @document_domain %>";
-  </script>  
+  <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' %>
 <% end %>
 

data/app/views/layouts/caboose/application.html.erb

@@ -13,13 +13,13 @@
 <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
 <%= yield :caboose_css %>
 <% end %>
-  <%
+  <%  
   b = @page.block  
   str = b.render(b, {     
     :view => self,
     :controller_view_content => yield,
     :modal => false,
-    :empty_text => '',
+    :empty_text => defined?(@editing) && @editing ? (defined?(@empty_text) ? @empty_text : 'Empty, click to edit') : "",
     :editing => defined?(@editing) ? @editing : false,
     :css => '|CABOOSE_CSS|',
     :js => '|CABOOSE_JAVASCRIPT|',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.28'
+  VERSION = '0.4.29'
 end

metadata

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