radiant-clipped-extension 1.1.1 → 1.1.2

data/README.md

@@ -56,7 +56,6 @@ The clipped extension is configured in the usual way, but only its minor setting
 
 * `paperclip.url` sets the url scheme for attached files. Paperclip interpolations are applied. You probably don't want to change this.
 * `paperclip.path` sets the path scheme for attached files. Paperclip interpolations are applied. You might conceivably want to change this.
-* `paperclip.additional_thumbnails` is a string of comma-separated style definitions that is passed to paperclip for any asset type that has a post-processor (that is, currently, images, pdfs and video clips). The definitions are in the format name=geometry and when assembled the string will look something like `preview=640x640>,square=#260x260`. Thumbnail and icon styles are already defined and don't need to be configured this way.
 * `paperclip.storage` can be 'filesystem' (the default) or 'fog' for cloud storage (such as s3).
 * `paperclip.skip_filetype_validation` is true by default and allows uploads of any mime type.
 
@@ -113,6 +112,13 @@ And you can set some defaults:
 * `assets.insertion_size` is the name of the style that's used when you click on 'insert' to add a radius asset tag to your text. You can edit it after insertion, of course.
 * `assets.display_size` is the name of the style that's shows when you edit a single asset in the admin interface.
 
+
+### Asset Thumbnail Sizes
+
+To configure different thumbnail sizes, set `assets.thumbnails.image`. Here is an example of setting two custom thumbnail sizes:
+
+    Radiant::Config['assets.thumbnails.image'] = "custom:geometry=200x300>,format=jpg|bigger:geometry=600x700>,format=jpg"
+
 ## Usage
 
 For most purposes you will probably work with assets while you're working on pages. Click on one of the 'assets' links and a panel will pop up allowing you to find, insert and attach existing assets or upload new ones.

data/app/models/asset.rb

@@ -64,7 +64,7 @@ class Asset < ActiveRecord::Base
   delegate :paperclip_processors, :paperclip_styles, :style_dimensions, :style_format, :to => :asset_type
 
   def thumbnail(style_name='original')
-    return asset.url if style_name.to_sym == :original
+    return asset.url if style_name.to_sym == :original 
     return asset.url(style_name.to_sym) if has_style?(style_name)
     return asset_type.icon(style_name)
   end

data/config/locales/fr.yml

