radiant 1.0.0.rc1 → 1.0.0.rc2

data/vendor/extensions/clipped/app/views/admin/assets/refresh.html.haml

@@ -0,0 +1,14 @@
+- include_stylesheet 'admin/assets' 
+
+%h1
+  = t("clipped_extension.refresh_assets")
+%p.confirmation
+  = t("clipped_extension.confirm_refresh_assets")
+%p.confirmation
+  =t('clipped_extension.refresh_assets_rake_task')
+
+%form{:action => regenerate_admin_assets_path, :method => :post}
+  .buttons
+    %input.button{:type => "submit", :value => t("clipped_extension.refresh_assets")}
+    = t("or")
+    = link_to t("cancel"), admin_assets_path

data/vendor/extensions/{assets → clipped}/app/views/admin/assets/remove.html.haml

@@ -1,7 +1,7 @@
 - include_stylesheet 'admin/assets' 
 
-%h1= t("assets_extension.remove_asset")
-%p= t("assets_extension.confirm_remove_asset")
+%h1= t("clipped_extension.remove_asset")
+%p= t("clipped_extension.confirm_remove_asset")
 
 %table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
   %tbody
@@ -11,6 +11,6 @@
 
 - form_for [:admin, @asset], :html => { :method => 'delete' } do
   .buttons
-    %input.button{:type => "submit", :value => t("assets_extension.delete_asset")}
+    %input.button{:type => "submit", :value => t("clipped_extension.delete_asset")}
     = t("or")
     = link_to t("cancel"), admin_assets_path

data/vendor/extensions/{assets → clipped}/app/views/admin/configuration/_edit.html.haml

@@ -1,6 +1,6 @@
 %fieldset
   %h4 
-    = t('assets_extension.assets')
+    = t('clipped_extension.assets')
   %p= edit_config 'assets.max_asset_size'
   %p= edit_config 'assets.display_size'
   %p= edit_config 'assets.insertion_size'

data/vendor/extensions/{assets → clipped}/app/views/admin/configuration/_show.html.haml

@@ -1,5 +1,5 @@
 %h4 
-  = t('assets_extension.assets')
+  = t('clipped_extension.assets')
 %p.ruled
   = show_config 'assets.max_asset_size'
 %p.ruled

data/vendor/extensions/clipped/app/views/admin/page_attachments/_attachment.html.haml

@@ -0,0 +1,25 @@
+- attachment ||= @page_attachment
+
+- page = attachment.page
+- asset = attachment.asset
+- asset_type = asset.image? ? "image" : "link"
+- css_class = "#{asset_type} asset"
+- css_class += ' unsaved' if attachment.new_record?
+
+%li{:class => css_class, :id => "attachment_#{asset.uuid}"}
+  - fields_for @page do |f|
+    - f.fields_for :page_attachments, attachment, :child_index => asset.uuid do |paf|
+      - if attachment.new_record?
+        = paf.hidden_field :asset_id, :class => 'attacher'
+      - else
+        = paf.hidden_field :_destroy, :class => 'destroyer'
+      = paf.hidden_field :position, :class => 'pos'
+  .front
+    .thumbnail= image_tag asset.thumbnail(:thumbnail)
+  .back
+    .title= asset.title
+    %ul.actions
+      %li
+        = asset_insertion_link(asset)
+      %li
+        = link_to t('clipped_extension.detach'), '#', :class => 'detach_asset'

data/vendor/extensions/{assets → clipped}/app/views/admin/page_parts/_page_part.html.haml

@@ -7,8 +7,9 @@
       %label{:for => "part_#{page_part.name.to_slug}_filter_id"} 
         = t('filter') 
       = select_tag "page[parts_attributes][#{page_part_counter}][filter_id]", filter_options_for_select(page_part.filter_id), :id => "part_#{page_part.name.to_slug}_filter_id"
-      %span.toolbar
-        = link_to t('assets_extension.assets'), '#attach_asset', :class => 'popup', :style => 'color: #666'
+      / bring this back when the new toolbar ui arrives
+      / %span.toolbar
+      /   = link_to t('clipped_extension.assets'), '#attach_asset', :class => 'popup', :style => 'color: #666'
       %span.reference_links
         = t('reference')
         %span{:id => "filter_reference_link_#{page_part.name.to_slug}"}

data/vendor/extensions/{assets → clipped}/app/views/admin/pages/_asset_popups.html.haml

