caboose-cms 0.4.71 → 0.4.72

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFjYWNhODVkZjAxODY3NDM0ZTE0YzE4ZTlkYWM2NzkxYmZkNzc2Nw==
+    OWQ2YWNkYzI0MTBjZjI1ZmYyNDRhYTE4NGE5ODA4ZDQ0MWRiMDBlMQ==
   data.tar.gz: !binary |-
-    MDk2YWUzODMyN2U0YWM0ZTRmMjExYzUzNDQ2MzliODYxYzc1ZjJmMw==
+    YWM0MWU1NTc0ZjE4NWIyNTA3NTI2ZDJlNjhlY2U3N2NjZWQ1ZmExOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDM1MWZkYzI2ZDIxOTlkNTIyMWYyYTlhOTQ5MTQ1MDAwMDg0NGQ0MTEwMTQx
-    MDBjZGI4NzA1Y2UzYjYwOGVhOTNkOWViZWY1Zjg0Yjc5YTg4ZGI2YmQ4ZDBj
-    YjIxODNmMGVmYmQ0NmQ0Y2M3NDRlNThjZTdmMDU2MmRkNzhjNDc=
+    NWQyNGIzYTJhNThmYjRiM2M0ZjQ0NjA3ZDU1ZGNiOTRlNzYyYzk2YWNjYTM4
+    OGUxMzc2N2Q2ODVkOGViNjg0NjJkZjJmOTE5Yjk2MjJhZjQ5YjI5MTk1MDFm
+    ZGRkMzE4YzJjY2U1MTY2ZmVmOWM3NjRmNmMyMWQwNjdiNjMxMzI=
   data.tar.gz: !binary |-
-    OTVhOGZjMDhkNjMxNjM1NzFlNWMzZjhhN2ZmYWYxYzU1OWNhNGY2YzkxZGFh
-    NWNiZGUzOWM0YzFkODdhMjY0NmE0ZDhiMDcwMTYyYzlmMGZhMGY2OGZkYWMw
-    YTY1NjFkYTJlYzJiMTI5ZWViYTQ5NWM4MGY3ZDVkMDFmNzgxYWQ=
+    Yzk3NjQyZTQxZTAxNTM2OTBlMTA0MGQzYjFmZmIxZDhlMDkwNzYzOWNmYTM5
+    MTE2OWNkNjVkOTcyYmEwYzM4MDcwNWFmMzMwNmQxZDNjNDZmYTU2ZDg3N2Fi
+    MjZkMDRiNWI1Njk1ODE3ZDViMjAwZDczYWZhYmM5NjE0YmYwNzQ=

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

