caboose-cms 0.4.52 → 0.4.53

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjFkNDIxYjhkZGIxNmQ5MTMxNjhkNWE4Y2E5YzU1ZjQ4OTIzOWRjZg==
+    NzhlMzNkYzE1YTRiM2FmY2RhZTBlODVjYTEyY2VjZTM4YWNiYWZjNA==
   data.tar.gz: !binary |-
-    MTA1MWI4N2QwYmI4NDVkODUzMDVjZjVlYTYwMWViNDNjNmY5NGVlMw==
+    ZGI2ZGYyNDJhZTEwNjU3ZDhjODM2NTQxMGFkOGNhZDllMzQ0NDg4Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjM5N2RjZjI5MWQ0YzljYjlkMmYxMzYwNWYwZDVhZGM2NjJhNjk4MDQxNzQy
-    OWY5MTQ4ZjQzZjg5NjlhNzY3NzZmMTQ1NGU2MzE3NWQ5MWQyYWM3Y2RkZGM2
-    MGQ2OTkyNDE4MmI0YmE1NWUzYjViNzNmNzljYjAzY2Q1MmYxZGY=
+    ZmQ2MWY0YThkYzA1YWJlNjI2MThiYjMyOTZkYjQ3NzcyYTY5ZTA5ZmE5YWRh
+    MDNmOGRiMzE2ZTBiNzIzODFiMTUzN2UwNmQ3MjZjZTI5ZjFmMDQ4M2RkYWI0
+    NTAwYmQ4MTFkZTU5OWEyZjI2MDQ3NWJmMDgzNDY4YzdlMGRlYzk=
   data.tar.gz: !binary |-
-    YTNlZWM3MTg3MmRlZDIyOTM0ZGExZjYzNWQyY2U0ZjBhNmZjZjM3MjRiOGI0
-    MjczMTJhODIzZDNlMjhlM2Y1YzMxYTNkMWEwZjFkODUzOGUzM2VhY2ZmOGZl
-    ZTY0NmY1NzlmZjUyMDkzMTc3NTg4NDZiZTBlNGU0YTRlOTI1YjY=
+    Nzk1ZTBhZWY1NTc4MzM5YmVjNDRkM2VjYjIxOWI1NzI4ZmMyNGVmM2IxOGNj
+    YWE0MGJhMWE0M2RlMjk3M2JiMDExZDNmYjQwOGIxYTkzNjZkOTY0OTUzY2Ji
+    OTFjOWVkN2M4YjhiMzMyN2ZmYWZjNTBkYmFjOGI5Njc1MDIzYzQ=

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

@@ -42,8 +42,8 @@ PageContentController.prototype = {
         {
           var ids = [];
           $.each($(e.target).children(), function(i, el) {
-            var id = $(el).attr('id');
-            if (id.substr(0, 6) == 'block_') ids.push(id.substr(6));
+            var id = $(el).attr('id');            
+            if (id && id.substr(0, 6) == 'block_') ids.push(id.substr(6));
           });          
             
           $.ajax({

data/app/assets/javascripts/caboose/jquery.fileupload.js

@@ -163,7 +163,7 @@
             // value properties, a function returning such an array, a FormData
             // object (for XHR file uploads), or a simple object.
             // The form of the first fileInput is given as parameter to the function:
-            formData: function (form) {
+            formData: function (form) {                
                 return form.serializeArray();
             },
 

data/app/assets/javascripts/caboose/jquery.iframe-transport.js

@@ -1 +1,215 @@
-(function(a,b){a.ajaxPrefilter(function(d,c,e){if(d.iframe){d.originalURL=d.url;return"iframe"}});a.ajaxTransport("iframe",function(l,j,k){var f=null,i=null,e="iframe-"+a.now(),d=a(l.files).filter(":file:enabled"),h=null,c=null;function g(){d.each(function(o,n){var m=a(n);m.data("clone").replaceWith(m)});f.remove();i.one("load",function(){i.remove()});i.attr("src","javascript:false;")}l.dataTypes.shift();l.data=j.data;if(d.length){f=a("<form enctype='multipart/form-data' method='post'></form>").hide().attr({action:l.originalURL,target:e});if(typeof(l.data)==="string"&&l.data.length>0){a.error("data must not be serialized")}a.each(l.data||{},function(m,n){if(a.isPlainObject(n)){m=n.name;n=n.value}a("<input type='hidden' />").attr({name:m,value:n}).appendTo(f)});a("<input type='hidden' value='IFrame' name='X-Requested-With' />").appendTo(f);if(l.dataTypes[0]&&l.accepts[l.dataTypes[0]]){c=l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", */*; q=0.01":"")}else{c=l.accepts["*"]}a("<input type='hidden' name='X-HTTP-Accept'>").attr("value",c).appendTo(f);h=d.after(function(m){var o=a(this),n=o.clone().prop("disabled",true);o.data("clone",n);return n}).next();d.appendTo(f);return{send:function(n,m){i=a("<iframe src='javascript:false;' name='"+e+"' id='"+e+"' style='display:none'></iframe>");i.one("load",function(){i.one("load",function(){var u=this.contentWindow?this.contentWindow.document:(this.contentDocument?this.contentDocument:this.document),q=u.documentElement?u.documentElement:u.body,p=q.getElementsByTagName("textarea")[0],r=p&&p.getAttribute("data-type")||null,o=p&&p.getAttribute("data-status")||200,t=p&&p.getAttribute("data-statusText")||"OK",s={html:q.innerHTML,text:r?p.value:q?(q.textContent||q.innerText):null};g();m(o,t,s,r?("Content-Type: "+r):null)});f[0].submit()});a("body").append(f,i)},abort:function(){if(i!==null){i.unbind("load").attr("src","javascript:false;");g()}}}}})})(jQuery);
+/*
+ * jQuery Iframe Transport Plugin 1.8.2
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/* global define, window, document */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define(['jquery'], factory);
+    } else {
+        // Browser globals:
+        factory(window.jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    // Helper variable to create unique names for the transport iframes:
+    var counter = 0;
+
+    // The iframe transport accepts four additional options:
+    // options.fileInput: a jQuery collection of file input fields
+    // options.paramName: the parameter name for the file form data,
+    //  overrides the name property of the file input field(s),
+    //  can be a string or an array of strings.
+    // options.formData: an array of objects with name and value properties,
+    //  equivalent to the return data of .serializeArray(), e.g.:
+    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
+    // options.initialIframeSrc: the URL of the initial iframe src,
+    //  by default set to "javascript:false;"
+    $.ajaxTransport('iframe', function (options) {
+        if (options.async) {
+            // javascript:false as initial iframe src
+            // prevents warning popups on HTTPS in IE6:
+            /*jshint scripturl: true */
+            var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
+            /*jshint scripturl: false */
+                form,
+                iframe,
+                addParamChar;
+            return {
+                send: function (_, completeCallback) {
+                    form = $('<form style="display:block;"></form>');
+                    form.attr('accept-charset', options.formAcceptCharset);
+                    addParamChar = /\?/.test(options.url) ? '&' : '?';
+                    // XDomainRequest only supports GET and POST:
+                    if (options.type === 'DELETE') {
+                        options.url = options.url + addParamChar + '_method=DELETE';
+                        options.type = 'POST';
+                    } else if (options.type === 'PUT') {
+                        options.url = options.url + addParamChar + '_method=PUT';
+                        options.type = 'POST';
+                    } else if (options.type === 'PATCH') {
+                        options.url = options.url + addParamChar + '_method=PATCH';
+                        options.type = 'POST';
+                    }
+                    // IE versions below IE8 cannot set the name property of
+                    // elements that have already been added to the DOM,
+                    // so we set the name along with the iframe HTML markup:
+                    counter += 1;
+                    iframe = $(
+                        '<iframe src="' + initialIframeSrc +
+                            '" name="iframe-transport-' + counter + '" style="width: 1000px; height: 800px;"></iframe>'
+                    ).bind('load', function () {
+                        var fileInputClones,
+                            paramNames = $.isArray(options.paramName) ?
+                                    options.paramName : [options.paramName];
+                        iframe
+                            .unbind('load')
+                            .bind('load', function () {
+                                var response;
+                                // Wrap in a try/catch block to catch exceptions thrown
+                                // when trying to access cross-domain iframe contents:
+                                try {
+                                    response = iframe.contents();
+                                    // Google Chrome and Firefox do not throw an
+                                    // exception when calling iframe.contents() on
+                                    // cross-domain requests, so we unify the response:
+                                    if (!response.length || !response[0].firstChild) {
+                                        throw new Error();
+                                    }
+                                } catch (e) {
+                                    response = undefined;
+                                }
+                                // The complete callback returns the
+                                // iframe content document as response object:
+                                completeCallback(
+                                    200,
+                                    'success',
+                                    {'iframe': response}
+                                );
+                                // Fix for IE endless progress bar activity bug
+                                // (happens on form submits to iframe targets):
+                                $('<iframe src="' + initialIframeSrc + '"></iframe>')
+                                    .appendTo(form);
+                                return;
+                                window.setTimeout(function () {
+                                    // Removing the form in a setTimeout call
+                                    // allows Chrome's developer tools to display
+                                    // the response result
+                                    form.remove();
+                                }, 0);
+                            });
+                        form
+                            .prop('target', iframe.prop('name'))
+                            .prop('action', options.url)
+                            .prop('method', options.type);
+                        if (options.formData) {
+                            $.each(options.formData, function (index, field) {
+                                $('<input type="hidden"/>')
+                                    .prop('name', field.name)
+                                    .val(field.value)
+                                    .appendTo(form);
+                            });
+                        }
+                        if (options.fileInput && options.fileInput.length &&
+                                options.type === 'POST') {
+                            fileInputClones = options.fileInput.clone();
+                            // Insert a clone for each file input field:
+                            options.fileInput.after(function (index) {
+                                return fileInputClones[index];
+                            });
+                            if (options.paramName) {
+                                options.fileInput.each(function (index) {
+                                    $(this).prop(
+                                        'name',
+                                        paramNames[index] || options.paramName
+                                    );
+                                });
+                            }
+                            // Appending the file input fields to the hidden form
+                            // removes them from their original location:
+                            form
+                                .append(options.fileInput)
+                                .prop('enctype', 'multipart/form-data')
+                                // enctype must be set as encoding for IE:
+                                .prop('encoding', 'multipart/form-data');
+                            // Remove the HTML5 form attribute from the input(s):
+                            options.fileInput.removeAttr('form');
+                        }
+                        form.submit();
+                        // Insert the file input fields at their original location
+                        // by replacing the clones with the originals:
+                        if (fileInputClones && fileInputClones.length) {
+                            options.fileInput.each(function (index, input) {
+                                var clone = $(fileInputClones[index]);
+                                // Restore the original name and form properties:
+                                $(input)
+                                    .prop('name', clone.prop('name'))
+                                    .attr('form', clone.attr('form'));
+                                clone.replaceWith(input);
+                            });
+                        }
+                    });
+                    form.append(iframe).appendTo(document.body);
+                },
+                abort: function () {
+                    if (iframe) {
+                        // javascript:false as iframe src aborts the request
+                        // and prevents warning popups on HTTPS in IE6.
+                        // concat is used to avoid the "Script URL" JSLint error:
+                        iframe
+                            .unbind('load')
+                            .prop('src', initialIframeSrc);
+                    }
+                    if (form) {
+                        form.remove();
+                    }
+                }
+            };
+        }
+    });
+
+    // The iframe transport returns the iframe content document as response.
+    // The following adds converters from iframe to text, json, html, xml
+    // and script.
+    // Please note that the Content-Type for JSON responses has to be text/plain
+    // or text/html, if the browser doesn't include application/json in the
+    // Accept header, else IE will show a download dialog.
+    // The Content-Type for XML responses on the other hand has to be always
+    // application/xml or text/xml, so IE properly parses the XML response.
+    // See also
+    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
+    $.ajaxSetup({
+        converters: {
+            'iframe text': function (iframe) {
+                return iframe && $(iframe[0].body).text();
+            },
+            'iframe json': function (iframe) {
+                return iframe && $.parseJSON($(iframe[0].body).text());
+            },
+            'iframe html': function (iframe) {
+                return iframe && $(iframe[0].body).html();
+            },
+            'iframe xml': function (iframe) {
+                var xmlDoc = iframe && iframe[0];
+                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
+                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
+                            $(xmlDoc.body).html());
+            },
+            'iframe script': function (iframe) {
+                return iframe && $.globalEval($(iframe[0].body).text());
+            }
+        }
+    });
+
+}));

data/app/controllers/caboose/images_controller.rb

@@ -276,31 +276,58 @@ module Caboose
     # GET /admin/images/sign-s3
     def admin_sign_s3
       
+      name = params[:name]      
+      mi = MediaImage.create(
+        :media_category_id => params[:media_category_id], 
+        :name => params[:name]
+      )
+      key = "media-images/#{mi.id}#{File.extname(name)}".downcase
+      
       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 = {
+      policy = {        
         "expiration" => 10.seconds.from_now.utc.xmlschema,
         "conditions" => [
-          { "bucket" => 'cabooseit' },           
+          { "bucket" => 'cabooseit' },
+          ["starts-with", "$key", key],
           { "acl" => "public-read" },
-          { "success_action_status" => "200" }          
+          { "success_action_status" => "200" }
+          #{ "success_action_redirect" => "/admin/images/s3-result" }          
         ]
       }
       policy = Base64.encode64(policy.to_json).gsub(/\n/,'')      
       signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret_key, policy)).gsub("\n","")
       
       render :json => {
-        :policy => policy, 
-        :signature => signature, 
-        :key => 'media-images/test.jpg',
-        :success_action_status => '200'
-        #:success_action_redirect => document_upload_success_document_url(@document)
+        :media_image_id => mi.id,
+        :url => "https://#{bucket}.s3.amazonaws.com",
+        :fields => {
+          :key                     => key,
+          'AWSAccessKeyId'         => access_key,
+          :acl                     => 'public-read',
+          :success_action_status   => '200',
+          #:success_action_redirect => '/admin/images/s3-result',
+          :policy                  => policy, 
+          :signature               => signature
+        }
       }
       
-    end        
+    end
+    
+    def admin_s3_result
+      render :layout => 'caboose/empty'      
+    end
+    
+    # GET /admin/images/:id/process
+    def admin_process
+      return if !user_is_allowed('images', 'edit')
+      mi = MediaImage.find(params[:id])
+      mi.delay.process
+      render :json => true      
+    end
 		
   end
 end

data/app/models/caboose/media_image.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 class Caboose::MediaImage < ActiveRecord::Base
 
   self.table_name = "media_images"
@@ -13,4 +15,10 @@ class Caboose::MediaImage < ActiveRecord::Base
   do_not_validate_attachment_file_type :image  
   attr_accessible :id, :media_category_id, :name, :description
 
+  def process
+    puts "http://#{Caboose::cdn_domain}/media-images/#{self.id}#{File.extname(self.name.downcase)}"
+    self.image = URI.parse("http://#{Caboose::cdn_domain}/media-images/#{self.id}#{File.extname(self.name.downcase)}")
+    self.save    
+  end
+  
 end

data/app/views/caboose/images/admin_index.html.erb

@@ -1,9 +1,18 @@
 <h1>Images</h1>
 
-<% if @domain && @media_category %>
-  <p>
-    <a href='/admin/images/new'>Upload Images</a> |
-    <a href='/admin/images/new-category?parent_id=<%= @media_category.id %>'>New Category</a>
+<% if @domain && @media_category %>  
+  <form action='/admin/images/sign-s3' method='post' id='new_image_form' enctype='multipart/form-data'>
+    <input type='hidden' name='key'                     value='' />
+    <input type='hidden' name='AWSAccessKeyId'          value='' />
+    <input type='hidden' name='acl'                     value='' />
+    <input type='hidden' name='success_action_status'   value='' />
+    <!--<input type='hidden' name='success_action_redirect' value='' />-->
+    <input type='hidden' name='policy'                  value='' />
+    <input type='hidden' name='signature'               value='' />
+    <input type="file" name="file" id="file" multiple='true' />    
+    <div id='progress'><div id='bar'></div></div>  
+  </form>
+  <p><a href='/admin/images/new-category?parent_id=<%= @media_category.id %>'>New Category</a></p>
   </p>  
   <% if @media_category.children.count > 0 || @media_category.media_images.count > 0 %>
     <ul class='media'>  
