caboose-cms 0.5.221 → 0.5.222

data/app/models/caboose/media.rb

@@ -0,0 +1,94 @@
+require 'uri'
+require 'httparty'
+
+class Caboose::Media < ActiveRecord::Base
+
+  self.table_name = "media"
+  belongs_to :media_category
+  has_attached_file :file, :path => ':path_prefixmedia/:id_:media_name.:extension'
+  do_not_validate_attachment_file_type :file  
+  has_attached_file :image, 
+    :path => ':path_prefixmedia/:id_:media_name_:style.:extension',
+    :default_url => 'http://placehold.it/300x300',    
+    :styles => {
+      :tiny  => '150x200>',
+      :thumb => '300x400>',
+      :large => '600x800>'
+    }
+    #:s3_headers => lambda { |attachment| { "Content-Disposition" => "attachment; filename=\"#{attachment.name}\"" }}
+  do_not_validate_attachment_file_type :image  
+  attr_accessible :id, 
+    :media_category_id, 
+    :name,
+    :original_name,
+    :description, 
+    :processed
+    
+   has_attached_file :sample
+   
+   #before_post_process :set_content_dispositon
+   #def set_content_dispositon
+   #  self.sample.options.merge({ :s3_headers => { "Content-Disposition" => "attachment; filename=#{self.name}" }})
+   #end
+
+  def process
+    #return if self.processed
+    
+    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+    bucket = config['bucket']
+        
+    key = "#{self.media_category_id}_#{self.original_name}"
+    uri = "http://#{bucket}-uploads.s3.amazonaws.com/#{key}"
+    
+    image_extensions = ['.jpg', '.jpeg', '.gif', '.png', '.tif']
+    ext = File.extname(key).downcase
+    if image_extensions.include?(ext)    
+      self.image = URI.parse(uri)
+    else
+      self.file = URI.parse(uri)
+    end
+    self.processed = true
+    self.save
+    
+    # Set the downloadable file names
+    #bucket = AWS::S3::Bucket.new(bucket)
+    #['tiny', 'thumb', 'large'].each do |style|            
+    #  obj = bucket.objects["media/#{self.id}_#{style}#{ext}"]
+    #  obj.content_disposition = 'attachment; filename="' + self.name + '"'
+    #  obj.store
+    #end
+           
+    # Remove the temp file            
+    bucket = AWS::S3::Bucket.new("#{bucket}-uploads")
+    obj = bucket.objects[key]
+    obj.delete
+         
+  end
+  
+  def api_hash
+    {
+      :id           => self.id,
+      :name         => self.name,
+      :description  => self.description,
+      :processed    => self.processed,
+      :image_urls   => self.image_urls,
+      :file_url     => self.file ? self.file.url : nil       
+    }    
+  end
+  
+  def image_urls
+    return nil if self.image.nil? || self.image.url(:tiny).starts_with?('http://placehold.it')
+    return {
+      :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
+  
+  def self.upload_name(str)
+    return '' if str.nil?
+    return File.basename(str, File.extname(str)).downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
+  end
+      
+end

data/app/models/caboose/media_category.rb

@@ -3,28 +3,68 @@ class Caboose::MediaCategory < ActiveRecord::Base
   self.table_name = "media_categories"  
   belongs_to :parent, :class_name => 'Caboose::MediaCategory'
   has_many :children, :class_name => 'Caboose::MediaCategory', :foreign_key => 'parent_id', :order => 'name'
-  has_many :media_images, :class_name => 'Caboose::MediaImage', :order => 'name'
-  has_many :media_files, :class_name => 'Caboose::MediaFile', :order => 'name'
+  has_many :media, :class_name => 'Caboose::Media', :order => 'name'  
   attr_accessible :id, :site_id, :parent_id, :name
   
-  def self.top_image_category(site_id)
-    return self.where("parent_id is null and site_id = ? and name = ?", site_id, 'Images').first
+  def self.top_category(site_id)
+    cat = self.where(:site_id => site_id, :parent_id => nil).first
+    cat = self.create(:site_id => site_id, :parent_id => nil, :name => 'Media') if cat.nil?
+    return cat    
   end
-  
-  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,
+      :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 }
+      :site_id   => self.site_id,      
+      :name      => self.name,
+      :children  => self.children.collect { |child| child.api_hash },
+      :media     => self.media.collect { |m| m.api_hash }      
     }
   end
