caboose-cms 0.8.66 → 0.8.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf7c6d9e4fe07dff210a8f64d6bf724ccc1ba82
-  data.tar.gz: 851278533f71b16795b16a5e91fbab4d4d7e01c1
+  metadata.gz: 650fd50d2cc40e1d916e15ed23930f3cff2427d6
+  data.tar.gz: 0cb4538479b27adf6d72fd3dcf640afdac72d071
 SHA512:
-  metadata.gz: acaf605b67399fb28bbcdb482cc7d2f3fe3820a30575e92a5c110cb96416de6ad7f0972af1f6aca44eabefbba8b181bf3be615a6eb9979e557d8ffa2ff6c4f5b
-  data.tar.gz: 9aa7634f77a9d4754abc9c9fe24a606d594ba1ac7dc091ae965174b363c75cd412e91ae5048862ecdd6657dd8a4e0877f64389460dba62f7d91d1a4c015ccbce
+  metadata.gz: 5f745259efc0b4cfd3e37cce5ccfcf73903497a0f5c2c0f8ddc1798072425f41f34bd71684f94d7e2d32c2473d06e4f3e2324a9b03b19a5507f578788db9c91b
+  data.tar.gz: f0c6a9d6ef387930ea19b0dc393de4da1246fc386ca666a2d9d204d52dea90ffa1309b85c0cf11f39a6fabdf2edfc736bbcef9c919352a5cc847bf59a6679245

data/app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js

@@ -293,7 +293,7 @@ var BlockModalController = ModalController.extend({
       });
     }
 
-    $('#the_modal #block_' + b.id).attr('onclick','').unbind('click');    
+    $('#the_modal #block_' + b.id).attr('onclick','').unbind('click');
     $('#the_modal #block_' + b.id).click(function(e) {      
       e.stopPropagation();
       that.parent_controller.edit_block(b.id); 

data/app/assets/javascripts/caboose/block_modal_controllers/media_modal_controller.js

@@ -99,6 +99,22 @@ var MediaModalController = BlockModalController.extend({
     that.print_media();
     that.autosize();
   },
+
+  alphabetize_media: function() {
+    var mylist = $('#the_modal #media > ul');
+    var listitems = mylist.children('li').get();
+    listitems.sort(function(a, b) {
+      return $(a).text().toUpperCase().localeCompare($(b).text().toUpperCase());
+    });
+    if ( mylist.data('alph-order') == null || mylist.data('alph-order') == 'desc' ) {
+      $.each(listitems, function(idx, itm) { mylist.append(itm); });
+      mylist.data('alph-order', 'asc');
+    }
+    else {
+      $.each(listitems, function(idx, itm) { mylist.prepend(itm); });
+      mylist.data('alph-order', 'desc');
+    }
+  },
   
   print_top_controls: function() 
   {
@@ -115,7 +131,8 @@ var MediaModalController = BlockModalController.extend({
         .append($('<select/>').attr('id', 'categories')).append(' | ')        
         .append($('<a/>').attr('href', '#').html('New Category'                                                 ).click(function(e) { e.preventDefault(); that.add_category();     })).append(' | ')              
         .append($('<a/>').attr('href', '#').html('Upload to this Category'                                      ).click(function(e) { e.preventDefault(); that.toggle_uploader();  })).append(' | ')
-        .append($('<a/>').attr('href', '#').html(that.file_view == 'thumbnail' ? 'List View' : 'Thumbnail View' ).click(function(e) { e.preventDefault(); that.toggle_file_view(); }))
+        .append($('<a/>').attr('href', '#').html(that.file_view == 'list' ? 'Thumbnail View' : 'List View' ).click(function(e) { e.preventDefault(); that.toggle_file_view(); $(this).html( that.file_view == 'thumbnail' ? 'List View' : 'Thumbnail View'  ); })).append(' | ')
+        .append($('<a/>').attr('href', '#').html('Alphabetize'                                      ).click(function(e) { e.preventDefault(); that.alphabetize_media();  }))
       )
       .append($('<div/>').attr('id', 'new_cat_message'))              
       .append($('<div/>').attr('id', 'uploader'   ).append($('<div/>').attr('id', 'the_uploader')));     
@@ -238,12 +255,14 @@ var MediaModalController = BlockModalController.extend({
     }
     
     $('#top_controls').empty();
-    $('#the_modal #media').empty()              
-      .append($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls ? m.image_urls.thumb_url : '//placehold.it/250x250'))      
+    var img_tag = m.media_type == 'image' ? ($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls ? m.image_urls.thumb_url : '//placehold.it/250x250')) : ( $('<p/>').text(m.original_name) );
+    $('#the_modal #media').empty()
+      .append(img_tag)      
       .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_media_category_id' ))) 
       .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_name'              )))
       .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))      
       .append(image_urls);
+    var select_text = m.media_type == 'image' ? 'Select this Image' : 'Select this File';
     $('#modal_controls').empty()
       .append($('<p/>').css('clear', 'both')
         .append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('< Back'            ).click(function(e) { 
@@ -251,7 +270,7 @@ var MediaModalController = BlockModalController.extend({
           that.print_media();
           that.print_controls();
         }))
-        .append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Select this Image' ).click(function(e) { that.select_media(media_id)                           }))        
+        .append($('<input/>').attr('type', 'button').addClass('caboose-btn').val(select_text ).click(function(e) { that.select_media(media_id)                           }))        
         .append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Close'             ).click(function(e) { that.parent_controller.render_blocks(); that.close(); }))
       );
     
@@ -432,8 +451,9 @@ var MediaModalController = BlockModalController.extend({
   toggle_file_view: function()
   {
     var that = this;
-    that.file_view = (that.file_view == 'thumbnail' ? 'list' : 'thumbnail');    
-    that.print_media();        
+    that.file_view = (that.file_view == 'thumbnail' ? 'list' : 'thumbnail');
+
+    that.print_media();
   },  
   
   media_with_id: function(media_id)

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

@@ -134,27 +134,30 @@
       position: relative;
       list-style: none; 
       margin: 4px; 
-      padding: 4px;                     
-      background-color: #666;
+      padding: 4px 6px; 
+      background-color: #e2e2e2;
       background-position: center;
       background-size: contain; 
       background-repeat: no-repeat;
-      border: #666 4px solid;
-
+      border: #b5b5b5 1px solid;
+      border-radius: 2px;
+      cursor: pointer;
+      img {
+        display: none;
+      }
       span.name { 
         display: block;                
-        color: #fff; 
+        color: #292929;
+        font-size: 15px;
         text-decoration: none !important;                                   
       }
       &:hover {
-        background-color: #fff799;
-        border: #fff799 4px solid;
-        span { background-color: #fff799; color: #000; }
+        background-color: #fffcdb;
+        span { background-color: #fffcdb; }
       }
       &.selected {
-        background-color: #90dbf9;
-        border: #90dbf9 4px solid;
-        span { background-color: #90dbf9; color: #000; }
+        background-color: #d1f2ff;
+        span { background-color: #d1f2ff; }
       }
     }
   }  
@@ -238,7 +241,7 @@
 
     
 #media {
-  ul {
+  ul.thumbnail_view {
     list-style: none; 
     margin: 0 0 20px 0; 
     padding: 0; 

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

@@ -14,7 +14,7 @@ if editing
   if url.nil? || url.starts_with?('http://placehold.it') || url.include?('missing')  
     %><div id='block_<%= block.id %>'><p>Empty file: <%= block.name %></p></div><%
   else
-    %><div id='block_<%= block.id %>'><p><a href="/admin/<%= block.page_id ? "pages/#{block.page_id}" : "posts/#{block.post_id}" %>/blocks/<%= block.id %>/edit"><%= name %></a></p></div><%
+    %><div id='block_<%= block.id %>'><p><span><%= name %></span></p></div><%
   end
 elsif url
   %><div id='block_<%= block.id %>'><p><a href="<%= raw file.url %>">Download File</a></p></div><%

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.66'
+  VERSION = '0.8.67'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.66
+  version: 0.8.67
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg