caboose-cms 0.6.18 → 0.6.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWYxMmMxNTU3NzZjZTAwZDNmZTg2NjNiMjE2ZWY0MWFkNmNmMDM3NA==
+    NTA2NjFiZGRkMDZiMjJhNzJmNWMzZTUwN2ZhY2FkNmU2Y2M5MjNiMA==
   data.tar.gz: !binary |-
-    MDQ1ZjZjOTAyZTY5MWIwNTQxNzFhZTVjYzU0ZGE1YTMzNGRiMTU3Yg==
+    ZmIxODVlNWMzZDAwZTBlN2MwMjczYjA5MmM3ODBlMzU4MjVmMjQ5ZA==
 SHA512:
   metadata.gz: !binary |-
-    NmI2YjRjOTk3M2Q1OGZhMTVkNDliMTY0ZWI2MTA0YzJhZjI3Yjc2YjJmNDAx
-    M2NlNmYyYjE5NWViZmVmNjdhNjk5ZmVjYzA2ZmQ1ZGUyMDc0NTNjOWIwMGRh
-    MGEyMzQ0NWNkYjc4MmRjMzMxNTQ5YTQzNTg1YjhlMzBjZWYxMDg=
+    NDQ1NTk1ZDNiMjlkNmI4ZjUyZGM0ZTE2YjlhZGNlNTU3NmU1MmNiYjJkNzU1
+    ODk1MGVmYjUzMmU0YTFkZmJhM2ZkZmJjMDZlNDYzMjNkODJjYjNhMDhkMGU0
+    ZTY4ZjdiZDQ2NTg2MWQ4ZDljZTRhM2JkNGIyZGY4YTI0ZGJkODI=
   data.tar.gz: !binary |-
-    Y2ZkMmZkY2QxNGE2OGIwM2M3YzliZTIyZjY4YmEyMjQ4YzUyMWU0NDhkNGZi
-    YzRlZGJlZDBhNTM4MzhiMTZjZmQ1NzI0NzNmZDExODE1NDBmMGU2ZjA3ODNj
-    ZjMzN2U3OGYzY2E1N2I2MzQ0ZjZhYzMyZjlmMzE0NDMxNDY0NDk=
+    NzA3ZmJhZjVjNWM0MTkxMzUwNTYwMzczZDI1MTM0ZGM3OWNhMWI5MmVlNWMx
+    ZTc4YjlkMGU2ZTRjNWQ2NzY2Mjc2ZGI1NGNmZGE0NmEwYTNlNjZlZGQ5YjVj
+    MmFjOTA0MjE2NjVjYTFiNWY0YWY1NWY3YTczNmM2OTI1OWNlZmU=

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

@@ -13,11 +13,11 @@ MediaController.prototype = {
 	signature: false,
 	selected_media: false,
 	uploader: false,
-  refresh_unprocessed_images: false,	
-	  
-  
-  
-  
+  refresh_unprocessed_images: true,
+  allow_edit: false,
+  feather_editor: false,
+  media_ids: [],
+  processing_media_ids: [],
   
   init: function(params) {
     var that = this;
@@ -32,7 +32,7 @@ MediaController.prototype = {
         .append($('<a/>').attr('href', '#').html('Select All').click(function(e) { e.preventDefault(); that.select_all_media(); }))
       )
       .append($('<div/>').attr('id', 'the_uploader'));          
-    that.refresh();    
+    that.refresh();        
   },    
   
   refresh: function()
@@ -40,8 +40,7 @@ MediaController.prototype = {
     var that = this;
     that.refresh_categories();
     that.refresh_media();
-    that.print_controls();
-    
+    that.print_controls();    
   },
       
   toggle_uploader: function()
@@ -136,11 +135,29 @@ MediaController.prototype = {
       type: 'get',
       async: false,
       data: { media_category_id: that.cat_id },
-      success: function(resp) { 
+      success: function(resp) {
         that.cat = resp;
         that.cat_id = that.cat.id;
         that.selected_media = [];
-        that.print_media();
+        //that.print_media();
+        
+        var mids = [];
+        var pmids = [];        
+        if (that.cat.media.length > 0)
+        {      
+          $.each(that.cat.media, function(i, m) {
+            mids.push(m.id);
+            if (m.media_type == 'image' && m.processed == false)
+              pmids.push(m.id);
+          });
+        }                                                
+        if (mids.join(',') != that.media_ids.join(',') || pmids.join(',') != that.processing_media_ids.join(','))          
+          that.print_media();
+        else if (pmids.length > 0)
+          setTimeout(function() { that.refresh_media(); }, 2000);
+          
+        that.media_ids = mids;
+        that.processing_media_ids = pmids;
       }        
     });
   },
@@ -249,17 +266,24 @@ MediaController.prototype = {
             that.edit_media_description($(this).parent().data('media_id'));
           }));
         if (m.image_urls)
-          li.append($('<img/>').attr('src', m.image_urls.tiny_url));                                      
+          li.append($('<img/>').attr('src', m.image_urls.tiny_url).attr("id","image-" + m.id));                                      
         if (that.selected_media.indexOf(m.id) > -1)
           li.addClass('selected ui-selected');
