caboose-cms 0.6.19 → 0.6.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTA2NjFiZGRkMDZiMjJhNzJmNWMzZTUwN2ZhY2FkNmU2Y2M5MjNiMA==
+    M2E4ZjUxYTEyYzFjN2Q1ZTBlNmQ2Y2MwOGMyZjMyNmI4NDlkMjk4OQ==
   data.tar.gz: !binary |-
-    ZmIxODVlNWMzZDAwZTBlN2MwMjczYjA5MmM3ODBlMzU4MjVmMjQ5ZA==
+    YmU0N2FkNDZiMjYyNjIxYjIyY2UxNjVmY2QzZTliOWZjYTAxMGQ0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDQ1NTk1ZDNiMjlkNmI4ZjUyZGM0ZTE2YjlhZGNlNTU3NmU1MmNiYjJkNzU1
-    ODk1MGVmYjUzMmU0YTFkZmJhM2ZkZmJjMDZlNDYzMjNkODJjYjNhMDhkMGU0
-    ZTY4ZjdiZDQ2NTg2MWQ4ZDljZTRhM2JkNGIyZGY4YTI0ZGJkODI=
+    ZjJmOGZjNzRkNzI2MmFhYjcyM2VlZGU4OTc4YWE0M2U3NjhjMmM5ZTVlMDg4
+    YzYyZTQxZGYxY2JiYmM0MjQyNmRkYThhOTcxMDFlNWFiYTllZjRmMTJhMTZh
+    YWNiOWVjZjFiMGZhZGE0MmI0ZTVlNWE3YzU2ZmQ4ZjQ3MDUzNTY=
   data.tar.gz: !binary |-
-    NzA3ZmJhZjVjNWM0MTkxMzUwNTYwMzczZDI1MTM0ZGM3OWNhMWI5MmVlNWMx
-    ZTc4YjlkMGU2ZTRjNWQ2NzY2Mjc2ZGI1NGNmZGE0NmEwYTNlNjZlZGQ5YjVj
-    MmFjOTA0MjE2NjVjYTFiNWY0YWY1NWY3YTczNmM2OTI1OWNlZmU=
+    M2NjZjBmZDdiOTU2MDE4M2M0NjYxOWY2YmMwMWMzY2ExNTIzOTRlYzVlMDE4
+    MzRhMWRjN2FiZTVjNDQzY2Y2NTIxOGJmMTk5MmE1YjExM2Y2YWVmMjlkZjhj
+    YTEyOTExOTY5ZTE3YzAwZTdjMzBhZTk3ZWQzZjhhZDZkNzM3ZjU=

data/app/assets/javascripts/caboose/admin_media_index.js

@@ -256,26 +256,34 @@ MediaController.prototype = {
       $.each(that.cat.media, function(i, m) {
         if (m.media_type == 'image' && m.processed == false)
           processing = true
-        var li = $('<li/>')          
+        var li = $('<li/>')
           .attr('id', 'media' + m.id)
           .addClass('media')          
           .data('media_id', m.id)
           .click(function(e) { that.select_media($(this).data('media_id')); })
-          .append($('<span/>').addClass('name').html(m.name).click(function(e) {
+          .append($('<span/>').addClass('name').html(m.original_name).click(function(e) {
             e.stopPropagation();
             that.edit_media_description($(this).parent().data('media_id'));
           }));
         if (m.image_urls)
-          li.append($('<img/>').attr('src', m.image_urls.tiny_url).attr("id","image-" + m.id));                                      
+          li.append($('<img/>').attr('src', m.image_urls.tiny_url).attr("id","image-" + m.id));  
+        else if (m.original_name) {
+          var ext = m.original_name.match(/\.[0-9a-z]+$/i);
+          if (ext && ext.length > 0)
+            li.append($('<img/>').attr('src', '/assets/caboose/file_types/' + ext[0].replace(".","").toLowerCase() + '.png').addClass('file-icon').attr("width","80").attr("height","80"));
+        }                                  
         if (that.selected_media.indexOf(m.id) > -1)
           li.addClass('selected ui-selected');
-        if (that.allow_edit && m.image_urls) 
-        {
+        if (that.allow_edit && m.image_urls) {
           li.append($("<a/>")
             .html("Edit Image")
             .click(function() { that.edit_image($(this).parent().data('media_id')); })
           );
         }
+        if ( m.image_urls )
+          li.append($("<a/>").addClass("dl i").html("Download").click(function() { that.download_image($(this).parent().data('media_id')); }));
+        else
+          li.append($("<a/>").addClass("dl").html("Download").click(function() { that.download_image($(this).parent().data('media_id')); }));
         ul.append(li);
       });
     }
@@ -490,7 +498,18 @@ MediaController.prototype = {
       });
     }
     return m;
-  },        
+  },
+
+  download_image: function(media_id) {
+    var that = this;
+    var m = that.media_with_id(media_id);
+    var url = '';
+    if ( m.image_urls )
+      url = m.image_urls.original_url;
+    else
+      url = m.file_url
+    window.open(url);
+  }, 
   
   //============================================================================
   // Aviary

data/app/assets/stylesheets/caboose/admin_media_index.css.scss

@@ -90,6 +90,7 @@
       background-size: contain; 
       background-repeat: no-repeat;
       border: #666 4px solid;
+      text-align: center;
       img {
         max-height: 120px;
         max-width: 90%;
@@ -97,25 +98,39 @@
       span.name { 
         display: block; 
         position: absolute; 
-        bottom: 18px; 
+        bottom: 18px;
+        font-size: 13px;
         width: 150px; 
         text-align: center;        
         color: #fff; 
         text-decoration: none !important;                                   
       }
+      .file-icon {
+        display: block;
+        width: 80px;
+        margin: 10px auto 0 auto;
+      }
       a {
         text-decoration: underline;
         cursor: pointer;
-        display: block;
+        display: inline-block;
         font-size: 13px;
         position: absolute;
         bottom: 0;
+        left: 0;
         text-align: center;
-        width: 100%;
         color: #000;
         &:hover {
           color: blue;
         }
+        &.dl {
+          right: 0;
+          left: initial;
+          width: 100%;
+          &.i {
+            width: auto;
+          }
+        }
       }
       &:hover {
         background-color: #fff799;

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

@@ -85,7 +85,7 @@ $(document).ready(function() {
     media_id: <% if @block.media_id %><%= @block.media_id %><% else %>false<% end %>, 
     authenticity_token: '<%= form_authenticity_token %>',    
     top_cat_id: <%= raw Caboose.json(@top_media_category.id) %>,
-    cat_id: <% if @block.media_id %><%= @block.media.media_category_id %><% else %><%= @top_media_category.id %><% end %>,
+    cat_id: <% if @block.media %><%= @block.media.media_category_id %><% else %><%= @top_media_category.id %><% end %>,
     s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
 	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
 	  policy: '<%= raw @policy %>',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.19'
+  VERSION = '0.6.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.20
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -369,6 +369,24 @@ files:
 - app/assets/images/caboose/caboose_nav_black.png
 - app/assets/images/caboose/credit_cards.png
 - app/assets/images/caboose/default_user_pic.png
+- app/assets/images/caboose/file_types/doc.png
+- app/assets/images/caboose/file_types/docx.png
+- app/assets/images/caboose/file_types/gif.png
+- app/assets/images/caboose/file_types/jpeg.png
+- app/assets/images/caboose/file_types/jpg.png
+- app/assets/images/caboose/file_types/mp3.png
+- app/assets/images/caboose/file_types/mp4.png
+- app/assets/images/caboose/file_types/pdf.png
+- app/assets/images/caboose/file_types/png.png
+- app/assets/images/caboose/file_types/pps.png
+- app/assets/images/caboose/file_types/ppt.png
+- app/assets/images/caboose/file_types/pptx.png
+- app/assets/images/caboose/file_types/psd.png
+- app/assets/images/caboose/file_types/rtf.png
+- app/assets/images/caboose/file_types/tiff.png
+- app/assets/images/caboose/file_types/xls.png
+- app/assets/images/caboose/file_types/xlsx.png
+- app/assets/images/caboose/file_types/zip.png
 - app/assets/images/caboose/loading_black_on_white.gif
 - app/assets/images/caboose/loading_black_on_yellow.gif
 - app/assets/images/caboose/loading_green.gif