@@ -11,7 +20,7 @@
         <li class='category' id='cat<%= cat.id %>'><a href='/admin/images?media_category_id=<%= cat.id %>'><%= cat.name %></a></li>
       <% end %>
       <% @media_category.media_images.each do |mi| %>
-        <li class='image' id='image<%= mi.id %>'><a href='/admin/images/<%= mi.id %>'><img src='<%= mi.image.url(:thumb) %>' /><span><%= img.name %></span></a></li>
+        <li class='image' id='image<%= mi.id %>'><a href='/admin/images/<%= mi.id %>'><img src='<%= mi.image.url(:thumb) %>' /><span><%= mi.name %></span></a></li>
       <% end %>
     </ul>
   <% else %>
@@ -22,3 +31,78 @@
 <% else %>
   <p>It doesn't look like this site is configured for the current domain.  Please <a href='/admin/sites'>configure your sites</a>.</p>
 <% end %>  
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+ul.media li.image { list-style: none; margin: 0; padding: 0; float: left; }
+ul.media li.image { list-style: none; margin: 0; padding: 0; float: left; }
+ul.media li.image img {}
+.progress { max-width: 600px; margin: 0.2em 0 0.2em 0; }
+.progress .bar { height:  1.2em; padding: 0.2em; color: white; display: none; }
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'jquery.ui.widget' %>
+<%= javascript_include_tag 'caboose/jquery.iframe-transport.js' %>
+<%= javascript_include_tag 'caboose/jquery.fileupload.js' %>
+<script type='text/javascript'>
+
+var image_ids = [];
+$(document).ready(function() {  
+  $('#file').fileupload({
+    //forceIframeTransport: true,    
+    autoUpload: true,        
+    //replaceFileInput: true,
+    //singleFileUploads: false,        
+    add: function(e, data) {            
+      $.ajax({
+        url: '/admin/images/s3',
+        type: 'get',
+        data: {
+          name: data.files[0].name,
+          media_category_id: <%= @media_category.id %>
+        },
+        async: false,
+        success: function(resp) {
+          image_ids.push(resp.media_image_id);
+          var form = $('#new_image_form');          
+          for (var i in resp.fields)            
+            form.find("input[name=" + i + "]").val(resp.fields[i]);
+          form.attr('action', resp.url);
+        }
+      });            
+      data.submit();
+    },                
+    progressall: function (e, data) {
+      $('#bar').css('width', parseInt(data.loaded / data.total * 100, 10) + '%') 
+    },
+    start: function (e) {
+      $('#file').hide();
+      $('#bar').css('background', 'green').css('display', 'block').css('width', '0%').html("&nbsp;"); 
+    },
+    done: function(e, data) {
+      console.log("Upload done.");
+      console.log(data);
+      setTimeout(function() {
+        $.each(image_ids, function(i, id) {
+          $.ajax({
+            url: '/admin/images/' + id + '/process',
+            type: 'get',            
+            async: false,
+            success: function(resp) {}
+          });
+        });
+        window.location.reload(true); 
+      }, 500);      
+    },
+    fail: function(e, data) {
+      console.log("Upload failed.");
+      console.log(data);      
+      $('#bar').css("background", "red").text("Failed"); 
+    }
+  });
+});
+
+</script>
+<% end %>

data/app/views/caboose/images/admin_new.html.erb

@@ -1,10 +1,19 @@
-
+<%
+# https://github.com/blueimp/jQuery-File-Upload/wiki/Upload-directly-to-S3
+%>
 <h1>Upload Images</h1>
 
-<form action='https://cabooseit.s3.amazonaws.com' method='post' id='new_image_form' enctype='multipart/form-data'>    
-  <input type="file" name="new_image" id="new_image" />  
-  <div class='#progress'><div class='#bar'></div></div>  
-<form>
+<form action='/admin/images/sign-s3' method='post' id='new_image_form' enctype='multipart/form-data'>
+  <input type='hidden' name='key'                     value='' />
+  <input type='hidden' name='AWSAccessKeyId'          value='' />
+  <input type='hidden' name='acl'                     value='' />
+  <input type='hidden' name='success_action_status'   value='' />
+  <!--<input type='hidden' name='success_action_redirect' value='' />-->
+  <input type='hidden' name='policy'                  value='' />
+  <input type='hidden' name='signature'               value='' />
+  <input type="file" name="file" id="file" multiple='true' />    
+  <div id='progress'><div id='bar'></div></div>  
+</form>
 
 <% content_for :caboose_css do %>
 <style type='text/css'>
@@ -14,48 +23,57 @@
 <% end %>
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag 'jquery.ui.all' %>
+<%= javascript_include_tag 'jquery.ui.widget' %>
 <%= javascript_include_tag 'caboose/jquery.iframe-transport.js' %>
 <%= javascript_include_tag 'caboose/jquery.fileupload.js' %>
 <script type='text/javascript'>
 
