radiant 1.0.0.rc1 → 1.0.0.rc2

data/vendor/extensions/clipped/app/controllers/admin/page_attachments_controller.rb

@@ -0,0 +1,18 @@
+class Admin::PageAttachmentsController < Admin::ResourceController
+  helper 'admin/assets'
+    
+  def new
+    render :partial => 'attachment', :object => model
+  end
+  
+  def load_model
+    begin
+      @asset = Asset.find(params[:asset_id])
+      @page = params[:page_id].blank? ? Page.new : Page.find_by_id(params[:page_id])
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :layout => false
+    end
+    self.model = PageAttachment.new(:asset => @asset, :page => @page)
+  end
+  
+end

data/vendor/extensions/clipped/app/helpers/admin/assets_helper.rb

@@ -0,0 +1,16 @@
+module Admin::AssetsHelper
+  
+  def automatic_size_descriptions
+    Asset.thumbnail_sizes.collect{|k,v| "#{k} (#{(v.to_s).match(/\d+x\d+/)})"}.join(', ')
+  end
+  
+  def asset_insertion_link(asset)
+    radius_tag = asset.asset_type.default_radius_tag || 'link';
+    link_to t('clipped_extension.insert'), '#', :class => 'insert_asset', :rel => "#{radius_tag}_#{Radiant.config['assets.insertion_size']}_#{asset.id}"
+  end
+  
+  def asset_attachment_link(asset)
+    link_to t("clipped_extension.attach"), new_admin_page_attachment_path(:asset_id => asset.id), :class => 'attach_asset', :rel => "attach_#{asset.id}"
+  end
+  
+end

data/vendor/extensions/{assets → clipped}/app/models/asset.rb

@@ -78,8 +78,18 @@ class Asset < ActiveRecord::Base
     File.basename(asset_file_name, ".*") if asset_file_name
   end
 
-  def extension
-    asset_file_name.split('.').last.downcase if asset_file_name
+  def extension(style_name='original')
+     if style_name == 'original'
+       return original_extension 
+     elsif style = asset.styles[style_name.to_sym]
+       return style.format 
+     else
+       return original_extension
+     end
+  end
+  
+  def original_extension
+    return asset_file_name.split('.').last.downcase if asset_file_name
   end
 
   def attached_to?(page)
@@ -89,13 +99,6 @@ class Asset < ActiveRecord::Base
   # geometry methods will return here
   # if they can be made more S3-friendly
 
-  # this is used to pass insertion guidance to javascript
-  def insertion_rel
-    radius_tag = asset_type.default_radius_tag || 'link';
-    size = Radiant.config['assets.insertion_size']
-    "#{radius_tag}_#{size}_#{id}"
-  end
-
 
 private
 

data/vendor/extensions/{assets → clipped}/app/models/asset_tags.rb

@@ -1,6 +1,5 @@
 module AssetTags
   include Radiant::Taggable
-  include TagDeprecation
   
   class TagError < StandardError; end
   
@@ -17,7 +16,7 @@ module AssetTags
     The namespace for referencing images and assets.
     
     *Usage:* 
-    <pre><code><r:asset [title="asset_title"]>...</r:asset></code></pre>
+    <pre><code><r:asset [name="asset name"]>...</r:asset></code></pre>
   }    
   tag 'asset' do |tag|
     tag.locals.asset = find_asset unless tag.attr.empty?
