caboose-cms 0.9.228 → 0.9.229

data/app/models/caboose/site.rb

@@ -42,6 +42,7 @@ class Caboose::Site < ActiveRecord::Base
     :analytics_id            ,
     :use_retargeting         ,
     :use_dragdrop            ,
+    :use_change_logs         ,
     :date_js_updated         ,
     :date_css_updated        ,
     :default_layout_id       ,
@@ -65,7 +66,13 @@ class Caboose::Site < ActiveRecord::Base
     :head_code,
     :body_open_code,
     :body_close_code,
-    :recaptcha_threshold
+    :recaptcha_threshold,
+    :google_api_key,
+    :use_caching,
+    :footer_css_digest,
+    :footer_js_digest,
+    :custom_css_files,
+    :custom_js_files
             
   before_save :validate_presence_of_store_config
 
@@ -151,6 +158,16 @@ class Caboose::Site < ActiveRecord::Base
   def self.sanitize_name(name)
     self.name = self.name.downcase.gsub(' ', '_')
   end
+
+  def dev_domain
+    Caboose::Domain.where(:site_id => self.id).where("domain LIKE ?","dev.%").first
+  end
+
+  def public_domain
+    ms = Caboose::Site.where(:is_master => true).first
+    md = Caboose::Domain.where(:site_id => ms.id, :primary => true).first if ms
+    return md ? "#{self.name}.#{md.domain}" : "caboosecms.com"
+  end
   
   def primary_domain
     Caboose::Domain.where(:site_id => self.id, :primary => true).first
@@ -235,5 +252,190 @@ class Caboose::Site < ActiveRecord::Base
     rm = Caboose::RoleMembership.create(:role_id => eli_role.id, :user_id => eli_user.id) if rm.nil?
         
   end