@@ -0,0 +1,168 @@
+
+var ImagesController = function(params) { this.init(params); };
+
+ImagesController.prototype = {
+  
+  cat_id: false,
+  cat: false,
+  
+  init: function(params) {
+    var that = this;
+    for (var i in params)
+      this[i] = params[i];
+    
+    $('#new_cat_link').click(function(e) {
+      e.preventDefault();
+      that.add_category(that.cat_id);
+    });
+    
+    this.print_images();
+  },
+
+  // Gets updated image info from server and prints out categories and images.
+  print_images: function() {
+    var that = this;
+    $('#message').html("<p class='loading'>Refreshing images...</p>");
+    $.ajax({
+      url: '/admin/images/json',
+      type: 'get',
+      async: false,
+      data: { media_category_id: this.cat_id },
+      success: function(resp) {
+        that.cat = resp;        
+      }        
+    });        
+    $('#message').empty();
+    var ul = $('#media');
+    if (this.cat.children.length > 0 || this.cat.images.count > 0)
+    {
+      $.each(this.cat.children, function(i, cat2) {
+        ul.append($('<li/>').addClass('category').attr('id', 'cat' + cat2.id)
+          .append($('<a/>').attr('href', '/admin/images?media_category_id=' + cat2.id)
+            .append($('<span/>').addClass('icon icon-folder2'))
+            .append($('<span/>').addClass('name').html(cat2.name))
+          )
+        );
+      });
+      $.each(this.cat.images, function(i, mi) {      
+        ul.append($('<li/>').addClass('image').attr('id', 'image' + mi.id)
+          .append($('<a/>').attr('href', '/admin/images/' + mi.id)
+            .css('background-image', mi.tiny_url)
+            .append($('<span/>').addClass('name').html(mi.name))
+          )
+        );
+      });
+    }
+    ul.replaceWith($('<p/>').html("This category is empty."));
+  },
+  
+  // Adds a new media category  
+  add_category: function(parent_id, name)
+  {
+    var that = this;
+    if (!name)
+    {
+      var div = $('<p/>').addClass('note warning')
+        .append('New Category Name: ')
+        .append($('<input/>').attr('type', 'text').attr('id', 'new_cat_name')).append(" ")
+        .append($('<input/>').attr('type', 'button').val('Add').click(function() { that.add_category(parent_id, $('#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: parent_id,
+        name: name
+      },
+      success: function(resp) {
+        if (resp.error) $('#new_cat_message').empty().html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.refresh) window.location.reload(true);
+      }    
+    });
+  },
+
+  // Lets a single image poll the server to see if it has been processed.
+  wait_for_image_processing: function(image_id, i)
+  {
+    if (!i) i = 1;
+    var is_finished = false;
+    $.ajax({
+      url: '/admin/images/' + image_id + '/finished',
+      type: 'get',
+      async: false,
+      success: function(resp) {        
+        if (resp.error) alert("Error processing image: \n" + resp.error);
+        if (resp.is_finished) 
+        {
+          is_finished = true;
+          $('#image' + mi.id + ' a').css('background-image', resp.tiny_url);                  
+        }
+      }
+    });
+    if (!is_finished)
+      setTimeout(function() { that.wait_for_image_processing(image_id, i+1); }, 500);  
+  },
+
+  upload_form: function()
+  {
+    var that = this;
+    $('#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: that.cat_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) {}
+            });                                                       
+          });
+          $('#progress').empty().html("<p class='loading'>Upload complete. Processing images...</p>");
+          that.wait_for_image_processing(id);
+          
+        }, 500);      
+      },
+      fail: function(e, data) {
+        console.log("Upload failed.");
+        console.log(data);      
+        $('#bar').css("background", "red").text("Failed"); 
+      }
+    });
+  }
+};

data/app/assets/stylesheets/caboose/admin_images_index.css