-        ul.append(li);      
+        if (that.allow_edit && m.image_urls) 
+        {
+          li.append($("<a/>")
+            .html("Edit Image")
+            .click(function() { that.edit_image($(this).parent().data('media_id')); })
+          );
+        }
+        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);
+      setTimeout(function() { that.refresh_media(); }, 2000);
     
     $.each(that.cat.media, function(i, m) {
       $('li.media').draggable({
@@ -450,5 +474,82 @@ MediaController.prototype = {
       }            
     });    
   },
+    
+  media_with_id: function(media_id) 
+  {
+    var that = this;
+    var m = false;
+    if (that.cat.media.length > 0)
+    {      
+      $.each(that.cat.media, function(i, m2) {        
+        if (parseInt(m2.id) == parseInt(media_id))
+        {
+          m = m2;
+          return false;
+        }
+      });
+    }
+    return m;
+  },        
+  
+  //============================================================================
+  // Aviary
+  //============================================================================
+
+  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); }
+    });        
+  },
+  
+  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
+    });
+  },
+  
+  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;
+  }
   
 };
+
+

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

@@ -83,23 +83,40 @@
       padding: 0;   
       display: inline-block;
       width: 150px;
-      height: 150px;
+      height: 165px;
       overflow: hidden;
       background-color: #666;
       background-position: center;
       background-size: contain; 
       background-repeat: no-repeat;
       border: #666 4px solid;
-        
+      img {
+        max-height: 120px;
+        max-width: 90%;
+      }
       span.name { 
         display: block; 
         position: absolute; 
-        bottom: 4px; 
+        bottom: 18px; 
         width: 150px; 
         text-align: center;        
         color: #fff; 
         text-decoration: none !important;                                   
       }
+      a {
+        text-decoration: underline;
+        cursor: pointer;
+        display: block;
+        font-size: 13px;
+        position: absolute;
+        bottom: 0;
+        text-align: center;
+        width: 100%;
+        color: #000;
+        &:hover {
+          color: blue;
+        }
+      }
       &:hover {
         background-color: #fff799;
         border: #fff799 4px solid;

data/app/controllers/caboose/media_controller.rb

@@ -82,11 +82,51 @@ module Caboose
       params.each do |name, value|
         case name
           when 'name'         then m.name         = value
-          when 'description'  then m.description  = value          
+          when 'description'  then m.description  = value
+          when 'image_url'    then
+            m.processed = false
+            m.delay.download_image_from_url(value)
         end
       end
+      
+      m.save
+      resp.success = save
+      render :json => resp
+    end
+
+    # POST /admin/media/edit-image
+    #def admin_edit_image
+    #  new_url = params[:new_url]
+    #  media_id = params[:media_id]
+    #  resp = StdClass.new({'attributes' => {}})
+    #  if !new_url.blank? && !media_id.blank?
+    #    m = Media.find(media_id.gsub("image-",""))
+    #    m.image = new_url
+    #    m.save
+    #    resp.success = "Saved image!"
+    #  else
+    #    resp.error = "Couldn't save image"
+    #  end
+    #  render :json => resp
+    #end
     
-      resp.success = save && m.save
+    # POST /admin/media/:id/image
+    def admin_update_image
+      return unless user_is_allowed('media', 'edit')
+      
+      resp = StdClass.new
+      new_url = params[:new_url]
+      m = Media.where(:id => params[:id]).first
+      
+      if m.nil?
+        resp.error = "Invalid media id."              
+      elsif new_url.nil? || new_url.strip.length == 0
+        resp.error = "Invalid image URL."
+      else                
+        m.image = URI.parse(new_url)
+        m.save
+        resp.success = "Image saved successfully."              
+      end
       render :json => resp
     end
     

data/app/mailers/caboose/caboose_mailer.rb

@@ -8,6 +8,7 @@ module Caboose
     @@site = nil
     
     before_filter do |mailer|
+      puts "Configuring mailer..."
       config = SmtpConfig.where(:site_id => @@site.id).first    
       self.smtp_settings['user_name']            = config.user_name
       self.smtp_settings['password']             = config.password

data/app/models/caboose/media.rb

@@ -68,6 +68,12 @@ class Caboose::Media < ActiveRecord::Base
          
   end
   
+  def download_image_from_url(url)
+    self.image = URI.parse(url)
+    self.processed = true
+    self.save
+  end
+  
   def api_hash
     {
       :id            => self.id,

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

@@ -35,6 +35,7 @@
 <script type="text/javascript" src="/assets/plupload/jquery.ui.plupload/jquery.ui.plupload.js"></script>
 -->
 
+<script type="text/javascript" src="http://feather.aviary.com/imaging/v2/editor.js"></script>
 <script type="text/javascript">
 
 var controller = false;
@@ -46,9 +47,16 @@ $(document).ready(function() {
 	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
 	  policy: '<%= raw @policy %>',
 	  signature: '<%= raw @signature %>',
-	  refresh_unprocessed_images: false
-  });	
+	  refresh_unprocessed_images: true,
+    allow_edit: true
+  });
 });
 
 </script>
 <% end %>
+
+<%
+# Adobe Image Editor SDK Credentials
+# CLIENT SECRETf42be039-1af0-41d8-89bb-fdebdb557d3d
+# CLIENT ID (DEVELOPMENT MODE)*933414ee42934e8b81d8cd2226a5a13b
+%>

data/config/routes.rb

@@ -219,8 +219,9 @@ Caboose::Engine.routes.draw do
   get     "/admin/media/:id/description" => "media#admin_edit_description"
   get     "/admin/media/:id"            => "media#admin_edit"  
   put     "/admin/media/:id"            => "media#admin_update"
-  post    "/admin/media/:id/image"      => "media#admin_update_image"  
-  post    "/admin/media"                => "media#admin_add"
+  post    "/admin/media/:id/image"      => "media#admin_update_image"
+  #post    "/admin/media/edit-image"     => "media#admin_edit_image"  
+  post    "/admin/media"                => "media#admin_add"  
   delete  "/admin/media/bulk"           => "media#admin_bulk_delete"
   delete  "/admin/media/:id"            => "media#admin_delete"
   

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.19
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg