Create FilePresenter infra

The idea is never to give a Upload File to a view. That must always work with a File Presenter providing overwrite methods and specific views/partials. ActionItem2373

Create FilePresenter infra
The idea is never to give a Upload File to a view. That must always work with a File Presenter providing overwrite methods and specific views/partials. ActionItem2373
Aurélio A. Heckert
1 parent 36553bc6
Showing 16 changed files with 275 additions and 69 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/uploaded_file.rb
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/views/file_presenter/_video.html.erb
public/designs/icons/tango/style.css
public/designs/themes/base/style.css
public/stylesheets/application.css
 class ApplicationController < ActionController::Base
+  # Preload FilePresenters to allow `FilePresenter.for()` to work
+  FilePresenter::Generic
+  FilePresenter::Image
+
   before_filter :setup_multitenancy
   before_filter :detect_stuff_by_domain
   before_filter :init_noosfero_plugins
@@ -55,7 +55,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
@@ -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,12 @@ module FolderHelper
   end
   def icon_for_article(article)
-    icon = article.class.icon_name(article)
+    icon = 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
@@ -133,8 +133,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
@@ -314,7 +318,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 allow_children?
@@ -61,11 +61,13 @@ class UploadedFile &lt; Article
   postgresql_attachment_fu
   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'
-    end
+    warn = ('='*80) + "\n" +
+           'The method `UploadedFile.icon_name(obj)` is deprecated. ' +
+           'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+           "\n" + ('='*80)
+    Rails.logger.warn warn if Rails.logger
+    puts warn
+    'upload-file'
   end
   def mime_type
@@ -91,40 +93,26 @@ 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)
+    Rails.logger.warn warn if Rails.logger
+    puts warn
     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
@@ -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,37 @@
+<% 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.class %>
+  <%= image.abstract %>
+</div>
+
@@ -0,0 +1,90 @@
+# 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
+
+  # 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
+
+  # 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
@@ -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,13 @@
+class FilePresenter::Image < FilePresenter
+  def initialize(f)
+    @file = f
+  end
+
+  def self.accepts?(f)
+    f.image? ? 10 : nil
+  end
+
+  def icon_name
+    article.public_filename :icon
+  end
+end
@@ -0,0 +1,10 @@
+class FilePresenter::Video < FilePresenter
+  def initialize(f)
+    @file = f
+  end
+
+  def self.accepts?(f)
+    return nil if f.content_type.nil?
+    ( f.content_type[0..4] == 'video' ) ? 10 : nil
+  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,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>
+
@@ -80,7 +80,7 @@
 .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-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) }
@@ -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: #FFF;
 }
+/************* 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 *******************************/
@@ -1534,14 +1534,15 @@ a.button.disabled, input.disabled {
 .map {
   clear: both;
 }
+
 /***********************************************************
  * style for blocks 
  ***********************************************************/
-  #content .communities-block .profile-image {
-    float: none;
-    padding-left: 0px;
-    max-width: none;
+#content .communities-block .profile-image {
+  float: none;
+  padding-left: 0px;
+  max-width: none;
 }
 #content .communities-block .vcard .profile_link {
   text-align: center;
@@ -3313,26 +3314,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;
@@ -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,37 @@		@@ -0,0 +1,37 @@
	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.class %>
	35	+ <%= image.abstract %>
	36	+</div>
	37	+