@@ -0,0 +1,33 @@
+
+ul.media { list-style: none; margin: 0; padding: 0; }
+ul.media li { list-style: none; margin: 4px; padding: 0; float: left; }
+ul.media a { 
+  display: block; 
+  width: 150px; 
+  height: 150px;
+  overflow: hidden; 
+  border: #666 4px solid; 
+  background-size: contain; 
+  background-repeat: no-repeat; 
+  background-position: center; 
+  background-color: #666; 
+  position: relative; 
+  text-align: center;
+}
+ul.media a:hover { 
+  background-color: #fff69f;
+  border-color: #fff69f; 
+}
+ul.media li a span { color: #fff; text-decoration: none; }
+ul.media li a:hover span { background: #efefef; color: #000; }
+ul.media li a span.name       { display: block; background: #666; color: #fff; text-decoration: none !important; border: 0; }
+ul.media li a:hover span.name { background: #fff69f; color: #000; }
+
+ul.media li a.selected span, 
+ul.media li a.selected:hover span { background: #fff69f; color: #000; border: #fff69f 1px solid; }
+
+ul.media li.category a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
+ul.media li.category a:hover span.icon { background: #fff69f; color: #000; }
+
+.progress { max-width: 600px; margin: 0.2em 0 0.2em 0; }
+.progress .bar { height:  1.2em; padding: 0.2em; color: white; display: none; }

data/app/assets/stylesheets/caboose/model_binder.css

@@ -16,7 +16,7 @@
 
 .mb_container input.mb_dirty,
 .mb_container textarea.mb_dirty {
-  background: #4D0101;  
+  background: #fff799;  
 }
 
 .mb_container select.mb_fake {

data/app/controllers/caboose/images_controller.rb

@@ -10,11 +10,23 @@ module Caboose
     
     # GET /admin/images
     def admin_index
-      return if !user_is_allowed('images', 'view')            
-      @domain = Domain.where(:domain => request.host_with_port).first
-      @media_category = @domain ? MediaCategory.top_image_category(@domain.site_id) : nil    
+      return if !user_is_allowed('images', 'view')
+      render :file => 'caboose/extras/error_invalid_site' and return if @site.nil?
+                  
+      id = params[:media_category_id]        
+      @media_category = id ? MediaCategory.find(id) : MediaCategory.top_image_category(@site.id)      
       render :layout => 'caboose/admin'      
     end
+    
+    # GET /admin/images/json
+    def admin_json
+      return if !user_is_allowed('images', 'view')
+      render :json => false and return if @site.nil?
+      
+      id = params[:media_category_id]        
+      cat = id ? MediaCategory.find(id) : MediaCategory.top_image_category(@site.id)      
+      render :json => cat.api_hash      
+    end
 
     # GET /admin/images/new
     def admin_new
@@ -26,252 +38,39 @@ module Caboose
     # GET /admin/images/:id
     def admin_edit
       return unless user_is_allowed('images', 'edit')
-      @page = Page.find(params[:id])
+      @media_image = MediaImage.find(params[:id])
       render :layout => 'caboose/admin'
     end
-    
-    # POST /admin/images
-    def admin_add
-      return unless user_is_allowed('images', 'add')
-
-      resp = Caboose::StdClass.new({
-          'error' => nil,
-          'redirect' => nil
-      })
             
-      parent_id = params[:parent_id]
-      title = params[:title]      
-
-      if (title.strip.length == 0)
-        resp.error = "A page title is required."
-      elsif (!logged_in_user.is_allowed('all', 'all') && 
-        !Page.page_ids_with_permission(logged_in_user, 'edit'   ).include?(parent_id) &&
-        !Page.page_ids_with_permission(logged_in_user, 'approve').include?(parent_id))
-        resp.error = "You don't have permission to add a page there."
-      end
-      if (!resp.error.nil?)
-        render :json => resp
-        return
-      end
-      	
-      parent = Caboose::Page.find(parent_id)                  		
-      page = Caboose::Page.new
-      
-      if parent.nil?
-        d = Domain.where(:domain => request.host_with_port).first.site_id
-        page.site_id = d.site_id
-      else      
-        page.site_id = parent.site_id
-      end
-      
-      page.title = title
-      page.parent_id = parent_id      
-      page.hide = true
-      page.content_format = Caboose::Page::CONTENT_FORMAT_HTML
-
-      i = 0
-      begin 
-        page.slug = Page.slug(page.title + (i > 0 ? " #{i}" : ""))
-        page.uri = parent.parent_id == -1 ? page.slug : "#{parent.uri}/#{page.slug}"
-        i = i+1
-      end while (Page.where(:uri => page.uri).count > 0 && i < 10)
-
-      page.save
-      
-      # Create the top level block for the page
-      bt = BlockType.find(params[:block_type_id])
-      Block.create(:page_id => page.id, :block_type_id => params[:block_type_id], :name => bt.name)
-      
-      # Set the new page's permissions		  
-      viewers = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'view' }).pluck(:role_id)
-      editors = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'edit' }).pluck(:role_id)
-      Caboose::Page.update_authorized_for_action(page.id, 'view', viewers)
-      Caboose::Page.update_authorized_for_action(page.id, 'edit', editors)
-
-      # Send back the response
-      resp.redirect = "/admin/images/#{page.id}/edit"
-      render json: resp
-    end
-    
     # PUT /admin/images/:id
     def admin_update
       return unless user_is_allowed('images', 'edit')
       
       resp = StdClass.new({'attributes' => {}})
-      page = Page.find(params[:id])
+      image = MediaImage.find(params[:id])
       
-      save = true
-      user = logged_in_user
+      save = true      
       params.each do |name, value|
         case name
-        when 'parent_id'
-          value = value.to_i
-          if page.id == value
-            resp.error = "The page's parent cannot be itself."
-          elsif Page.is_child(page.id, value)
-            resp.error = "You can't set the current page's parent to be one of its child pages."
-          elsif value != page.parent_id
-            p = Page.find(value)
-            if !user.is_allowed(p, 'edit')
-              resp.error = "You don't have access to put the current page there."
-            end
-          end	
-          if resp.error
-            save = false
-          else
-            page.parent = Page.find(value)
-            page.save
-            Page.update_uri(page)
-            resp.attributes['parent_id'] = { 'text' => page.parent.title }
-          end
-
-        when 'custom_css', 'custom_js'
-          value.strip!
-          page[name.to_sym] = value
-
-        when 'title', 'menu_title', 'hide', 'layout', 'redirect_url',
-          'seo_title', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
-          page[name.to_sym] = value
-
-        when 'linked_resources'
-          result = []
-          value.each_line do |line|
-            line.chomp!
-            line.strip!
-            next if line.empty?
-
-            if !(line.ends_with('.js') || line.ends_with('.css'))
-              resp.error = "Resource '#{line}' has an unsupported file type ('#{comps.last}')."
-              save = false
-            end
-
-            result << line
-          end
-          page.linked_resources = result.join("\n")
-          
-        when 'content_format'
-          page.content_format = value
-          resp.attributes['content_format'] = { 'text' => value }
-          
-        when 'meta_robots'
-          if (value.include?('index') && value.include?('noindex'))
-            resp.error = "You can't have both index and noindex"
-            save = false
-          elsif (value.include?('follow') && value.include?('nofollow'))
-            resp.error = "You can't have both follow and nofollow"
-            save = false
-          else
-            page.meta_robots = value.join(', ')
-            resp.attributes['meta_robots'] = { 'text' => page.meta_robots }
-          end
-          
-        when 'content'
-          page.content = value.strip.gsub(/<meta.*?>/, '').gsub(/<link.*?>/, '').gsub(/\<\!--[\S\s]*?--\>/, '')
-          
-        when 'slug' 
-          page.slug = Page.slug(value.strip.length > 0 ? value : page.title)
-          page.save
-          Page.update_uri(page)                      
-          resp.attributes['slug'] = { 'value' => page.slug }
-          resp.attributes['uri'] = { 'value' => page.uri }
-          
-        when 'alias'
-          page.alias = Page.slug(value.strip)
-          page.save
-          Page.update_uri(page)
-          resp.attributes['slug'] = { 'value' => page.slug }
-          resp.attributes['uri'] = { 'value' => page.uri }
-
-        when 'custom_sort_children'
-          if (value == 0)
-            page.children.each do |p|
-              p.sort_order = 1
-              p.save
-            end
-          end
-          page.custom_sort_children = value 		  
-
-        when 'viewers'
-          Page.update_authorized_for_action(page.id, 'view', value)
-        when 'editors'
-          Page.update_authorized_for_action(page.id, 'edit', value)
-        when 'approvers'
-          Page.update_authorized_for_action(page.id, 'approve', value)
+          when 'name'         then image.name         = value
+          when 'description'  then image.description  = value          
         end
       end
     
-      resp.success = save && page.save
-      render json: resp
+      resp.success = save && image.save
+      render :json => resp
     end
     
-    # DELETE /admin/images/1
+    # DELETE /admin/images/:id
     def admin_delete
       return unless user_is_allowed('images', 'delete')
-      p = Page.find(params[:id])
-      p.destroy
-      
+      img = MediaImage.find(params[:id])      
       resp = StdClass.new({
-        'redirect' => '/admin/images'
+        'redirect' => "/admin/images?media_category_id=#{img.media_category_id}"
       })
-      render json: resp
+      img.destroy            
+      render :json => resp
     end       
-    
-    ## PUT /admin/images/sign-s3
-    #def admin_sign_s3
-    #  return unless user_is_allowed('images', 'add')
-    #        
-    #  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']
-    #  s3 = AWS::S3.new(
-    #    :access_key_id => access_key,
-    #    :secret_access_key => secret_key
-    #  )
-    #  
-    #  name = params[:name]      
-    #  mi = MediaImage.create(
-    #    :media_category_id => params[:media_category_id], 
-    #    :name => params[:name]
-    #  )      
-    #  pp = s3.buckets[bucket].presigned_post(              
-    #    :key => "media-images/test.jpg", #{mi.id}.#{File.extname(name)}",
-    #    :expires => DateTime.now + 10.seconds,
-    #    :success_action_status => 201, 
-    #    :acl => :public_read
-    #  )
-    #  
-    #  render :json => {
-    #    'media_image' => mi,
-    #    'presigned_post' => {
-    #      'url' => pp.url.to_s,
-    #      'fields' => pp.fields
-    #    }
-    #  }
-    #  
-    #  #expires = (DateTime.now.utc + 10.seconds).to_i
-    #  #amz_headers = "x-amz-acl:public-read"      
-    #  #put_request = "PUT\n\n#{mime_type}\n#{expires}\n#{amz_headers}\n/#{bucket}/media-images/#{object_name}"
-    #  #signature = CGI.escape(Base64.encode64("#{OpenSSL::HMAC.digest('sha1', secret_key, put_request)}\n"))      
-    #  ##signature = base64.encodestring(hmac.new(secret_key, put_request, sha1).digest())
-    #  ##signature = urllib.quote_plus(signature.strip())
-    #  #render :json => {
-    #  #  'signed_request' => "#{url}?AWSAccessKeyId=#{access_key}&Expires=#{expires}&Signature=#{signature}",
-    #  #  'url' => url
-    #  #}
-    #
-    #  #pp = AWS::S3::PresignedPost.new(s3.buckets[bucket], 
-    #  #  :key => "media-images/#{object_name}",
-    #  #  :expires => DateTime.now + 10.seconds,
-    #  #  :content_type => mime_type
-    #  #)            
-    #  #url = "#{pp.url.to_s}#{pp.key}" #"https://#{pp.bucket.name}.s3.amazonaws.com/#{pp.key}"
-    #  #render :json => {
-    #  #  'signed_request' => "#{url}?AWSAccessKeyId=#{access_key}&Expires=#{pp.expires.to_time.to_i}&Signature=#{pp.fields[:signature]}",
-    #  #  'url' => url
-    #  #}                              
-    #  
-    #end
        
     # GET /admin/images/sign-s3
     def admin_sign_s3
@@ -291,7 +90,7 @@ module Caboose
       policy = {        
         "expiration" => 10.seconds.from_now.utc.xmlschema,
         "conditions" => [
-          { "bucket" => 'cabooseit' },
+          { "bucket" => bucket },
           ["starts-with", "$key", key],
           { "acl" => "public-read" },
           { "success_action_status" => "200" }
@@ -324,10 +123,27 @@ module Caboose
     # GET /admin/images/:id/process
     def admin_process
       return if !user_is_allowed('images', 'edit')
-      mi = MediaImage.find(params[:id])
+      mi = MediaImage.find(params[:id])      
       mi.delay.process
       render :json => true      
     end
+    
+    ## GET /admin/images/:id/finished
+    def admin_process_finished      
+      return if !user_is_allowed('images', 'edit')
+      mi = MediaImage.find(params[:id])
+      resp = StdClass.new
+      if mi.image_file_name && mi.image_file_name.strip.length > 0
+        resp.is_finished = true
+        resp.tiny_url     = mi.image.url(:tiny)
+        resp.thumb_url    = mi.image.url(:thumb)
+        resp.large_url    = mi.image.url(:large)
+        resp.original_url = mi.image.url(:original)
+      else
+        resp.is_finished = false
+      end
+      render :json => resp
+    end
 		
   end
 end

data/app/controllers/caboose/login_controller.rb

@@ -39,7 +39,7 @@ module Caboose
             login_user(login_resp.user, remember)            
             resp.redirect = return_url
             resp.modal = false
-            Caboose.plugin_hook('login_success')            
+            Caboose.plugin_hook('login_success', user_id)            
           end
         end
       end

data/app/controllers/caboose/logout_controller.rb

@@ -2,6 +2,8 @@ module Caboose
   class LogoutController < ApplicationController
     # GET /logout
     def index
+      Caboose.plugin_hook('before_logout')
+      
       logout_user
       elo = User.find(User::LOGGED_OUT_USER_ID)        
       login_user(elo)      

data/app/controllers/caboose/media_categories_controller.rb

@@ -0,0 +1,56 @@
+
+module Caboose
+  class MediaCategoriesController < ApplicationController
+
+    # POST /admin/media-categories
+    def admin_add
+      return unless user_is_allowed('mediacategories', 'add')
+
+      resp = Caboose::StdClass.new
+      
+      cat = MediaCategory.new(
+        :site_id   => @site.id,
+        :parent_id => params[:parent_id],
+        :name      => params[:name]
+      )      
+      if !cat.save
+        resp.error = cat.errors.first[1]
+      else
+        resp.refresh = true
+      end
+     
+      render :json => resp
+    end
+    
+    # PUT /admin/media-categories/:id
+    def admin_update
+      return unless user_is_allowed('mediacategories', 'edit')
+      
+      resp = StdClass.new
+      cat = MediaCategory.find(params[:id])
+      
+      save = true      
+      params.each do |name, value|
+        case name          
+          when 'name' then cat.name = value            
+        end
+      end
+    
+      resp.success = save && cat.save
+      render :json => resp
+    end
+    
+    # DELETE /admin/media-categories/:id
+    def admin_delete
+      return unless user_is_allowed('mediacategories', 'delete')
+      cat = MediaCategory.find(params[:id])
+      cat.destroy
+      
+      resp = StdClass.new({
+        'redirect' => '/admin/media-categories'
+      })
+      render :json => resp
+    end       
+		
+  end
+end

data/app/models/caboose/media_category.rb

@@ -14,5 +14,17 @@ class Caboose::MediaCategory < ActiveRecord::Base
   def self.top_file_category(site_id)
     return self.where("parent_id is null and site_id = ? and name = ?", site_id, 'Files').first
   end
+  
+  def api_hash
+    {
+      :id => self.id,
+      :parent_id => self.parent_id,
+      :site_id => self.site_id,      
+      :name => self.name,
+      :children => self.children.collect { |child| child.api_hash },
+      :images => self.media_images.collect { |img| img.api_hash },
+      :files => self.media_files.collect { |file| file.api_hash }
+    }
+  end
 
 end

data/app/models/caboose/media_file.rb

@@ -5,5 +5,14 @@ class Caboose::MediaFile < ActiveRecord::Base
   has_attached_file :file, :path => 'media-files/:id.:extension'
   do_not_validate_attachment_file_type :file  
   attr_accessible :id, :media_category_id, :name, :description
+  
+  def api_hash
+    {
+      :id => self.id,
+      :name => self.name,      
+      :description => self.description,
+      :url => self.file.url      
+    }
+  end
 
 end

data/app/models/caboose/media_image.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'httparty'
 
 class Caboose::MediaImage < ActiveRecord::Base
 
@@ -16,9 +17,27 @@ class Caboose::MediaImage < ActiveRecord::Base
   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    
+    
+    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+    bucket = config['bucket']
+    
+    uri = "http://#{bucket}.s3.amazonaws.com/media-images/#{self.id}#{File.extname(self.name.downcase)}"
+    puts "Processing #{uri}..."
+    
+    self.image = URI.parse(uri)
+    self.save                
+  end
+  
+  def api_hash
+    {
+      :id => self.id,
+      :name => self.name,
+      :description => self.description,
+      :tiny_url => self.image.url(:tiny),
+      :thumb_url => self.image.url(:thumb),
+      :large_url => self.image.url(:large),
+      :original_url => self.image.url(:original)
+    }
   end
   
 end

data/app/models/caboose/media_image_socket.rb

@@ -0,0 +1,73 @@
+require 'faye/websocket'
+
+module Caboose
+  class MediaImageSocket
+    
+    KEEPALIVE_TIME = 15 # in seconds
+
+    def initialize(app)
+      @app = app
+      @clients = {}
+      @image_ids = {}
+    end
+
+    def call(env)             
+      if Faye::WebSocket.websocket?(env)
+                        
+        uri = env['REQUEST_URI']
+        #Caboose.log(uri)
+        
+        # GET /admin/images/:id/wait
+        if uri =~ /\/admin\/images\/\d*\/wait/                    
+          image_id = uri.gsub('/admin/images/', '').gsub('/wait', '').to_i
+          #Caboose.log("Waiting on image_id #{image_id}...")          
+          ws = Faye::WebSocket.new(env, nil, { :ping =>  KEEPALIVE_TIME })
+          ws.on :open do |event|
+            Caboose.log("Opening browser web socket for image #{image_id}...")
+            @clients[image_id] = [] if @clients[image_id].nil?            
+            @clients[image_id] << ws
+          end
+          ws.on :message do |event|            
+            Caboose.log("Received browser message for image #{image_id}")
+            @clients[image_id].each { |client| client.send(event.data) }
+          end
+          ws.on :close do |event|
+            Caboose.log("Closing browser web socket for image #{image_id}...")
+            #p [:close, ws.object_id, event.code, event.reason]
+            @clients.delete(ws)
+            ws = nil
+          end                    
+          ws.rack_response
+          
+        # GET /admin/images/:id/finished
+        elsif uri =~ /\/admin\/images\/\d*\/finished/          
+          image_id = uri.gsub('/admin/images/', '').gsub('/finished', '').to_i                    
+          ws = Faye::WebSocket.new(env, nil, { :ping =>  KEEPALIVE_TIME })
+          ws.on :open do |event|
+            #p [:open, ws.object_id]
+            Caboose.log("Opening server web socket for image #{image_id}...")
+            @image_ids[ws.object_id] = image_id
+          end
+          ws.on :message do |event|
+            #p [:message, event.data]
+            Caboose.log("Receieved server message for image #{image_id}")
+            image_id = @image_ids[ws.object_id]            
+            @clients[image_id].each { |client| client.send(event.data) }
+          end
+          ws.on :close do |event|
+            #p [:close, ws.object_id, event.code, event.reason]
+            Caboose.log("Closing server web socket for image #{image_id}...")
+            @image_ids.delete(ws.object_id)
+            ws = nil
+          end                    
+          ws.rack_response
+        end
+        
+      else
+        @app.call(env)
+      end
+      
+    end
+  end
+end
+

data/app/models/caboose/schema.rb

@@ -136,14 +136,16 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name              , :string  ]        
       ],
       Caboose::MediaImage => [
-        [ :media_category_id , :integer ],
-        [ :name              , :string  ],
-        [ :description       , :text    ]
+        [ :media_category_id , :integer    ],
+        [ :name              , :string     ],
+        [ :description       , :text       ],
+        [ :image             , :attachment ]
       ],
       Caboose::MediaFile => [
-        [ :media_category_id , :integer ],
-        [ :name              , :string  ],
-        [ :description       , :text    ]
+        [ :media_category_id , :integer    ],
+        [ :name              , :string     ],
+        [ :description       , :text       ],
+        [ :file              , :attachment ]
       ],
       Caboose::Page => [
         [ :site_id               , :integer ],

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

@@ -0,0 +1,7 @@
+<div id='block_<%= block.id %>'>
+  <% if editing %>
+    <p style='border: #ccc 1px solid;'>Controller view content</p>
+  <% else %>
+    <%= raw controller_view_content %>
+  <% end %>
+</div>

data/app/views/caboose/extras/error_invalid_site.html.erb

@@ -0,0 +1,3 @@
+<h1>Invalid Site</h1>
+
+<p>It doesn't look like this site is configured for the current domain.  Please <a href='/admin/sites'>configure your sites</a>.</p>

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

@@ -0,0 +1,60 @@
+<%
+img = @media_image
+%>
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/images'>Images</a>
+</div>
+
+<h1>Edit Image</h1>
+<img src='<%= img.image.url(:thumb) %>' style='float: right;' />
+<p><div id='mediaimage_<%= img.id %>_name'        ></div></p>
+<p><div id='mediaimage_<%= img.id %>_description' ></div></p>
+
+<div id='message'></div>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/images?media_category_id=<%= img.media_category_id %>';" />
+<input type='button' value='Delete Image' onclick="delete_image(<%= img.id %>);" />
+</p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+function delete_image(image_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append('Are you sure you want to delete the image? ')
+      .append($('<input/>').attr('type', 'button').val('Yes').click(function() { delete_image(image_id, true); })).append(" ")
+      .append($('<input/>').attr('type', 'button').val('No' ).click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').empty().append($('<p/>').addClass('loading').html('Deleting image...'));
+  $.ajax({
+    url: '/admin/images/' + image_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'MediaImage',
+    id: <%= img.id %>,
+    update_url: '/admin/images/<%= img.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'        , nice_name: 'Name'        , type: 'text'     , value: <%= raw Caboose.json(img.name)        %>, width: 400 },
+      { name: 'description' , nice_name: 'Description' , type: 'textarea' , value: <%= raw Caboose.json(img.description) %>, width: 400, height: 200 }      
+    ]
+  });
+});
+
+</script>
+<% end %>

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

@@ -1,106 +1,57 @@
 <h1>Images</h1>
 
-<% if @domain && @media_category %>  
+<% if @site && @media_category %>
+  <%
+  arr = []
+  cat = @media_category
+  arr << cat
+  while cat.parent_id
+    cat = cat.parent
+    arr << cat
+  end
+  crumb_trail = arr.collect{ |cat| "<a href='/admin/images?media_category_id=#{cat.id}'>#{cat.name}</a>" }.reverse.join(" > ")
+  %>
+  <p id='crumb_trail'><%= raw crumb_trail %></p>
+
   <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='success_action_status'   value='' />    
     <input type='hidden' name='policy'                  value='' />
-    <input type='hidden' name='signature'               value='' />
-    <input type="file" name="file" id="file" multiple='true' />    
+    <input type='hidden' name='signature'               value='' />    
+    <input type="file" name="file" id="file" multiple='true' style='display: none;' />
+    <p>
+      <a href='#' id='new_cat_link'>New Category</a> |
+      <a href='#' onclick="$('#file').click();">Upload Files</a>
+    </p>    
     <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'>  
-      <% @media_category.children.each do |cat| %>
-        <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><%= mi.name %></span></a></li>
-      <% end %>
-    </ul>
-  <% else %>
-    <p>This category is empty.</p>
-  <% end %>
-<% elsif @domain && @media_category.nil? %>
+  </form>  
+  <div id='new_cat_message'></div>
+  </p>
+  <div id='media'></div>
+<% elsif @site && @media_category.nil? %>
   <p>Invalid media category.</p>
 <% 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>
+<%= stylesheet_link_tag 'caboose/icomoon_fonts' %>
+<%= stylesheet_link_tag 'caboose/admin_images_index' %>
 <% 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' %>
+<%= javascript_include_tag 'caboose/admin_images_index.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"); 
-    }
+var controller = false;
+$(document).ready(function() {
+  controller = new ImagesController({
+    cat_id: <%= @media_category.id %>
   });
 });
 

data/config/routes.rb

@@ -73,13 +73,18 @@ Caboose::Engine.routes.draw do
   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/json"           => "images#admin_json"
   get     "admin/images/:id/process"    => "images#admin_process"
+  get     "admin/images/:id/finished"   => "images#admin_process_finished"
   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"
   delete  "admin/images/:id"            => "images#admin_delete"
   
+  post    "admin/media-categories"      => "media_categories#admin_add"
+  put     "admin/media-categories/:id"  => "media_categories#admin_update"      
+  delete  "admin/media-categories/:id"  => "media_categories#admin_delete"
   
   get     "admin/permissions"             => "permissions#index"
   get     "admin/permissions/options"     => "permissions#options"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.71'
+  VERSION = '0.4.72'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.71
+  version: 0.4.72
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -194,6 +194,7 @@ files:
 - app/assets/images/caboose/search.png
 - app/assets/javascripts/caboose/admin.js
 - app/assets/javascripts/caboose/admin_block_edit.js
+- app/assets/javascripts/caboose/admin_images_index.js
 - app/assets/javascripts/caboose/admin_page_edit_content.js
 - app/assets/javascripts/caboose/admin_page_edit_content_bak.js
 - app/assets/javascripts/caboose/admin_page_new_blocks.js
@@ -231,6 +232,7 @@ files:
 - app/assets/javascripts/caboose/testing.js
 - app/assets/javascripts/tinymce/plugins/caboose/plugin.js
 - app/assets/stylesheets/caboose/admin.css
+- app/assets/stylesheets/caboose/admin_images_index.css
 - app/assets/stylesheets/caboose/admin_page_edit_content.css
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/bound_input.css
@@ -265,6 +267,7 @@ files:
 - app/controllers/caboose/images_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_controller.rb
+- app/controllers/caboose/media_categories_controller.rb
 - app/controllers/caboose/modal_controller.rb
 - app/controllers/caboose/page_permissions_controller.rb
 - app/controllers/caboose/pages_controller.rb
@@ -302,6 +305,7 @@ files:
 - app/models/caboose/media_category.rb
 - app/models/caboose/media_file.rb
 - app/models/caboose/media_image.rb
+- app/models/caboose/media_image_socket.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
@@ -342,6 +346,7 @@ files:
 - app/views/caboose/block_types/admin_index.html.erb
 - app/views/caboose/block_types/admin_new.html.erb
 - app/views/caboose/blocks/_block.html.erb
+- app/views/caboose/blocks/_controller_view_content.html.erb
 - app/views/caboose/blocks/_file.html.erb
 - app/views/caboose/blocks/_heading.html.erb
 - app/views/caboose/blocks/_html.html.erb
@@ -381,6 +386,8 @@ files:
 - app/views/caboose/blocks/admin_render_second_level.json.erb
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
+- app/views/caboose/extras/error_invalid_site.html.erb
+- app/views/caboose/images/admin_edit.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