caboose-cms 0.9.228 → 0.9.229

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b89809e13ef7764c5cad31cc964088a62059fd1d9c4f8fc605a6f25205d17b05
-  data.tar.gz: 40eec51e9e0de7c6639ad0a08982f61501eb05c50275509fe0b6558234f0ed65
+  metadata.gz: 121271249da78a68a31b4fd59d45251631066a87fc53b308f8b0ef8c0eabd082
+  data.tar.gz: 2434ebfd7e93850f55da2a75320299e01c9ad778ee1b60210e0c93f218e50a92
 SHA512:
-  metadata.gz: d483ad56514bf89e62d123521fe32c94471a696da74caa09854c1a255918254e30b1d7b94e749bf3cb0fa05f6d8b0c0685380648ff3d9f2af17ce6de97bc427c
-  data.tar.gz: f42704933116462997b19e25c21d0f5ffa79a40b544c35a38558a63f84b27841318ffd27b1f98963f48b531befda1766902de057985d8c2abc5258883876c564
+  metadata.gz: 5189d3c36ef6c4aae4bf201d080c9e53616b2304bc2e145d2fd7e847a74f5fb08a7f7fabfb17d0d4fbac62f6441c839883d61f284f20892d876f834df6860b10
+  data.tar.gz: 35070ab584b77c04c51590ba62aa42ec9b514c850ed81723da554d7424d8ca09361e9223dbe8e28bc65d597e9e9f23cb5c40dcc1f19fc651fd59f3d36de619b7

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

@@ -17,4 +17,4 @@
 //= require caboose/jquery.datetimepicker
 //= require caboose/jquery.placeholder
 //= require caboose/modal_integration
-//= require caboose/admin_main
+//= require caboose/admin_main

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

@@ -1,4 +1,3 @@
-
 function curr(x)
 {
   if (!x) return '0.00'
@@ -18,15 +17,4 @@ function add_to_crumbtrail(href, text)
   if (!c.is(':empty'))
     c.append(' > ');
   c.append($('<a/>').attr('href', href).html(text));
-}
-
-$(window).load(function() {
-  $("#top_nav ul.quick > li").mouseenter(function() {
-    $(this).find("ul").show();
-    $(this).children('a, span').addClass('hovered');
-  });
-  $("#top_nav ul.quick > li").mouseleave(function() {
-    $(this).find("ul").hide();
-    $(this).children('a, span').removeClass('hovered');
-  });
-});
+}

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

@@ -29,20 +29,23 @@ MediaController.prototype = {
       .empty()
       .append($('<p/>')
         .append($('<a/>').addClass('caboose-btn').attr('href', '#').html('Upload').click(function(e) { e.preventDefault(); that.toggle_uploader(); }))
-        .append($('<a/>').addClass('caboose-btn').attr('href', '#').html('Select All').click(function(e) { e.preventDefault(); that.select_all_media(); }))
-        .append($('<a/>').addClass('caboose-btn').attr('href', '#').attr('id', 'sort-btn').html('Sort').click(function(e) { e.preventDefault(); that.sort_media(); }))
+        .append($('<a/>').addClass('caboose-btn blue').attr('href', '#').html('Select All').click(function(e) { e.preventDefault(); that.select_all_media(); }))
+        .append($('<a/>').addClass('caboose-btn blue').attr('href', '#').attr('id', 'sort-btn').html('Sort').click(function(e) { e.preventDefault(); that.sort_media(); }))
+        .append($('<a/>').addClass('caboose-btn red').attr('href', '#').attr('id', 'delete-btn').html('Delete Selected Files').click(function(e) { e.preventDefault(); that.delete_media(false); }))
+        .append($('<a/>').addClass('caboose-btn red').attr('href', '#').attr('id', 'delete-btn').html('Delete Selected Category').click(function(e) { e.preventDefault(); that.delete_category(that.cat_id, false); }))
+        .append($('<a/>').addClass('caboose-btn green').attr('href', '#').attr('id', 'new-btn').html('New Category').click(function(e) { e.preventDefault(); that.add_category(); }))
       )
+      .append("<div id='delete'></div>")
+      .append("<div id='new_cat_message'></div>")
       .append($('<div/>').attr('id', 'the_uploader'));          
     that.refresh();   
   },    
   
   refresh: function()
   {
-    //console.log("REFRESHING EVERYTHING");
     var that = this;
     that.refresh_categories();
     that.refresh_media();
-    that.print_controls();    
   },
   
   refresh_categories: function(after) 
@@ -64,7 +67,6 @@ MediaController.prototype = {
   
   refresh_media: function() 
   {
-    //console.log("REFRESHING MEDIA");
     var that = this;
     $.ajax({
       url: '/admin/media/json',
@@ -88,7 +90,7 @@ MediaController.prototype = {
         sort: list
       },
       success: function(resp) { 
-        console.log("success");
+      //  console.log("success");
       }        
     });
   },
@@ -236,10 +238,9 @@ MediaController.prototype = {
           .addClass('category')
           .attr('id', 'cat' + cat.id)
           .data('media_category_id', cat.id)
-          .append($('<a/>').attr('href', '#').html(cat.name + ' (' + cat.media_count + ')').click(function(e) { e.preventDefault(); that.select_category($(this).parent().data('media_category_id')); }));
+          .append($('<a/>').attr('href', '#').html(cat.name).click(function(e) { e.preventDefault(); that.select_category($(this).parent().data('media_category_id')); }));
         if (cat.id == that.cat_id)
           li.addClass('selected');
-     //   console.dir(cat);
         if (cat.name && cat.name.indexOf('Products') > -1 && product_cat_id == 0) {
           li.addClass('products-li');
           li.html('').append($('<a/>').attr('href', '#').html(cat.name).click(function(e) { e.preventDefault(); $(this).closest('#left_content').toggleClass('hide-products'); }));
@@ -247,7 +248,7 @@ MediaController.prototype = {
         }
         else if ( cat.parent_id == product_cat_id ) {
           li.addClass('product-sub-li');
-          li.html('').append($('<a/>').attr('href', '#').html(cat.name + ' (' + cat.media_count + ')').click(function(e) { e.preventDefault(); that.select_category($(this).parent().data('media_category_id')); }));
+          li.html('').append($('<a/>').attr('href', '#').html(cat.name).click(function(e) { e.preventDefault(); that.select_category($(this).parent().data('media_category_id')); }));
         }
         ul.append(li);
       });      
@@ -255,8 +256,8 @@ MediaController.prototype = {
     else
       ul = $('<p/>').html("There are no media categories.");
     $('#categories').empty().append(ul)
-      .append($('<p/>').append($('<a/>').attr('href', '#').html('New Category').click(function(e) { e.preventDefault(); that.add_category(); })))
-      .append($('<div/>').attr('id', 'new_cat_message'));            
+     // .append($('<p/>').append($('<a/>').attr('href', '#').html('New Category').click(function(e) { e.preventDefault(); that.add_category(); })))
+     // .append($('<div/>').attr('id', 'new_cat_message'));            
 
     $.each(that.categories, function(i, cat) {
       $('#cat' + cat.id).droppable({
@@ -290,34 +291,49 @@ MediaController.prototype = {
       $('#cat' + cat.id).draggable({ revert: 'invalid' });
     });    
   },
+
+  // delete_media: function() {
+  //   if (ui.draggable.hasClass('category')) {
+  //     var media_category_id = ui.draggable.data('media_category_id');
+  //     that.delete_category(media_category_id);                      
+  //   }
+  //   else {                    
+  //     id = ui.draggable.data('media_id');
+  //     if (that.selected_media.length > 0 && that.selected_media.indexOf(id) > -1)            
+  //     {            
+  //       that.select_media(id); // Go ahead and de-select because the select event is about to run            
+  //     }                    
+  //     that.delete_media();
+  //   }
+  // },
   
-  print_controls: function()
-  {
-    var that = this;
-    $('#controls').empty()
-      .append($('<div/>').attr('id', 'delete').append($('<p/>').addClass('delete_dropper').html('Delete')));
+  // print_controls: function()
+  // {
+  //   var that = this;
+  //   $('#controls').empty()
+  //     .append($('<div/>').attr('id', 'delete').append($('<p/>').addClass('delete_dropper').html('Delete')));
       
-    $('#delete').droppable({
-      accept: function(draggable) { return (draggable.hasClass('category') || draggable.hasClass('media')) },
-      hoverClass: 'hover',
-      drop: function(event, ui) {        
-        if (ui.draggable.hasClass('category'))
-        {
-          var media_category_id = ui.draggable.data('media_category_id');
-          that.delete_category(media_category_id);                      
-        }
-        else // media
-        {                    
-          id = ui.draggable.data('media_id');
-          if (that.selected_media.length > 0 && that.selected_media.indexOf(id) > -1)            
-          {            
-            that.select_media(id); // Go ahead and de-select because the select event is about to run            
-          }                    
-          that.delete_media();
-        }
-      }        
-    });
-  },  
+  //   $('#delete').droppable({
+  //     accept: function(draggable) { return (draggable.hasClass('category') || draggable.hasClass('media')) },
+  //     hoverClass: 'hover',
+  //     drop: function(event, ui) {        
+  //       if (ui.draggable.hasClass('category'))
+  //       {
+  //         var media_category_id = ui.draggable.data('media_category_id');
+  //         that.delete_category(media_category_id);                      
+  //       }
+  //       else // media
+  //       {                    
+  //         id = ui.draggable.data('media_id');
+  //         if (that.selected_media.length > 0 && that.selected_media.indexOf(id) > -1)            
+  //         {            
+  //           that.select_media(id); // Go ahead and de-select because the select event is about to run            
+  //         }                    
+  //         that.delete_media();
+  //       }
+  //     }        
+  //   });
+  // },  
 
   print_media: function() 
   {
@@ -342,8 +358,13 @@ MediaController.prototype = {
         if (m.original_name && m.original_name.indexOf('png') > 0) {
           li.addClass("png");
         }
+        //console.log("original_name: " + m.original_name);
         if (m.image_urls)
           li.append($("<div/>").addClass("table").append($("<div/>").addClass("table-cell").append($('<img/>').attr('src', m.image_urls.tiny_url).attr("id","image-" + m.id))));  
+        // else if (m.original_name && (m.original_name.indexOf('.pdf') > 0 || m.original_name.indexOf('.PDF') > 0)) {
+        //   li.append($('<canvas/>').attr('id','pdf-' + m.id).attr("width","80").attr("height","80"));
+        //   that.load_pdf_preview(m);
+        // }
         else if (m.original_name) {
           var ext = m.original_name.match(/\.[0-9a-z]+$/i);
           li.addClass('empty');
@@ -354,22 +375,19 @@ MediaController.prototype = {
           li.addClass('selected ui-selected');
         var btndiv = $("<div/>").addClass("buttons");
         li.append(btndiv);
-        if (that.allow_edit && m.image_urls) btndiv.append($("<a/>").html("Edit Image").click(function() { that.edit_image($(this).parent().parent().data('media_id')); }));
-        else                                 btndiv.append($("<a/>").attr('href', m.file_url).html("Direct URL"));
-        if ( m.image_urls )                  btndiv.append($("<a/>").addClass("dl i").html("Download").click(function() { that.download_image($(this).parent().parent().data('media_id')); }));
-        else                                 btndiv.append($("<a/>").addClass("dl i").html("Download").click(function() { that.download_image($(this).parent().parent().data('media_id')); }));
+        //if (that.allow_edit && m.image_urls) btndiv.append($("<a/>").html("Edit Image").click(function() { that.edit_image($(this).parent().parent().data('media_id')); }));
+        if ( m.image_urls && m.image_urls.large_url )                            
+          btndiv.append($("<a/>").attr('target','_blank').attr('href', m.image_urls.large_url).html("Direct URL"));
+        else
+          btndiv.append($("<a/>").attr('target','_blank').attr('href', m.file_url).html("Direct URL"));                               
+        btndiv.append($("<a/>").addClass("dl i").html("Download").click(function() { that.download_image($(this).parent().parent().data('media_id')); }));
         ul.append(li);
       });
     }
     else
       ul = $('<p/>').html("This category is empty.");
     $('#media').empty().append(ul);    
-    if (that.refresh_unprocessed_images == true && processing)
-    {
-      //setTimeout(function() { that.refresh_media(); }, 2000);
-      setTimeout(function() { that.check_processing_status(); }, 3000);
-    }
-    
+    if (that.refresh_unprocessed_images == true && processing) { setTimeout(function() { that.check_processing_status(); }, 3000); }
     $.each(that.media, function(i, m) {
       $('li.media').draggable({
         multiple: true,
@@ -377,7 +395,6 @@ MediaController.prototype = {
         start: function() { $(this).data("origPosition", $(this).position()); }
       });
     });
-  //  $("#media ul").sortable();
   },     
   
   //============================================================================
@@ -431,58 +448,37 @@ MediaController.prototype = {
   delete_media: function(confirm)
   {        
     var that = this;    
-    if (!confirm)
+    if ( that.selected_media.length == 0 ) {
+      $('#delete').empty().html("<p class='note error'>You don't have any files selected.</p>");
+      setTimeout(function(){ $('#delete').empty() }, 3000);
+    }
+    else if (!confirm)
     {            
-      $.each(that.selected_media, function(i, id) {     
-        $('#media' + id).css('top', '0').css('left', '0');        
-      });                                  
+      // $.each(that.selected_media, function(i, id) {     
+      //   $('#media' + id).css('top', '0').css('left', '0');        
+      // });                                  
       var div = $('<p/>').addClass('note error')
-        .append('Are you sure?<br/>')        
+        .append('Are you sure you want to delete the selected ' + that.selected_media.length + ' files?&nbsp;&nbsp;')    
         .append($('<input/>').attr('type', 'button').val('Yes').click(function() { that.delete_media(true); })).append(" ")
-        .append($('<input/>').attr('type', 'button').val('No' ).click(function() { that.refresh_media(); that.print_controls(); }));
+        .append($('<input/>').attr('type', 'button').val('No' ).click(function() { that.refresh_media(); $('#delete').empty(); }));
       $('#delete').empty().append(div);
       return;            
     }    
-    $('#delete').empty().html("<p class='loading'>Deleting...</p>");
-    $.ajax({
-      url: '/admin/media/bulk',
-      type: 'delete',
-      data: { ids: that.selected_media },      
-      success: function(resp) { that.refresh_categories(); that.refresh_media(); that.print_controls(); }            
-    });    
+    else {
+      $('#delete').empty().html("<p class='note loading'>Deleting files...</p>");
+      $.ajax({
+        url: '/admin/media/bulk',
+        type: 'delete',
+        data: { ids: that.selected_media },      
+        success: function(resp) { that.refresh_categories(); that.refresh_media(); $('#delete').empty(); }            
+      }); 
+    }   
   },
   
   edit_media_description: function(media_id)
   {
     var that = this;
     caboose_modal_url('/admin/media/' + media_id + '/description');
-    
-    //var div = $('<div/>').attr('id', 'media_' + media_id + '_description');
-    //$('#media').append(div);
-    //new ModelBinder({
-    //  name: 'Media',
-    //  id: media_id,
-    //  update_url: '/admin/media/' + media_id,
-    //  authenticity_token: that.authenticity_token,
-    //  attributes: [
-    //    {
-    //      name: 'description', nice_name: 'Description', type: 'textarea', value: '', width: 400, height: 100, fixed_placeholder: true,        
-    //      after_update: function() { $('#media_' + media_id + '_description_container').remove(); },
-    //      after_cancel: function() { $('#media_' + media_id + '_description_container').remove(); }          
-    //    }
-    //  ]      
-    //});
-    //var options = {      
-    //  iframe: true,
-    //  innerWidth: 200,
-    //  innerHeight:  50,
-    //  scrolling: false,
-    //  transition: 'fade',
-    //  closeButton: false,
-    //  onComplete: caboose_fix_colorbox,
-    //  opacity: 0.50       
-    //};
-    //setTimeout(function() { $('#media_' + media_id + '_description_container').colorbox(options); }, 2000);
   },
   
   //============================================================================
@@ -502,14 +498,14 @@ MediaController.prototype = {
     if (!name)
     {      
       var div = $('<p/>').addClass('note warning')
-        .append('New Category Name: ')
+        .append('New category name:&nbsp;&nbsp;')
         .append($('<input/>').attr('type', 'text').attr('id', 'new_cat_name')).append(" ")
         .append($('<input/>').attr('type', 'button').val('Add').click(function() { that.add_category($('#new_cat_name').val()); })).append(" ")
         .append($('<input/>').attr('type', 'button').val('Cancel').click(function() { $('#new_cat_message').empty(); }));
       $('#new_cat_message').empty().append(div);
       return;
     }
-    $('#new_cat_message').empty().html("<p class='loading'>Adding category...</p>");
+    $('#new_cat_message').empty().html("<p class='note loading'>Adding category...</p>");
     $.ajax({
       url: '/admin/media-categories',
       type: 'post',
@@ -520,6 +516,7 @@ MediaController.prototype = {
       success: function(resp) {
         if (resp.error) $('#new_cat_message').empty().html("<p class='note error'>" + resp.error + "</p>");
         if (resp.refresh) that.refresh_categories();
+        $('#new_cat_message').empty();
       }    
     });
   },
@@ -527,31 +524,38 @@ MediaController.prototype = {
   delete_category: function(cat_id, confirm)
   {
     var that = this;
-    if (!confirm)
+    if (cat_id == that.top_cat_id) {
+      $('#delete').empty().html("<p class='note error'>You cannot delete the top level category.</p>");
+      setTimeout(function(){ $('#delete').empty() }, 3000);
+    }
+    else if (!confirm)
     {
       var div = $('<p/>').addClass('note warning')
-        .append('Are you sure? ')        
+        .append('Are you sure you want to delete the selected category? All files in this category, and all subcategories, will also be deleted.&nbsp;&nbsp;')        
         .append($('<input/>').attr('type', 'button').val('Yes').click(function() { that.delete_category(cat_id, true); })).append(" ")
-        .append($('<input/>').attr('type', 'button').val('No' ).click(function() { that.refresh_categories(); that.print_controls() }));
+        .append($('<input/>').attr('type', 'button').val('No' ).click(function() { that.refresh_categories(); $('#delete').empty(); }));
       $('#delete').empty().append(div);
       return;
     }
-    $('#delete').empty().html("<p class='loading'>Deleting...</p>");              
-    $.ajax({
-      url: '/admin/media-categories/' + cat_id,
-      type: 'delete',      
-      success: function(resp) {                  
-        that.refresh_categories(function() {                        
-          var exists = false;
-          $.each(that.categories, function(i, cat) { if (cat.id == cat_id) { exists = true; return false; }});
-          if (!exists) 
-            that.select_category(that.categories[0].id);
-          else            
-            that.refresh_media();
-          that.print_controls();
-        });
-      }            
-    });    
+    else {
+      $('#delete').empty().html("<p class='note loading'>Deleting category...</p>");              
+      $.ajax({
+        url: '/admin/media-categories/' + cat_id,
+        type: 'delete',      
+        success: function(resp) {               
+          that.refresh_categories(function() {                        
+            var exists = false;
+            $.each(that.categories, function(i, cat) { if (cat.id == cat_id) { exists = true; return false; }});
+            if (!exists) 
+              that.select_category(that.categories[0].id);
+            else            
+              that.refresh_media();
+          });
+          $('#delete').empty();
+        }            
+      });  
+    }
+  
   },
     
   media_with_id: function(media_id) 
@@ -592,59 +596,58 @@ MediaController.prototype = {
   // Aviary
   //============================================================================
 
-  edit_image: function(media_id) 
-  {
-    var that = this;
-    var m = that.media_with_id(media_id);    
+  // edit_image: function(media_id) 
+  // {
+  //   var that = this;
+  //   var m = that.media_with_id(media_id);    
         
-    if (that.feather_editor != false)
-    {
-      that.edit_image_helper(m);
-      return;
-    }    
-    that.feather_editor = new Aviary.Feather({
-      apiKey: '933414ee42934e8b81d8cd2226a5a13b',
-      theme: 'light',
-      enableCORS: false,
-      maxSize: 1600,
-      onSave: function(media_id, new_url) { return that.update_image(media_id, new_url); },
-      onLoad: function() { that.edit_image_helper(m); }
-    });        
-  },
+  //   if (that.feather_editor != false)
+  //   {
+  //     that.edit_image_helper(m);
+  //     return;
+  //   }    
+  //   that.feather_editor = new Aviary.Feather({
+  //     apiKey: '933414ee42934e8b81d8cd2226a5a13b',
+  //     theme: 'light',
+  //     enableCORS: false,
+  //     maxSize: 1600,
+  //     onSave: function(media_id, new_url) { return that.update_image(media_id, new_url); },
+  //     onLoad: function() { that.edit_image_helper(m); }
+  //   });        
+  // },
   
-  edit_image_helper: function(m)
-  {
-    console.log(m.image_urls.original_url);
-    var that = this;
-    that.feather_editor.launch({
-      image: 'image-' + m.id,
-      url: m.image_urls.original_url
-    });
-  },
+  // edit_image_helper: function(m)
+  // {
+  //   var that = this;
+  //   that.feather_editor.launch({
+  //     image: 'image-' + m.id,
+  //     url: m.image_urls.original_url
+  //   });
+  // },
   
-  update_image: function(image_id, new_url) 
-  {
-    var that = this;    
-    var media_id = parseInt(image_id.replace('image-', ''));
+  // update_image: function(image_id, new_url) 
+  // {
+  //   var that = this;    
+  //   var media_id = parseInt(image_id.replace('image-', ''));
 
-    that.feather_editor.showWaitIndicator();
-    $.ajax({
-      url: '/admin/media/' + media_id,
-      type: 'put',
-      data: { image_url: new_url },
-      success: function(resp) {
-        if(resp.error)   { alert("Error saving image:\n\n" + resp.error); } 
-        if(resp.success) {
-          that.feather_editor.hideWaitIndicator();
-          var src = $('#image-' + media_id).attr('src').split('?')[0];                    
-          $('#image-' + media_id).attr('src', src + '?' +  Date.now());
-          that.feather_editor.close();
-          that.refresh_media();
-        }
-      }
-    });
-    return false;
-  }
+  //   that.feather_editor.showWaitIndicator();
+  //   $.ajax({
+  //     url: '/admin/media/' + media_id,
+  //     type: 'put',
+  //     data: { image_url: new_url },
+  //     success: function(resp) {
+  //       if(resp.error)   { alert("Error saving image:\n\n" + resp.error); } 
+  //       if(resp.success) {
+  //         that.feather_editor.hideWaitIndicator();
+  //         var src = $('#image-' + media_id).attr('src').split('?')[0];                    
+  //         $('#image-' + media_id).attr('src', src + '?' +  Date.now());
+  //         that.feather_editor.close();
+  //         that.refresh_media();
+  //       }
+  //     }
+  //   });
+  //   return false;
+  // }
   
 };