@@ -26,7 +25,7 @@ module AssetTags
 
   desc %{
     Cycles through all assets attached to the current page.  
-    This tag does not require the title atttribute, nor do any of its children.
+    This tag does not require the name atttribute, nor do any of its children.
     Use the @limit@ and @offset@ attribute to render a specific number of assets.
     Use @by@ and @order@ attributes to control the order of assets.
     Use @extensions@ attribute to specify which assets to be rendered.
@@ -51,15 +50,15 @@ module AssetTags
     raise TagError, "r:asset_list: no assets to list" unless tag.locals.assets
     options = tag.attr.symbolize_keys
     result = []
-    pagination = pagination_control(tag)
-    assets = pagination ? tag.locals.assets.paginate(pagination) : tag.locals.assets.all
+    paging = pagination_find_options(tag)
+    assets = paging ? tag.locals.assets.paginate(paging) : tag.locals.assets.all
     assets.each do |asset|
       tag.locals.asset = asset
       result << tag.expand
     end
-    if pagination && assets.total_pages > 1
+    if paging && assets.total_pages > 1
       tag.locals.paginated_list = assets
-      result << tag.render('pagination')
+      result << tag.render('pagination', tag.attr.dup)
     end
     result
   end
@@ -162,7 +161,7 @@ module AssetTags
     @ignore_case@ attribute is set to false, the match is case sensitive. By
     default, @ignore_case@ is set to true.
       
-    The @title@ attribute is required on the parent tag unless this tag is used in @asset:each@.
+    The @name@ or @id@ attribute is required on the parent tag unless this tag is used in @asset:each@.
 
     *Usage:* 
     <pre><code><r:asset:each><r:if_content_type matches="regexp" [ignore_case=true|false"]>...</r:if_content_type></r:asset:each></code></pre>
@@ -193,7 +192,7 @@ module AssetTags
     end
   end
   
-  [:title, :caption, :asset_file_name, :asset_content_type, :asset_file_size, :id].each do |method|
+  [:title, :caption, :asset_file_name, :extension, :asset_content_type, :asset_file_size, :id].each do |method|
     desc %{
       Renders the @#{method.to_s}@ attribute of the asset
     }
@@ -203,6 +202,10 @@ module AssetTags
     end
   end
   
+  tag 'asset:name' do |tag|
+    tag.render('asset:title', tag.attr.dup)
+  end  
+  
   tag 'asset:filename' do |tag|
     asset, options = asset_and_options(tag)
     asset.asset_file_name rescue nil
@@ -217,21 +220,22 @@ module AssetTags
     settings.
     
     *Usage:* 
-    <pre><code><r:asset:image [title="asset_title"] [size="icon|thumbnail"]></code></pre>
+    <pre><code><r:asset:image [name="asset name" or id="asset id"] [size="icon|thumbnail"]></code></pre>
   }    
   tag 'asset:image' do |tag|
     tag.locals.asset, options = asset_and_options(tag)
-    raise TagError, 'Asset is not an image' unless tag.locals.asset.image?
-    size = options['size'] ? options.delete('size') : 'original'
-    # geometry = options['geometry'] ? options.delete('geometry') : nil
-    # #This is very experimental and will generate new sizes on the fly
-    # asset.generate_style(size, { :size => geometry }) if geometry
+    if tag.locals.asset.image?
+      size = options['size'] ? options.delete('size') : 'original'
+      # geometry = options['geometry'] ? options.delete('geometry') : nil
+      # #This is very experimental and will generate new sizes on the fly
+      # asset.generate_style(size, { :size => geometry }) if geometry
     
-    alt = " alt='#{asset.title}'" unless tag.attr['alt'] rescue nil
-    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
-    attributes << alt unless alt.nil?
-    url = tag.locals.asset.thumbnail(size)
-    %{<img src="#{url}" #{attributes unless attributes.empty?} />} rescue nil
+      alt = " alt='#{asset.title}'" unless tag.attr['alt'] rescue nil
+      attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+      attributes << alt unless alt.nil?
+      url = tag.locals.asset.thumbnail(size)
+      %{<img src="#{url}" #{attributes unless attributes.empty?} />} rescue nil
+    end
   end
   
   desc %{
@@ -240,24 +244,25 @@ module AssetTags
     dimensions of the swf file
     
     *Usage:*
-    <pre><code><r:asset:flash [title="asset_title"] [width="100"] [height="100"]>Fallback content</flash></code></pre>
+    <pre><code><r:asset:flash [name="asset name" or id="asset id"] [width="100"] [height="100"]>Fallback content</flash></code></pre>
     
     *Example with text fallback:*
-    <pre><code><r:asset:flash title="flash_movie">
+    <pre><code><r:asset:flash name="flash_movie">
         Sorry, you need to have flash installed, <a href="http://adobe.com/flash">get it here</a>
     </flash></code></pre>
     
     *Example with image fallback and explicit dimensions:*
-    <pre><code><r:asset:flash title="flash_movie" width="300" height="200">
-        <r:asset:image title="flash_screenshot" />
+    <pre><code><r:asset:flash name="flash_movie" width="300" height="200">
+        <r:asset:image name="flash_screenshot" />
       </flash></code></pre>
   }
   tag 'asset:flash' do |tag|
     asset, options = asset_and_options(tag)
-    raise TagError, 'Must be flash' unless asset.swf?
-    url = asset.thumbnail('original')
-    dimensions = [(tag.attr['width'] || asset.width),(tag.attr['height'] || asset.height)]
-    swf_embed_markup url, dimensions, tag.expand
+    if tag.locals.asset.swf?
+      url = asset.thumbnail('original')
+      dimensions = [(tag.attr['width'] || asset.width),(tag.attr['height'] || asset.height)]
+      swf_embed_markup url, dimensions, tag.expand
+    end
   end
   
   tag 'asset:thumbnail' do |tag|
@@ -271,7 +276,7 @@ module AssetTags
     generate the url for that size. 
     
     *Usage:* 
-    <pre><code><r:url [title="asset_title"] [size="icon|thumbnail"]></code></pre>
+    <pre><code><r:url [name="asset name" or id="asset id"] [size="icon|thumbnail"]></code></pre>
   }    
   tag 'asset:url' do |tag|
     asset, options = asset_and_options(tag)
@@ -284,7 +289,7 @@ module AssetTags
     generate a link to that size. 
     
     *Usage:* 
-    <pre><code><r:asset:link [title="asset_title"] [size="icon|thumbnail"] /></code></pre>
+    <pre><code><r:asset:link [name="asset name" or id="asset id"] [size="icon|thumbnail"] /></code></pre>
   }
   tag 'asset:link' do |tag|
     asset, options = asset_and_options(tag)
@@ -297,27 +302,7 @@ module AssetTags
     url = asset.thumbnail(size)
     %{<a href="#{url  }#{anchor}"#{attributes}>#{text}</a>} rescue nil
   end
-  
-  desc %{
-  Renders the extension of the asset, as extracted from its filename.
-  
-  *Usage*:
-    <pre><code>
-      <ul>
-        <r:assets:each>
-          <li class="<r:extension/>">
-            <r:link/>
-          </li>
-        </r:assets:each>
-      </ul>
-    </code></pre>
-  }
-  tag 'asset:extension' do |tag|
-    raise TagError, 'must be nested inside an assets or assets:each tag' unless tag.locals.asset
-    asset = tag.locals.asset
-    asset.asset_file_name[/\.(\w+)$/, 1]
-  end
-  
+    
 private
   def asset_and_options(tag)
     options = tag.attr.dup
@@ -327,10 +312,8 @@ private
   def find_asset(tag, options)
     return tag.locals.asset if tag.locals.asset
     if title = options.delete('name') || options.delete('title')
-      Rails.logger.warn "<<< finding asset by title #{title}"
       Asset.find_by_title(title)
     elsif id = options.delete('id')
-      Rails.logger.warn "<<< finding asset by id #{id}"
       Asset.find_by_id(id)
     else
       raise TagError, "'name' or 'id' attribute required for unenclosed r:asset tag" unless tag.locals.asset

data/vendor/extensions/{assets → clipped}/app/models/asset_type.rb

@@ -92,7 +92,7 @@ class AssetType
   end
   
   def configured_styles
-    Radiant::Config["assets.additional_thumbnails"].to_s.gsub(' ','').split(',').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = [v, :jpg]; ha}
+    Radiant::config["assets.additional_thumbnails"].to_s.gsub(' ','').split(',').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = [v, :jpg]; ha}
   end
   
   def style_dimensions(style_name)
