trusty-clipped-extension 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjEwYmYzNjRhMjA5NGQ1NGMxY2VhMjIwMzY2OTcwNjM2ZjdjNmJlYg==
+    NjE1MWFiNDUxYWY1NjU2MDUxMzE4MGJlODA0MWJiNzExMzUwZTY4ZQ==
   data.tar.gz: !binary |-
-    YThhZDc5NDMxZDEyMWUwNGI3MmViNDgyZDE1YTA0MzBmYThhNTY1OQ==
+    NmFkNjg1ZDA1YzY4NWI3YzhjYTMzOThiYTliYjZhZTVmOGYxYTQ3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MGI3NDAzOTA0OWViNmU5ZjcxMWU1MTc4Njk0NDExYTFiZWVhZTU4MjkyNjQy
-    ZWU2MDlmZGVjM2E1YjA5OTNlM2FjOTBmMDk5OWU2NDVhNWU2NjI0MmY3MDRh
-    NTJmYjQ3OTc5YjczMDU2OWVlZWQzODc5ZjE3ZDBmMDU1NzcyOWI=
+    MDA4ODU3NTQzZDViMDM3YzMxMTc5YjUxNjA5ZWQzMzM2MzU5OWZhYTZjZTk1
+    OTJlZWQwZTI5Y2U4OWExMGM3NTI3NjYzMzBjODcxNzg0ZDhmZTM3ODQwNDE3
+    MTg5ZjIyMWQxN2JmYjQwMmUzMjIyNTA3ZWJiY2VmOTU2OTJiMjY=
   data.tar.gz: !binary |-
-    ZmEwMDkzMDlkMTRlZTA3OGYxZmRiOGFlMmFmOGNmNDkxN2Q3ZDViNjIyMjkw
-    NmFkNGM2ZmRjMmM1MjQzMmZkZmEyMmE1YjlmZDVlNWE0MzlhOWRiNTVhMzE5
-    NDVlOTdmMjk4OGFiZDEzY2JkNzg4ZjdhZTMxNjg1ZWEyYWRhY2Y=
+    NzBlNTdkYjg4MjhiMDhiYzhmNzE3YmM0YzJmMTUxNTBjMTQ4YTEzZDk5MTcx
+    YjUzM2ZhNGU0ZmVlZDEzMjNmYmExZGQ1YzNhNGRjYjlhOWNhZTlmN2M3Mjhh
+    Mjc4OWRhZWYyYjJkOTliMzA4MjFhYjQwNzg2Y2M2ZjY3ZjBkMjA=

data/app/assets/javascripts/admin/assets.js

@@ -26,6 +26,7 @@ Assets = {
       e.preventDefault();
       var part_name = $("a.tab.here").children('span').html();
       if (part_name.indexOf(' ')) part_name = part_name.replace(' ', '-');
+      part_name = part_name.replace('_', '-');
       var part_id = 'part_' + part_name + '_content';
       var tag_parts = $(this).attr('rel').split('_');
       var tag_name = tag_parts[0];
@@ -57,6 +58,11 @@ Assets = {
     if ($('#filesearchforminput').val() !== '') {
       parameters.push(['search', $('#filesearchforminput').val()]);
     }
+
+    if ($('#page_id').val() !== undefined) {
+      parameters.push(['page_id', $('#page_id').val()]);
+    }
+
     var filters = [];
     var url_params = "";
     $('a.selective.pressed').each(function(){

data/app/assets/stylesheets/admin/assets.sass

@@ -49,7 +49,7 @@ p.asset
         border-top-color: #999
         border-left-color: #b0b0b0
         border-right-color: #bbb
-        background: white image_url('admin/search.png') 4px center no-repeat
+        background: white url('/assets/admin/search.png') 4px center no-repeat
         +box-shadow(rgba(black, 0.2), 0, 1px, 0, inset)
         width: 180px
         padding: 2px 8px 2px 20px
@@ -147,7 +147,7 @@ p.asset
         .back
           display: none
         .front
-          background: transparent url(/images/admin/spinner.gif) no-repeat center center
+          background: transparent url(/assets/admin/spinner.gif) no-repeat center center
           img
             opacity: 0.2
 

data/app/controllers/admin/assets_controller.rb

@@ -3,7 +3,9 @@ class Admin::AssetsController < Admin::ResourceController
   
   def index
     assets = Asset.scoped({:order => "created_at DESC"})
-    
+
+    @page = Page.find(params[:page_id]) if params[:page_id]
+
     @term = params[:search] || ''
     assets = assets.matching(@term) if @term && !@term.blank?
     

data/app/models/asset_type.rb

@@ -48,9 +48,9 @@ class AssetType
 
   def icon(style_name='icon')
     if File.exist?(Rails.root + "public/images/admin/assets/#{icon_name}_#{style_name.to_s}.png")
-      return "/images/admin/assets/#{icon_name}_#{style_name.to_s}.png"
+      return "/assets/admin/#{icon_name}_#{style_name.to_s}.png"
     else
-      return "/images/admin/assets/#{icon_name}_icon.png"
+      return "/assets/admin/#{icon_name}_icon.png"
     end
   end
   

data/app/views/admin/page_attachments/_attachment.html.haml

@@ -6,7 +6,7 @@
 - css_class = "#{asset_type} asset"
 - css_class += ' unsaved' if attachment.new_record?
 
-%li{:class => css_class, :id => "attachment_#{asset.uuid}"}
+%li{:class => css_class, :id => "attachment_#{asset.uuid}", data: {toggle: "tooltip", placement: "left"}, title: "Asset ID: #{asset.id}"}
   = fields_for :page, @page do |f|
     = f.fields_for :page_attachments, attachment, :child_index => asset.uuid do |paf|
       - if attachment.new_record?
@@ -15,7 +15,7 @@
         = paf.hidden_field :_destroy, :class => 'destroyer'
       = paf.hidden_field :position, :class => 'pos'
   .front
-    .thumbnail= image_tag asset.thumbnail(:thumbnail)
+    .thumbnail= image_tag asset.thumbnail(:thumbnail), alt: "Asset ID: #{asset.id}"
   .back
     .title= asset.title
     %ul.actions

data/app/views/admin/pages/_asset_popups.html.haml

@@ -13,7 +13,7 @@
             = f.label :asset, t("clipped_extension.choose_file")
             = f.file_field :asset, :class => 'file', :multiple => true
             #upload-status{:style => 'display: none;'}
-              %img{:src => "/images/admin/spinner.gif"}
+              %img{:src => "/assets/admin/spinner.gif"}
           %p
             %a#attach-popup{:href=>"#attach_asset", :style => 'color: #666; font-size: .8em'}= t('clipped_extension.attach_existing')
 
@@ -33,7 +33,7 @@
           .buttons
             = button_tag "Set Title", {:id => 'update-asset', :class => "button"}
             #update-status{:style => 'display: none;'}
-              %img{:src => "/images/admin/spinner.gif"}
+              %img{:src => "/assets/admin/spinner.gif"}
             = t('or')
             %a.close_popup{:href=>"#"}= 'Continue'
     #upload_holders

data/clipped_extension.rb

@@ -16,8 +16,6 @@ class ClippedExtension < TrustyCms::Extension
       AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => :standard, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
       AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => :standard, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
       AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg application/ogg audio/x-ms-wma audio/vnd.rn-realaudio audio/x-wav]
-      AssetType.new :font, :icon => 'font', :extensions => %w[ttf otf eot woff]
-      AssetType.new :flash, :icon => 'flash', :default_radius_tag => 'flash', :extensions => %w{swf}, :mime_types => %w[application/x-shockwave-flash]
       AssetType.new :pdf, :icon => 'pdf', :processors => [:thumbnail], :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => :standard
       AssetType.new :document, :icon => 'document', :mime_types => %w[application/msword application/rtf application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.ms-project application/vnd.ms-works text/plain text/html]
       AssetType.new :other, :icon => 'unknown'

data/lib/trusty-clipped-extension.rb

@@ -1,5 +1,5 @@
 module TrustyCmsClippedExtension
-  VERSION     = "1.1.0"
+  VERSION     = "1.1.1"
   SUMMARY     = %q{Assets for TrustyCms CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "https://github.com/pgharts/trusty-clipped-extension"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Keith Bingman
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -116,6 +116,8 @@ files:
 - app/assets/images/admin/image_thumbnail.png
 - app/assets/images/admin/java_icon.png
 - app/assets/images/admin/page_edit.png
+- app/assets/images/admin/pdf_icon.png
+- app/assets/images/admin/pdf_thumbnail.png
 - app/assets/images/admin/perl_icon.png
 - app/assets/images/admin/php_icon.png
 - app/assets/images/admin/presentation_icon.png