Merge commit 'refs/merge-requests/316' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb

Merge commit 'refs/merge-requests/316' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
Rodrigo Souto
2 parents f5c2a127 1c68caa0
Showing 68 changed files with 514 additions and 242 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/blog_helper.rb
app/helpers/cms_helper.rb
app/helpers/folder_helper.rb
app/helpers/profile_editor_helper.rb
app/models/article.rb
app/models/article_block.rb
app/models/profile_list_block.rb
app/models/uploaded_file.rb
app/views/cms/view.rhtml
app/views/file_presenter/_generic.html.erb
app/views/file_presenter/_image.html.erb
lib/file_presenter.rb
lib/file_presenter/generic.rb
lib/file_presenter/image.rb
plugins/html5_video/lib/file_presenter/video.rb
plugins/html5_video/lib/html5_video_plugin.rb
plugins/html5_video/test/functional/content_viewer_controler_test.rb
plugins/html5_video/views/file_presenter/_video.html.erb
public/designs/icons/tango/ie6.css
@@ -53,7 +53,9 @@ class ContentViewerController &lt; ApplicationController
     # At this point the page will be showed
     @page.hit
-    unless @page.mime_type == 'text/html' || (@page.image? && params[:view])
+    @page = FilePresenter.for @page
+
+    unless @page.mime_type == 'text/html' || params[:view]
       headers['Content-Type'] = @page.mime_type
       data = @page.data
@@ -42,7 +42,7 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
-    html = send("display_#{format}_format", article).html_safe
+    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
     article_title(article, :no_comments => no_comments) + html
   end
@@ -33,7 +33,7 @@ module CmsHelper
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
       if article.image?
-         image_tag(icon_for_article(article)) + link_to(article_name, article.url)
+        image_tag(icon_for_article(article)) + link_to(article_name, article.url)
       else
         link_to article_name, article.url, :class => icon_for_article(article)
       end
@@ -21,6 +21,7 @@ module FolderHelper
   end
   def display_article_in_listing(article, recursive = false, level = 0)
+    article = FilePresenter.for article
     article_link = if article.image?
          link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
        else
@@ -40,12 +41,15 @@ module FolderHelper
   end
   def icon_for_article(article)
-    icon = article.class.icon_name(article)
+    article = FilePresenter.for article
+    icon = article.respond_to?(:icon_name) ?
+             article.icon_name :
+             article.class.icon_name(article)
     if (icon =~ /\//)
       icon
     else
-      klasses = 'icon icon-' + icon
-      if article.kind_of?(UploadedFile)
+      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
         klasses += ' icon-upload-file'
       end
       klasses
@@ -136,7 +136,7 @@ module ProfileEditorHelper
     concat(
       content_tag(
         'div',
-        capture(&block) + content_tag('br', '', :style => 'clear: left'),
+        capture(&block) + tag('br', :style => 'clear: left'),
         :class => 'control-panel')
     )
   end
@@ -154,8 +154,12 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def css_class_list
+    [self.class.name.underscore.dasherize]
+  end
+
   def css_class_name
-    self.class.name.underscore.dasherize
+    [css_class_list].flatten.compact.join(' ')
   end
   def pending_categorizations
@@ -329,7 +333,7 @@ class Article &lt; ActiveRecord::Base
   end
   def view_url
-    @view_url ||= image? ? url.merge(:view => true) : url
+    @view_url ||= is_a?(UploadedFile) ? url.merge(:view => true) : url
   end
   def comment_url_structure(comment, action = :edit)
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article,
+      (block.article ? article_to_html(FilePresenter.for(block.article),
           :gallery_view => false,
           :inside_block => block,               # For Blogs and folders
           :format => block.visualization_format # For Articles and contents
@@ -54,7 +54,7 @@ class ProfileListBlock &lt; Block
         list = content_tag 'ul', nl +'  '+ list + nl
       end
       block_title(title) + nl +
-      content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))
+      content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
     end
   end
@@ -60,12 +60,20 @@ class UploadedFile &lt; Article
   postgresql_attachment_fu
+  # Use this method only to get the generic icon for this kind of content.
+  # If you want the specific icon for a file type or the iconified version
+  # of an image, use FilePresenter.for(uploaded_file).icon_name
   def self.icon_name(article = nil)
-    if article
-      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
-    else
-      'upload-file'
+    unless article.nil?
+      warn = ('='*80) + "\n" +
+             'The method `UploadedFile.icon_name(obj)` is deprecated. ' +
+             'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+             "\n" + ('='*80)
+      raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+      Rails.logger.warn warn if Rails.logger
+      puts warn if ENV['RAILS_ENV'] == 'development'
     end
+    'upload-file'
   end
   def mime_type
@@ -91,40 +99,27 @@ class UploadedFile &lt; Article
   end
   def to_html(options = {})
+    warn = ('='*80) + "\n" +
+           'The method `UploadedFile#to_html()` is deprecated. ' +
+           'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+           "\n" + ('='*80)
+    raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+    Rails.logger.warn warn if Rails.logger
+    puts warn if ENV['RAILS_ENV'] == 'development'
     article = self
     if image?
       lambda do
-        if article.gallery? && options[:gallery_view]
-          images = article.parent.images
-          current_index = images.index(article)
-          total_of_images = images.count
-
-          link_to_previous = if current_index >= 1
-            link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'left')
-          else
-            content_tag('span', _('&laquo; Previous'), :class => 'left')
-          end
-
-          link_to_next = if current_index < total_of_images - 1
-            link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'right')
-          else
-            content_tag('span', _('Next &raquo;'), :class => 'right')
-          end
-
-          content_tag(
-            'div',
-            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
-            :class => 'gallery-navigation'
-          )
-        end.to_s +
-        image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
-
+        image_tag(article.public_filename(:display),
+                  :class => article.css_class_name,
+                  :style => 'max-width: 100%') +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     else
       lambda do
-        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name))) +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
+        content_tag('div',
+                    link_to(article.name, article.url),
+                    :class => article.css_class_name) +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     end
   end