@@ -101,12 +101,6 @@ class AssetType
     end
   end
   
-  def style_format(style_name)
-    if style = paperclip_styles[style_name.to_sym]
-      style.last if style.is_a?(Array)
-    end
-  end
-
   # class methods
   
   def self.from(mimetype)

data/vendor/extensions/clipped/app/models/page_attachment.rb

@@ -0,0 +1,21 @@
+class PageAttachment < ActiveRecord::Base
+  belongs_to :asset
+  belongs_to :page
+  attr_accessor :selected
+
+  accepts_nested_attributes_for :asset
+  
+  acts_as_list :scope => :page_id
+  
+  def selected?
+    !!selected
+  end
+  
+  # a small change to the method in acts_as_list so that we don't override 
+  # the position value if it has already been set (as it usually is for new attachments)
+  def add_to_list_bottom
+    p "add_to_list_bottom: current value is #{self[position_column]}"
+    self[position_column] ||= bottom_position_in_list.to_i + 1
+  end
+  
+end

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

@@ -8,5 +8,5 @@
     .title= asset.title
     %ul.actions
       %li
-        = link_to t('assets_extension.edit'), edit_admin_asset_url(asset), :class => 'edit_asset'
-        = link_to t('assets_extension.remove'), remove_admin_asset_url(asset), :class => 'remove_asset'
+        = link_to t('clipped_extension.edit'), edit_admin_asset_url(asset), :class => 'edit_asset'
+        = link_to t('clipped_extension.remove'), remove_admin_asset_url(asset), :class => 'remove_asset'

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

@@ -4,7 +4,7 @@
 
 - if assets.empty?
   %p
-    = t("assets_extension.no_assets")
+    = t("clipped_extension.no_assets")
 - else
   - if with_pagination && assets.respond_to?(:previous_page) && assets.previous_page
     = pagination_for(assets, pagination_parameters.merge(:depaginate => false, :params => {:controller => 'admin/assets', :action => 'index', :id => nil, :format => 'js'}))
@@ -21,10 +21,10 @@
           %ul.actions
             - if @page
               %li= asset_insertion_link(asset)
-              %li= link_to t("assets_extension.attach"), new_admin_page_page_attachment_path(page, :asset_id => asset.id), :class => 'attach_asset'
+              %li= asset_attachment_link(asset)
             - else
