caboose-cms 0.3.31 → 0.3.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI4ZDcyZjQ4MTY4MzNmNTg0NmQ0Yjc0NTJiNmZlMWNmMjhkZGFhYg==
+    MGE4OWQ5MjhhZTk1ZDM2MTBhNjU0MzQyNjc0ZjExNDcwMGE5ZmMxYw==
   data.tar.gz: !binary |-
-    MTMyZTdhY2YwZWJhMDVjNDllMWFjMzE3YTExZWNlOWYwODY2ZDZhMA==
+    Y2Q1YjRkYzUwY2EzNzIyMzRhY2U2NWZkM2ExN2VmOGM0YjExM2MyYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzJhOWVmYTg3N2I0YTMyZmM2NGU3MDU3Mzk5ZGExYTE5NDUzODYyMGI3YzE1
-    MzViY2JlZGQ3NDI3YTc1YjE1YjRhNzlhNjhjNmU0Y2I3Y2IwYWVkY2Q2ZjRk
-    NDMwYTRlYzI4NDUzZmY0MzJjMzY0MWY3MzZkYzY3ODFkMjU0MDM=
+    OTZlMTgxNzY0MjgwNjEzNDVhMGU2ZGM1YWI2YWYxY2FmYzhmZTUzNzVkNWU3
+    ODA4MzE3YTI0YWRkNzgzOGFhNGUzY2MxZDA2MTliYjMxMjVmYmJhMzRjYTI4
+    NTg5MzYyN2NmZWI0YWY5ZmNlN2NmYzJjYzg5YzlkNzkxYTUwMzI=
   data.tar.gz: !binary |-
-    ZWVjMTY1YWFkZTM2MTZmZDYyYjc3OWUwNmRjMTUxNDJmMTM3YTkwNGUwOThh
-    ZDk4Y2RmY2Q3NjVlNzA1YjA0MGY4NmRmMGRmYzE3OGYyOTQ2NjIwY2ZmNTM4
-    Zjk1NjIxMGI4N2YxOTA0NjI3NzNjZDdkN2VhZjdmNjA1YmJmZTM=
+    MzMyZTk4MTc3ZjQ2MzQ2N2E5ZjIzZDU4YzYxYTgxMTI1MDM4OGY4MzdmMGIy
+    NzBkZWYwZWZmMTI1MmU1MTdkNmI3M2UzN2NlMWM4MWZlMThkMzY0MjdjNGFm
+    YjhlMDBiNWYxMzYxMmQyNzY3YTViY2YxNmFmOTFlZjkyOGZkNzk=

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

@@ -22,6 +22,8 @@ Attribute.prototype = {
   before_cancel: false,
   after_cancel: false,
   debug: false,
+  download_text: false,
+  upload_text: false,
   
   update_url: false,
   options_url: false,

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

@@ -31,12 +31,16 @@ BoundFile = BoundControl.extend({
       );
     }
     
-    tr.append($('<td/>').append($('<a/>')
+    var td = $('<td/>').append($('<a/>')
       .attr('id', this.el + '_link')
       .attr('href', this.attribute.value)
-      .html('Download current file')
+      .attr('target', '_blank')
+      .html(this.attribute.download_text ? this.attribute.download_text : 'Download current file')
       .css('margin-right', 10)      
-    ));    
+    );
+    if (this.attribute.value == false)
+      td.css('display', 'none');
+    tr.append(td);
     
     tr.append($('<td/>').append($('<form/>')
       .attr('action', this.attribute.update_url)
@@ -48,10 +52,13 @@ BoundFile = BoundControl.extend({
          $('#'+this2.el+'_message').html("<p class='loading'>Uploading...</p>");
          $('#'+this2.el+'_iframe').on('load', function() { this2.post_upload(); });  
       })
-      .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))
-      .append($('<input/>').attr('type', 'button').val('Update ' + this.attribute.nice_name).click(function() { 
+      .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))      
+      .append($('<a/>').attr('href', '#').html(this.attribute.upload_text ? this.attribute.upload_text : 'Update ' + this.attribute.nice_name).click(function() { 
         $('#'+this2.el+'_container input[type="file"]').click(); 
-      }))
+      }))      
+      //.append($('<input/>').attr('type', 'button').val('Update ' + this.attribute.nice_name).click(function() { 
+      //  $('#'+this2.el+'_container input[type="file"]').click(); 
+      //}))
       .append($('<input/>')
         .attr('type', 'file')
         .attr('name', this.attribute.name)
@@ -96,7 +103,8 @@ BoundFile = BoundControl.extend({
       this.error(resp.error);
     else
     {
-      $('#'+this.el+'_container a').attr('href', this.attribute.value);      
+      $('#'+this.el+'_link').parent().css('display', 'block');
+      $('#'+this.el+'_link').attr('href', this.attribute.value);      
       //$('#'+this.el+'_container img').attr('src', this.attribute.value);
     }
   },

data/app/assets/stylesheets/caboose/modal.css

@@ -190,7 +190,7 @@ select.fake option {
 }
 
 #modal_content input[type='checkbox'] {
-  position: absolute;
+  /*position: absolute;*/
   top: 4px;
   left: 0;
   z-index: 19;

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.31'
+  VERSION = '0.3.32'
 end

metadata

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