@@ -40,13 +40,15 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| %>
+  <% @articles.each do |article| article = FilePresenter.for article %>
     <tr>
       <td>
         <%= link_to_article(article) %>
       </td>
       <td>
-        <%= article.class.short_description %>
+        <%= article.respond_to?(:short_description) ?
+                      article.short_description :
+                      article.class.short_description %>
       </td>
       <td class="article-controls">
         <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
@@ -0,0 +1,9 @@
+<span class="download-link">
+  <span>Download</span>
+  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+</span>
+
+<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
+  <%= generic.abstract %>
+</div>
+
@@ -0,0 +1,36 @@
+<% if image.gallery? && options[:gallery_view] %>
+<%
+  images = image.parent.images
+  current_index = images.index(image.encapsulated_file)
+  total_of_images = images.count
+  link_to_previous = if current_index >= 1
+   link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'previous')
+  else
+    content_tag('span', _('&laquo; Previous'), :class => 'previous')
+  end
+
+  link_to_next = if current_index < total_of_images - 1
+    link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'next')
+  else
+    content_tag('span', _('Next &raquo;'), :class => 'next')
+  end
+%>
+
+<div class="gallery-navigation">
+  <%= link_to_previous %>
+  <span class="total-of-images">
+    <%= _('image %d of %d') % [current_index + 1, total_of_images] %>
+  </span>
+  <%= link_to_next %>
+</div>
+
+<% end %>
+
+<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
+
+<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+
+<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
+  <%= image.abstract %>
+</div>
+
@@ -0,0 +1,107 @@
+# All file presenters must extends `FilePresenter` not only to ensure the
+# same interface, but also to make `FilePresenter.for(file)` to work.
+class FilePresenter
+
+  # Will return a encapsulated `UploadedFile` or the same object if no
+  # one accepts it. That behave allow to give any model to this class,
+  # like a Article and have no trouble with that.
+  def self.for(f)
+    return f if f.is_a? FilePresenter
+    klass = FilePresenter.subclasses.sort_by {|class_name|
+      class_name.constantize.accepts?(f) || 0
+    }.last.constantize
+    klass.accepts?(f) ? klass.new(f) : f
+  end
+
+  def initialize(f)
+    @file = f
+  end
+
+  # Allows to use the original `UploadedFile` reference.
+  def encapsulated_file
+    @file
+  end
+
+  def id
+    @file.id
+  end
+
+  def reload
+    @file.reload
+    self
+  end
+
+  # This method must be overridden in subclasses.
+  #
+  # If the class accepts the file, return a number that represents the
+  # priority the class should be given to handle that file. Higher numbers
+  # mean higher priority.
+  #
+  # If the class does not accept the file, return false.
+  def self.accepts?(f)
+    nil
+  end
+
+  def short_description
+    _("File (%s)") % content_type
+  end
+
+  # Define the css classes to style the page fragment with the file related
+  # content. If you want other classes to identify this area to your
+  # customized presenter, so do this:
+  #   def css_class_list
+  #     [super, 'myclass'].flatten
+  #   end
+  def css_class_list
+    [ @file.css_class_list,
+      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
+      'content-type_' + self.content_type.split('/')[0],
+      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
+    ].flatten
+  end
+
+  # Enable file presenter to customize the css classes on view_page.rhtml
+  # You may not overwrite this method on your customized presenter.
+  def css_class_name
+    [css_class_list].flatten.compact.join(' ')
+  end
+
+  # The generic icon class-name or the specific file path.
+  # You may replace this method on your custom FilePresenter.
+  # See the current used icons class-names in public/designs/icons/tango/style.css
+  def icon_name
+    if mime_type
+      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
+    else
+      'upload-file'
+    end
+  end
+
+  # Automatic render `file_presenter/<custom>.html.erb` to display your
+  # custom presenter html content.
+  # You may not overwrite this method on your customized presenter.
+  # A variable with the same presenter name will be created to refer
+  # to the file object.
+  # Example:
+  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
+  # inside the `file_presenter/image.html.erb` you can access the
+  # required `FilePresenter::Image` instance in the `image` variable.
+  def to_html(options = {})
+    file = self
+    lambda do
+      render :partial => file.class.to_s.underscore,
+             :locals => { :options => options },
+             :object => file
+    end
+  end
+
+  # That makes the presenter to works like any other `UploadedFile` instance.
+  def method_missing(m, *args)
+    @file.send(m, *args)
+  end
+
+end
+
+# Preload FilePresenters to allow `FilePresenter.for()` to work
+FilePresenter::Generic
+FilePresenter::Image
@@ -0,0 +1,11 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  def initialize(f)
+    @file = f
+  end
+
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,18 @@
+class FilePresenter::Image < FilePresenter
+  def initialize(f)
+    @file = f
+  end
+
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -0,0 +1,14 @@
+class FilePresenter::Video < FilePresenter
+  def initialize(f)
+    @file = f
+  end
+
+  def self.accepts?(f)
+    return nil if !f.respond_to?(:content_type) || f.content_type.nil?
+    ( f.content_type[0..4] == 'video' ) ? 10 : nil
+  end
+
+  def short_description
+    _('Video (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -0,0 +1,13 @@
+class Html5VideoPlugin < Noosfero::Plugin
+
+  FilePresenter::Video
+
+  def self.plugin_name
+    "HTML5 Video"
+  end
+
+  def self.plugin_description
+    _("A plugin to enable the video suport, with auto conversion for the web.")
+  end
+
+end
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'content_viewer_controller'
+
+class ContentViewerController
+  # Re-raise errors caught by the controller.
+  def rescue_action(e) raise e end
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  all_fixtures
+
+  def setup
+    @controller = ContentViewerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = create_user('testinguser').person
+    @environment = @profile.environment
+  end
+  attr_reader :profile, :environment
+
+  should 'add html5 video tag to the page of file type video' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'video/ogg'), :profile => profile)
+    get :view_page, file.url.merge(:view=>:true)
+    assert_select '#article video'
+  end
+
+end
@@ -0,0 +1,8 @@
+<video class="video-js vjs-default-skin" controls poster="video.jpg" preload="auto" data-setup="{}">
+  <source type="video/ogg" src="<%= video.public_filename %>"/>
+</video>
+
+<div class="uploaded-file-description <%= 'empty' if video.abstract.blank? %>">
+  <%= video.abstract %>
+</div>
+
@@ -1,52 +0,0 @@
-.msie6 .icon-edit      { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) }
-.msie6 .icon-home      { background-image: url(ie6/Tango/16x16/actions/go-home.gif)          }
-.msie6 .icon-new,
-.msie6 .icon-suggest   { background-image: url(ie6/Tango/16x16/actions/filenew.gif)              }
-.msie6 .icon-close     { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
-.msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) }
-.msie6 .icon-save      { background-image: url(ie6/Tango/16x16/actions/filesave.gif)             }
-.msie6 .icon-send      { background-image: url(ie6/Tango/16x16/actions/stock_mail-forward.gif)             }
-.msie6 .icon-cancel    { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
-.msie6 .icon-person    { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)           }
-.msie6 .icon-product    { background-image: url(ie6/Tango/16x16/mimetypes/package.gif)          }
-.msie6 .icon-delete    { background-image: url(ie6/Tango/16x16/places/user-trash.gif) }
-.msie6 .icon-back      { background-image: url(ie6/Tango/16x16/actions/back.gif)          }
-.msie6 .icon-next      { background-image: url(ie6/Tango/16x16/actions/go-next.gif)  }
-.msie6 .icon-add       { background-image: url(ie6/Tango/16x16/actions/add.gif)              }
-.msie6 .icon-more      { background-image: url(ie6/Tango/16x16/actions/add.gif)              }
-.msie6 .icon-up        { background-image: url(ie6/Tango/16x16/actions/go-up.gif)            }
-.msie6 .icon-down      { background-image: url(ie6/Tango/16x16/actions/go-down.gif)          }
-.msie6 .icon-left      { background-image: url(ie6/Tango/16x16/actions/go-previous.gif)          }
-.msie6 .icon-right     { background-image: url(ie6/Tango/16x16/actions/go-next.gif)         }
-.msie6 .icon-up-disabled        { background-image: url(ie6/Tango/16x16/actions/go-up.gif); opacity: 0.25; filter:alpha(opacity=25); }
-.msie6 .icon-down-disabled      { background-image: url(ie6/Tango/16x16/actions/go-down.gif); opacity: 0.25; filter:alpha(opacity=25);         }
-.msie6 .icon-left-disabled      { background-image: url(ie6/Tango/16x16/actions/go-previous.gif); opacity: 0.25; filter:alpha(opacity=25);          }
-.msie6 .icon-right-disabled     { background-image: url(ie6/Tango/16x16/actions/go-next.gif); opacity: 0.25; filter:alpha(opacity=25);         }
-.msie6 .icon-up-red    { background-image: url(ie6/mod/16x16/actions/go-up-red.gif)        }
-.msie6 .icon-forward   { background-image: url(ie6/Tango/16x16/actions/go-next.gif)       }
-.msie6 .icon-search    { background-image: url(ie6/Tango/16x16/actions/search.gif)           }
-.msie6 .icon-ok        { background-image: url(ie6/Tango/16x16/actions/media-playback-start.gif)               }
-.msie6 .icon-login     { background-image: url(ie6/mod/16x16/actions/log-in.gif)              }
-.msie6 .icon-help      { background-image: url(ie6/Tango/16x16/apps/gnome-help.gif)                }
-.msie6 .icon-firefox   { background-image: url(firefox-24x24.gif)       }
-.msie6 .icon-help32on  { background-image: url(ie6/Tango/32x32/apps/gnome-help.gif)    }
-.msie6 .icon-help32off { background-image: url(ie6/mod/32x32/apps/gnome-help-red.gif)   }
-.msie6 .icon-spread    { background-image: url(ie6/mod/16x16/actions/spread.gif) }
-.msie6 .icon-todo            { background-image: url(ie6/Tango/16x16/actions/stock_paste.gif)          }
-.msie6 .icon-eyes            { background-image: url(ie6/Tango/16x16/actions/gtk-print-preview.gif)          }
-.msie6 .icon-menu-home       { background-image: url(ie6/Tango/16x16/actions/go-home.gif)             }
-.msie6 .icon-menu-product    { background-image: url(ie6/Tango/16x16/mimetypes/package.gif)          }
-.msie6 .icon-menu-enterprise { background-image: url(ie6/Tango/16x16/actions/go-home.gif)       }
-.msie6 .icon-menu-community  { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)        }
-.msie6 .icon-menu-ctrl-panel { background-image: url(ie6/Tango/16x16/categories/preferences-desktop.gif)          }
-.msie6 .icon-menu-admin      { background-image: url(ie6/Tango/16x16/categories/preferences-system.gif)          }
-.msie6 .icon-menu-my-groups { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)    }
-.msie6 .icon-menu-login      { background-image: url(ie6/mod/16x16/actions/log-in.gif)            }
-.msie6 .icon-menu-logout     { background-image: url(ie6/Tango/16x16/actions/exit.gif)             }
-.msie6 .icon-menu-search     { background-image: url(ie6/Tango/16x16/actions/search.gif)           }
-.msie6 .icon-menu-events     { background-image: url(ie6/Tango/16x16/mimetypes/stock_calendar.gif)         }
-.msie6 .icon-menu-articles   { background-image: url(ie6/Tango/16x16/apps/text-editor.gif)             }
-.msie6 .icon-menu-people     { background-image: url(ie6/mod/16x16/apps/user.gif)            }
-.msie6 .icon-menu-mail       { background-image: url(ie6/Tango/16x16/apps/email.gif)             }
-.msie6 .icon-upload-file     { background-image: url(ie6/Tango/16x16/actions/filesave.gif)            }
-.msie6 .icon-slideshow       { background-image: url(ie6/Tango/16x16/mimetypes/x-office-presentation.gif)           }
-@import url(ie6.css);
-
 /******************SMALL ICONS********************/
 .icon-edit      { background-image: url(Tango/16x16/apps/text-editor.png) }