+
+
+
+  # Caching
+
+  def cached_footer_css
+    str = ''
+    return str if !self.use_caching
+    index_page = Caboose::Page.index_page(self.id)
+    footer_ids = Caboose::Page.home_page_footer_block_ids(index_page)
+    blocks = Caboose::Block.includes(:block_type).where("blocks.parent_id in (?)",footer_ids).where("blocks.cached_css IS NOT NULL").where("block_types.is_dynamic = false").order("blocks.id").all
+    blocks.each do |b|
+      str << b.cached_css
+    end
+    return str.blank? ? '' : str.gsub(/<\/style>(\s*)<style>/,'')
+  end
+
+  def cached_footer_js
+    str = ''
+    return str if !self.use_caching
+    index_page = Caboose::Page.index_page(self.id)
+    footer_ids = Caboose::Page.home_page_footer_block_ids(index_page)
+    blocks = Caboose::Block.includes(:block_type).where("blocks.parent_id in (?)",footer_ids).where("blocks.cached_js IS NOT NULL").where("block_types.is_dynamic = false").order("blocks.id").all
+    blocks.each do |b|
+      str << b.cached_js
+    end
+    host = Rails.env.production? ? "https://#{ActionController::Base.asset_host}" : ""
+    return str.blank? ? '' : str.gsub('"/assets/',"\"#{host}/assets/")
+  end
+
+  def refresh_footer_css
+    begin
+      rad = rand(999)
+      dom = Rails.env.production? ? self.public_domain : self.dev_domain.domain
+      uri = URI("http://#{dom}/api/generate-asset/site_#{self.id}.css?#{rad}")
+      css = Net::HTTP.get(uri)
+    rescue
+      Caboose.log("Couldn't generate site CSS")
+    end
+  end
+
+  def refresh_footer_js
+    begin
+      rad = rand(999)
+      dom = Rails.env.production? ? self.public_domain : self.dev_domain.domain
+      uri = URI("http://#{dom}/api/generate-asset/site_#{self.id}.js?#{rad}")
+      css = Net::HTTP.get(uri)
+    rescue
+      Caboose.log("Couldn't generate site JS")
+    end
+  end
+
+
+  def footer_css_path(digest = self.footer_css_digest)
+    return "assets/sites/site_#{self.id}_footer_#{digest}.css"
+  end
+
+  def footer_css_url
+    rad = rand(999)
+    old = "/api/generate-asset/site_#{self.id}.css?#{rad}"
+    return old if self.footer_css_digest.blank?
+    if Rails.env.production?
+      return "https://#{Caboose::cdn_domain}/#{footer_css_path}"
+    else
+      path = File.join(Rails.root, 'public', "#{footer_css_path}")
+      if File.file?(path)
+        return "#{ActionController::Base.asset_host}/#{footer_css_path}"
+      else
+        return "https://#{Caboose::cdn_domain}/#{footer_css_path}"
+      end
+    end
+  end
+
+  def update_footer_css_file
+    str = ""
+    footer_css_digest = SecureRandom.urlsafe_base64.to_s
+    old_digest = self.footer_css_digest
+    css = self.refresh_footer_css
+    if css && !css.blank?
+      begin
+        if Rails.env.production?
+          config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+          AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
+          bucket =  AWS::S3.new.buckets[config['bucket']]                         
+          bucket.objects[self.footer_css_path(footer_css_digest)].write(css, :acl => 'public-read', :content_type => 'text/css', :cache_control => 'public, max-age=86400')
+          if !old_digest.blank? && old_digest != 'empty'
+            key = self.footer_css_path(old_digest)
+            obj = bucket.objects[key]
+            obj.delete
+          end
+        else
+          file_path = File.join(Rails.root, 'public', 'assets', 'sites')
+          FileUtils.mkdir_p(file_path) unless File.directory?(file_path)
+          File.open(File.join(Rails.root, 'public', self.footer_css_path(footer_css_digest)), 'w') { |f| f.write( css ) } 
+          if !old_digest.blank? && old_digest != 'empty'
+            path = File.join(Rails.root, 'public', self.footer_css_path(old_digest))
+            File.delete(path) if File.file?(path)
+          end
+        end
+        self.update_column('footer_css_digest', footer_css_digest)
+      rescue
+        self.update_column('footer_css_digest', old_digest)
+      end
+    else
+      self.update_column('footer_css_digest', 'empty')
+    end
+  end
+
+
+
+
+  def footer_js_path(digest = self.footer_js_digest)
+    return "assets/sites/site_#{self.id}_footer_#{digest}.js"
+  end
+
+  def footer_js_url
+    rad = rand(999)
+    old = "/api/generate-asset/site_#{self.id}.js?#{rad}"
+    return old if self.footer_js_digest.blank?
+    if Rails.env.production?
+      return "https://#{Caboose::cdn_domain}/#{footer_js_path}"
+    else
+      path = File.join(Rails.root, 'public', "#{footer_js_path}")
+      if File.file?(path)
+        return "#{ActionController::Base.asset_host}/#{footer_js_path}"
+      else
+        return "https://#{Caboose::cdn_domain}/#{footer_js_path}"
+      end
+    end
+  end
+
+  def update_footer_js_file
+    str = ""
+    footer_js_digest = SecureRandom.urlsafe_base64.to_s
+    old_digest = self.footer_js_digest
+    js = self.refresh_footer_js
+    if js && !js.blank?
+      begin
+        if Rails.env.production?
+          config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+          AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
+          bucket =  AWS::S3.new.buckets[config['bucket']]                         
+          bucket.objects[self.footer_js_path(footer_js_digest)].write(js, :acl => 'public-read', :content_type => 'text/javascript', :cache_control => 'public, max-age=86400')
+          if !old_digest.blank? && old_digest != 'empty'
+            key = self.footer_js_path(old_digest)
+            obj = bucket.objects[key]
+            obj.delete
+          end
+        else
+          file_path = File.join(Rails.root, 'public', 'assets', 'sites')
+          FileUtils.mkdir_p(file_path) unless File.directory?(file_path)
+          File.open(File.join(Rails.root, 'public', self.footer_js_path(footer_js_digest)), 'w') { |f| f.write( js ) } 
+          if !old_digest.blank? && old_digest != 'empty'
+            path = File.join(Rails.root, 'public', self.footer_js_path(old_digest))
+            File.delete(path) if File.file?(path)
+          end
+        end
+        self.update_column('footer_js_digest', footer_js_digest)
+      rescue
+        self.update_column('footer_js_digest', old_digest)
+      end
+    else
+      self.update_column('footer_js_digest', 'empty')
+    end
+  end
+
+
+  def refresh_all_page_caches
+    if self.use_caching
+      home_page = Caboose::Page.index_page(self.id)
+      footer = home_page.block.child('footer')
+      Caboose::Page.where(:site_id => self.id).order(:id).all.each do |page|
+        content = page.block ? page.block.child('content') : nil
+        block_ids = content ? Caboose::Block.where("parent_id = ?", content.id).pluck(:id) : []
+        page.update_cached_blocks(block_ids)
+        page.delay(:queue => 'caching', :priority => 8).update_css_file
+        page.delay(:queue => 'caching', :priority => 8).update_js_file
+      end
+      footer_ids = Caboose::Block.where("parent_id = ?", footer.id).pluck(:id)
+      home_page.update_cached_blocks(footer_ids)
+      self.delay(:queue => 'caching', :priority => 9).update_footer_css_file
+      self.delay(:queue => 'caching', :priority => 9).update_footer_js_file
+    end
+  end
+
   
 end