+  
+  def self.tree(site_id)
+    return self.where(:parent_id => nil, :site_id => site_id).reorder("name").all
+  end
+  
+  def self.flat_tree(site_id, prefix = '-')
+    arr = []
+    self.tree(site_id).each do |cat|
+      arr += self.flat_tree_helper(cat, prefix, '')
+    end    
+    return arr
+  end
+  
+  def self.flat_tree_helper(cat, prefix, str)        
+    cat.name = "#{str}#{cat.name}"
+    arr = [{
+      :id          => cat.id,
+      :parent_id   => cat.parent_id,
+      :site_id     => cat.site_id,      
+      :name        => cat.name,
+      :media_count => cat.media.count      
+    }]
+    cat.children.each do |cat2|
+      arr += self.flat_tree_helper(cat2, prefix, "#{str}#{prefix}")
+    end
+    return arr
+  end
+  
+  def is_ancestor_of?(cat)    
+    if cat.is_a?(Integer) || cat.is_a?(String)
+      cat_id = cat.to_i
+      return false if cat_id == -1
+      cat = Caboose::MediaCategory.find(cat_id)
+    end
+    return false if cat.parent_id.nil?
+    return false if cat.parent.nil?
+    return true  if cat.parent.id == self.id
+    return is_ancestor_of?(cat.parent)      
+  end
+  
+  def is_child_of?(cat)
+    cat = Caboose::MediaCategory.find(cat) if cat.is_a?(Integer)
+    return cat.is_ancestor_of?(self)      
+  end
 
 end

data/app/models/caboose/schema.rb

@@ -329,18 +329,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :site_id           , :integer ],
         [ :name              , :string  ]        
       ],