@@ -3,31 +3,31 @@
     #upload_asset.popup.textured{:style => "display: none; width: 28em"}
       #upload_asset_busy.busy{:style => "display: none"}= image('spinner.gif', :alt => "")
       
-      .popup_title= t('assets_extension.upload_asset')
+      .popup_title= t('clipped_extension.upload_asset')
       
       - form_for([:admin, Asset.new], :html => {:method => 'post', :multipart => true, :class => 'upload_asset'}) do |f|
         = hidden_field_tag "for_attachment", 1
         = hidden_field_tag "page_id", @page.id
         
         %p
-          = f.label :asset, t("assets_extension.choose_file")
+          = f.label :asset, t("clipped_extension.choose_file")
           = f.file_field :asset, :class => 'file'
         
         %p
-          = f.label :title, t("assets_extension.alt_text_or_title")
+          = f.label :title, t("clipped_extension.alt_text_or_title")
           = f.text_field :title, :class => "textbox big"
         
         .buttons
-          = f.submit t("assets_extension.upload"), :class => "button"
+          = f.submit t("clipped_extension.upload"), :class => "button"
           = t('or')
           %a.cancel.close_popup{:href=>"javascript:void(0)"}= t('cancel')
-          %a.popup{:href=>"#attach_asset", :style => 'color: #666; float: left'}= t('assets_extension.attach_existing')
+          %a.popup{:href=>"#attach_asset", :style => 'color: #666; float: left'}= t('clipped_extension.attach_existing')
     #upload_holders
     
   - popups.attach_asset do
     #attach_asset.popup.textured{:style=>"display: none;"}
       
-      .popup_title= t('assets_extension.find_assets')
+      .popup_title= t('clipped_extension.find_assets')
       
       .toolbar
         = render :partial => 'admin/assets/search'
@@ -39,4 +39,4 @@
       .busy{:style => "display: none"}= image('spinner.gif', :alt => "")
       .buttons
         %a.cancel.close_popup{:href=>"javascript:void(0)"}= t('close')
-        %a.popup{:href=>"#upload_asset", :style => 'color: #666; float: left'}= t('assets_extension.upload_asset')
+        %a.popup{:href=>"#upload_asset", :style => 'color: #666; float: left'}= t('clipped_extension.upload_asset')

data/vendor/extensions/clipped/app/views/admin/pages/_assets.html.haml

@@ -0,0 +1,11 @@
+- include_stylesheet 'admin/assets'
+- include_javascript 'admin/assets'
+
+#attachment_list.assets
+  %ul#attachment_fields{:class => @page.page_attachments.empty? ? 'empty' : ''}
+    = render :partial => 'admin/page_attachments/attachment', :collection => @page.page_attachments
+  %p.note
+    = link_to t('clipped_extension.assets'), '#attach_asset', :class => 'popup'
+    %span.message
+      - if @page.page_attachments.empty?
+        = t('clipped_extension.no_attached_assets')

data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_assets_bucket.html.haml

@@ -3,6 +3,6 @@
   
   %p.note
     = automatic_size_descriptions
-    = t('assets_extension.images_automatically_created')
+    = t('clipped_extension.images_automatically_created')
   #close-link     
     = link_to t("close"), "#"

data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_assets_container.html.haml

@@ -9,20 +9,20 @@
       - if @page && !@page.new_record? 
         - asset_tabs.attachment_tab do
           %a.asset-tab{ :href => "#page-attachments", :id => "tab_page-attachments" }
-            = t("assets_extension.attached_assets")
+            = t("clipped_extension.attached_assets")
         - asset_tabs.upload_tab do
           %a.asset-tab{ :href => "#upload_assets", :id => "tab_upload_assets" }
-            = t("assets_extension.upload")
+            = t("clipped_extension.upload")
         - asset_tabs.bucket_tab do
           %a.asset-tab{ :href => "#bucket", :id => "tab_bucket" }
-            = t("assets_extension.bucket")
+            = t("clipped_extension.bucket")
         - asset_tabs.search_tab do  
           %a.asset-tab{ :href => "#search-assets" }
-            = t("assets_extension.search")
+            = t("clipped_extension.search")
       - else
         - asset_tabs.bucket_tab do
           %a.asset-tab.here{ :href => "#" }
-            = t("assets_extension.bucket")
+            = t("clipped_extension.bucket")
       
     - if @page && !@page.new_record? 
       - render_region :asset_panes do |asset_panes|
@@ -31,7 +31,7 @@
           #page-attachments.pane
             %p
               %span.note 
-                != t("assets_extension.asset_note")
+                != t("clipped_extension.asset_note")
             %ul#attachments
               = render :partial => "admin/assets/page_assets" 
             .clear
@@ -40,7 +40,7 @@
           #upload_assets.pane
             %p
               %span.note
-                != t("assets_extension.asset_page_upload_note")
+                != t("clipped_extension.asset_page_upload_note")
             = render :partial => "admin/assets/upload_to_page"
             .clear
           
@@ -49,10 +49,10 @@
             - form_tag do
               %p
                 %label.note{ :for => 'search' }
-                  = t("assets_extension.search_assets")
+                  = t("clipped_extension.search_assets")
                 %input{ :type => "hidden", :name => "search", :value => @page.id }
                 %input{ :type => "search", :id => "search", :name => "search" }
-                = submit_tag t("assets_extension.search")
+                = submit_tag t("clipped_extension.search")
             #search-results
             .clear
             = observe_field 'search',  :frequency => 1, :update => 'search-results', :url =>  admin_assets_path(:asset_page => @page), :method => 'get', :with => "'search=' + escape(value)"

data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_bucket.html.haml

@@ -5,7 +5,7 @@
   - else
     %li
       %p.note
-        = t("assets_extension.empty_bucket")
+        = t("clipped_extension.empty_bucket")
       
  
 

data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_bucket_asset.html.haml

@@ -4,6 +4,6 @@
     = link_to image_tag(asset_thumbnail), asset_url, :title => asset_title, :class => "bucket_link"
 
   .info{ :id => "#{asset_id}_info" }
-    = link_to image('assets/edit'), edit_admin_asset_url(asset_id), :class => "edit_asset", :title => t("assets_extension.edit_asset", :asset => asset_title)
+    = link_to image('assets/edit'), edit_admin_asset_url(asset_id), :class => "edit_asset", :title => t("clipped_extension.edit_asset", :asset => asset_title)
     - if page && !page.new_record?
-      = link_to image('assets/add'), attach_page_asset_url(:asset => asset_id, :page => page.id), :class => "add_asset", :title => t("assets_extension.attach_to_page")
+      = link_to image('assets/add'), attach_page_asset_url(:asset => asset_id, :page => page.id), :class => "add_asset", :title => t("clipped_extension.attach_to_page")

data/vendor/extensions/clipped/app/views/admin/removed/_show_bucket_link.html.haml

@@ -0,0 +1,4 @@
+- unless @page.nil? || @page.new_record?
+  %span#show-bucket
+    = t('clipped_extension.bucket')
+    = link_to t("clipped_extension.show_assets_bucket"), "#"

data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_upload_to_page.html.haml

@@ -2,11 +2,11 @@
   - form_for :asset, :url => admin_assets_path(:page => @page, :format => 'js'), :html => { :id => 'asset-upload', :method => "post", :multipart => true, :target => 'ulframe' } do |form|
     %div.file
       %label.upload
-        = t("assets_extension.choose_upload")
+        = t("clipped_extension.choose_upload")
       = form.file_field :asset, :class => "", :style => "width: 100%"
 
     .upload-buttons
-      = form.submit t("assets_extension.save_and_upload"), :class => "button"
+      = form.submit t("clipped_extension.save_and_upload"), :class => "button"
       %div.spinner
         
   %iframe{:id => 'ulframe', :name => "ulframe", :src => "about:blank"}

data/vendor/extensions/{assets/assets_extension.rb → clipped/clipped_extension.rb}

@@ -1,9 +1,9 @@
 require_dependency 'application_controller'
-
-class AssetsExtension < Radiant::Extension
-  version "1.0.0.rc1"
+require 'radiant-clipped-extension/version'
+class ClippedExtension < Radiant::Extension
+  version RadiantClippedExtension::VERSION
   description "Assets extension based Keith Bingman's original Paperclipped extension."
-  url "http://github.com/radiant/radiant-assets-extension"
+  url "http://github.com/radiant/radiant-clipped-extension"
 
   extension_config do |config|
     config.gem "uuidtools"
@@ -14,13 +14,13 @@ class AssetsExtension < Radiant::Extension
   def activate
     if Asset.table_exists?
       Page.send :include, PageAssetAssociations                                          # defines page-asset associations. likely to be generalised soon.
-      Radiant::AdminUI.send :include, AssetsAdminUI unless defined? admin.asset          # defines shards for extension of the asset-admin interface
+      Radiant::AdminUI.send :include, ClippedAdminUI unless defined? admin.asset         # defines shards for extension of the asset-admin interface
       Admin::PagesController.send :helper, Admin::AssetsHelper                           # currently only provides a description of asset sizes
       Page.send :include, AssetTags                                                      # radius tags for selecting sets of assets and presenting each one
       UserActionObserver.instance.send :add_observer!, Asset                             # the usual creator- and updater-stamping
     
       AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => {:icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}, :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 => {:thumbnail => ['100x100#', :png]}, :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]
+      AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => {:thumbnail => ['100x100#', :png]}, :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 :flash, :icon => 'flash', :default_radius_tag => 'flash', :mime_types => %w[application/x-shockwave-flash]
       AssetType.new :pdf, :icon => 'document', :processors => [:thumbnail], :mime_types => %w[application/pdf application/x-pdf], :styles => {:thumbnail => ['100x100#', :png]}
@@ -34,8 +34,8 @@ class AssetsExtension < Radiant::Extension
       admin.configuration.show.add :config, 'admin/configuration/show', :after => 'defaults'
       admin.configuration.edit.add :form,   'admin/configuration/edit', :after => 'edit_defaults'
     
-      if Radiant::Config.table_exists? && Radiant::Config["assets.command_path"]    # This is needed for testing if you are using mod_rails
-        Paperclip.options[:command_path] = Radiant::Config["assets.command_path"]
+      if Radiant::Config.table_exists? && Radiant::config["paperclip.command_path"]    # This is needed for testing if you are using mod_rails
+        Paperclip.options[:command_path] = Radiant::config["paperclip.command_path"]
       end
     
       tab "Assets", :after => "Content" do
@@ -60,7 +60,7 @@ class AssetsExtension < Radiant::Extension
         prepend_before_filter :update_assets_sass
         def update_assets_sass
           radiant_assets_sass = "#{RAILS_ROOT}/public/stylesheets/sass/admin/assets.sass"
-          extension_assets_sass = "#{AssetsExtension.root}/public/stylesheets/sass/admin/assets.sass"
+          extension_assets_sass = "#{ClippedExtension.root}/public/stylesheets/sass/admin/assets.sass"
           FileUtils.mkpath File.dirname(radiant_assets_sass)
           if (not File.exists?(radiant_assets_sass)) or (File.mtime(extension_assets_sass) > File.mtime(radiant_assets_sass))
             FileUtils.cp extension_assets_sass, radiant_assets_sass
@@ -74,7 +74,7 @@ class AssetsExtension < Radiant::Extension
         prepend_before_filter :update_assets_javascript
         def update_assets_javascript
           radiant_assets_javascript = "#{RAILS_ROOT}/public/javascripts/admin/assets.js"
-          extension_assets_javascript = "#{AssetsExtension.root}/public/javascripts/admin/assets.js"
+          extension_assets_javascript = "#{ClippedExtension.root}/public/javascripts/admin/assets.js"
           FileUtils.mkpath File.dirname(radiant_assets_javascript)
           if (not File.exists?(radiant_assets_javascript)) or (File.mtime(extension_assets_javascript) > File.mtime(radiant_assets_javascript))
             FileUtils.cp extension_assets_javascript, radiant_assets_javascript

data/vendor/extensions/clipped/config/initializers/processors.rb

@@ -0,0 +1,12 @@
+require 'paperclip'
+
+Paperclip.options[:command_path] = IMAGE_MAGICK_PATH if defined? IMAGE_MAGICK_PATH
+
+begin
+  Paperclip.run('ffmpeg', '-L')
+rescue Paperclip::CommandNotFoundError
+  Radiant.config['assets.create_video_thumbnails?'] = false
+  Rails.logger.warn "FFmpeg executable not found: video thumbnailing disabled."
+rescue Paperclip::PaperclipCommandLineError => e
+  Rails.logger.warn "FFmpeg is present but returns an error: #{e}"
+end

data/vendor/extensions/{assets → clipped}/config/initializers/radiant_config.rb

@@ -5,11 +5,12 @@ Radiant.config do |config|
 
     assets.define 'additional_thumbnails',    :default => 'normal=640x640>'
     assets.define 'url',                      :default => '/:class/:id/:basename:no_original_style.:extension'