@@ -0,0 +1,110 @@
+# encoding: utf-8
+---
+fr:
+  assets: 'Médias'
+  asset_types:
+    all: 'Tous'
+    documents: 'Documents'
+    fonts: 'Fonts'
+    images: 'Images'
+    others: 'Autres'
+    audios: 'Audio'
+    flashes: 'Flash'
+    videos: 'Video'
+    pdfs: 'PDFs'
+    swfs: 'Flash'
+  
+  activerecord:
+    errors:
+      models:
+        asset:
+          attributes:
+            asset:
+              blank: 'Il faut choisir un fichier á télécharger!'
+
+  clipped_extension:
+    actions: Actions
+    all: 'Tous'
+    all_thumbnails_refreshed: 'Tous les thumbnails sont régenéré.'
+    alt_text_or_title: 'Alt-Text ou Titre <span class="hint">(optionnel)</span>'
+    asset: 'M&eacute;dia'
+    asset_edit_title: 'Modifier M&eacute;dia'
+    asset_errors: 'D&eacute;sol&eacute;. {{errors}}'
+    asset_page_attachment_note: 'M&eacute;dias attach&eacute;. These can be inserted with drag and drop or shown with the <code>&lt;r:assets:each /&gt;</code> tag.'
+    asset_note: 'M&eacute;dias attach&eacute;.'
+    assets: 'M&eacute;dias'
+    assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on a asset name above to edit it or click <code>Remove</code> to delete it.'
+    assets_title: 'M&eacute;dias'
+    asset_page_upload_note: 'M&eacute;dias t&eacute;l&eacute;chargez ici seront automatiquement attach&eacute; a cette page.'
+    asset_upload_note: 'Choose an asset to upload here. If the <code>Title</code> field is left blank, the filename (without the file type) will be automatically added. By clicking on <code>More</code>, you can add a caption as well.'
+    attached_assets: 'M&eacute;dias attach&eacute;'
+    attach: 'Attacher'
+    attach_asset: 'attache m&eacute;dia'
+    attach_assets: 'Attache m&eacute;dias'
+    attach_existing: 'Attache m&eacute;dias existantes'
+    attach_to_page: 'Attache a ce page'
+    audio: 'Audio'
+    cancel_attachment: 'D&eacute;sattache'
+    copy: 'Copie'
+    copy_alt: 'copy radius tag to clipboard'
+    choose_file: 'Choissisez Fichier'
+    documents: 'Documents'
+    caption: 'Caption'
+    confirm_refresh_assets: 'Are you sure you want to regenerate every asset thumbnail? This is likely to take a long time and use a lot of server resources: <strong class="warning">the performance of your site is very likely to be affected</strong> and your browser may time out before the operation is complete. This is only recommended if your asset collection is small!'
+    confirm_remove_asset: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following asset?'
+    confirm_remove_from_page: 'Are you sure you want to remove this assets from the page?'
+    delete_asset: 'Supprimer M&eacute;dia'
+    detach: 'D&eacute;tacher'
+    edit: 'Modifier'
+    edit_asset: 'Modifier {{asset}}'
+    filename: 'Nom du fichier'
+    find_assets: 'Trouver M&eacute;dias'
+    images: 'Images'
+    images_automatically_created: 'images sont cr&eacute;&eacute;es automatiquement'
+    insert: 'Ins&eacute;rer'
+    modify: 'Modifier'
+    movies: 'Vid&eacute;os'
+    need_to_upload: 'Vous souhaitez t&eacute;l&eacute;charger?'
+    new_asset: 'Nouveau M&eacute;dia'
+    no_assets_found: 'There were no assets found'
+    no_assets: 'Aucun M&eacute;dia'
+    no_attached_assets: 'Aucun M&eacute;dia attach&eacute;.'
+    others: 'Autres'
+    refresh_assets: 'Regenerate all thumbnails'
+    regenerate: 'Regenerate'
+    regenerate_thumbnails: 'Regenerate Thumbnails'
+    remove_asset: 'Supprimer M&eacute;dia'
+    remove_from_page: 'Supprimer de cette page'
+    reorder: 'R&eacute;ordonner'
+    remove: 'Supprimer'
+    refresh_assets_rake_task: 'For better results please log into your server and run <code>rake paperclip:refresh class=Asset</code>.'
+    replace_file: 'Replace File'
+    save_and_upload: 'Save and Upload'
+    search_assets: 'Search for assets'
+    search: 'Rechercher'
+    select: 'Selecter'
+    thumbnails_refreshed: "Thumbnails refreshed."
+    title: 'Titre'
+    type: 'Type'
+    types_to_find: 'Types &aacute; trouver'
+    upload: 'T&eacute;l&eacute;charger'
+    upload_asset: 'T&eacute;l&eacute;charger M&eacute;dia'
+
+  config:
+    assets:
+      additional_thumbnails: 'Additional Thumbnails'
+      content_types: 'Content Types'
+      create_image_thumbnails?: 'Image thumbnails'
+      create_pdf_thumbnails?: 'PDF thumbnails'
+      create_video_thumbnails?: 'Video thumbnails'
+      display_size: 'Display Size'
+      insertion_size: 'Insertion Size'
+      max_asset_size: 'Max Asset Size'
+      path: 'Path'
+      s3:
+        bucket: 'Bucket'
+        key: 'Cl&eacute;'
+        secret: 'Secret'
+      skip_filetype_validation: 'Skip Filetype Validation'
+      storage: 'H&eacute;bergement'
+      url: 'Url'

data/lib/asset_tags.rb

@@ -1,5 +1,7 @@
 module AssetTags
   include Radiant::Taggable
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::AssetTagHelper
   
   class TagError < StandardError; end
   
@@ -230,9 +232,8 @@ module AssetTags
     size = options.delete('size') || 'original'
     raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.has_style?(size)
     options['alt'] ||= tag.locals.asset.title
-    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
     url = tag.locals.asset.thumbnail(size)
-    %{<img src="#{url}" #{attributes} />} rescue nil
+    image_tag url, options rescue nil
   end
   
   desc %{

data/lib/radiant-clipped-extension.rb

@@ -1,5 +1,5 @@
 module RadiantClippedExtension
-  VERSION     = "1.1.1"
+  VERSION     = "1.1.2"
   SUMMARY     = %q{Assets for Radiant CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "http://radiantcms.org"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -86,9 +86,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- Rakefile
 - app/controllers/admin/assets_controller.rb
 - app/controllers/admin/page_attachments_controller.rb
 - app/helpers/admin/assets_helper.rb
@@ -129,6 +126,7 @@ files:
 - config/initializers/radiant_config.rb
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/fr.yml
 - config/locales/nl.yml
 - config/locales/ru.yml
 - config/routes.rb
@@ -153,6 +151,7 @@ files:
 - lib/radiant-clipped-extension.rb
 - lib/tasks/clipped_extension_tasks.rake
 - lib/tasks/paperclip_tasks.rake
+- LICENSE
 - public/flash/ZeroClipboard.swf
 - public/images/admin/assets/add.png
 - public/images/admin/assets/archive_icon.png
@@ -192,6 +191,8 @@ files:
 - public/javascripts/admin/assets.js
 - public/stylesheets/sass/admin/assets.sass
 - radiant-clipped-extension.gemspec
+- Rakefile
+- README.md
 - spec/ci/before_script
 - spec/ci/script
 - spec/controllers/admin/assets_controller_spec.rb
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Assets for Radiant CMS