caboose-cms 0.6.9 → 0.6.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzNlNGVmNDBkYzVhNzViNzY1MThlMmI0NmVmMjU3ZmQ3MjhiNmYyNQ==
+    NDAwMWQ4M2NiYWExMWY4ZjMzN2RkYTQxMzhkZTAzOTZjNmUzNDYyZg==
   data.tar.gz: !binary |-
-    YjZiODExNDc0ZjA0MjY5ZjE5NDZmM2NjNzRjZmY3OWFkYmMzZTU4MA==
+    OWUzNGE4OGZjOWVlNWQ0MWYyMmI0OTIyZmMzZjQwNGE1YTE1Njg5YQ==
 SHA512:
   metadata.gz: !binary |-
-    OTI3ZTZiOTY5MmZjNmI4NzAzOGE3MTYxNWYzZDY1ZTRmZjNhNjlkOGM1ZTRk
-    MGM5NWZmNzExYTY4ODk4MWQ0MmQ4ZWQ2MzEzYmNjN2E0ZWNhNDEwZjM5ZWY2
-    NTBiOTUxN2FkODNmNzE5MjZiMWZjNDlhYzIyMTFhZGRmMzMzNDE=
+    MjBiNDY1NmU4NjdlYzcyODA2OWQxYWM1OTQ3MDQ1NWFlMTk2NTdkNmJhOTMz
+    ZWRhODAzMWQ2NTRkNDQzODU2ZWJhZWQzNWIzZjg5ZjQ4ZmQyYzQyOTExNjk3
+    OGU3YzQzMmViZGE5NThlOWI1ZDk1NjFhZWIzMTkyMTRmNGRmYWQ=
   data.tar.gz: !binary |-
-    Yjc4NmY0NjdhYzBkM2Y0OTdiZWFiNjIwYjg4ZDQxYzk5MzhjOGNhNGVmYmYx
-    ZjFjNDE5YTZkOGZkZjk3ODJkNjkxZGM5ZTM5NGQ5OGFhYjRlNDdiZTE0MDYx
-    OWY2NzI5ZGUxMjUyMjMxMDZhODYzYWIzZjI5NDg4NmM0Y2JlNmE=
+    YTcxN2FiNDcwYjBhOGQ2NjUwMzJkZTVkZDAzOTFlNjViYjNiN2M3ZjBmMWJm
+    M2YxMTVlYmVkMWNjZGY3ZWVmZTZmNjRmZTRmM2I2OWFhYWVmZmM4NjQ4OTFh
+    MTNjZjY3NGQ0MmUxMTcxNDFmY2FmYmNiOTBhMzM3YjQyZTQ4MWI=

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