-    assets.define 'path',                     :default => ':rails_root/public/:class/:id/:basename:no_original_style.:extension'
+    assets.define 'path',                     :default => ':rails_root/public/:class/:id/:basename:no_original_style.:extension', :allow_change => true
     assets.define 'skip_filetype_validation', :default => true, :type => :boolean
-    assets.define 'storage', :default     => 'filesystem',
-                             :select_from => {'File System' => 'filesystem', 'Amazon S3' => 's3'},
-                             :allow_blank => false
+    assets.define 'storage', :default      => 'filesystem',
+                             :select_from  => {'File System' => 'filesystem', 'Amazon S3' => 's3'},
+                             :allow_blank  => false,
+                             :allow_change => true
 
     assets.namespace 's3' do |s3|
       s3.define 'bucket'

data/vendor/extensions/{assets → clipped}/config/locales/en.yml

@@ -20,9 +20,10 @@ en:
             asset:
               blank: 'You must choose a file to upload!'
 
-  assets_extension:
+  clipped_extension:
     actions: Actions
     all: 'All'
+    all_thumbnails_refreshed: 'All asset thumbnails refreshed.'
     alt_text_or_title: 'Alt-Text or Title <span class="hint">(optional)</span>'
     asset: 'Asset'
     asset_edit_title: 'Edit Asset'
@@ -47,6 +48,7 @@ en:
     choose_file: 'Choose File'
     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: 'Delete Asset'
@@ -66,19 +68,20 @@ en:
     no_assets: 'No Assets'
     no_attached_assets: 'No assets attached.'
     others: 'Others'
-    regenerate_all_thumbnails: 'You can regenerate all thumbnails here. Beware that this will take a while and consume considerable resources on your server.'
+    refresh_assets: 'Regenerate all thumbnails'
     regenerate: 'Regenerate'
     regenerate_thumbnails: 'Regenerate Thumbnails'
     remove_asset: 'Remove Asset'
     remove_from_page: 'Remove from page'
     reorder: 'Reorder'
     remove: 'Remove'
+    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: 'Search'
     select: 'Select'
-    thumbnails_refreshed: "Thumbnail successfully refreshed."
+    thumbnails_refreshed: "Thumbnails refreshed."
     title: 'Title'
     type: 'Type'
     types_to_find: 'Types to find'

data/vendor/extensions/{assets → clipped}/config/locales/nl.yml

@@ -20,7 +20,7 @@ nl:
             asset:
               blank: 'Er werd geen bestand geselecteerd om te uploaden!'
 
-  assets_extension:
+  clipped_extension:
     actions: Acties
     all: 'Alle'
     alt_text_or_title: 'Alt-Tekst of Titel <span class="hint">(optioneel)</span>'

data/vendor/extensions/{assets → clipped}/config/routes.rb

@@ -1,7 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace :admin, :member => { :remove => :get } do |admin|
-    admin.resources :assets, :collection => { :refresh => :post }
-    admin.resources :page_attachments
+    admin.resources :assets, :collection => { :refresh => :get, :regenerate => :post }, :member => { :refresh => :put }
+    admin.resources :page_attachments, :only => [:new]
     admin.resources :pages, :has_many => :page_attachments
   end
 end

data/vendor/extensions/clipped/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress features --tags ~@proposed,~@in_progress

data/vendor/extensions/clipped/features/support/env.rb

@@ -0,0 +1,11 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] = "test"
+# Extension root
+extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require extension_env+'.rb'
+
+Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step unless step =~ /datasets_loader\.rb$/}
+
+Cucumber::Rails::World.class_eval do
+  dataset :assets
+end

data/vendor/extensions/clipped/features/support/paths.rb

@@ -0,0 +1,22 @@
+module NavigationHelpers
+
+  # Extend the standard PathMatchers with your own paths
+  # to be used in your features.
+  #
+  # The keys and values here may be used in your standard web steps
+  # Using:
+  #
+  #   When I go to the "assets" admin page
+  #
+  # would direct the request to the path you provide in the value:
+  #
+  #   admin_assets_path
+  #
+  PathMatchers = {} unless defined?(PathMatchers)
+  PathMatchers.merge!({
+    # /assets/i => 'admin_assets_path'
+  })
+
+end
+
+World(NavigationHelpers)