caboose-cms 0.5.221 → 0.5.222

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

@@ -1,171 +0,0 @@
-
-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 = $('<ul/>');
-    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))
-          )
-        );
-      });
-    }
-    else
-      ul = $('<p/>').html("This category is empty.");
-    $('#media').empty().append(ul);
-  },
-  
-  // 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.scss

@@ -1,53 +0,0 @@
-
-#media {
-  ul {
-    list-style: none; margin: 0; padding: 0; 
-    
-    li { 
-      list-style: none; margin: 4px; padding: 0; float: left;   
-      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;
-        
-        span { color: #fff; text-decoration: none; }
-        span.name { display: block; background: #666; color: #fff; text-decoration: none !important; border: 0; }
-          
-        &:hover { 
-          background-color: #fff69f;
-          border-color: #fff69f;
-          
-          span      { background: #efefef; color: #000; }
-          span.name { background: #fff69f; color: #000; }
-        }
-        
-        &.selected span, 
-        &.selected:hover span { background: #fff69f; color: #000; border: #fff69f 1px solid; }
-      }
-      &.category {                                    
-        a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
-        a:hover span.icon { background: #fff69f; color: #000; }      
-      }
-    }
-  }
-}
- 
-.progress { 
-  max-width: 600px; 
-  margin: 0.2em 0 0.2em 0;
-  .bar { 
-    height: 1.2em; 
-    padding: 0.2em;
-    color: white;
-    display: none; 
-  }
-}
-

data/app/controllers/caboose/images_controller.rb

@@ -1,149 +0,0 @@
-
-module Caboose
-  class ImagesController < ApplicationController
-    
-    helper :application
-    
-    def before_action
-      @page = Page.page_with_uri(request.host_with_port, '/admin')
-    end    
-    
-    # GET /admin/images
-    def admin_index
-      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
-      return unless user_is_allowed('images', 'add')
-      @media_category_id = params[:media_category_id]             
-      render :layout => 'caboose/admin'
-    end
-    
-    # GET /admin/images/:id
-    def admin_edit
-      return unless user_is_allowed('images', 'edit')
-      @media_image = MediaImage.find(params[:id])
-      render :layout => 'caboose/admin'
-    end
-            
-    # PUT /admin/images/:id
-    def admin_update
-      return unless user_is_allowed('images', 'edit')
-      
-      resp = StdClass.new({'attributes' => {}})
-      image = MediaImage.find(params[:id])
-      
-      save = true      
-      params.each do |name, value|
-        case name
-          when 'name'         then image.name         = value
-          when 'description'  then image.description  = value          
-        end
-      end
-    
-      resp.success = save && image.save
-      render :json => resp
-    end
-    
-    # DELETE /admin/images/:id
-    def admin_delete
-      return unless user_is_allowed('images', 'delete')
-      img = MediaImage.find(params[:id])      
-      resp = StdClass.new({
-        'redirect' => "/admin/images?media_category_id=#{img.media_category_id}"
-      })
-      img.destroy            
-      render :json => resp
-    end       
-       
-    # 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 = {        
-        "expiration" => 10.seconds.from_now.utc.xmlschema,
-        "conditions" => [
-          { "bucket" => bucket },
-          ["starts-with", "$key", key],
-          { "acl" => "public-read" },
-          { "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 => {
-        :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
-    
-    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
-    
-    ## 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/models/caboose/media_file.rb

@@ -1,18 +0,0 @@
-class Caboose::MediaFile < ActiveRecord::Base
-
-  self.table_name = "media_files"
-  belongs_to :media_category
-  has_attached_file :file, :path => ':path_prefixmedia-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,43 +0,0 @@
-require 'uri'
-require 'httparty'
-
-class Caboose::MediaImage < ActiveRecord::Base
-
-  self.table_name = "media_images"
-  belongs_to :media_category  
-  has_attached_file :image, 
-    :path => ':path_prefixmedia-images/:id_:style.:extension',
-    :default_url => 'http://placehold.it/300x300',    
-    :styles => {
-      :tiny  => '150x200>',
-      :thumb => '300x400>',
-      :large => '600x800>'
-    }
-  do_not_validate_attachment_file_type :image  
-  attr_accessible :id, :media_category_id, :name, :description
-
-  def process
-    
-    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/views/caboose/images/admin_index.html.erb

@@ -1,59 +0,0 @@
-<h1>Images</h1>
-
-<% 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='policy'                  value='' />
-    <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>  
-  <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 %>
-<%= 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 controller = false;
-$(document).ready(function() {
-  controller = new ImagesController({
-    cat_id: <%= @media_category.id %>
-  });
-});
-
-</script>
-<% end %>