@@ -15,6 +15,10 @@ MediaController.prototype = {
 	uploader: false,
   refresh_unprocessed_images: false,	
 	  
+  
+  
+  
+  
   init: function(params) {
     var that = this;
     for (var i in params)
@@ -37,6 +41,7 @@ MediaController.prototype = {
     that.refresh_categories();
     that.refresh_media();
     that.print_controls();
+    
   },
       
   toggle_uploader: function()
@@ -115,6 +120,8 @@ MediaController.prototype = {
       async: false,      
       success: function(resp) { 
         that.categories = resp;
+        if (!that.cat_id)
+          that.cat_id = that.categories[0].id;
         that.print_categories();
         if (after) after();
       }        
@@ -144,8 +151,7 @@ MediaController.prototype = {
     var ul = $('<ul/>');
     if (that.categories.length > 0)
     {      
-      $.each(that.categories, function(i, cat) {
-        
+      $.each(that.categories, function(i, cat) {        
         var li = $('<li/>')
           .addClass('category')
           .attr('id', 'cat' + cat.id)
@@ -241,7 +247,7 @@ MediaController.prototype = {
           .append($('<span/>').addClass('name').html(m.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));                                      
         if (that.selected_media.indexOf(m.id) > -1)
@@ -280,6 +286,16 @@ MediaController.prototype = {
       that.selected_media[that.selected_media.length] = media_id;
       $('#media' + media_id).addClass('selected ui-selected').css('top', '0').css('left', '0');
     }        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   },
   
   select_all_media: function()

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

@@ -6,26 +6,114 @@ BlockMediaController.prototype = {
   post_id: false,
   page_id: false,
   block_parent_id: false,
-  block_id: false,
+  block_id: false,  
+  media_id: false,  
   top_cat_id: false,
   cat: false,
-  cat_id: false,  
+  cat_id: false,
+  categories: false,  
+  s3_upload_url: false,
+	aws_access_key_id: false,		
+	policy: false,
+	signature: false,
+	selected_media: false,
+	uploader: false,
+  refresh_unprocessed_images: false,
+  upload_extensions: "jpg,jpeg,png,gif,tif,tiff,pdf,doc,docx,odt,odp,ods,ppt,pptx,xls,xlsx,zip,tgz,csv,txt",
+  file_view: 'thumbnail',
 	  
   init: function(params) {
     var that = this;
     for (var i in params)
-      this[i] = params[i];                          
+      this[i] = params[i];
+    
+    $("#uploader")
+      .empty()
+      //.append($('<p/>')
+      //  .append($('<a/>').attr('href', '#').html('Upload').click(function(e) { e.preventDefault(); that.toggle_uploader(); }))
+      //  .append(' | ')
+      //  .append($('<a/>').attr('href', '#').html('Toggle Thumbnail/List View').click(function(e) { e.preventDefault(); that.toggle_view(); }))
+      //)
+      .append($('<div/>').attr('id', 'the_uploader'));      
     that.refresh();    
   },    
   
   refresh: function()
   {
-    var that = this;
+    var that = this;        
     that.refresh_categories(function() {        
       that.refresh_media();
     });
+    that.print_controls();
   },
-    
+   
+  toggle_uploader: function()
+  {
+    var that = this;
+    if (that.uploader)
+    {      
+      $("#the_uploader").slideUp(400, function() {
+        $("#the_uploader").plupload('destroy');
+        that.uploader = false;
+      });            
+    }
+    else
+    {      
+      $("#the_uploader").hide();
+      that.uploader = $("#the_uploader").plupload({
+		    runtimes: 'html5,flash,silverlight',
+		    url: that.s3_upload_url,		      
+		    multipart: true,
+		    multipart_params: {
+		    	key: that.cat_id + '_${filename}', // use filename as a key
+		    	Filename: that.cat_id + '_${filename}', // adding this to keep consistency across the runtimes
+		    	acl: 'public-read',
+		    	//'Content-Type': 'image/jpeg',
+		    	AWSAccessKeyId: that.aws_access_key_id,		
+		    	policy: that.policy,
+		    	signature: that.signature
+		    },		
+		    file_data_name: 'file', // optional, but better be specified directly
+		    filters: {			
+		    	max_file_size: '100mb', // Maximum file size			
+		    	mime_types: [{ title: "Upload files", extensions: that.upload_extensions }] // Specify what files to browse for		    	
+		    },		
+		    flash_swf_url: '../../js/Moxie.swf', // Flash settings		
+		    silverlight_xap_url: '../../js/Moxie.xap', // Silverlight settings
+        init: {
+          BeforeUpload: function(up, file) {        
+            $.ajax({
+              url: '/admin/media/pre-upload',
+              type: 'post',
+              data: {
+                media_category_id: that.cat_id,
+                name: file.name 
+              },
+              success: function(resp) {},
+              async: false          
+            });
+            controller.refresh();
+          },
+          FileUploaded: function(ip, file)
+          {
+            that.refresh();            
+          },          
+          UploadComplete: function(up, files) {
+            that.refresh();
+            if (that.uploader)
+            {
+              $("#the_uploader").slideUp(400, function() {
+                $("#the_uploader").plupload('destroy');
+                that.uploader = false;
+              });
+            }
+          }
+        }
+      });
+      $("#the_uploader").slideDown();      
+    }
+  },
+  
   refresh_categories: function(after) 
   {
     var that = this;
@@ -79,30 +167,66 @@ BlockMediaController.prototype = {
     }
     else
       ul = $('<p/>').html("There are no media categories.");
-    $('#categories').empty().append(ul);
+    $('#categories').empty().append(ul);              
+  },
+  
+  print_controls: function()
+  {
+    var that = this;
+    $('#controls').empty()
+      //.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('Upload').click(function(e) { e.preventDefault(); that.toggle_uploader(); })))
+      //.append($('<p/>').append($('<a/>').attr('href', '#').html('Toggle Thumbnail/List View').click(function(e) { e.preventDefault(); that.toggle_file_view(); })));
+      .append($('<p/>')
+        .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($('<div/>').attr('id', 'new_cat_message'));      
   },
 
   print_media: function() 
   {
     var that = this;
-    var ul = $('<ul/>');    
+    var ul = $('<ul/>').addClass(that.file_view + '_view');    
+    var processing = false;
+    var d = new Date();
+    d = d.getTime();
+        
     if (that.cat.media.length > 0)
     {      
-      $.each(that.cat.media, function(i, m) {        
+      $.each(that.cat.media, function(i, m) {
+        if (m.media_type == 'image' && m.processed == false)
+          processing = true
         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));
+          .append($('<span/>').addClass('name').html(m.original_name));
         if (m.image_urls)
-          li.append($('<img/>').attr('src', m.image_urls.tiny_url));
+          li.append($('<img/>').attr('src', m.image_urls.tiny_url + '?' + d));
+        //if (that.selected_media.indexOf(m.id) > -1)
+        //  li.addClass('selected ui-selected');
+        if (m.id == that.media_id)
+          li.addClass('selected ui-selected');
         ul.append(li);      
       });
     }
     else
       ul = $('<p/>').html("This category is empty.");
-    $('#media').empty().append(ul);                
+    $('#media').empty().append(ul);
+    if (that.refresh_unprocessed_images == true && processing)
+      setTimeout(function() { that.refresh(); }, 2000);
+    
+    $.each(that.cat.media, function(i, m) {
+      $('li.media').draggable({
+        multiple: true,
+        revert: 'invalid',
+        start: function() { $(this).data("origPosition", $(this).position()); }
+      });
+    });
   },
   
   //============================================================================
@@ -117,8 +241,10 @@ BlockMediaController.prototype = {
       success: function(resp) {
         window.location = '/admin/pages/' + that.page_id + '/blocks/' + that.block_parent_id + '/edit';        
       }
-    });
-  },
+    });        
+  },         
+  
+  //============================================================================
   
   select_category: function(cat_id)
   {
@@ -126,6 +252,47 @@ BlockMediaController.prototype = {
     that.cat_id = cat_id;
     that.print_categories();
     that.refresh_media();        
-  }
+  }, 
+  
+  add_category: function(name)
+  {
+    var that = this;
+    if (!name)
+    {
+      if (!$('#new_cat_message').is(':empty'))
+      {
+        $('#new_cat_message').empty();
+        return;
+      }
+      var div = $('<p/>').addClass('note warning')
+        .append('Name: ')
+        .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>");
+    $.ajax({
+      url: '/admin/media-categories',
+      type: 'post',
+      data: {
+        parent_id: that.cat.id,
+        name: name
+      },
+      success: function(resp) {
+        if (resp.error) $('#new_cat_message').empty().html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.refresh) { that.cat_id = resp.new_id; that.refresh(); }
+      }    
+    });
+  },
+
+  toggle_file_view: function()
+  {
+    var that = this;
+    that.file_view = (that.file_view == 'thumbnail' ? 'list' : 'thumbnail');
+    that.print_controls();
+    that.print_media();        
+  },  
   
 };

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

@@ -13,9 +13,10 @@
 //= require_tree ../../templates
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui
 //= require colorbox-rails
 //= require caboose/jquery.datetimepicker
 //= require caboose/jquery.placeholder
 //= require caboose/jquery.detect
 //= require caboose/modal_integration
-//= require caboose/admin_main
+//= require caboose/admin_main

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

@@ -1,11 +1,11 @@
 
 #left_content {
-  width: 280px;
+  width: 200px;
   float: left; 
 }
 
 #right_content {
-  margin-left: 300px;
+  margin-left: 220px;
   max-height: 600px;
   overflow-y: scroll;
 }
@@ -67,13 +67,13 @@
   }
 }
 
-#the_uploader {
+#uploader {  
   margin-bottom: 20px;
-  padding-right: 20px; 
 }