-      Caboose::MediaImage => [
+      Caboose::Media => [
         [ :media_category_id , :integer    ],
         [ :name              , :string     ],
         [ :description       , :text       ],
-        [ :image             , :attachment ]
-      ],
-      Caboose::MediaFile => [
-        [ :media_category_id , :integer    ],
-        [ :name              , :string     ],
-        [ :description       , :text       ],
-        [ :file              , :attachment ]
-      ],
+        [ :original_name     , :string     ],
+        [ :image             , :attachment ],
+        [ :file              , :attachment ],
+        [ :processed         , :boolean     , { :default => false }]
+      ],      
       Caboose::Modification => [      
         [ :product_id               , :integer ],
         [ :sort_order               , :integer  , { :default => 0 }],

data/app/models/caboose/tax_calculator.rb

@@ -25,7 +25,7 @@ module Caboose
       sa = order.shipping_address
       if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?        
         sa = order.billing_address
-      end      
+      end
       return 0.00 if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?
       
       TaxCloud.configure do |config|

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

@@ -0,0 +1,49 @@
+
+<h1>Media</h1>
+
+<p><a href='http://d9hjv462jiw15.cloudfront.net/media-images/22_tiny.jpg?1435603149'>Download</a></p>
+
+<div id='left_content'>
+  <div id='categories'></div>
+  <div id='controls'></div>
+</div>
+<div id='right_content'>
+  <div id='uploader'></div>
+  <div id='media'></div>
+</div>
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/admin_media_index' %>
+<link rel="stylesheet" href="/assets/plupload/jquery.ui.plupload/css/jquery.ui.plupload.css" type="text/css" />
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/admin_media_index.js' %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+
+<!-- production -->
+<script type="text/javascript" src="/assets/plupload/plupload.full.min.js"></script>
+<script type="text/javascript" src="/assets/plupload/jquery.ui.plupload/jquery.ui.plupload.js"></script>
+                
+<!-- debug 
+<script type="text/javascript" src="/assets/plupload/moxie.js"></script>
+<script type="text/javascript" src="/assets/plupload/plupload.dev.js"></script>
+<script type="text/javascript" src="/assets/plupload/jquery.ui.plupload/jquery.ui.plupload.js"></script>
+-->
+
+<script type="text/javascript">
+
+var controller = false;
+$(document).ready(function() {
+  controller = new MediaController({
+    top_cat_id: <%= raw Caboose.json(@media_category ? @top_media_category.id : false) %>,
+    cat_id: <%= raw Caboose.json(@media_category ? @media_category.id : false) %>,
+    s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
+	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
+	  policy: '<%= raw @policy %>',
+	  signature: '<%= raw @signature %>'
+  });	
+});
+
+</script>
+<% end %>

data/app/views/caboose/posts/admin_edit_general.html.erb

@@ -6,6 +6,7 @@
 <p><div id='post_<%= @post.id %>_title'     ></div></p>
 <p><div id='post_<%= @post.id %>_subtitle'  ></div></p>
 <p><div id='post_<%= @post.id %>_author'    ></div></p>
+<p><div id='post_<%= @post.id %>_created_at'></div></p>
 <p><div id='post_<%= @post.id %>_published' ></div></p>
 <p><div id='post_<%= @post.id %>_image'     ></div></p>
 
@@ -25,7 +26,8 @@ $(document).ready(function() {
       { name: 'slug'      , nice_name: 'Slug'      , type: 'text'      , value: <%= raw Caboose.json(@post.slug       )        %>, width: 600, after_update: function() { refresh_uri(); } },
       { name: 'title'     , nice_name: 'Title'     , type: 'text'      , value: <%= raw Caboose.json(@post.title      )        %>, width: 600, after_update: function() { refresh_uri(); } }, 
       { name: 'subtitle'  , nice_name: 'Subtitle'  , type: 'text'      , value: <%= raw Caboose.json(@post.subtitle   )        %>, width: 600 },
-      { name: 'author'    , nice_name: 'Author'    , type: 'text'      , value: <%= raw Caboose.json(@post.author     )        %>, width: 600 },      
+      { name: 'author'    , nice_name: 'Author'    , type: 'text'      , value: <%= raw Caboose.json(@post.author     )        %>, width: 600 },    
+      { name: 'created_at'    , nice_name: 'Date Published'    , type: 'date'      , value: <%= raw Caboose.json( @post.created_at.strftime('%m/%d/%Y')     )        %>, width: 600 },     
       { name: 'published' , nice_name: 'Published' , type: 'checkbox'  , value: <%= raw @post.published ? true : false         %>, width: 600 },
       { name: 'image'     , nice_name: 'Image'     , type: 'image'     , value: <%= raw Caboose.json(@post.image.url(:thumb))  %>, width: 600, update_url: '/admin/posts/<%= @post.id %>/image' }            
     ]

data/config/routes.rb

@@ -111,7 +111,17 @@ Caboose::Engine.routes.draw do
   put     "/admin/social"               => "social#admin_update"
   get     "/admin/analytics"            => "social#analytics"
 
+  #=============================================================================
+  # Amazon SNS
+  #=============================================================================
 
+  get    "/admin/sns/confirm" => "sns#admin_confirm"
+  post   "/admin/sns/confirm" => "sns#admin_confirm"
+  get    "/admin/sns"         => "sns#admin_index"      
+  post   "/admin/sns"         => "sns#admin_add"
+  put    "/admin/sns/:id"     => "sns#admin_update"
+  delete "/admin/sns/:id"     => "sns#admin_delete"                        
+    
   #=============================================================================
   # Fonts
   #=============================================================================  
@@ -119,7 +129,6 @@ Caboose::Engine.routes.draw do
   get     "/admin/fonts"               => "fonts#admin_index"
   put     "/admin/fonts"               => "fonts#admin_update"
 
-
   #=============================================================================
   # Shipping Packages
   #=============================================================================
@@ -200,22 +209,26 @@ Caboose::Engine.routes.draw do
   # Images
   #=============================================================================
   
-  get     "/admin/images"                => "images#admin_index"
-  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"
+  post    "/admin/media/pre-upload"     => "media#admin_pre_upload"
+  get     "/admin/media"                => "media#admin_index"    
+  get     "/admin/media/new"            => "media#admin_new"
+  get     "/admin/media/json"           => "media#admin_json"
+  get     "/admin/media/:id/process"    => "media#admin_process"
+  get     "/admin/media/:id/finished"   => "media#admin_process_finished"
+  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"
+  delete  "/admin/media/bulk"           => "media#admin_bulk_delete"
+  delete  "/admin/media/:id"            => "media#admin_delete"
+  
+  
+  get     "/admin/media-categories/json"        => "media_categories#admin_json"
+  get     "/admin/media-categories/flat-tree"   => "media_categories#admin_flat_tree"
+  post    "/admin/media-categories"             => "media_categories#admin_add"
+  post    "/admin/media-categories/:id/attach"  => "media_categories#admin_attach"
+  put     "/admin/media-categories/:id"         => "media_categories#admin_update"      
+  delete  "/admin/media-categories/:id"         => "media_categories#admin_delete"
   
   #=============================================================================
   # Settings

data/lib/caboose.rb

@@ -153,3 +153,9 @@ Paperclip.interpolates :block_image_upload_name do |attachment, style|
   return b.id if b.image_upload_name.nil? || b.image_upload_name.strip.length == 0
   return b.image_upload_name        
 end
+
+Paperclip.interpolates :media_name do |attachment, style|
+  m = attachment.instance
+  return '' if m.name.nil? || m.name.strip.length == 0
+  return m.name            
+end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.221'
+  VERSION = '0.5.222'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.221
+  version: 0.5.222
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -398,8 +398,8 @@ files:
 - app/assets/javascripts/caboose/admin_block_edit.js
 - app/assets/javascripts/caboose/admin_edit_modifications.js
 - app/assets/javascripts/caboose/admin_edit_order.js
-- app/assets/javascripts/caboose/admin_images_index.js
 - app/assets/javascripts/caboose/admin_main.js
+- app/assets/javascripts/caboose/admin_media_index.js
 - app/assets/javascripts/caboose/admin_page_edit_content.js
 - app/assets/javascripts/caboose/admin_page_new_blocks.js
 - app/assets/javascripts/caboose/admin_post_edit_content.js
@@ -419,6 +419,7 @@ files:
 - app/assets/javascripts/caboose/date_format.js
 - app/assets/javascripts/caboose/google_spreadsheets.js
 - app/assets/javascripts/caboose/imageZoom.js
+- app/assets/javascripts/caboose/jquery-ui.drag-multiple.min.js
 - app/assets/javascripts/caboose/jquery.datetimepicker.js
 - app/assets/javascripts/caboose/jquery.detect.js
 - app/assets/javascripts/caboose/jquery.fileupload.js
@@ -464,11 +465,82 @@ files:
 - app/assets/javascripts/caboose/spectrum.js
 - app/assets/javascripts/caboose/station.js
 - app/assets/javascripts/caboose/testing.js
+- app/assets/javascripts/plupload/Moxie.swf
+- app/assets/javascripts/plupload/Moxie.xap
+- app/assets/javascripts/plupload/i18n/ar.js
+- app/assets/javascripts/plupload/i18n/az.js
+- app/assets/javascripts/plupload/i18n/bg.js
+- app/assets/javascripts/plupload/i18n/bs.js
+- app/assets/javascripts/plupload/i18n/ca.js
+- app/assets/javascripts/plupload/i18n/cs.js
+- app/assets/javascripts/plupload/i18n/cy.js
+- app/assets/javascripts/plupload/i18n/da.js
+- app/assets/javascripts/plupload/i18n/de.js
+- app/assets/javascripts/plupload/i18n/el.js
+- app/assets/javascripts/plupload/i18n/en.js
+- app/assets/javascripts/plupload/i18n/es.js
+- app/assets/javascripts/plupload/i18n/et.js
+- app/assets/javascripts/plupload/i18n/fa.js
+- app/assets/javascripts/plupload/i18n/fi.js
+- app/assets/javascripts/plupload/i18n/fr.js
+- app/assets/javascripts/plupload/i18n/he.js
+- app/assets/javascripts/plupload/i18n/hr.js
+- app/assets/javascripts/plupload/i18n/hu.js
+- app/assets/javascripts/plupload/i18n/hy.js
+- app/assets/javascripts/plupload/i18n/id.js
+- app/assets/javascripts/plupload/i18n/it.js
+- app/assets/javascripts/plupload/i18n/ja.js
+- app/assets/javascripts/plupload/i18n/ka.js
+- app/assets/javascripts/plupload/i18n/kk.js
+- app/assets/javascripts/plupload/i18n/km.js
+- app/assets/javascripts/plupload/i18n/ko.js
+- app/assets/javascripts/plupload/i18n/ku_IQ.js
+- app/assets/javascripts/plupload/i18n/lt.js
+- app/assets/javascripts/plupload/i18n/lv.js
+- app/assets/javascripts/plupload/i18n/mn.js
+- app/assets/javascripts/plupload/i18n/ms.js
+- app/assets/javascripts/plupload/i18n/nl.js
+- app/assets/javascripts/plupload/i18n/pl.js
+- app/assets/javascripts/plupload/i18n/pt_BR.js
+- app/assets/javascripts/plupload/i18n/ro.js
+- app/assets/javascripts/plupload/i18n/ru.js
+- app/assets/javascripts/plupload/i18n/sk.js
+- app/assets/javascripts/plupload/i18n/sq.js
+- app/assets/javascripts/plupload/i18n/sr.js
+- app/assets/javascripts/plupload/i18n/sr_RS.js
+- app/assets/javascripts/plupload/i18n/sv.js
+- app/assets/javascripts/plupload/i18n/th_TH.js
+- app/assets/javascripts/plupload/i18n/tr.js
+- app/assets/javascripts/plupload/i18n/uk_UA.js
+- app/assets/javascripts/plupload/i18n/vi.js
+- app/assets/javascripts/plupload/i18n/zh_CN.js
+- app/assets/javascripts/plupload/i18n/zh_TW.js
+- app/assets/javascripts/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/backgrounds.gif
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/buttons-disabled.png
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/buttons.png
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/delete.gif
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/done.gif
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/error.gif
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/throbber.gif
+- app/assets/javascripts/plupload/jquery.plupload.queue/img/transp50.png
+- app/assets/javascripts/plupload/jquery.plupload.queue/jquery.plupload.queue.js
+- app/assets/javascripts/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js
+- app/assets/javascripts/plupload/jquery.ui.plupload/css/jquery.ui.plupload.css
+- app/assets/javascripts/plupload/jquery.ui.plupload/img/loading.gif
+- app/assets/javascripts/plupload/jquery.ui.plupload/img/plupload.png
+- app/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js
+- app/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.min.js
+- app/assets/javascripts/plupload/moxie.js
+- app/assets/javascripts/plupload/moxie.min.js
+- app/assets/javascripts/plupload/plupload.dev.js
+- app/assets/javascripts/plupload/plupload.full.min.js
+- app/assets/javascripts/plupload/plupload.min.js
 - app/assets/javascripts/tinymce/plugins/caboose/plugin.js
 - app/assets/stylesheets/caboose/admin.css
 - app/assets/stylesheets/caboose/admin_crumbtrail.css.scss
-- app/assets/stylesheets/caboose/admin_images_index.css.scss
 - app/assets/stylesheets/caboose/admin_main.css
+- app/assets/stylesheets/caboose/admin_media_index.css.scss
 - app/assets/stylesheets/caboose/admin_page_edit_content.css
 - app/assets/stylesheets/caboose/admin_post_edit_content.css
 - app/assets/stylesheets/caboose/admin_products.css
@@ -537,11 +609,11 @@ files:
 - app/controllers/caboose/fonts_controller.rb
 - app/controllers/caboose/gift_cards_controller.rb
 - app/controllers/caboose/google_spreadsheets_controller.rb
-- app/controllers/caboose/images_controller.rb
 - app/controllers/caboose/line_items_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_controller.rb
 - app/controllers/caboose/media_categories_controller.rb
+- app/controllers/caboose/media_controller.rb
 - app/controllers/caboose/modal_controller.rb
 - app/controllers/caboose/modification_value_input_fields_controller.rb
 - app/controllers/caboose/modification_values_controller.rb
@@ -568,6 +640,7 @@ files:
 - app/controllers/caboose/shipping_packages_controller.rb
 - app/controllers/caboose/sites_controller.rb
 - app/controllers/caboose/smtp_controller.rb
+- app/controllers/caboose/sns_controller.rb
 - app/controllers/caboose/social_controller.rb
 - app/controllers/caboose/stackable_groups_controller.rb
 - app/controllers/caboose/station_controller.rb
@@ -619,9 +692,8 @@ files:
 - app/models/caboose/gift_card.rb
 - app/models/caboose/line_item.rb
 - app/models/caboose/line_item_modification.rb
+- app/models/caboose/media.rb
 - app/models/caboose/media_category.rb
-- app/models/caboose/media_file.rb
-- app/models/caboose/media_image.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/message.rb
 - app/models/caboose/model_binder.rb
@@ -797,15 +869,13 @@ files:
 - app/views/caboose/fonts/admin_index.html.erb
 - app/views/caboose/gift_cards/admin_edit.html.erb
 - app/views/caboose/gift_cards/admin_index.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
 - app/views/caboose/line_items/admin_new.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
 - app/views/caboose/login_mailer/forgot_password_email.html.erb
+- app/views/caboose/media/admin_edit.html.erb
+- app/views/caboose/media/admin_index.html.erb
 - app/views/caboose/modal/index.html.erb
 - app/views/caboose/modification_value_input_fields/admin_edit.html.erb
 - app/views/caboose/my_account/index.html.erb