caboose-cms 0.3.42 → 0.3.43

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg5NmI3YTFlZWU3MDg5NTlkMzM2NWFjMDcxZmE0MTAxZjE0NTk5Yw==
+    YTQ2YzZjNzlhNjJkMWU2NjllMmI1MGQ2M2M1ZDE1M2E0OGZkNDQxOQ==
   data.tar.gz: !binary |-
-    NzFkMTM5ZGYzYWU1ZTUwNmNmY2ZmMTBjMTkxM2VjZjc0OWZkNDQ5OQ==
+    ZjYwZjFiYmRkNWY2OWY2ZDAwNjkyYjAxNGE0Y2FhZTFkNmZlNzk0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2VmZTNhYTgyYTU2Y2UyMzJiOTk0MmNjYWFhNzczMmRkNTRjZmZlZWNmZjYz
-    MDVmZDAxNzcyZGE0YmI1Yzc3ZjViZWNmNWZiM2ZhMmMxMmU3ZWEyODNkMThk
-    Njg3NzM4NzI3MjA3MWRhMzQwOGY1ZGMwMzA5MGMxYmYwNGQ0Yjk=
+    N2IwMDAzMTMzOGVlNWZkZGIyZGM1OGUyZTI4MTJmZjk5MGIwYzBhYWM1NjIy
+    YjE5Mjc4MjEyMzViY2VmYTRmODIwNDBkYjQwODZjMmQwMTk1NTExMDJiYTNj
+    OTJkZDdiM2RmOWNiY2ZlZjY2NWI2M2Q5OTZlNWIwODE1NDdhZTc=
   data.tar.gz: !binary |-
-    Y2YxN2RkOTZjMTY4OTA2YmZhZTExZmY2ZTZjNTY0N2NhZTY2NDdlZDkxNzQ0
-    NjFhMjI0MzcwMTdmNjlkODAxZTZlN2EzZjcyNjE4Nzg5ZWE4NGY2OTBlMWU3
-    ZGVlMDczMDBmMmUxMGNlOGUxNGVmZjE1MzYxMjhjZDA4NTdiNjE=
+    ZjY3N2JiNWU2NjE3NjcwZTIxYmRjZDUxMWVlZjllN2VlMzk1MWUzMmVkYzgx
+    OWM1NjgwY2MyNjIyNWRmYjEzOGIyZjkwNDNiZTBmZGY4MzA3MTFmOWM3YWU5
+    OTNjYTAxZDRhNGNkODRlOTI2ZjRiNjZkNDM4YTA1YjNmNWY3NWU=

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

@@ -24,6 +24,7 @@ Attribute.prototype = {
   debug: false,
   download_text: false,
   upload_text: false,
+  image_refresh_delay: false,
   
   update_url: false,
   options_url: false,

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

@@ -72,7 +72,7 @@ BoundFile = BoundControl.extend({
     $('#'+this.el+'_container').append($('<div/>')
       .attr('id', this.el + '_message')
     );
-    iframe = $("<iframe name='" + this.el + "_iframe' />")    
+    iframe = $("<iframe name=\"" + this.el + "_iframe\"></iframe>")    
       .attr('name', this.el + '_iframe')
       .attr('id', this.el + '_iframe');      
     if (this.attribute.debug)      

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

@@ -73,7 +73,7 @@ BoundImage = BoundControl.extend({
     
     var resp = $.parseJSON(str);    
     if (resp.success)
-		{
+		{		  
 		  if (resp.attributes && resp.attributes[this.attribute.name])
 		    for (var thing in resp.attributes[this.attribute.name])
 		      this.attribute[thing] = resp.attributes[this.attribute.name][thing];
@@ -83,7 +83,25 @@ BoundImage = BoundControl.extend({
     if (resp.error)
       this.error(resp.error);
     else
-      $('#'+this.el+'_container img').attr('src', this.attribute.value + '?' + Math.random());
+    {
+      if (this.attribute.image_refresh_delay)
+      {
+        var that = this;
+        setTimeout(function() { that.refresh_image(); }, this.attribute.image_refresh_delay);
+      }
+      else
+      {
+        this.refresh_image();
+      }        
+    }
+  },
+  
+  refresh_image: function() {
+    var src = this.attribute.value;
+    if (src.indexOf('?') > 0)
+      src = src.split('?')[0];    
+    src = src + '?' + Math.random();    
+    $('#'+this.el+'_container img').attr('src', src);
   },
     
   error: function(str) {

data/app/controllers/caboose/page_block_field_values_controller.rb

@@ -22,6 +22,32 @@ module Caboose
       resp.success = save && fv.save
       render :json => resp
     end
+    
+    # POST /admin/page-block-field-values/:id/image
+    def admin_update_image
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      fv = PageBlockFieldValue.find(params[:id])
+      fv.image = params[:value]
+      fv.save
+      resp.success = true 
+      resp.attributes = { 'value' => { 'value' => fv.image.url(:tiny) }}
+      
+      render :json => resp
+    end
+    
+    # POST /admin/page-block-field-values/:id/image
+    def admin_update_file
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      fv = PageBlockFieldValue.find(params[:id])
+      fv.file = params[:value]               
+      resp.success = fv.save      
+      
+      render :json => resp
+    end
 		
   end  
 end

data/app/models/caboose/page_block.rb

@@ -13,7 +13,12 @@ class Caboose::PageBlock < ActiveRecord::Base
   
   def field_value(name)    
     page_block_field_values.each do |fv|
-      return fv.value if fv.page_block_field.name == name
+      if fv.page_block_field.name == name
+        if    fv.page_block_field.field_type == 'image' then return fv.image
+        elsif fv.page_block_field.field_type == 'file'  then return fv.file
+        else return fv.value
+        end
+      end
     end
     return nil
   end

data/app/models/caboose/page_block_field_value.rb

@@ -4,6 +4,18 @@ class Caboose::PageBlockFieldValue < ActiveRecord::Base
 
   belongs_to :page_block
   belongs_to :page_block_field
+
+  has_attached_file :file, :path => '/uploads/:id.:extension'
+  do_not_validate_attachment_file_type :file
+  has_attached_file :image, 
+    :path => 'uploads/:id_:image_updated_at_:style.:extension', 
+    :styles => {
+      :tiny  => '160x120>',
+      :thumb => '400x300>',
+      :large => '640x480>'
+    }
+  do_not_validate_attachment_file_type :image
+    
   attr_accessible :id, :page_block_id, :page_block_field_id, :value
     
 end

data/app/models/caboose/schema.rb

@@ -120,9 +120,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :options_url          , :string  ]
       ],
       Caboose::PageBlockFieldValue => [
-        [ :page_block_id        , :integer ],
-        [ :page_block_field_id  , :integer ],
-        [ :value                , :text    ]                
+        [ :page_block_id        , :integer    ],
+        [ :page_block_field_id  , :integer    ],
+        [ :value                , :text       ],
+        [ :file                 , :attachment ],
+        [ :image                , :attachment ]
       ],      
       Caboose::Post => [  
         [ :title       , :text     ],  		 	 

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

@@ -1,9 +1,15 @@
+<%
+update_on_close = false
+@block.page_block_type.fields.each do |f|
+  update_on_close = true if f.field_type == 'image' || f.field_type == 'file'
+end
+%>
 <h2 style='margin-top: 0; padding-top: 0;'>Edit <%= @block.page_block_type.description %></h2>
 <% @block.page_block_type.fields.each do |f| %>  
   <% fv = @block.field_value_object(f.name) %>  
   <div id='pageblockfieldvalue_<%= fv.id %>_value'></div>
 <% end %>
-<p><input type='button' value='Close' onclick="modal.close();" /></p>
+<p><input type='button' value='Close' onclick="<% if update_on_close %>parent.controller.render_blocks();<% end %>modal.close();" /></p>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
@@ -27,14 +33,23 @@ $(document).ready(function() {
       attributes: [{      
         name: 'value',
         type: <%=  raw Caboose.json(f.field_type) %>,
-        value: <% if f.field_type == 'checkbox' %><%= fv.value ? 'true' : 'false' %><% else %><%= raw Caboose.json(fv.value) %><% end %>,
+        value: <% 
+          if f.field_type == 'checkbox' %><%= fv.value ? 'true' : 'false'           %><%
+          elsif f.field_type == 'image' %><%= raw Caboose.json(fv.image.url(:tiny)) %><%
+          elsif f.field_type == 'file'  %><%= raw Caboose.json(fv.image.url)        %><%
+          else                          %><%= raw Caboose.json(fv.value)            %><% 
+        end %>,
         <% if f.field_type == 'select' %>text: <%= raw Caboose.json(fv.value) %>,<% end %>        
         nice_name: <%= raw Caboose.json(f.nice_name ? f.nice_name : f.name) %>,
         width: <% if f.width %><%= raw Caboose.json(f.width) %><% else %>780<% end %>,
-        <% if f.height            %>height: <%=            raw Caboose.json(f.height)            %>,<% end %>
-        <% if f.fixed_placeholder %>fixed_placeholder: <%= raw Caboose.json(f.fixed_placeholder) %>,<% end %>
-        <% if f.options           %>options_url: '/admin/page-block-fields/<%= f.id %>/options',<%
-           elsif f.options_url    %>options_url: <%=       raw Caboose.json(f.options_url)       %>,<% end %>        
+        <% if f.height                %>height: <%=            raw Caboose.json(f.height)            %>,<% end %>
+        <% if f.fixed_placeholder     %>fixed_placeholder: <%= raw Caboose.json(f.fixed_placeholder) %>,<% end %>
+        <% if f.options               %>options_url: '/admin/page-block-fields/<%= f.id %>/options',<%
+           elsif f.options_url        %>options_url: <%=       raw Caboose.json(f.options_url)       %>,<% end %>
+        <% if f.field_type == 'image' %>update_url: '/admin/page-block-field-values/<%= fv.id %>/image',
+        image_refresh_delay: 100,
+        <% end %>
+        <% if f.field_type == 'file'  %>update_url: '/admin/page-block-field-values/<%= fv.id %>/file',<% end %>
         after_update: function() { parent.controller.render_blocks(); },
         after_cancel: function() { parent.controller.render_blocks(); }
       }]

data/config/routes.rb

@@ -87,7 +87,9 @@ Caboose::Engine.routes.draw do
   put     "admin/pages/:page_id/blocks/:id"        => "page_blocks#admin_update"
   delete  "admin/pages/:page_id/blocks/:id"        => "page_blocks#admin_delete"
   
-  put     "admin/page-block-field-values/:id"     => "page_block_field_values#admin_update"
+  put     "admin/page-block-field-values/:id"       => "page_block_field_values#admin_update"
+  post    "admin/page-block-field-values/:id/image" => "page_block_field_values#admin_update_image"
+  post    "admin/page-block-field-values/:id/file"  => "page_block_field_values#admin_update_file"
     
   get     "admin/page-block-types/new"            => "page_block_types#admin_new"    
   get     "admin/page-block-types/:id/edit"       => "page_block_types#admin_edit"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.42'
+  VERSION = '0.3.43'
 end

metadata

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