-    
+
 #media {
-  ul {
+  
+  ul.thumbnail_view {
     list-style: none; 
     margin: 0 0 20px 0; 
     padding: 0; 
@@ -114,4 +114,38 @@
       }
     }
   }
+      
+  ul.list_view {
+    list-style: none; 
+    margin: 0; 
+    padding: 0; 
+    
+    li { 
+      position: relative;
+      list-style: none; 
+      margin: 4px; 
+      padding: 4px;                     
+      background-color: #666;
+      background-position: center;
+      background-size: contain; 
+      background-repeat: no-repeat;
+      border: #666 4px solid;
+
+      span.name { 
+        display: block;                
+        color: #fff; 
+        text-decoration: none !important;                                   
+      }
+      &:hover {
+        background-color: #fff799;
+        border: #fff799 4px solid;
+        span { background-color: #fff799; color: #000; }
+      }
+      &.selected {
+        background-color: #90dbf9;
+        border: #90dbf9 4px solid;
+        span { background-color: #90dbf9; color: #000; }
+      }
+    }
+  }  
 }

data/app/controllers/caboose/application_controller.rb

@@ -17,6 +17,9 @@ module Caboose
       # Get the site we're working with      
       domain = Domain.where(:domain => request.host_with_port).first
       @site = domain ? domain.site : nil
+      
+      # Set the site in any mailers
+      CabooseMailer.site = @site
         
       # Make sure someone is logged in
       if !logged_in?      

data/app/controllers/caboose/login_controller.rb

@@ -83,8 +83,8 @@ module Caboose
 		  bob.password_reset_id = rand
 		  bob.password_reset_sent = DateTime.now
 		  bob.save
-		  
-		  LoginMailer.configure_for_site(@site.id).forgot_password_email(bob).deliver
+		  		  
+		  LoginMailer.forgot_password_email(bob).deliver
 		  		  
 		  resp.success = "We just sent you an email.  The reset link inside is good for 3 days."
 		  render :json => resp

data/app/controllers/caboose/media_categories_controller.rb

@@ -40,6 +40,7 @@ module Caboose
       if !cat.save
         resp.error = cat.errors.first[1]
       else
+        resp.new_id = cat.id
         resp.refresh = true
       end
      

data/app/mailers/caboose/caboose_mailer.rb

@@ -0,0 +1,22 @@
+module Caboose
+  class CabooseMailer < ActionMailer::Base
+    include AbstractController::Callbacks
+    
+    default :from => Caboose::email_from
+    
+    cattr_accessor :site
+    @@site = nil
+    
+    before_filter do |mailer|
+      config = SmtpConfig.where(:site_id => @@site.id).first    
+      self.smtp_settings['user_name']            = config.user_name
+      self.smtp_settings['password']             = config.password
+      self.smtp_settings['address']              = config.address
+      self.smtp_settings['port']                 = config.port
+      self.smtp_settings['domain']               = config.domain
+      self.smtp_settings['authentication']       = config.authentication
+      self.smtp_settings['enable_starttls_auto'] = config.enable_starttls_auto
+    end
+    
+  end
+end

data/app/mailers/caboose/login_mailer.rb

@@ -1,10 +1,10 @@
 module Caboose
-  class LoginMailer < ActionMailer::Base
-    default :from => Caboose::email_from
-            
+  class LoginMailer < CabooseMailer #ActionMailer::Base
+
     def forgot_password_email(user)
       @user = user
       mail(:to => user.email, :subject => "#{Caboose::website_name} Forgot Password")
     end    
+
   end
 end

data/app/models/caboose/block.rb

@@ -10,10 +10,10 @@ class Caboose::Block < ActiveRecord::Base
   belongs_to :block_type
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::Block'   
   has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::Block', :dependent => :delete_all, :order => 'sort_order'
-  has_attached_file :file, :path => ':path_prefixuploads/:block_file_upload_name.:extension'
+  has_attached_file :file, :path => ':caboose_prefixuploads/:block_file_upload_name.:extension'
   do_not_validate_attachment_file_type :file  
   has_attached_file :image,
-    :path => ':path_prefixuploads/:block_image_upload_name_:style.:extension',
+    :path => ':caboose_prefixuploads/:block_image_upload_name_:style.:extension',
     :default_url => "http://placehold.it/300x300",
     :styles => {
       :tiny  => '160x120>',

data/app/models/caboose/category.rb

@@ -15,7 +15,7 @@ module Caboose
     has_many :category_memberships
     
     has_attached_file :image,    
-      :path => ':path_prefixcategories/:id_:style.:extension',      
+      :path => ':caboose_prefixcategories/:id_:style.:extension',      
       :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles => {

data/app/models/caboose/media.rb

@@ -5,10 +5,10 @@ class Caboose::Media < ActiveRecord::Base
 
   self.table_name = "media"
   belongs_to :media_category
-  has_attached_file :file, :path => ':path_prefixmedia/:id_:media_name.:extension'
+  has_attached_file :file, :path => ':caboose_prefixmedia/:id_:media_name.:extension'
   do_not_validate_attachment_file_type :file  
   has_attached_file :image, 
-    :path => ':path_prefixmedia/:id_:media_name_:style.:extension',
+    :path => ':caboose_prefixmedia/:id_:media_name_:style.:extension',
     :default_url => 'http://placehold.it/300x300',    
     :styles => {      
       :tiny  => '160x120>',
@@ -72,13 +72,14 @@ class Caboose::Media < ActiveRecord::Base
   
   def api_hash
     {
-      :id           => self.id,
-      :name         => self.name,
-      :description  => self.description,
-      :processed    => self.processed,
-      :image_urls   => self.image_urls,
-      :file_url     => self.file ? self.file.url : nil,
-      :media_type   => self.is_image? ? 'image' : 'file'
+      :id            => self.id,
+      :name          => self.name,
+      :original_name => self.original_name,
+      :description   => self.description,
+      :processed     => self.processed,
+      :image_urls    => self.image_urls,
+      :file_url      => self.file ? self.file.url : nil,
+      :media_type    => self.is_image? ? 'image' : 'file'
     }    
   end
   

data/app/models/caboose/post.rb

@@ -20,7 +20,7 @@ class Caboose::Post < ActiveRecord::Base
     :updated_at
     
   has_attached_file :image, 
-    :path => ':path_prefixposts/:id_:style.:extension',
+    :path => ':caboose_prefixposts/:id_:style.:extension',
     :default_url => 'http://placehold.it/300x300',
     :styles => {
       :tiny  => '75x75>',

data/app/models/caboose/product_image.rb

@@ -20,7 +20,7 @@ module Caboose
       :square_scale_factor
       
     has_attached_file :image,      
-      :path => ':path_prefixproducts/:product_id_:id_:style.:extension',      
+      :path => ':caboose_prefixproducts/:product_id_:id_:style.:extension',      
       :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles      => {

data/app/models/caboose/site.rb

@@ -11,7 +11,7 @@ class Caboose::Site < ActiveRecord::Base
   has_many :post_categories, :class_name => 'Caboose::PostCategory'
   has_one :store_config
   has_attached_file :logo, 
-    :path => ':path_prefixsite_logos/:id_:style.:extension',    
+    :path => ':caboose_prefixsite_logos/:id_:style.:extension',    
     :default_url => 'http://placehold.it/300x300',    
     :styles => {
       :tiny  => '150x200>',

data/app/models/caboose/smtp_config.rb

@@ -17,6 +17,10 @@ class Caboose::SmtpConfig < ActiveRecord::Base
   AUTH_LOGIN = 'login'
   AUTH_MD5 = 'cram_md5'
   
+  def self.configure_for_site(mailer, site_id)
+    return self.configure_mailer_for_site(mailer, site_id)
+  end
+  
   def self.configure_mailer_for_site(mailer, site_id)
     c = self.where(:site_id => site_id).first
     
@@ -29,6 +33,6 @@ class Caboose::SmtpConfig < ActiveRecord::Base
     mailer.smtp_settings['enable_starttls_auto'] = c.enable_starttls_auto
     
     return mailer
-  end
+  end    
 
 end

data/app/models/caboose/user.rb

@@ -5,7 +5,7 @@ class Caboose::User < ActiveRecord::Base
   has_many :role_memberships
   has_many :roles, :through => :role_memberships
   has_attached_file :image, 
-    :path => ':path_prefixusers/:id_:style.:extension',    
+    :path => ':caboose_prefixusers/:id_:style.:extension',    
     :default_url => 'http://placehold.it/300x300',    
     :styles => {
       :tiny  => '150x200>',

data/app/models/caboose/vendor.rb

@@ -6,7 +6,7 @@ module Caboose
     belongs_to :site    
     has_many :products
     has_attached_file :image, 
-      :path => ':path_prefixvendors/:id_:style.:extension',    
+      :path => ':caboose_prefixvendors/:id_:style.:extension',    
       :default_url => 'http://placehold.it/300x300',    
       :styles => {
         :tiny  => '150x200>',

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

@@ -1,4 +1,27 @@
 <%
+config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]      
+access_key = config['access_key_id']
+secret_key = config['secret_access_key']
+bucket     = config['bucket']      
+policy = {        
+  "expiration" => 1.hour.from_now.utc.xmlschema,
+  "conditions" => [
+    { "bucket" => "#{bucket}-uploads" },          
+    { "acl" => "public-read" },
+    [ "starts-with", "$key", '' ],
+    #[ "starts-with", "$Content-Type", 'image/' ],          
+    [ 'starts-with', '$name', '' ], 	
+    [ 'starts-with', '$Filename', '' ],          
+  ]
+}
+@policy = Base64.encode64(policy.to_json).gsub(/\n/,'')      
+@signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret_key, @policy)).gsub("\n","")
+@s3_upload_url = "https://#{bucket}-uploads.s3.amazonaws.com/"
+@aws_access_key_id = access_key                                                
+@top_media_category = Caboose::MediaCategory.top_category(@site.id)      
+
+#===============================================================================
+
 base_url = @block.page_id ? "/admin/pages/#{@block.page_id}/blocks" : "/admin/posts/#{@block.post_id}/blocks"
 crumbs = []
 b = @block
@@ -9,36 +32,19 @@ while b
   b = b.parent
 end
 
-url = nil
-name = nil
-if @block.media  
-  url = @block.media.file_url
-  name = @block.media.file_file_name
-  name = @block.media.image_file_name if name.nil?
-elsif @block.image
-  url = @block.file.url
-  name = @block.file_file_name  
-end
-
 %>
 <h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
 
 <div id='left_content'>
-  <div id='categories'></div>
-  <div id='controls'>
-    <% if url.nil? || url.include?('missing') %>            
-      <p>Please select a file.</p>
-    <% else %>
-      <p>Current File</p>
-      <p><%= name %></p>
-    <% end %>    
-  </div>
+  <div id='categories'></div>  
 </div>
 <div id='right_content'>
+  <div id='controls'></div>
   <div id='uploader'></div>
   <div id='media'></div>
 </div>
 
+<p style='clear: both;'>&nbsp;</p>
 <p>
 <input type='button' value='< Back'       onclick="window.location='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.parent_id %>/edit';" />
 <input type='button' value='Close'        onclick="parent.controller.render_blocks(); modal.close();" />
@@ -47,11 +53,22 @@ end
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+<%= stylesheet_link_tag 'plupload/jquery.ui.plupload/css/jquery.ui.plupload.css' %>
 <% end %>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <%= javascript_include_tag "caboose/block_media_controller" %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+
+<%= javascript_include_tag 'plupload/plupload.full.min.js' %> 
+<%= javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js' %>
+<%
+#javascript_include_tag 'plupload/moxie.js'
+#javascript_include_tag 'plupload/plupload.dev.js'
+#javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js'
+%>
+
 <script type='text/javascript'>
 
 var modal = false;
@@ -61,11 +78,19 @@ $(window).load(function() {
   
 var controller = false;
 $(document).ready(function() {  
-  controller = new BlockMediaController({          
+  controller = new BlockMediaController({
     <% if @block.page_id %>page_id: <%= @block.page_id %><% else %>post_id: <%= @block.post_id %><% end %>,
-    block_id: <%= @block.id %>,
-    block_parent_id: <%= @block.parent_id %>,              
-    authenticity_token: '<%= form_authenticity_token %>'    
+    block_id: <%= @block.id %>,    
+    block_parent_id: <%= @block.parent_id %>,    
+    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 %>,
+    s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
+	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
+	  policy: '<%= raw @policy %>',
+	  signature: '<%= raw @signature %>',
+	  refresh_unprocessed_images: false	          
   });    
 });    
 

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

@@ -1,4 +1,27 @@
-<%
+<%  
+config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]      
+access_key = config['access_key_id']
+secret_key = config['secret_access_key']
+bucket     = config['bucket']      
+policy = {        
+  "expiration" => 1.hour.from_now.utc.xmlschema,
+  "conditions" => [
+    { "bucket" => "#{bucket}-uploads" },          
+    { "acl" => "public-read" },
+    [ "starts-with", "$key", '' ],
+    #[ "starts-with", "$Content-Type", 'image/' ],          
+    [ 'starts-with', '$name', '' ], 	
+    [ 'starts-with', '$Filename', '' ],          
+  ]
+}
+@policy = Base64.encode64(policy.to_json).gsub(/\n/,'')      
+@signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret_key, @policy)).gsub("\n","")
+@s3_upload_url = "https://#{bucket}-uploads.s3.amazonaws.com/"
+@aws_access_key_id = access_key                                                
+@top_media_category = Caboose::MediaCategory.top_category(@site.id)      
+
+#===============================================================================
+
 base_url = @block.page_id ? "/admin/pages/#{@block.page_id}/blocks" : "/admin/posts/#{@block.post_id}/blocks"
 crumbs = []
 b = @block
@@ -9,32 +32,19 @@ while b
   b = b.parent
 end
 
-url = nil
-if @block.media  
-  url = @block.media.image.url(:tiny)
-elsif @block.image
-  url = @block.image.url(:tiny)
-end
-
 %>
 <h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
 
 <div id='left_content'>
-  <div id='categories'></div>
-  <div id='controls'>
-    <% if url.nil? %>            
-      <p>Please upload an image.</p>
-    <% else %>
-      <p>Current Image</p>
-      <p><img src='<%= raw url %>' /></p>
-    <% end %>    
-  </div>
+  <div id='categories'></div>  
 </div>
 <div id='right_content'>
+  <div id='controls'></div>
   <div id='uploader'></div>
   <div id='media'></div>
 </div>
 
+<p style='clear: both;'>&nbsp;</p>
 <p>
 <input type='button' value='< Back'       onclick="window.location='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.parent_id %>/edit';" />
 <input type='button' value='Close'        onclick="parent.controller.render_blocks(); modal.close();" />
@@ -43,27 +53,46 @@ end
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+<%= stylesheet_link_tag 'plupload/jquery.ui.plupload/css/jquery.ui.plupload.css' %>
 <% end %>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <%= javascript_include_tag "caboose/block_media_controller" %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+
+<%= javascript_include_tag 'plupload/plupload.full.min.js' %> 
+<%= javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js' %>
+<%
+#javascript_include_tag 'plupload/moxie.js'
+#javascript_include_tag 'plupload/plupload.dev.js'
+#javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js'
+%>
+
 <script type='text/javascript'>
 
 var modal = false;
 $(window).load(function() {  
-  modal = new CabooseModal(800);
+  modal = new CabooseModal(900);
 });
-  
+
 var controller = false;
-$(document).ready(function() {  
-  controller = new BlockMediaController({          
+$(document).ready(function() {
+  controller = new BlockMediaController({
     <% if @block.page_id %>page_id: <%= @block.page_id %><% else %>post_id: <%= @block.post_id %><% end %>,
-    block_id: <%= @block.id %>,
-    block_parent_id: <%= @block.parent_id %>,              
-    authenticity_token: '<%= form_authenticity_token %>'    
-  });    
-});    
+    block_id: <%= @block.id %>,    
+    block_parent_id: <%= @block.parent_id %>,    
+    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 %>,
+    s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
+	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
+	  policy: '<%= raw @policy %>',
+	  signature: '<%= raw @signature %>',
+	  refresh_unprocessed_images: false
+  });	
+});
 
 </script>
 <% end %>

data/lib/caboose.rb

@@ -127,20 +127,20 @@ module Caboose
 end
 
 # These are used so that both local filestorage and S3 can work without having to change paperclip paths in models
-Paperclip.interpolates :path_prefix do |attachment, style|  
+Paperclip.interpolates :caboose_prefix do |attachment, style|  
   return "#{Rails.root}/public/" if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'
   return ''
 end
 
-Paperclip.interpolates :model_url do |attachment, style|
-  # Local file storeage
-  if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'
-    p = attachment.path.gsub("#{Rails.root}/public/", '')
-    return "/#{p}"
-  end  
-  # Otherwise S3
-  return "#{Caboose::cdn_domain}/#{attachment.path}"
-end
+#Paperclip.interpolates :model_url do |attachment, style|
+#  # Local file storeage
+#  if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'
+#    p = attachment.path.gsub("#{Rails.root}/public/", '')
+#    return "/#{p}"
+#  end  
+#  # Otherwise S3
+#  return "#{Caboose::cdn_domain}/#{attachment.path}"
+#end
 
 Paperclip.interpolates :block_file_upload_name do |attachment, style|
   b = attachment.instance

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.9'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -657,6 +657,7 @@ files:
 - app/helpers/caboose/pages_helper.rb
 - app/helpers/caboose/permissions_helper.rb
 - app/helpers/caboose/products_helper.rb
+- app/mailers/caboose/caboose_mailer.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
 - app/models/caboose/ab_option.rb