data/app/models/caboose/theme.rb

@@ -102,7 +102,13 @@ class Caboose::Theme < ActiveRecord::Base
 
     :digest,
     :custom_sass,
-    :cl_banner_version
+    :cl_banner_version,
+    :sass_error,
+    :main_js,
+    :js_digest,
+
+    :default_page_padding,
+    :default_page_constrain
 
   def compile(for_site_id = 0)
   	theme = self
@@ -111,6 +117,7 @@ class Caboose::Theme < ActiveRecord::Base
   	body = ERB.new(File.read(File.join(path))).result(theme.get_binding(for_site_id))
   	tmp_themes_path = File.join(Rails.root, 'tmp', 'themes')
   	tmp_asset_name = "theme_#{self.id}_site_#{for_site_id}"
+  	old_digest = self.digest
   	FileUtils.mkdir_p(tmp_themes_path) unless File.directory?(tmp_themes_path)
   	File.open(File.join(tmp_themes_path, "#{tmp_asset_name}.scss"), 'w') { |f| f.write(body) }
 		begin
@@ -131,17 +138,28 @@ class Caboose::Theme < ActiveRecord::Base
 	      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
 		    AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
 		    bucket =  AWS::S3.new.buckets[config['bucket']]                         
-		    bucket.objects[theme.asset_path(asset.digest, for_site_id)].write(str, :acl => 'public-read', :content_type => 'text/css')
+		    bucket.objects[theme.asset_path(asset.digest, for_site_id)].write(str, :acl => 'public-read', :content_type => 'text/css', :cache_control => 'public, max-age=86400')
+		    # if !old_digest.blank?
+      #     key = self.asset_path(old_digest, for_site_id)
+      #     obj = bucket.objects[key]
+      #     obj.delete
+      #   end
 	    else
 	    	theme_path = File.join(Rails.root, 'public', 'assets', 'themes')
 				FileUtils.mkdir_p(theme_path) unless File.directory?(theme_path)
 	      File.open(File.join(Rails.root, 'public', theme.asset_path(asset.digest, for_site_id)), 'w') { |f| f.write(compressed_body) }
+	      if !old_digest.blank?
+          path = File.join(Rails.root, 'public', self.asset_path(old_digest, for_site_id))
+          File.delete(path) if File.file?(path)
+        end
 	    end
 	    self.update_digest(asset.digest)
 		rescue Sass::SyntaxError => error
 			if Rails.env.development?
 				raise error
 			end
+			theme.sass_error = error
+			theme.save
 			theme.revert
 		end
   end
@@ -179,9 +197,56 @@ class Caboose::Theme < ActiveRecord::Base
 		end
 	end
 