-.icon-home      { background-image: url(Tango/16x16/actions/go-home.png)          }
+.icon-home      { background-image: url(Tango/16x16/actions/go-home.png) }
 .icon-new,
-.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png)              }
-.icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
+.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png) }
+.icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
 .icon-folder    { background-image: url(Tango/16x16/places/folder.png) }
-.icon-parent-folder    { background-image: url(Tango/16x16/places/folder_home.png) }
+.icon-parent-folder { background-image: url(Tango/16x16/places/folder_home.png) }
 .icon-newblog   { background-image: url(mod/16x16/apps/text-editor.png) }
 .icon-blog      { background-image: url(mod/16x16/apps/text-editor.png) }
-/*.icon-open      { background-image: url(folder-open.gif)         } UNUSED*/
-/*.icon-cms       { background-image: url(abiword_48.png)          } UNUSED*/
-.icon-save      { background-image: url(Tango/16x16/actions/filesave.png)             }
-.icon-send      { background-image: url(Tango/16x16/actions/stock_mail-forward.png)             }
-.icon-cancel    { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
-.icon-person    { background-image: url(Tango/16x16/apps/system-config-users.png)           }
-.icon-product    { background-image: url(Tango/16x16/mimetypes/package.png)          }
+/*.icon-open    { background-image: url(folder-open.gif) } UNUSED*/
+/*.icon-cms     { background-image: url(abiword_48.png) } UNUSED*/
+.icon-save      { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-send      { background-image: url(Tango/16x16/actions/stock_mail-forward.png) }
+.icon-cancel    { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
+.icon-person    { background-image: url(Tango/16x16/apps/system-config-users.png) }
+.icon-product   { background-image: url(Tango/16x16/mimetypes/package.png) }
 .icon-delete    { background-image: url(Tango/16x16/places/user-trash.png) }
-/*.icon-find      { background-image: url(noosfero-find.png)       } UNUSED*/
-.icon-back      { background-image: url(Tango/16x16/actions/back.png)          }
-.icon-next      { background-image: url(Tango/16x16/actions/go-next.png)  }
-.icon-add       { background-image: url(Tango/16x16/actions/add.png)              }
-.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png)              }
-.icon-more      { background-image: url(Tango/16x16/actions/add.png)              }
-.icon-up        { background-image: url(Tango/16x16/actions/go-up.png)            }
-.icon-down      { background-image: url(Tango/16x16/actions/go-down.png)          }
-.icon-left      { background-image: url(Tango/16x16/actions/go-previous.png)          }
-.icon-right     { background-image: url(Tango/16x16/actions/go-next.png)         }
-.icon-up-disabled        { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
-.icon-down-disabled      { background-image: url(Tango/16x16/actions/go-down.png); opacity: 0.25; filter:alpha(opacity=25);         }
-.icon-left-disabled      { background-image: url(Tango/16x16/actions/go-previous.png); opacity: 0.25; filter:alpha(opacity=25);          }
-.icon-right-disabled     { background-image: url(Tango/16x16/actions/go-next.png); opacity: 0.25; filter:alpha(opacity=25);         }
-.icon-up-red    { background-image: url(mod/16x16/actions/go-up-red.png)        }
-.icon-forward   { background-image: url(Tango/16x16/actions/go-next.png)       }
-.icon-search    { background-image: url(Tango/16x16/actions/search.png)           }
-.icon-ok        { background-image: url(Tango/16x16/actions/media-playback-start.png)               }
-.icon-login     { background-image: url(mod/16x16/actions/log-in.png)              }
-.icon-help      { background-image: url(Tango/16x16/apps/gnome-help.png)                }
-.icon-firefox   { background-image: url(firefox-24x24.gif)       }
-.icon-help32on  { background-image: url(Tango/32x32/apps/gnome-help.png)    }
-.icon-help32off { background-image: url(mod/32x32/apps/gnome-help-red.png)   }
+/*.icon-find    { background-image: url(noosfero-find.png) } UNUSED*/
+.icon-back      { background-image: url(Tango/16x16/actions/back.png) }
+.icon-next      { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-add       { background-image: url(Tango/16x16/actions/add.png) }
+.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png) }
+.icon-more      { background-image: url(Tango/16x16/actions/add.png) }
+.icon-up        { background-image: url(Tango/16x16/actions/go-up.png) }
+.icon-down      { background-image: url(Tango/16x16/actions/go-down.png) }
+.icon-left      { background-image: url(Tango/16x16/actions/go-previous.png) }
+.icon-right     { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-up-disabled    { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-down-disabled  { background-image: url(Tango/16x16/actions/go-down.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-left-disabled  { background-image: url(Tango/16x16/actions/go-previous.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-right-disabled { background-image: url(Tango/16x16/actions/go-next.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-up-red    { background-image: url(mod/16x16/actions/go-up-red.png) }
+.icon-forward   { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-search    { background-image: url(Tango/16x16/actions/search.png) }
+.icon-ok        { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-login     { background-image: url(mod/16x16/actions/log-in.png) }
+.icon-help      { background-image: url(Tango/16x16/apps/gnome-help.png) }
+.icon-firefox   { background-image: url(firefox-24x24.gif) }
+.icon-help32on  { background-image: url(Tango/32x32/apps/gnome-help.png) }
+.icon-help32off { background-image: url(mod/32x32/apps/gnome-help-red.png) }
 .icon-spread    { background-image: url(mod/16x16/actions/spread.png) }
-.icon-todo            { background-image: url(Tango/16x16/actions/stock_paste.png)          }
-.icon-eyes            { background-image: url(Tango/16x16/actions/gtk-print-preview.png)          }
-/*.icon-menu-           { background-image: url(menu-without-ico-HC.gif) }*/
-.icon-menu-home       { background-image: url(Tango/16x16/actions/go-home.png)             }
-/*.icon-menu-blog       { background-image: url(blog-HC.gif)             } UNUSED*/
-/*.icon-menu-album      { background-image: url(album-HC.gif)            } UNUSED*/
-.icon-menu-product    { background-image: url(Tango/16x16/mimetypes/package.png)          }
-.icon-menu-enterprise { background-image: url(Tango/16x16/actions/go-home.png)       }
-.icon-menu-community  { background-image: url(Tango/16x16/apps/system-config-users.png)        }
-/*.icon-menu-edit       { background-image: url(edit-HC.gif)             } UNUSED */
-.icon-menu-ctrl-panel { background-image: url(Tango/16x16/categories/preferences-desktop.png)          }
-.icon-menu-admin      { background-image: url(Tango/16x16/categories/preferences-system.png)          }
-.icon-menu-my-groups { background-image: url(Tango/16x16/apps/system-config-users.png)    }
-.icon-menu-login      { background-image: url(mod/16x16/actions/log-in.png)            }
-.icon-menu-logout     { background-image: url(mod/16x16/actions/log-out.png)             }
-.icon-menu-search     { background-image: url(Tango/16x16/actions/search.png)           }
-/*.icon-menu-ed-design  { background-image: url(edit-design-HC.gif)      } UNUSED */
-.icon-menu-events     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-event     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-newevent     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-menu-articles   { background-image: url(Tango/16x16/apps/text-editor.png)             }
-/*.icon-menu-comments   { background-image: url(blog-HC.gif)             } UNUSED */
-.icon-menu-people     { background-image: url(mod/16x16/apps/user.png)            }
-.icon-menu-mail       { background-image: url(Tango/16x16/apps/email.png)             }
-.icon-upload-file     { background-image: url(Tango/16x16/actions/filesave.png)            }
-.icon-newupload-file     { background-image: url(Tango/16x16/actions/filesave.png)            }
-.icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png)           }
+.icon-todo            { background-image: url(Tango/16x16/actions/stock_paste.png) }
+.icon-eyes            { background-image: url(Tango/16x16/actions/find.png) }
+/*.icon-menu-         { background-image: url(menu-without-ico-HC.gif) }*/
+.icon-menu-home       { background-image: url(Tango/16x16/actions/go-home.png) }
+/*.icon-menu-blog     { background-image: url(blog-HC.gif) } UNUSED*/
+/*.icon-menu-album    { background-image: url(album-HC.gif) } UNUSED*/
+.icon-menu-product    { background-image: url(Tango/16x16/mimetypes/package.png) }
+.icon-menu-enterprise { background-image: url(Tango/16x16/actions/go-home.png) }
+.icon-menu-community  { background-image: url(Tango/16x16/apps/system-config-users.png) }
+/*.icon-menu-edit     { background-image: url(edit-HC.gif) } UNUSED */
+.icon-menu-ctrl-panel { background-image: url(Tango/16x16/categories/preferences-desktop.png) }
+.icon-menu-admin      { background-image: url(Tango/16x16/categories/preferences-system.png) }
+.icon-menu-my-groups  { background-image: url(Tango/16x16/apps/system-config-users.png) }
+.icon-menu-login      { background-image: url(mod/16x16/actions/log-in.png) }
+.icon-menu-logout     { background-image: url(mod/16x16/actions/log-out.png) }
+.icon-menu-search     { background-image: url(Tango/16x16/actions/search.png) }
+/*.icon-menu-ed-design { background-image: url(edit-design-HC.gif) } UNUSED */
+.icon-menu-events     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-event           { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-newevent        { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-menu-articles   { background-image: url(Tango/16x16/apps/text-editor.png) }
+/*.icon-menu-comments { background-image: url(blog-HC.gif) } UNUSED */
+.icon-menu-people     { background-image: url(mod/16x16/apps/user.png) }
+.icon-menu-mail       { background-image: url(Tango/16x16/apps/email.png) }
+.icon-upload-file     { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-newupload-file  { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }
 .icon-photos          { background-image: url(Tango/16x16/devices/camera-photo.png) }
-.icon-text-html          { background-image: url(Tango/16x16/mimetypes/text-html.png) }
+.icon-text-html       { background-image: url(Tango/16x16/mimetypes/text-html.png) }
 .icon-text-plain      { background-image: url(Tango/16x16/mimetypes/text-x-generic.png) }
-.icon-image-svg-xml      { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
+.icon-image-svg-xml   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-application-octet-stream { background-image: url(Tango/16x16/mimetypes/binary.png) }
-.icon-application-x-gzip { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png) }
-.icon-application-postscript { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
-.icon-application-pdf   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
-.icon-application-ogg   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
-.icon-video-mpeg   { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
-.icon-application-vnd-oasis-opendocument-text  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
+.icon-application-x-gzip       { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png) }
+.icon-application-postscript   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
+.icon-application-pdf          { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
+.icon-application-ogg          { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
+.icon-video, .icon-video-mpeg  { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
+.icon-application-vnd-oasis-opendocument-text         { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
 .icon-application-vnd-oasis-opendocument-spreadsheet  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }
-.icon-application-vnd-oasis-opendocument-presentation  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
+.icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
-.icon-media-pause      { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
-.icon-media-play       { background-image: url(Tango/16x16/actions/media-playback-start.png) }
-.icon-media-prev       { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
-.icon-media-next       { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
+.icon-media-pause  { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
+.icon-media-play   { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-media-prev   { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
+.icon-media-next   { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
 .icon-lock	       { background-image: url(Tango/16x16/actions/lock.png) }
-.icon-chat             { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
-.icon-reply            { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
-.icon-newforum   { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
-.icon-forum      { background-image: url(Tango/16x16/apps/system-users.png) }
-.icon-gallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
+.icon-chat         { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
+.icon-reply        { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
+.icon-newforum     { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
+.icon-forum        { background-image: url(Tango/16x16/apps/system-users.png) }
+.icon-gallery      { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-newgallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
-.icon-locale           { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) }
-.icon-user-removed           { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
-.icon-user-unknown           { background-image: url(Tango/16x16/status/dialog-error.png) }
-.icon-alert           { background-image: url(Tango/16x16/status/dialog-warning.png) }
+.icon-locale       { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) }
+.icon-user-removed { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
+.icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) }
+.icon-alert        { background-image: url(Tango/16x16/status/dialog-warning.png) }
 /******************LARGE ICONS********************/
-.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) }
-.image-gallery-item .gallery   { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
+.image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
+.image-gallery-item .gallery { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
@@ -822,12 +822,6 @@ div#notice {
   margin-bottom: 0px;
 }
-X.sep {
-  background: url(imgs/blog-sep.png) 50% 50% repeat-x;
-  padding: 10px 20px;
-  margin: 10px -19px;
-}
-
 /* ==> search-results.css <== */
@@ -1019,6 +1013,46 @@ hr.pre-posts, hr.sep-posts {
   background: transparent;
 }
+/************* uploaded file *****************/
+
+#article .gallery-navigation {
+  padding: 10px 0;
+}
+
+#article .gallery-navigation .previous {
+  margin-right: 10px;
+}
+
+#article .gallery-navigation .next {
+  margin-left: 10px;
+}
+
+#article .gallery-navigation .total-of-images {
+  font-weight: bold;
+}
+
+#article .uploaded-file-description {
+  background: #f6f6f6;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  padding: 1em;
+}
+#article .uploaded-file-description.empty {
+  display: none;
+}
+
+#article.file-generic .download-link {
+  display: block;
+  margin-bottom: 10px;
+}
+#article.file-generic .download-link span {
+  font-size: 150%;
+  padding-right: 5px;
+}
+#article.file-generic .download-link a {
+  font-size: 180%;
+  text-decoration: none;
+}
 /**************************** Comments *******************************/
@@ -1584,6 +1584,7 @@ a.button.disabled, input.disabled {
 .map {
   clear: both;
 }
+
 /***********************************************************
  * style for blocks 
  ***********************************************************/
@@ -3440,26 +3441,7 @@ div#article-parent {
 .article-body-uploaded-file {
   text-align: center;
 }
-/************* uploaded file *****************/
-#article .gallery-navigation {
-  padding: 10px 0;
-}
-#article .gallery-navigation .left {
-  margin-right: 10px;
-}
-#article .gallery-navigation .right {
-  margin-left: 10px;
-}
-#article .gallery-navigation .total-of-images {
-  font-weight: bold;
-}
-#article .uploaded-file-description {
-  background: #f6f6f6;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  padding: 1em;
-}
 /* ==> public/stylesheets/controller_events.css <== */
 #agenda {
   position: relative;
@@ -940,8 +940,8 @@ class CmsControllerTest &lt; ActionController::TestCase
                :article => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
     process_delayed_job_queue
-    file = profile.articles.find_by_name('rails.png')
-    assert File.exists?(file.class.icon_name(file))
+    file = FilePresenter.for profile.articles.find_by_name('rails.png')
+    assert File.exists?(file.icon_name)
     file.destroy
   end
@@ -951,8 +951,8 @@ class CmsControllerTest &lt; ActionController::TestCase
                :article => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
     process_delayed_job_queue
-    file = profile.articles.find_by_name('rails.png')
-    assert File.exists?(file.class.icon_name(file))
+    file = FilePresenter.for profile.articles.find_by_name('rails.png')
+    assert File.exists?(file.icon_name)
     file.destroy
   end
@@ -1271,4 +1271,12 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'strong', :content => /bold/
   end
+  should 'display link to download of non-recognized file types on its page' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'bin/unknown'), :profile => profile)
+    get :view_page, file.url.merge(:view=>:true)
+    assert_tag :tag => 'a',
+               :content => file.filename,
+               :attributes => { :href => file.public_filename }
+  end
+
 end
@@ -110,9 +110,12 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
-    expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
-
-    assert_match(/image/, instance_eval(&block.content))
+    assert_tag_in_string instance_eval(&block.content),
+        :tag => 'img',
+        :attributes => {
+            :src => image.public_filename(:display),
+            :class => /file-image/
+        }
   end
   should 'not display gallery pages navigation in content' do
@@ -123,8 +126,6 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
-    expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
-
     assert_no_match(/Previous/, instance_eval(&block.content))
   end
@@ -94,10 +94,10 @@ class BlogHelperTest &lt; ActiveSupport::TestCase
   should 'display link to file if post is an uploaded_file' do
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => profile, :published => true, :parent => blog)
-    expects(:article_to_html).with(file).returns('TO HTML')
-
     result = display_post(file)
-    assert_tag_in_string result, :content => /TO HTML/
+    assert_tag_in_string result, :tag => 'a',
+                                 :attributes => { :href => file.public_filename },
+                                 :content => file.filename
   end
   should 'display image if post is an image' do
@@ -41,6 +41,7 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   should 'display image and link if article is an image' do
     profile = fast_create(Profile)
     file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    file = FilePresenter.for file
     icon = icon_for_article(file)
     expects(:image_tag).with(icon).returns('icon')
@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FilePresenterTest < ActiveSupport::TestCase
+
+  should 'notify about deprecated method UploadedFile.icon_name' do
+    profile = fast_create(Profile)
+    file = UploadedFile.create!(
+             :profile => profile,
+             :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
+           )
+    assert_raise NoMethodError do
+      UploadedFile.icon_name file
+    end
+    ENV.stubs('[]').with('RAILS_ENV').returns('other')
+    Rails.logger.expects(:warn) # must warn on any other RAILS_ENV
+    stubs(:puts)
+    UploadedFile.icon_name file
+  end
+
+  should 'notify about deprecated method UploadedFile#to_html' do
+    profile = fast_create(Profile)
+    file = UploadedFile.create!(
+             :profile => profile,
+             :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
+           )
+    assert_raise NoMethodError do
+      file.to_html
+    end
+    ENV.stubs('[]').with('RAILS_ENV').returns('other')
+    Rails.logger.expects(:warn) # must warn on any other RAILS_ENV
+    stubs(:puts)
+    file.to_html
+  end
+
+  should 'return a thumbnail as icon for images ' do
+    f = UploadedFile.new
+    f.stubs(:image?).returns(true)
+    p = FilePresenter.for f
+    p.expects(:public_filename).with(:icon).returns('/path/to/file.xyz')
+    assert_equal '/path/to/file.xyz', p.icon_name
+  end
+
+  should 'not crach when accepts? method receives a pure article' do
+    assert_nothing_raised do
+      FilePresenter.for Article.new
+    end
+  end
+
+  should 'not crach when accepts? method receives a non-sense object' do
+    assert_nothing_raised do
+      FilePresenter.for nil
+    end
+    assert_nothing_raised do
+      FilePresenter.for({:key => 'value'})
+    end
+    assert_nothing_raised do
+      FilePresenter.for 'a string'
+    end
+  end
+
+end
@@ -26,6 +26,7 @@ class FolderHelperTest &lt; ActiveSupport::TestCase
   should 'display icon for images' do
     profile = fast_create(Profile)
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile)
+    file = FilePresenter.for file
     process_delayed_job_queue
     assert_match /rails_icon\.png/, icon_for_article(file.reload)
@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProfileListBlockTest < ActiveSupport::TestCase
+  include ActionView::Helpers::TagHelper
+
   should 'describe itself' do
     assert_not_equal Block.description, ProfileListBlock.description
   end
@@ -7,13 +7,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
   end
   attr_reader :profile
-  should 'return a thumbnail as icon for images ' do
-    f = UploadedFile.new
-    f.expects(:image?).returns(true)
-    f.expects(:public_filename).with(:icon).returns('/path/to/file.xyz')
-    assert_equal '/path/to/file.xyz', UploadedFile.icon_name(f)
-  end
-
   should 'return a default icon for uploaded files' do
     assert_equal 'upload-file', UploadedFile.icon_name
   end
@@ -113,8 +106,11 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     p = create_user('test_user').person
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => p)
+    ENV.stubs('[]').with('RAILS_ENV').returns('other')
+    Rails.logger.expects(:warn) # warn about deprecatede usage of UploadedFile#to_html
+    stubs(:puts)
     stubs(:content_tag).returns('link')
-    expects(:link_to).with(file.name, file.url, :class => file.css_class_name)
+    expects(:link_to).with(file.name, file.url)
     instance_eval(&file.to_html)
   end
@@ -206,13 +202,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     file.destroy
   end
-  should 'return the default thumbnail image as icon for images ' do
-    f = UploadedFile.new
-    f.expects(:image?).returns(true)
-    f.expects(:public_filename).with(:icon).returns('/path/to/file.xyz')
-    assert_equal '/path/to/file.xyz', UploadedFile.icon_name(f)
-  end
-
   should 'store width and height after processing' do
     file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
     file.create_thumbnails
@@ -287,12 +276,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal '', f.lead
   end
-  should 'survive when try to get icon_name from a file with mime_type nil' do
-    f = UploadedFile.new
-    f.expects(:mime_type).returns(nil)
-    assert_equal 'upload-file', UploadedFile.icon_name(f)
-  end
-
   should 'upload to a folder with same name as the schema if database is postgresql' do
     uses_postgresql 'image_schema_one'
     file1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => @profile)
	@@ -42,7 +42,7 @@ module BlogHelper		@@ -42,7 +42,7 @@ module BlogHelper
42		42
43	def display_post(article, format = 'full')	43	def display_post(article, format = 'full')
44	no_comments = (format == 'full') ? false : true	44	no_comments = (format == 'full') ? false : true
45	- html = send("display_#{format}_format", article).html_safe	45	+ html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
46		46
47	article_title(article, :no_comments => no_comments) + html	47	article_title(article, :no_comments => no_comments) + html
48	end	48	end
	@@ -33,7 +33,7 @@ module CmsHelper		@@ -33,7 +33,7 @@ module CmsHelper
33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)	33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
34	else	34	else
35	if article.image?	35	if article.image?
36	- image_tag(icon_for_article(article)) + link_to(article_name, article.url)	36	+ image_tag(icon_for_article(article)) + link_to(article_name, article.url)
37	else	37	else
38	link_to article_name, article.url, :class => icon_for_article(article)	38	link_to article_name, article.url, :class => icon_for_article(article)
39	end	39	end
	@@ -136,7 +136,7 @@ module ProfileEditorHelper		@@ -136,7 +136,7 @@ module ProfileEditorHelper
136	concat(	136	concat(
137	content_tag(	137	content_tag(
138	'div',	138	'div',
139	- capture(&block) + content_tag('br', '', :style => 'clear: left'),	139	+ capture(&block) + tag('br', :style => 'clear: left'),
140	:class => 'control-panel')	140	:class => 'control-panel')
141	)	141	)
142	end	142	end
	@@ -12,7 +12,7 @@ class ArticleBlock < Block		@@ -12,7 +12,7 @@ class ArticleBlock < Block
12	block = self	12	block = self
13	lambda do	13	lambda do
14	block_title(block.title) +	14	block_title(block.title) +
15	- (block.article ? article_to_html(block.article,	15	+ (block.article ? article_to_html(FilePresenter.for(block.article),
16	:gallery_view => false,	16	:gallery_view => false,
17	:inside_block => block, # For Blogs and folders	17	:inside_block => block, # For Blogs and folders
18	:format => block.visualization_format # For Articles and contents	18	:format => block.visualization_format # For Articles and contents
	@@ -54,7 +54,7 @@ class ProfileListBlock < Block		@@ -54,7 +54,7 @@ class ProfileListBlock < Block
54	list = content_tag 'ul', nl +' '+ list + nl	54	list = content_tag 'ul', nl +' '+ list + nl
55	end	55	end
56	block_title(title) + nl +	56	block_title(title) + nl +
57	- content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))	57	+ content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
58	end	58	end
59	end	59	end
60		60
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<span class="download-link">
	2	+ <span>Download</span>
	3	+ <strong><%= link_to generic.filename, generic.public_filename %></strong>
	4	+</span>
	5	+
	6	+<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
	7	+ <%= generic.abstract %>
	8	+</div>
	9	+
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+<% if image.gallery? && options[:gallery_view] %>
	2	+<%
	3	+ images = image.parent.images
	4	+ current_index = images.index(image.encapsulated_file)
	5	+ total_of_images = images.count
	6	+ link_to_previous = if current_index >= 1
	7	+ link_to(_('« Previous'), images[current_index - 1].view_url, :class => 'previous')
	8	+ else
	9	+ content_tag('span', _('« Previous'), :class => 'previous')
	10	+ end
	11	+
	12	+ link_to_next = if current_index < total_of_images - 1
	13	+ link_to(_('Next »'), images[current_index + 1].view_url, :class => 'next')
	14	+ else
	15	+ content_tag('span', _('Next »'), :class => 'next')
	16	+ end
	17	+%>
	18	+
	19	+<div class="gallery-navigation">
	20	+ <%= link_to_previous %>
	21	+ <span class="total-of-images">
	22	+ <%= _('image %d of %d') % [current_index + 1, total_of_images] %>
	23	+ </span>
	24	+ <%= link_to_next %>
	25	+</div>
	26	+
	27	+<% end %>
	28	+
	29	+<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
	30	+
	31	+<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
	32	+
	33	+<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
	34	+ <%= image.abstract %>
	35	+</div>
	36	+
@@ -0,0 +1,107 @@		@@ -0,0 +1,107 @@
	1	+# All file presenters must extends `FilePresenter` not only to ensure the
	2	+# same interface, but also to make `FilePresenter.for(file)` to work.
	3	+class FilePresenter
	4	+
	5	+ # Will return a encapsulated `UploadedFile` or the same object if no
	6	+ # one accepts it. That behave allow to give any model to this class,
	7	+ # like a Article and have no trouble with that.
	8	+ def self.for(f)
	9	+ return f if f.is_a? FilePresenter
	10	+ klass = FilePresenter.subclasses.sort_by {\|class_name\|
	11	+ class_name.constantize.accepts?(f) \|\| 0
	12	+ }.last.constantize
	13	+ klass.accepts?(f) ? klass.new(f) : f
	14	+ end
	15	+
	16	+ def initialize(f)
	17	+ @file = f
	18	+ end
	19	+
	20	+ # Allows to use the original `UploadedFile` reference.
	21	+ def encapsulated_file
	22	+ @file
	23	+ end
	24	+
	25	+ def id
	26	+ @file.id
	27	+ end
	28	+
	29	+ def reload
	30	+ @file.reload
	31	+ self
	32	+ end
	33	+
	34	+ # This method must be overridden in subclasses.
	35	+ #
	36	+ # If the class accepts the file, return a number that represents the
	37	+ # priority the class should be given to handle that file. Higher numbers
	38	+ # mean higher priority.
	39	+ #
	40	+ # If the class does not accept the file, return false.
	41	+ def self.accepts?(f)
	42	+ nil
	43	+ end
	44	+
	45	+ def short_description
	46	+ _("File (%s)") % content_type
	47	+ end
	48	+
	49	+ # Define the css classes to style the page fragment with the file related
	50	+ # content. If you want other classes to identify this area to your
	51	+ # customized presenter, so do this:
	52	+ # def css_class_list
	53	+ # [super, 'myclass'].flatten
	54	+ # end
	55	+ def css_class_list
	56	+ [ @file.css_class_list,
	57	+ 'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
	58	+ 'content-type_' + self.content_type.split('/')[0],
	59	+ 'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
	60	+ ].flatten
	61	+ end
	62	+
	63	+ # Enable file presenter to customize the css classes on view_page.rhtml
	64	+ # You may not overwrite this method on your customized presenter.
	65	+ def css_class_name
	66	+ [css_class_list].flatten.compact.join(' ')
	67	+ end
	68	+
	69	+ # The generic icon class-name or the specific file path.
	70	+ # You may replace this method on your custom FilePresenter.
	71	+ # See the current used icons class-names in public/designs/icons/tango/style.css
	72	+ def icon_name
	73	+ if mime_type
	74	+ [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
	75	+ else
	76	+ 'upload-file'
	77	+ end
	78	+ end
	79	+
	80	+ # Automatic render `file_presenter/<custom>.html.erb` to display your
	81	+ # custom presenter html content.
	82	+ # You may not overwrite this method on your customized presenter.
	83	+ # A variable with the same presenter name will be created to refer
	84	+ # to the file object.
	85	+ # Example:
	86	+ # The `FilePresenter::Image` render `file_presenter/image.html.erb`
	87	+ # inside the `file_presenter/image.html.erb` you can access the
	88	+ # required `FilePresenter::Image` instance in the `image` variable.
	89	+ def to_html(options = {})
	90	+ file = self
	91	+ lambda do
	92	+ render :partial => file.class.to_s.underscore,
	93	+ :locals => { :options => options },
	94	+ :object => file
	95	+ end
	96	+ end
	97	+
	98	+ # That makes the presenter to works like any other `UploadedFile` instance.
	99	+ def method_missing(m, *args)
	100	+ @file.send(m, *args)
	101	+ end
	102	+
	103	+end
	104	+
	105	+# Preload FilePresenters to allow `FilePresenter.for()` to work
	106	+FilePresenter::Generic
	107	+FilePresenter::Image
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+# Made to encapsulate any UploadedFile
	2	+class FilePresenter::Generic < FilePresenter
	3	+ def initialize(f)
	4	+ @file = f
	5	+ end
	6	+
	7	+ # if returns low priority, because it is generic.
	8	+ def self.accepts?(f)
	9	+ 1 if f.is_a? UploadedFile
	10	+ end
	11	+end
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class FilePresenter::Image < FilePresenter
	2	+ def initialize(f)
	3	+ @file = f
	4	+ end
	5	+
	6	+ def self.accepts?(f)
	7	+ return nil unless f.respond_to? :image?
	8	+ f.image? ? 10 : nil
	9	+ end
	10	+
	11	+ def icon_name
	12	+ public_filename :icon
	13	+ end
	14	+
	15	+ def short_description
	16	+ _('Image (%s)') % content_type.split('/')[1].upcase
	17	+ end
	18	+end