-              %li= link_to t('assets_extension.edit'), admin_asset_path(asset), :class => 'edit'
-              %li= link_to t("assets_extension.remove"), remove_admin_asset_path(asset), :class => "delete"
+              %li= link_to t('clipped_extension.edit'), admin_asset_path(asset), :class => 'edit'
+              %li= link_to t("clipped_extension.remove"), remove_admin_asset_path(asset), :class => "delete"
             
   - if with_pagination && assets.respond_to?(:next_page) && assets.next_page
     = pagination_for(assets, pagination_parameters.merge(:depaginate => false, :param_name => 'p', :params => {:controller => 'admin/assets', :action => 'index', :id => nil, :format => 'js', :page_id => (page && page.id), :pp => assets.per_page }))

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

@@ -0,0 +1,3 @@
+- if @asset.errors && !@asset.errors.empty?
+  %p#asset_errors
+    %strong= t("clipped_extension.asset_errors", :errors => @asset.errors.full_messages.to_sentence)

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

@@ -3,7 +3,7 @@
   - form.edit_title do
     %p.title
       %label{ :for => "asset_title" }
-        = t("assets_extension.title")
+        = t("clipped_extension.title")
       = f.text_field :title, :class => 'textbox', :maxlength => 100 
   - form.edit_metadata do
     .drawer
@@ -12,7 +12,7 @@
           %tr
             %th.label
               %label{ :for => "asset_caption" }
-                = t("assets_extension.caption")
+                = t("clipped_extension.caption")
             %td.field
               = f.text_field :caption, :class => 'textbox', :maxlength => 255 
           = render_region :extended_metadata, :locals => {:f => f}

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

@@ -4,7 +4,7 @@
 - else
   %li
     %p.note
-      = t("assets_extension.no_attached_assets")
+      = t("clipped_extension.no_attached_assets")
     
 %script{ :type => "text/javascript" }
   Asset.MakeDraggables();

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

@@ -7,7 +7,7 @@
   - else
     %li
       %p.note
-        = t("assets_extension.no_assets_found")
+        = t("clipped_extension.no_assets_found")
       
 %script
   Asset.MakeDroppables();

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

@@ -3,7 +3,7 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t("assets_extension.asset_edit_title")
+    %h1= t("clipped_extension.asset_edit_title")
   
   - main.edit_form do
     - form_for :asset, :url => admin_asset_path(@asset), :html => { :method => "put", :multipart => true } do |f|
@@ -13,16 +13,16 @@
         %div.content
           %p
             %label.filename
-              = "#{t("assets_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
+              = "#{t("clipped_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
           %p.asset
-            - display_size = Radiant::Config['assets_extension.display_size'] || 'normal'
+            - display_size = Radiant::config['assets.display_size'] || 'normal'
             = image_tag @asset.thumbnail(display_size.to_sym), :class => 'preview'
 
           = updated_stamp @asset
         
         %p.upload
           %label.upload
-            = t("assets_extension.replace_file")
+            = t("clipped_extension.replace_file")
           = f.file_field :asset, :class => "", :style => "width: 100%"
         
         .buttons
@@ -33,9 +33,8 @@
   
   - main.edit_regenerate do
     - if current_user.admin? or current_user.designer?
-      %p= t("assets_extension.regenerate_thumbnails")
+      %p= t("clipped_extension.regenerate_thumbnails")
       
-      - form_tag refresh_admin_assets_path do
+      - form_tag refresh_admin_asset_path(@asset), :method => :put do
         %p.asset_buttons
-          %input{ :type => "hidden", :name => "id", :value => @asset.id }
-          %input.button{ :type => "submit", :value => t("assets_extension.regenerate") }
+          %input.button{ :type => "submit", :value => t("clipped_extension.regenerate") }

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

@@ -13,6 +13,7 @@
   #actions
     = pagination_for @assets, :depaginate => false
     %ul
-      %li= link_to((image('upload') + ' ' + t('assets_extension.upload_asset')), new_admin_asset_path)
+      %li= link_to((image('upload') + ' ' + t('clipped_extension.upload_asset')), new_admin_asset_path)
       - if current_user.admin?
-        %li= link_to t('assets_extension.regenerate_thumbnails'), refresh_admin_assets_path, :confirm => 'Beware that this will take a while and consume considerable resources on your server. Are you sure you want to continue?'
+        %li
+          = link_to t('clipped_extension.regenerate_thumbnails'), refresh_admin_assets_path

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

@@ -3,7 +3,7 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t("assets_extension.new_asset")
+    %h1= t("clipped_extension.new_asset")
   
   - main.edit_form do  
     - form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
@@ -11,7 +11,7 @@
       = render :partial => "form", :locals => { :f => f }
       
       %p
-        %label= t("assets_extension.choose_file")
+        %label= t("clipped_extension.choose_file")
         = f.file_field :asset, :style => "width: 100%"
       
       .buttons