-	def js_url
-		# TODO - figure out how to do this 
-		"https://cabooseit.s3.amazonaws.com/assets/natureseyenri/js/application.js"
+	def js_path(site_id = 0, digest = self.js_digest)
+		"assets/themes/theme_#{self.id}_site_#{site_id}_#{digest}.js"
+	end
+
+	def upload_js(for_site_id = 0)
+		str = ""
+		js_digest = SecureRandom.urlsafe_base64.to_s
+		old_digest = self.js_digest
+		Caboose::ThemeFile.where("filename ILIKE (?)","%.js%").all.each do |jsfile|
+			if Caboose::ThemeFileMembership.where(:theme_id => self.id, :theme_file_id => jsfile.id).exists?
+				uri = URI(jsfile.filename)
+				str += Net::HTTP.get(uri)
+			end 
+		end
+		str += self.main_js
+		if Rails.env.production?
+      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+	    AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
+	    bucket =  AWS::S3.new.buckets[config['bucket']]                         
+	    bucket.objects[self.js_path(for_site_id, js_digest)].write(str, :acl => 'public-read', :content_type => 'application/javascript', :cache_control => 'public, max-age=86400')
+	    # if !old_digest.blank?
+     #    key = self.js_path(for_site_id, old_digest)
+     #    obj = bucket.objects[key]
+     #    obj.delete
+     #  end
+    else
+    	theme_path = File.join(Rails.root, 'public', 'assets', 'themes')
+			FileUtils.mkdir_p(theme_path) unless File.directory?(theme_path)
+      File.open(File.join(Rails.root, 'public', self.js_path(for_site_id, js_digest)), 'w') { |f| f.write( str ) }
+      if !old_digest.blank?
+        path = File.join(Rails.root, 'public', self.js_path(for_site_id, old_digest))
+        File.delete(path) if File.file?(path)
+      end
+    end
+    self.update_column('js_digest', js_digest)
+	end
+
+	def js_url(site_id = 0)
+		old = "https://cabooseit.s3.amazonaws.com/assets/natureseyenri/js/application.js"
+		return old if self.main_js.blank?
+		if Rails.env.production?
+			return "https://#{ActionController::Base.asset_host}/#{js_path(site_id)}"
+		else
+			path = File.join(Rails.root, 'public', "#{js_path(site_id)}")
+			if File.file?(path)
+				return "#{ActionController::Base.asset_host}/#{js_path(site_id)}"
+			else
+				return "https://#{Caboose::cdn_domain}/#{js_path(site_id)}"
+			end
+		end
 	end
 
 	def update_digest(digest)

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

@@ -16,8 +16,6 @@ bt = @block_type
 
 <h2>Children</h2>
 <div id='block_types'></div>
-
-
     
 <h2>Advanced</h2>
 <p><div id='blocktype_<%= bt.id %>_block_type_category_id'          ></div></p>
@@ -30,17 +28,16 @@ bt = @block_type
 <p><div id='blocktype_<%= bt.id %>_options'                         ></div></p>
 <!-- <p><div id='blocktype_<%= bt.id %>_is_global'                       ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_use_render_function'             ></div></p>
-<p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p>
+<!-- <p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_use_js_for_modal'                ></div></p>
 <p><div id='blocktype_<%= bt.id %>_allow_child_blocks'              ></div></p>
+<p><div id='blocktype_<%= bt.id %>_is_dynamic'                      ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_child_block_type_id'     ></div></p>
 <!-- <p><div id='blocktype_<%= bt.id %>_default_constrain'               ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_full_width'              ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_default_included'              ></div></p>
-<p>
 
-</p>
-<p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p>
+<!-- <p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p> -->
 
 <div id='message'></div>
 