@@ -0,0 +1,90 @@		@@ -0,0 +1,90 @@
	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	+ # This method must be overridden in subclasses.
	26	+ #
	27	+ # If the class accepts the file, return a number that represents the
	28	+ # priority the class should be given to handle that file. Higher numbers
	29	+ # mean higher priority.
	30	+ #
	31	+ # If the class does not accept the file, return false.
	32	+ def self.accepts?(f)
	33	+ nil
	34	+ end
	35	+
	36	+ # Define the css classes to style the page fragment with the file related
	37	+ # content. If you want other classes to identify this area to your
	38	+ # customized presenter, so do this:
	39	+ # def css_class_list
	40	+ # [super, 'myclass'].flatten
	41	+ # end
	42	+ def css_class_list
	43	+ [ @file.css_class_list,
	44	+ 'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
	45	+ 'content-type_' + self.content_type.split('/')[0],
	46	+ 'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
	47	+ ].flatten
	48	+ end
	49	+
	50	+ # Enable file presenter to customize the css classes on view_page.rhtml
	51	+ # You may not overwrite this method on your customized presenter.
	52	+ def css_class_name
	53	+ [css_class_list].flatten.compact.join(' ')
	54	+ end
	55	+
	56	+ # The generic icon class-name or the specific file path.
	57	+ # You may replace this method on your custom FilePresenter.
	58	+ # See the current used icons class-names in public/designs/icons/tango/style.css
	59	+ def icon_name
	60	+ if mime_type
	61	+ [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
	62	+ else
	63	+ 'upload-file'
	64	+ end
	65	+ end
	66	+
	67	+ # Automatic render `file_presenter/<custom>.html.erb` to display your
	68	+ # custom presenter html content.
	69	+ # You may not overwrite this method on your customized presenter.
	70	+ # A variable with the same presenter name will be created to refer
	71	+ # to the file object.
	72	+ # Example:
	73	+ # The `FilePresenter::Image` render `file_presenter/image.html.erb`
	74	+ # inside the `file_presenter/image.html.erb` you can access the
	75	+ # required `FilePresenter::Image` instance in the `image` variable.
	76	+ def to_html(options = {})
	77	+ file = self
	78	+ lambda do
	79	+ render :partial => file.class.to_s.underscore,
	80	+ :locals => { :options => options },
	81	+ :object => file
	82	+ end
	83	+ end
	84	+
	85	+ # That makes the presenter to works like any other `UploadedFile` instance.
	86	+ def method_missing(m, *args)
	87	+ @file.send(m, *args)
	88	+ end
	89	+
	90	+end
@@ -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,13 @@		@@ -0,0 +1,13 @@
	1	+class FilePresenter::Image < FilePresenter
	2	+ def initialize(f)
	3	+ @file = f
	4	+ end
	5	+
	6	+ def self.accepts?(f)
	7	+ f.image? ? 10 : nil
	8	+ end
	9	+
	10	+ def icon_name
	11	+ article.public_filename :icon
	12	+ end
	13	+end
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+class FilePresenter::Video < FilePresenter
	2	+ def initialize(f)
	3	+ @file = f
	4	+ end
	5	+
	6	+ def self.accepts?(f)
	7	+ return nil if f.content_type.nil?
	8	+ ( f.content_type[0..4] == 'video' ) ? 10 : nil
	9	+ end
	10	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class Html5VideoPlugin < Noosfero::Plugin
	2	+
	3	+ FilePresenter::Video
	4	+
	5	+ def self.plugin_name
	6	+ "HTML5 Video"
	7	+ end
	8	+
	9	+ def self.plugin_description
	10	+ _("A plugin to enable the video suport, with auto conversion for the web.")
	11	+ end
	12	+
	13	+end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+<video class="video-js vjs-default-skin" controls poster="video.jpg" preload="auto" data-setup="{}">
	2	+ <source type="video/ogg" src="<%= video.public_filename %>">
	3	+</video>
	4	+
	5	+<div class="uploaded-file-description <%= 'empty' if video.abstract.blank? %>">
	6	+ <%= video.abstract %>
	7	+</div>
	8	+
	@@ -80,7 +80,7 @@		@@ -80,7 +80,7 @@
80	.icon-application-postscript { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }	80	.icon-application-postscript { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
81	.icon-application-pdf { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }	81	.icon-application-pdf { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
82	.icon-application-ogg { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }	82	.icon-application-ogg { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
83	-.icon-video-mpeg { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }	83	+.icon-video, .icon-video-mpeg { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
84	.icon-application-vnd-oasis-opendocument-text { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }	84	.icon-application-vnd-oasis-opendocument-text { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
85	.icon-application-vnd-oasis-opendocument-spreadsheet { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }	85	.icon-application-vnd-oasis-opendocument-spreadsheet { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }
86	.icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }	86	.icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
	@@ -822,12 +822,6 @@ div#notice {		@@ -822,12 +822,6 @@ div#notice {
822	margin-bottom: 0px;	822	margin-bottom: 0px;
823	}	823	}
824		824
825	-X.sep {
826	- background: url(imgs/blog-sep.png) 50% 50% repeat-x;
827	- padding: 10px 20px;
828	- margin: 10px -19px;
829	-}
830	-
831	/* ==> search-results.css <== */	825	/* ==> search-results.css <== */
832		826
833		827
	@@ -1019,6 +1013,46 @@ hr.pre-posts, hr.sep-posts {		@@ -1019,6 +1013,46 @@ hr.pre-posts, hr.sep-posts {
1019	background: #FFF;	1013	background: #FFF;
1020	}	1014	}
1021		1015
		1016	+/*********** uploaded file ***************/
		1017	+
		1018	+#article .gallery-navigation {
		1019	+ padding: 10px 0;
		1020	+}
		1021	+
		1022	+#article .gallery-navigation .previous {
		1023	+ margin-right: 10px;
		1024	+}
		1025	+
		1026	+#article .gallery-navigation .next {
		1027	+ margin-left: 10px;
		1028	+}
		1029	+
		1030	+#article .gallery-navigation .total-of-images {
		1031	+ font-weight: bold;
		1032	+}
		1033	+
		1034	+#article .uploaded-file-description {
		1035	+ background: #f6f6f6;
		1036	+ border-top: 1px solid #ccc;
		1037	+ border-bottom: 1px solid #ccc;
		1038	+ padding: 1em;
		1039	+}
		1040	+#article .uploaded-file-description.empty {
		1041	+ display: none;
		1042	+}
		1043	+
		1044	+#article.file-generic .download-link {
		1045	+ display: block;
		1046	+ margin-bottom: 10px;
		1047	+}
		1048	+#article.file-generic .download-link span {
		1049	+ font-size: 150%;
		1050	+ padding-right: 5px;
		1051	+}
		1052	+#article.file-generic .download-link a {
		1053	+ font-size: 180%;
		1054	+ text-decoration: none;
		1055	+}
1022		1056
1023	/************************** Comments *****************************/	1057	/************************** Comments *****************************/
1024		1058