caboose-cms 0.4.15 → 0.4.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWRiZTU5NzZiYWJkMDQ5MDY4ZDg3ODkwZjViYTg5NWJiZmJjMjMzOQ==
+    MTBmODk0Mzk5YjQ3YTM5MDg5YzIzNjllMTJkZmM1YjNiNzNmZDhmMg==
   data.tar.gz: !binary |-
-    OWViNmIyYThiMGJhMzRiZjExZmVjNjQ3ODNkNDdlODY0ZDdmYWYzMg==
+    ZjAzMjNmNDc5N2EyNjc2Y2VjMWI0ZjgxZDQzYzQ0OGY5YmZkYmNkMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWJkODMxNjNlZjliYjBmOTkxNmFlNmM1NzU5YmQ1N2U5Njc5YzE3ODQxNWU3
-    YWE4MzVkNGViMmZjYjZjMmEwZjhkYjkxYzU2MTg5NDA3ZTNiODcxYjBjMjBi
-    MjYxY2QzYmQzZDQ2N2FjNzYwMmIyYjgyZmQ3NWQ2NGE3N2JkNTI=
+    N2QwODU3NzQ4ZWFkY2MzZDE5NzkwZTFiODFiMmMwYmU0OGFkNzQ1MjRjZmZj
+    ZDJhYjdlNTQwYWViN2NmNmMyMDFjNTkwMjZkN2Q1YTM0MDMwNjA5YzhkOThj
+    NTkxOTg5NDllYWI4Y2JhNWIzOWZmNDYzNDlmNDE3ZGFhOTAwNDk=
   data.tar.gz: !binary |-
-    NDQ5ODEyYjM0MzM2ZTI3OTBiMWM4NjEyODM2MmQ3MGNiNTZiMjVmYjU5Mjdl
-    NDg0MjViYTc0MGY1NWYyNTc4MmU4MmE2ZmU0M2I1MTUyZjhmMmY5Mzc4NDQy
-    ZTVlMzRhNzQ3NGRmZmI2MDk5YWZiMDdjMTQxNDJkOTdjNTMwNGQ=
+    ZWQ2ZjIwYjBkYWM4ZGVjMzQyY2QzNjgxMTFlNWYyYWFkYmRhZjhjZGVkZTgy
+    NjJjYWUzMWVjZjVlNTdlMzk1OGM0ZjZkZWEzNzMzNzU0ZTYxNmZlMjI4YzI0
+    YzdmYmU3YTY5NGZiYmQzZTk3MTJmNzNmNmNiNjVkMTI4ODI0YTU=

data/app/assets/javascripts/caboose/model/bound_richtext.js

@@ -126,5 +126,5 @@ BoundRichText = BoundControl.extend({
 });
 
 BoundRichText.test1 = function() {
-  alert('Testing');
+  //alert('Testing');
 };

data/app/models/caboose/schema.rb

@@ -351,6 +351,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
       bt = Caboose::BlockType.where(:name => 'richtext').first
       bt.field_type = 'richtext'
       bt.save      
+    end
+    if !Caboose::BlockType.where(:name => 'image').exists?
+      Caboose::BlockType.create(:name => 'image', :description => 'Image', :field_type => 'image', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+    end
+    if !Caboose::BlockType.where(:name => 'file').exists?
+      Caboose::BlockType.create(:name => 'file', :description => 'File', :field_type => 'file', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
     end    
             
   end

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

@@ -0,0 +1,5 @@
+<% if block.file %>
+  <a href="<%= block.file.url %>" id='block_<%= block.id %>'>Download</a>
+<% elsif editing %>
+  <div id='block_<%= block.id %>'><p>Upload a file.</p></div>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% if block.image %>
+  <img src="<%= block.image.url(:large) %>" id='block_<%= block.id %>' />
+<% elsif editing %>
+  <div id='block_<%= block.id %>'><p>Upload an image.</p></div>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.15'
+  VERSION = '0.4.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -314,6 +314,7 @@ files:
 - 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
+- app/views/caboose/blocks/_file.html.erb
 - app/views/caboose/blocks/_heading.html.erb
 - app/views/caboose/blocks/_html.html.erb
 - app/views/caboose/blocks/_image.html.erb