@@ -102,7 +99,7 @@ $(document).ready(function() {
       { name: 'block_type_category_id'         , sort: 'block_type_category_id'         , show: false , bulk_edit: false, nice_name: 'Category'                       , type: 'select'            , value: function(bt) { return bt.block_type_category_id;          }, width: 400, options_url: '/admin/block-type-categories/tree-options' },
   //    { name: 'is_global'                      , sort: 'is_global'                      , show: false , bulk_edit: false, nice_name: 'Global'                         , type: 'checkbox'          , value: function(bt) { return bt.is_global;                       }, text: function(bt) { return bt.is_global                      ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_render_function'            , sort: 'use_render_function'            , show: true  , bulk_edit: false, nice_name: 'Use Render Function'            , type: 'checkbox'          , value: function(bt) { return bt.use_render_function;             }, text: function(bt) { return bt.use_render_function            ? 'Yes' : 'No' }, width: 400 },
-      { name: 'use_render_function_for_layout' , sort: 'use_render_function_for_layout' , show: true  , bulk_edit: false, nice_name: 'Use Render Function for Modal'  , type: 'checkbox'          , value: function(bt) { return bt.use_render_function_for_layout;  }, text: function(bt) { return bt.use_render_function_for_layout ? 'Yes' : 'No' }, width: 400 },
+  //    { name: 'use_render_function_for_layout' , sort: 'use_render_function_for_layout' , show: true  , bulk_edit: false, nice_name: 'Use Render Function for Modal'  , type: 'checkbox'          , value: function(bt) { return bt.use_render_function_for_layout;  }, text: function(bt) { return bt.use_render_function_for_layout ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_js_for_modal'               , sort: 'use_js_for_modal'               , show: true  , bulk_edit: false, nice_name: 'Use JS for Modal'               , type: 'checkbox'          , value: function(bt) { return bt.use_js_for_modal;                }, text: function(bt) { return bt.use_js_for_modal               ? 'Yes' : 'No' }, width: 400 },
       { name: 'allow_child_blocks'             , sort: 'allow_child_blocks'             , show: true  , bulk_edit: false, nice_name: 'Allow Child Blocks'             , type: 'checkbox'          , value: function(bt) { return bt.allow_child_blocks;              }, text: function(bt) { return bt.allow_child_blocks             ? 'Yes' : 'No' }, width: 400 },
       { name: 'default_child_block_type_id'    , sort: 'default_child_block_type_id'    , show: false , bulk_edit: false, nice_name: 'Default Child Block Type ID'       , type: 'text'            , value: function(bt) { return bt.default_child_block_type_id;     }, width: 400 },          
@@ -137,6 +134,7 @@ $(document).ready(function() {
       { name: 'use_render_function_for_layout' , nice_name: 'Use Render Function for Modal'  , type: 'checkbox' , value: <%= bt.use_render_function_for_layout ? 'true' : 'false' %>, width: 400 },
       { name: 'use_js_for_modal'               , nice_name: 'Use JS for Modal'               , type: 'checkbox' , value: <%= bt.use_js_for_modal               ? 'true' : 'false' %>, width: 400 },
       { name: 'allow_child_blocks'             , nice_name: 'Allow Child Blocks'             , type: 'checkbox' , value: <%= bt.allow_child_blocks             ? 'true' : 'false' %>, width: 400 },
+      { name: 'is_dynamic'             , nice_name: 'Dynamic Block'             , type: 'checkbox' , value: <%= bt.is_dynamic      ? 'true' : 'false' %>, width: 400 },
       { name: 'default_child_block_type_id'    , nice_name: 'Default Child Block Type ID'       , type: 'text'   , value: <%= raw Caboose.json(bt.default_child_block_type_id)     %>,  width: 400 },   
       { name: 'field_type'                     , nice_name: 'Field type'                     , type: 'select'   , value: <%= raw Caboose.json(bt.field_type)                      %>, text: <%= raw Caboose.json(bt.field_type) %>, width: 400, options_url: '/admin/block-types/field-type-options' },
       { name: 'default'                        , nice_name: 'Default value'                  , type: 'text'     , value: <%= raw Caboose.json(bt.default)                         %>, width: 400 },
@@ -144,7 +142,7 @@ $(document).ready(function() {
       { name: 'height'                         , nice_name: 'Height'                         , type: 'text'     , value: <%= raw Caboose.json(bt.height)                          %>, width: 400 },
       { name: 'fixed_placeholder'              , nice_name: 'Fixed placeholder'              , type: 'checkbox' , value: <%= raw Caboose.json(bt.fixed_placeholder)               %>, width: 400 },
       { name: 'options_url'                    , nice_name: 'Options URL'                    , type: 'text'     , value: <%= raw Caboose.json(bt.options_url)                     %>, width: 400 },
-      { name: 'options_function'               , nice_name: 'Options Function'               , type: 'textarea' , value: <%= raw Caboose.json(bt.options_function)                %>, width: 400, height: 100 },
+    //  { name: 'options_function'               , nice_name: 'Options Function'               , type: 'textarea' , value: <%= raw Caboose.json(bt.options_function)                %>, width: 400, height: 100 },
       { name: 'options'                        , nice_name: 'Options'                        , type: 'textarea' , value: <%= raw Caboose.json(bt.options)                         %>, width: 400, height: 100 }, 
       { name: 'default_included'             , sort: 'default_included'             ,  nice_name: 'Include on New Sites'          , type: 'checkbox'          , value: <%= bt.default_included ? 'true' : 'false' %> , width: 400 }
     ]

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

@@ -0,0 +1,28 @@
+<%== ERB.new(render_function).result(self.instance_eval { binding }) %>
+
+<% if caboose_js && caboose_js.length > 1 %>
+	<% caboose_js.to_a.each_with_index do |js, ind| %>
+		<% next if ind == 0 %>
+		<% content_for :js do %>
+			<% begin %>
+				<% block.cached_js = ERB.new(js).result(self.instance_eval { binding }) %>
+				<% block.save %>
+			<% rescue %>
+				<% Caboose.log("JS ERROR for block #{block.id}") %>
+			<% end %>
+		<% end %>
+	<% end %>
+<% end %>
+<% if caboose_css && caboose_css.length > 1 %>
+	<% caboose_css.to_a.each_with_index do |css, ind| %>
+		<% next if ind == 0 %>
+		<% content_for :css do %>
+			<% begin %>
+				<% block.cached_css = ERB.new(css).result(self.instance_eval { binding }) %>
+				<% block.save %>
+			<% rescue %>
+				<% Caboose.log("CSS ERROR for block #{block.id}") %>
+			<% end %>
+		<% end %>
+	<% end %>
+<% end %>

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

@@ -12,9 +12,9 @@ end
 
 if editing
   if url.nil? || url.starts_with?('http://placehold.it') || url.include?('missing')  
-    %><div id='block_<%= block.id %>'><p>Click to select a file.</p></div><%
+    %><div id='block_<%= block.id %>' class='file-select'><p>Click to select file for <%= block.block_type.description %>.</p></div><%
   else
-    %><div id='block_<%= block.id %>'><p><span><%= name %></span></p></div><%
+    %><div id='block_<%= block.id %>' class='file-select'><p><%= block.block_type.description %> file:<br /><span><%= name %></span></p></div><%
   end
 elsif url
   %><div id='block_<%= block.id %>'><p><a href="<%= raw file.url %>">Download File</a></p></div><%

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

@@ -1,6 +1,5 @@
 <% sc = site.social_config %>
-
-<% if sc.auto_ga_js && !sc.google_analytics_id.blank? %>
+<% if sc.auto_ga_js && !sc.google_analytics_id.blank? && !editing && Rails.env.production? %>
 <script async src="https://www.googletagmanager.com/gtag/js?id=<%== sc.google_analytics_id %>"></script>
 <script>
   window.dataLayer = window.dataLayer || [];

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

@@ -1,12 +1,15 @@
 <% 
 url = nil
+mc = "Media"
 if block.media  
   url = block.media.image.url(:tiny)
+  mc = block.media.media_category ? block.media.media_category.name : mc
 elsif block.image
   url = block.image.url(:tiny)
 end
 if editing && url.include?('placehold') %>
 <div class="img-wrap" style="position:relative;display:inline-block;">
+	<% if block.media %><span>Media > <%= mc %> > <%= block.media.original_name %></span><% end %>
 	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
 		<img src='https://cabooseit.s3.amazonaws.com/assets/select_image.png' width="150" style="max-width:100%;display:block;" />
 		<span style="opacity:0;" class="select">Select an Image</span>
@@ -14,6 +17,7 @@ if editing && url.include?('placehold') %>
 </div>
 <% elsif editing %>
 <div class="img-wrap" style="position:relative;display:inline-block;">
+	<% if block.media %><span>Media > <%= mc %> > <%= block.media.original_name %></span><% end %>
 	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
 		<img src='<%== url %>' width="200" style="max-width:100%;display:block;" />
 		<span style="opacity:0;" class="select">Select an Image</span>