-$(document).ready(function() {
-  $('#new_image').fileupload({
-    forceIframeTransport: true,
-    autoUpload: true,
-    
-    //fileInput: $('#new_image'),
-    //url: pp.url,
-    type: 'POST',    
-    //formData: pp.fields,
-    //paramName: 'file', // S3 does not like nested name fields i.e. name="user[avatar_url]"
-    //dataType: 'XML',  // S3 returns XML if success_action_status is set to 201
-    replaceFileInput: false,
-    
-    add: function(e, data) {
+$(document).ready(function() {  
+  $('#file').fileupload({
+    //forceIframeTransport: true,    
+    autoUpload: true,        
+    //replaceFileInput: true,
+    //singleFileUploads: false,        
+    add: function(e, data) {            
       $.ajax({
-        url: '/admin/images/sign-s3',
+        url: '/admin/images/s3',
         type: 'get',
         data: {
-          name: document.getElementById('new_image').value,
+          name: data.files[0].name,
           media_category_id: <%= @media_category_id %>
         },
         async: false,
-        success: function(resp) {
-          pp = resp.presigned_post;    
-          var form = $('#new_image_form');
-          for (var i in pp.fields)
-            form.append($('<input/>').attr('type', 'hidden').attr('name', i).val(pp.fields[i]));
-          //form.attr('action', pp.url);
+        success: function(resp) {          
+          var form = $('#new_image_form');          
+          for (var i in resp.fields)            
+            form.find("input[name=" + i + "]").val(resp.fields[i]);
+          form.attr('action', resp.url);
         }
-      });
-      //data.submit();
+      });            
+      data.submit();
     },                
-    progressall: function (e, data) { $('#bar').css('width', parseInt(data.loaded / data.total * 100, 10) + '%') },
-    start: function (e) { $('#bar').css('background', 'green').css('display', 'block').css('width', '0%').text("Loading..."); },
-    done: function(e, data) { $('#bar').text("Uploading done"); },
-    fail: function(e, data) { $('#bar').css("background", "red").text("Failed"); }
-  });  
+    progressall: function (e, data) {
+      $('#bar').css('width', parseInt(data.loaded / data.total * 100, 10) + '%') 
+    },
+    start: function (e) {
+      $('#file').hide();
+      $('#bar').css('background', 'green').css('display', 'block').css('width', '0%').text("Uploading..."); 
+    },
+    done: function(e, data) {
+      console.log("Upload done.");
+      console.log(data);      
+      $('#bar').text("Uploading done");
+      setTimeout(function() { 
+        $('#file').val('').show(); 
+        $('#bar').css('background', 'transparent').empty();        
+      }, 2000);                  
+    },
+    fail: function(e, data) {
+      console.log("Upload failed.");
+      console.log(data);      
+      $('#bar').css("background", "red").text("Failed"); 
+    }
+  });
 });
 
 </script>

data/app/views/caboose/images/admin_s3_result.html.erb

@@ -0,0 +1,3 @@
+<script>
+document.body.innerText=document.body.textContent=decodeURIComponent(window.location.search.slice(1));
+</script>

data/app/views/layouts/caboose/empty.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Empty Page</title>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>

data/config/routes.rb

@@ -63,9 +63,11 @@ Caboose::Engine.routes.draw do
   delete  "admin/roles/:id/permissions/:permission_id"  => "roles#remove_permission"
   
   get     "admin/images"                => "images#admin_index"
-  get     "admin/images/sign-s3"        => "images#admin_sign_s3"    
+  get     "admin/images/s3"             => "images#admin_sign_s3"
+  get     "admin/images/s3-result"      => "images#admin_s3_result"  
   get     "admin/images/new"            => "images#admin_new"
-  get     "admin/images/:id"            => "images#admin_edit"
+  get     "admin/images/:id/process"    => "images#admin_process"
+  get     "admin/images/:id"            => "images#admin_edit"  
   put     "admin/images/:id"            => "images#admin_update"
   post    "admin/images/:id/image"      => "images#admin_update_image"  
   post    "admin/images"                => "images#admin_add"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.52'
+  VERSION = '0.4.53'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.52
+  version: 0.4.53
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -369,6 +369,7 @@ files:
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/images/admin_index.html.erb
 - app/views/caboose/images/admin_new.html.erb
+- app/views/caboose/images/admin_s3_result.html.erb
 - app/views/caboose/login/forgot_password_form.html.erb
 - app/views/caboose/login/index.html.erb
 - app/views/caboose/login/reset_password_form.html.erb
@@ -431,6 +432,7 @@ files:
 - app/views/layouts/caboose/_top_nav.html.erb
 - app/views/layouts/caboose/admin.html.erb
 - app/views/layouts/caboose/application.html.erb
+- app/views/layouts/caboose/empty.html.erb
 - app/views/layouts/caboose/error404.html.erb
 - app/views/layouts/caboose/modal.html.erb
 - bin/caboose