Merge branch 'master' into production

Conflicts: lib/noosfero/plugin.rb

Merge branch 'master' into production
Conflicts: lib/noosfero/plugin.rb
Victor Costa
2 parents d66a1bc8 4eb04441
Showing 98 changed files with 1013 additions and 451 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/maps_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/helpers/events_helper.rb
app/helpers/folder_helper.rb
app/helpers/forum_helper.rb
app/helpers/manage_products_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/environment.rb
app/models/profile.rb
app/models/uploaded_file.rb
app/presenters/image.rb
app/views/admin_panel/_site_info.html.erb
@@ -105,6 +105,11 @@ class CmsController &lt; MyProfileController
         end
       end
     end
+
+    unless @article.kind_of?(RssFeed)
+      @escaped_body = CGI::escapeHTML(@article.body || '')
+      @escaped_abstract = CGI::escapeHTML(@article.abstract || '')
+    end
   end
   def new
@@ -35,7 +35,7 @@ class ManageProductsController &lt; ApplicationController
   end
   def categories_for_selection
-    @category = Category.find(params[:category_id]) if params[:category_id]
+    @category = environment.categories.find_by_id params[:category_id]
     @object_name = params[:object_name]
     if @category
       @categories = @category.children
@@ -95,6 +95,20 @@ class ManageProductsController &lt; ApplicationController
     end
   end
+  def show_category_tree
+    @category = environment.categories.find params[:category_id]
+    render :partial => 'selected_category_tree'
+  end
+
+  def search_categories
+    @term = params[:term].downcase
+    conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
+    @categories = ProductCategory.all :conditions => conditions, :limit => 10
+    render :json => (@categories.map do |category|
+      {:label => category.name, :value => category.id}
+    end)
+  end
+
   def add_input
     @product = @profile.products.find(params[:id])
     @input = @product.inputs.build
@@ -16,6 +16,7 @@ class MapsController &lt; MyProfileController
         Profile.transaction do
           if profile.update_attributes!(params[:profile_data])
+            BlockSweeper.expire_blocks profile.blocks.select{ |b| b.class == LocationBlock }
             session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
           end
@@ -15,6 +15,7 @@ class ContentViewerController &lt; ApplicationController
     path = get_path(params[:page], params[:format])
     @version = params[:version].to_i
+    @npage = params[:npage] || '1'
     if path.blank?
       @page = profile.home_page
@@ -131,7 +132,7 @@ class ContentViewerController &lt; ApplicationController
     end
     unless @page.display_to?(user)
-      if !profile.visible? || profile.secret? || (user && user.follows?(profile))
+      if !profile.visible? || profile.secret? || (user && user.follows?(profile)) || user.blank?
         render_access_denied
       else #!profile.public?
         private_profile_partial_parameters
@@ -1226,35 +1226,6 @@ module ApplicationHelper
     list.sort.inject(Hash.new(0)){|h,i| h[i] += 1; h }.collect{ |x, n| [n, connector, x].join(" ") }.sort
   end
-  #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
-  def time_ago_as_sentence(from_time, include_seconds = false)
-    to_time = Time.now
-    from_time = Time.parse(from_time.to_s)
-    from_time = from_time.to_time if from_time.respond_to?(:to_time)
-    to_time = to_time.to_time if to_time.respond_to?(:to_time)
-    distance_in_minutes = (((to_time - from_time).abs)/60).round
-    distance_in_seconds = ((to_time - from_time).abs).round
-    case distance_in_minutes
-      when 0..1
-        return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
-        case distance_in_seconds
-          when 0..4   then _('less than 5 seconds')
-          when 5..9   then _('less than 10 seconds')
-          when 10..19 then _('less than 20 seconds')
-          when 20..39 then _('half a minute')
-          when 40..59 then _('less than a minute')
-          else             _('1 minute')
-        end
-
-      when 2..44           then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
-      when 45..89          then _('about 1 hour ago')
-      when 90..1439        then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
-      when 1440..2879      then _('1 day ago')
-      when 2880..10079     then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
-      else                      show_time(from_time)
-    end
-  end
-
   def comment_balloon(options = {}, &block)
     wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
     (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
@@ -22,7 +22,9 @@ module BlogHelper
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
-      :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
+      :params => {:action=>"view_page",
+                  :page=>articles.first.parent.path.split('/'),
+                  :controller=>"content_viewer"}
     }) if articles.present? && conf[:paginate]
     content = []
     artic_len = articles.length
@@ -44,7 +46,7 @@ module BlogHelper
   end
   def display_post(article, format = 'full')
-    no_comments = (format == 'full') ? false : true
+    no_comments = (format == 'full' || format == 'compact' ) ? false : true
     title = article_title(article, :no_comments => no_comments)
     method = "display_#{format.split('+')[0]}_format"
     html = send(method, FilePresenter.for(article)).html_safe
@@ -55,8 +57,12 @@ module BlogHelper
       else
         '<div class="post-pic" style="background-image:url('+img+')"></div>'
       end
-    end.to_s +
-    title + html
+    end.to_s + title + html
+  end
+
+  def display_compact_format(article)
+    render :file => 'content_viewer/_display_compact_format',
+           :locals => { :article => article, :format => "compact" }
   end
   def display_full_format(article)
 module CommentHelper
+  include DatesHelper
   def article_title(article, args = {})
     title = article.title
@@ -2,6 +2,7 @@ module ContentViewerHelper
   include BlogHelper
   include ForumHelper
+  include DatesHelper
   def display_number_of_comments(n)
     base_str = "<span class='comment-count hide'>#{n}</span>"
@@ -24,8 +25,9 @@ module ContentViewerHelper
       unless args[:no_comments] || !article.accept_comments
         comments = (" - %s") % link_to_comments(article)
       end
+      date_format = show_with_right_format_date article
       title << content_tag('span',
-        content_tag('span', show_date(article.published_at), :class => 'date') +
+        date_format +
         content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
@@ -34,6 +36,24 @@ module ContentViewerHelper
     title
   end
+  def show_with_right_format_date article
+    date_format = article.environment.date_format
+    use_numbers = false
+    year = true
+    left_time = false
+    if date_format ==  'numbers_with_year'
+      use_numbers = true
+    elsif date_format == 'numbers'
+      use_numbers = true
+      year = false
+    elsif date_format == 'month_name'
+      year = false
+    elsif date_format == 'past_time'
+      left_time = true
+    end
+    content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
+  end
+
   def link_to_comments(article, args = {})
     return '' unless article.accept_comments?
     reference_to_article number_of_comments(article), article, 'comments_list'
@@ -2,6 +2,7 @@ require &#39;noosfero/i18n&#39;
 module DatesHelper
+  include ActionView::Helpers::DateHelper
   def months
     I18n.t('date.month_names')
   end
@@ -15,10 +16,12 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date, use_numbers = false, year=true)
+  def show_date(date, use_numbers = false, year = true, left_time = false)
     if date && use_numbers
       date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
       date_format % { :day => date.day, :month => date.month, :year => date.year }
+    elsif date && left_time
+      date_format = time_ago_in_words(date)
     elsif date
       date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
       date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
 module EventsHelper
+  include DatesHelper
   def list_events(date, events)
     title = _('Events for %s') % show_date_month(date)
     content_tag('h2', title) +
-require 'short_filename'
-
 module FolderHelper
-  include ShortFilename
   include ArticleHelper
   def list_contents(configure={})
@@ -10,8 +7,8 @@ module FolderHelper
     configure[:list_type] ||= :folder
     if !configure[:contents].blank?
       configure[:contents] = configure[:contents].paginate(
-        :order => "updated_at DESC",
-        :per_page => 10,
+        :order => "name ASC",
+        :per_page => 30,
         :page => params[:npage]
       )
@@ -25,49 +22,32 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  def display_content_in_listing(configure={})
-    recursive = configure[:recursive] || false
-    list_type = configure[:list_type] || :folder
-    level = configure[:level] || 0
-    content = FilePresenter.for configure[:content]
+  def display_content_icon(content_item)
+    content = FilePresenter.for content_item
     content_link = if content.image?
-         link_to('&nbsp;' * (level * 4) +
-           image_tag(icon_for_article(content)) + short_filename(content.name),
+         link_to(
+           image_tag(icon_for_article(content, :bigicon)),
            content.url.merge(:view => true)
          )
        else
-         link_to('&nbsp;' * (level * 4) +
-           short_filename(content.name),
-           content.url.merge(:view => true), :class => icon_for_article(content)
+         link_to('',
+          content.url.merge(:view => true),
+          :class => icon_for_article(content, :bigicon)
          )
        end
-    result = content_tag(
-      'tr',
-      content_tag('td', content_link ) +
-      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
-      :class => "#{list_type}-item"
-    )
-    if recursive
-      result + content.children.map {|item|
-        display_content_in_listing :content=>item, :recursive=>recursive,
-                                   :list_type=>list_type, :level=>level+1
-      }.join("\n")
-    else
-      result
-    end
   end
-  def icon_for_article(article)
+  def icon_for_article(article, size = 'icon')
     article = FilePresenter.for article
-    icon = article.respond_to?(:icon_name) ?
-             article.icon_name :
-             article.class.icon_name(article)
-    if (icon =~ /\//)
-      icon
+    if article.respond_to?(:sized_icon)
+      article.sized_icon(size)
     else
-      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      icon = article.respond_to?(:icon_name) ?
+              article.icon_name :
+              article.class.icon_name(article)
+      klasses = "#{size} " + [icon].flatten.map{|name| "#{size}-"+name}.join(' ')
       if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
-        klasses += ' icon-upload-file'
+        klasses += " #{size}-upload-file"
       end
       klasses
     end
 module ForumHelper
+  include ActionView::Helpers::DateHelper
   def cms_label_for_new_children
     _('New discussion topic')
@@ -42,9 +43,9 @@ module ForumHelper
   def last_topic_update(article)
     info = article.info_from_last_update
     if info[:author_url]
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
     else
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
     end
   end
@@ -75,9 +75,12 @@ module ManageProductsHelper
   end
   def categories_container(categories_selection_html, hierarchy_html = '')
-    hidden_field_tag('selected_category_id') +
-    content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
-    content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
+    content_tag 'div',
+      render('categories_autocomplete') +
+      hidden_field_tag('selected_category_id') +
+      content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
+      content_tag('div', categories_selection_html, :id => 'categories_container_wrapper'),
+    :id => 'categories-container'
   end
   def select_for_categories(categories, level = 0)
@@ -28,7 +28,7 @@ class Article &lt; ActiveRecord::Base
   def initialize(*params)
     super
-    if !params.blank? && params.first.has_key?(:profile)
+    if !params.blank? && params.first.has_key?(:profile) && !params.first[:profile].blank?
       profile = params.first[:profile]
       self.published = false unless profile.public?
     end
@@ -76,9 +76,12 @@ class Blog &lt; Folder
   end
   settings_items :visualization_format, :type => :string, :default => 'full'
-  validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
+  validates_inclusion_of :visualization_format,
+                         :in => [ 'full', 'short', 'short+pic', 'compact'],
+                         :if => :visualization_format
-  settings_items :display_posts_in_current_language, :type => :boolean, :default => false
+  settings_items :display_posts_in_current_language,
+                 :type => :boolean, :default => false
   alias :display_posts_in_current_language? :display_posts_in_current_language
@@ -3,7 +3,17 @@
 # domains.
 class Environment < ActiveRecord::Base
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount
+  attr_accessible :name, :is_default, :signup_welcome_text_subject,
+                  :signup_welcome_text_body, :terms_of_use,
+                  :message_for_disabled_enterprise, :news_amount_by_folder,
+                  :default_language, :languages, :description,
+                  :organization_approval_method, :enabled_plugins,
+                  :enabled_features, :redirection_after_login,
+                  :redirection_after_signup, :contact_email, :theme,
+                  :reports_lower_bound, :noreply_email,
+                  :signup_welcome_screen_body, :members_whitelist_enabled,
+                  :members_whitelist, :highlighted_news_amount,
+                  :portal_news_amount, :date_format
   has_many :users
@@ -14,6 +24,12 @@ class Environment &lt; ActiveRecord::Base
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
+  validates_inclusion_of :date_format,
+                         :in => [ 'numbers_with_year', 'numbers',
+                                  'month_name_with_year', 'month_name',
+                                  'past_time'],
+                         :if => :date_format
+
   def self.verify_filename(filename)
     filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
     filename
@@ -1006,19 +1006,11 @@ private :generate_url, :url_options
     self.save
   end
-  def disabled?
-    !visible
-  end
-
   def enable
     self.visible = true
     self.save
   end
-  def enabled?
-    visible
-  end
-
   def control_panel_settings_button
     {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
-require 'short_filename'
-
 # Article type that handles uploaded files.
 #
 # Limitation: only file metadata are versioned. Only the latest version
@@ -14,8 +12,6 @@ class UploadedFile &lt; Article
   track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent
-  include ShortFilename
-
   def title
     if self.name.present? then self.name else self.filename end
   end
@@ -65,7 +61,7 @@ class UploadedFile &lt; Article
   #  :min_size => 2.megabytes
   #  :max_size => 5.megabytes
   has_attachment :storage => :file_system,
-    :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
+    :thumbnails => { :icon => [24,24], :bigicon => [50,50], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
     :max_size => self.max_size
@@ -4,6 +4,10 @@ class FilePresenter::Image &lt; FilePresenter
     f.image? ? 10 : nil
   end
+  def sized_icon(size)
+    public_filename size
+  end
+
   def icon_name
     public_filename :icon
   end
@@ -3,6 +3,21 @@
 <%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
+
+<%= labelled_form_field(
+  _("Article's date format"),
+  select(:environment, :date_format,
+    options_for_select([
+      [ _('mm/dd/yyyy'), 'numbers_with_year'],
+      [ _('mm/dd'), 'numbers'],
+      [ _('Month dd, yyyy'), 'month_name_with_year'],
+      [ _('Month dd'), 'month_name'],
+      [ _('X minutes/hours/days/months/years ago'), 'past_time']
+      ], environment.date_format
+    )
+  )
+) %>
+
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
 <%= label_tag :languages, _('Available languages') %>
@@ -67,7 +67,8 @@
 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [
   [ _('Full post'), 'full'],
   [ _('First paragraph'), 'short'],
-  [ _('First paragraph, with post picture'), 'short+pic']
+  [ _('First paragraph, with post picture'), 'short+pic'],
+  [ _("Title, Image, Lead"), 'compact']
 ])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -0,0 +1,29 @@
+<% @articles.each do |article| article = FilePresenter.for article %>
+  <tr title="<%= article.title%>" >
+    <td class="article-name">
+      <%= link_to_article(article) %>
+    </td>
+    <% short_description =  article.respond_to?(:short_description) ?
+          article.short_description :
+          article.class.short_description %>
+    <td class="article-mime" title=<%= short_description.to_json %>>
+      <%= short_description %>
+    </td>
+  <td class="last-update">
+    <%= time_ago_in_words article.updated_at %>
+  </td>
+    <td class="article-controls">
+      <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
+      <%= button_without_text :eyes, _('Public view'), article.view_url %>
+      <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
+      <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
+        <% if profile.home_page != article %>
+          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+        <% else %>
+          <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+        <% end %>
+      <% end %>
+      <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
+    </td>
+  </tr>
+<% end %>
@@ -37,6 +37,7 @@
   <tr>
     <th><%= _('Name') %></th>
     <th><%= _('Type') %></th>
+    <th><%= _('Last update') %></th>
     <th><%= _('Actions') %></th>
   </tr>
@@ -54,32 +55,7 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| article = FilePresenter.for article %>
-    <tr title="<%= article.title%>" >
-      <td class="article-name">
-        <%= link_to_article(article) %>
-      </td>
-      <% short_description =  article.respond_to?(:short_description) ?
-            article.short_description :
-            article.class.short_description %>
-      <td class="article-mime" title=<%= short_description.to_json %>>
-        <%= short_description %>
-      </td>
-      <td class="article-controls">
-        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
-        <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
-        <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
-          <% if profile.home_page != article %>
-            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
-          <% else %>
-            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
-          <% end %>
-        <% end %>
-        <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
-      </td>
-    </tr>
-  <% end %>
+  <%= render 'view_items' %>
 </table>
@@ -0,0 +1,21 @@
+<% if article.image %>
+  <% className = "article-compact-abstract-with-image" %>
+  <% if article.image.thumbnails_processed? %>
+    <% image_file = article.image.public_filename(:big) %>
+  <% else %>
+    <% image_file = "/images/icons-app/image-loading-thumb.png" %>
+  <% end %>
+<% else %>
+  <% className = "article-compact-abstract" %>
+<% end %>
+
+<div>
+  <% if article.image %>
+    <div class = "article-compact-image">
+      <%= image_tag(image_file) %>
+    </div>
+  <% end %>
+  <div class = <%= className %> >
+      <%= article.abstract.truncate(400) %>
+  </div>
+</div>
@@ -8,7 +8,7 @@
   </div>
 </div>
 <hr class="pre-posts"/>
-<div class="blog-posts">
+<div class="blog-posts page-<%= @npage %>">
   <% paginate = true %>
   <%=
    posts = @posts
 <% unless folder.body.blank? %>
-  <div>
+  <div class="folder-description">
     <%= folder.body %>
   </div>
-  <hr/>
 <% end %>
 <% if folder.children.empty? %>
@@ -0,0 +1,8 @@
+<%= text_field_tag 'product_category_id', '', :placeholder => _('type a category for the product') %>
+
+<%= javascript_include_tag '/javascripts/product_categories.js' %>
+<% javascript_tag do %>
+  product_categories.autocomplete.search_url = <%= url_for(:controller => :manage_products, :action => :search_categories).to_json %>
+  product_categories.autocomplete.select_url = <%= url_for(:controller => :manage_products, :action => :show_category_tree).to_json %>
+  product_categories.autocomplete.load('#product_category_id')
+<% end %>
@@ -0,0 +1,2 @@
+<%= categories_container selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true) %>
+
@@ -16,7 +16,7 @@
     <h3><%= _('Edit category of this product:') %></h3>
-    <%= categories_container(selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true)) %>
+    <%= render 'manage_products/selected_category_tree' %>
     <div id='categories_selection_actionbar'>
       <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
@@ -19,7 +19,7 @@
         <span style="font-size: 12px;"><%= comment.title %></span><br/>
       <% end %>
       <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
-      <span style="font-size: 8px; color: #929292"><%= time_ago_as_sentence(comment.created_at) %></span>
+      <span style="font-size: 8px; color: #929292"><%= time_ago_in_words(comment.created_at) %></span>
   <br style="clear: both;" />
   <% unless comment.replies.blank? %>
@@ -6,7 +6,7 @@
     <p>
     <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
     <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
-    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
     <p>
     <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
@@ -5,7 +5,7 @@
   <td>
     <p>
       <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
   </td>
 </tr>
@@ -12,7 +12,7 @@
           <span style="font-size: 14px">
             <%= task_information(task) %>
           </span>
-          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(task.created_at) %></span>
+          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(task.created_at) %></span>
         </div>
       </td>
     </tr>
@@ -5,7 +5,7 @@
     <td>
       <p>
         <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
       </p>
   </td>
 </tr>
@@ -40,7 +40,7 @@
       <%= txt2html comment.body %>
     </div>
     <div class="profile-activity-time">
-      <%= time_ago_as_sentence(comment.created_at) %>
+      <%= time_ago_in_words(comment.created_at) %>
     </div>
   </div>
@@ -12,7 +12,7 @@
     <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
   </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
   </div>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -22,5 +22,5 @@
     <% end %>
   </ul>
   <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
-  <hr />  
+  <hr />
 </li>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -4,7 +4,7 @@
   </div>
   <div class='profile-activity-description'>
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
     <div class='profile-wall-actions'>
       <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
     </div>
@@ -0,0 +1,11 @@
+<div id="list-item">
+  <div class="item-info">
+    <div class="item-icon" >
+      <%= display_content_icon(content) %>
+    </div>
+    <span class="item-description">
+      <%= link_to(content.name, content.url) %>
+    </span>
+    <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
+  </div>
+</div>
@@ -19,17 +19,27 @@
 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
+  <% abstract_options = {:style => 'width: 100%; height: 200px;', :class => editor_type} %>
   <% if f %>
-    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, abstract_options)) %>
   <% else %>
-    <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
+    <% if @article.kind_of?(Article) %>
+      <%= labelled_form_field(_(abstract_label), text_area_tag("article[abstract]", @escaped_abstract, abstract_options)) %>
+    <% else %>
+      <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, abstract_options)) %>
+    <% end %>
   <% end %>
 </div>
 <div style="margin-top: 10px;">
+  <% body_options = {:style => 'width: 100%; height: 400px;', :class => editor_type} %>
   <% if f %>
-    <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(body_label), f.text_area(body_method, body_options)) %>
   <% else %>
-    <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
+    <% if @article.kind_of?(Article) %>
+      <%= labelled_form_field(_(body_label), text_area_tag("article[body]", @escaped_body, body_options)) %>
+    <% else %>
+      <%= labelled_form_field(_(body_label), text_area(object, body_method, body_options)) %>
+    <% end %>
   <% end %>
 </div>
-<table class="<%= list_type %>-content">
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
+<ul class="<%= list_type %>-content">
   <% contents.each do |content| %>
-    <% if content.display_to?(user) %>
-      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
-    <% end %>
+    <li class="<%= list_type %>-item">
+      <% if content.display_to?(user) %>
+        <%= render :partial => 'shared/content_item', :locals => { :content => content } %>
+      <% end %>
+    </li>
   <% end %>
-</table>
+</ul>
 <p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
@@ -2,7 +2,7 @@
 <% task.abuse_reports.each do |abuse_report| %>
   <div>
     <strong style="word-wrap: break-word; display: block; padding-right: 40px">"<%= abuse_report.reason %>"</strong> <br />
-    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%></i> <br />
+    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_in_words(abuse_report.created_at) }%></i> <br />
     <% if !abuse_report.content.blank? %>
       <button class="display-abuse-report-details" data-report="<%=abuse_report.id%>"><%=_('View details')%></button>
       <div style='display: none' id=<%= 'abuse-report-details-'+abuse_report.id.to_s %> class="abuse-report-details">
 require 'noosfero/role_assignment_ext'
 require 'noosfero/action_tracker_ext'
+require 'noosfero/vote_ext'
@@ -0,0 +1,15 @@
+class IndexRoleAssignmentsFilteredFields < ActiveRecord::Migration
+
+  def self.up
+    add_index :role_assignments, [:accessor_id, :accessor_type]
+    add_index :role_assignments, [:accessor_id, :accessor_type, :role_id], name: :index_on_role_assigments_accessor_role
+    add_index :role_assignments, [:resource_id, :resource_type]
+    add_index :role_assignments, [:resource_id, :resource_type, :role_id], name: :index_on_role_assigments_resource_role
+    add_index :role_assignments, [:accessor_id, :accessor_type, :resource_id, :resource_type], name: :index_on_role_assigments_accessor_resource_role
+    add_index :profiles, [:type]
+    add_index :profiles, [:visible]
+    add_index :profiles, [:enabled]
+    add_index :profiles, [:validated]
+  end
+
+end
@@ -0,0 +1,19 @@
+class FixTagsCaseDifferences < ActiveRecord::Migration
+  def up
+    tags = ActsAsTaggableOn::Tag.joins('LEFT JOIN tags as b on LOWER(tags.name) = b.name').where('b.id is null')
+    tags.find_each do |tag|
+      unless ActsAsTaggableOn::Tag.exists?(:name => tag.name.mb_chars.downcase)
+        ActsAsTaggableOn::Tag.create(:name => tag.name.mb_chars.downcase)
+      end
+    end
+
+    execute("UPDATE taggings SET tag_id = new.id FROM taggings AS t INNER JOIN tags AS old ON t.tag_id = old.id INNER JOIN tags AS new ON LOWER(old.name) = new.name WHERE old.id != new.id AND taggings.id = t.id")
+
+    execute("UPDATE tags SET taggings_count = (SELECT COUNT(*) FROM taggings WHERE taggings.tag_id = tags.id)")
+    execute("DELETE FROM tags WHERE taggings_count = 0")
+  end
+
+  def down
+    say 'This migration is irreversible.'
+  end
+end
@@ -0,0 +1,9 @@
+class AddDateFormatToEnvironment < ActiveRecord::Migration
+  def up
+    add_column :environments, :date_format, :string, :default => 'month_name_with_year'
+  end
+
+  def down
+    remove_column :environments, :date_format
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150525101430) do
+ActiveRecord::Schema.define(:version => 20150602142030) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -321,17 +321,18 @@ ActiveRecord::Schema.define(:version =&gt; 20150525101430) do
     t.text     "design_data"
     t.text     "custom_header"
     t.text     "custom_footer"
-    t.string   "theme",                        :default => "default",           :null => false
+    t.string   "theme",                        :default => "default",              :null => false
     t.text     "terms_of_use_acceptance_text"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "reports_lower_bound",          :default => 0,                   :null => false
+    t.integer  "reports_lower_bound",          :default => 0,                      :null => false
     t.string   "redirection_after_login",      :default => "keep_on_same_page"
     t.text     "signup_welcome_text"
     t.string   "languages"
     t.string   "default_language"
     t.string   "noreply_email"
     t.string   "redirection_after_signup",     :default => "keep_on_same_page"
+    t.string   "date_format",                  :default => "month_name_with_year"
   end
   create_table "external_feeds", :force => true do |t|
@@ -692,6 +693,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150525101430) do
     t.integer  "image_id"
     t.boolean  "spam",                         :default => false
     t.integer  "responsible_id"
+    t.integer  "closed_by_id"
   end
   add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
@@ -62,7 +62,8 @@ Feature: approve article
     And I press "Spread this"
     And I follow "Delete"
     And I confirm the browser dialog
-    When I am logged in as "joaosilva"
+    And I follow "Logout"
+    And I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
     And I choose "Reject"
@@ -0,0 +1,30 @@
+Feature: article visualization
+  As a user
+  I want to change view modes
+  In order to see articles in fullscreen or not in fullscreen
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And "joaosilva" has no articles
+    And the following articles
+      | owner     | name           | body               |
+      | joaosilva | Sample Article | This is an article |
+    And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: viewing the article in fullscreen by default
+    Given I go to /joaosilva/sample-article?fullscreen=1
+    Then I should see "Exit full screen"
+
+  @selenium
+  Scenario: viewing the article not in fullscreen by default
+    Given I go to /joaosilva/sample-article
+    Then I should see "Full screen"
+
+  @selenium
+  Scenario: changing the view mode from not in fullscreen to fullscreen
+    Given I go to /joaosilva/sample-article
+    And I follow "Full screen"
+    Then I should see "Exit full screen"
@@ -41,19 +41,19 @@ Feature: balloon
   @selenium
   Scenario: I should not see trigger if not enabled on page
     Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    When I go to /assets/people
+    When I go to /search/people
     Then I should not see "Profile links"
   @selenium
   Scenario: I should not see trigger by default on page
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /assets/communities
+    When I go to /search/communities
     Then I should not see "Members"
   @selenium
   Scenario: I should see balloon when clicked on page trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to /assets/communities
+    And I go to /search/communities
     And display ".community-trigger"
     When I follow "Profile links"
     Then I should see "Members"
@@ -13,20 +13,20 @@ Scenario: show all enterprises
   Given the following enterprises
     | identifier | name        |
     | shop2      | Fruits Shop |
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   Then I should see "Enterprises"
   And I should see "Shoes Shop"
   And I should see "Fruits Shop"
 Scenario: show profile links button
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   Then I should see "Profile links" within "a.enterprise-trigger"
   And I should not see "Members"
   And I should not see "Agenda"
 @selenium-fixme
 Scenario: show profile links when clicked
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   When I follow "Profile links"
   Then I should see "Products" within "ul.menu-submenu-list"
   And I should see "Members" within "ul.menu-submenu-list"
@@ -34,7 +34,7 @@ Scenario: show profile links when clicked
 @selenium-fixme
 Scenario: go to catalog when click on products link
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   When I follow "Profile links"
   And I follow "Products" and wait
   Then I should be exactly on /catalog/shop1
@@ -14,7 +14,7 @@ Feature: Change appearance
     And I should not see an element ".box-4"
     And I go to joaosilva's control panel
     And I follow "Edit Appearance"
-    And I follow "Left Top and Right"
+    And I follow "Top and Side Bars"
     And I go to joaosilva's control panel
     And I follow "Edit sideboxes"
     And I should see an element ".box-4"
@@ -17,7 +17,7 @@ Feature: events
     Then I should see "November 2009" within ".current-month"
   Scenario: go to next month in global agenda
-    Given I am on /assets/events?year=2009&month=11
+    Given I am on /search/events?year=2009&month=11
     When I follow "December"
     Then I should see "December 2009" within ".current-month"
@@ -27,7 +27,7 @@ Feature: events
     Then I should see "September 2009" within ".current-month"
   Scenario: go to previous month in global agenda
-    Given I am on /assets/events?year=2009&month=11
+    Given I am on /search/events?year=2009&month=11
     When I follow "October"
     Then I should see "October 2009" within ".current-month"
@@ -43,7 +43,7 @@ Feature: events
   Scenario: go to specific day in global agenda
     Given I am on the homepage
-    When I am on /assets/events?year=2009&month=11&day=12
+    When I am on /search/events?year=2009&month=11&day=12
     Then I should see "Events for November, 2009"
   Scenario: list events for specific day
@@ -88,7 +88,7 @@ Feature: events
     And the following events
       | owner      | name            | start_date |
       | josemanuel | Manuel Birthday | 2009-10-24 |
-    When I am on /assets/events?year=2009&month=10&day=24
+    When I am on /search/events?year=2009&month=10&day=24
     Then I should see "Another Conference"
     And I should see "Manuel Birthday"
@@ -157,7 +157,7 @@ Feature: events
     Then I should not see "New events" link
   Scenario: display environment name in global agenda
-    When I am on /assets/events
+    When I am on /search/events
     Then I should see "Colivre.net's Events"
   @selenium
@@ -21,9 +21,7 @@ Feature: domain for profile
   Scenario: access profile control panel through profile blocks
     Given I am logged in as "joaosilva"
     When I go to joaosilva's homepage
-    And I follow "Control panel" within ".profile-info-block"
-    Then I should see "Joao Silva" within "span.control-panel-title"
-    When I follow "Control panel" within ".profile-image-block"
+    And I follow "Control panel" within ".profile-image-block"
     Then I should see "Joao Silva" within "span.control-panel-title"
   @selenium
@@ -36,7 +36,7 @@ Feature: search inside a profile
       | joaosilva | ProfileSearchBlock  |
     When I go to joaosilva's profile
     And I fill in "q" with "bees" within ".profile-search-block"
-    And I press "Search"
+    And I press "Search" within ".profile-search-block"
     Then I should see "bees and butterflies" within ".main-block"
   Scenario: not display unpublished articles
@@ -203,5 +203,5 @@ Feature: register enterprise
   Scenario: a user cant see button to register new enterprise if enterprise_registration disabled
     Given feature "enterprise_registration" is disabled on environment
-    When I am on /assets/enterprises
+    When I am on /search/enterprises
     Then I should not see "New enterprise" link
@@ -56,7 +56,7 @@ Feature: search enterprises
       | owner | name | body | homepage |
       | shop1 | Shoes home | This is the <i>homepage</i> of Shoes shop! It has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. We should probably talk about shoes. | true |
     When I search enterprises for "shoes"
-    And I choose the search filter "Full"
+    And I select "Full" from "display"
     Then I should see "This is the homepage of" within ".search-enterprise-description"
     And I should see "about sho..." within ".search-enterprise-description"
@@ -66,7 +66,7 @@ Feature: search enterprises
       | identifier | name | description |
       | shop4 | Clothes shop | This <b>clothes</b> shop also sells shoes! This too has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. Clothes are a really important part of our lives. |
     When I search enterprises for "clothes"
-    And I choose the search filter "Full"
+    And I select "Full" from "display"
     And I should see "This clothes shop" within ".search-enterprise-description"
     And I should see "really import..." within ".search-enterprise-description"
@@ -94,7 +94,7 @@ Given /^the following blocks$/ do |table|
       owner.boxes<< Box.new
       owner.boxes.first.blocks << MainBlock.new
     end
-    box = owner.boxes.where(:position => 3).first
+    box = owner.boxes.first
     klass.constantize.create!(item.merge(:box => box))
   end
 end
@@ -14,9 +14,12 @@ Feature: suggest article
   @selenium
   Scenario: highlight an article before approval of a suggested article
-    Given someone suggested the following article to be published
-      | target           | article_name        | article_body                    | name | email            |
-      | sample-community | A suggested article | this is an article about whales | jose | jose@example.org |
+    Given I am on Sample Community's blog
+    And I follow "Suggest an article"
+    And I fill in "Title" with "Suggestion"
+    And I fill in "Your name" with "Some Guy"
+    And I fill in "Email" with "someguy@somewhere.com"
+    And I press "Save"
     When I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
 require_dependency 'noosfero'
+require 'noosfero/plugin/parent_methods'
 class Noosfero::Plugin
@@ -14,13 +15,9 @@ class Noosfero::Plugin
   class << self
-    attr_writer :should_load
+    include Noosfero::Plugin::ParentMethods
-    # Called for each ActiveRecord class with parents
-    # See http://apidock.com/rails/ActiveRecord/ModelSchema/ClassMethods/full_table_name_prefix
-    def table_name_prefix
-      @table_name_prefix ||= "#{name.to_s.underscore}_"
-    end
+    attr_writer :should_load
     def should_load
       @should_load.nil? && true || @boot
@@ -92,8 +89,14 @@ class Noosfero::Plugin
       end
     end
-    def load_plugin(plugin_name)
-      (plugin_name.to_s.camelize + 'Plugin').constantize
+    def load_plugin_identifier identifier
+      klass = identifier.to_s.camelize.constantize
+      klass = klass.const_get :Base if klass.class == Module
+      klass
+    end
+
+    def load_plugin public_name
+      load_plugin_identifier "#{public_name.to_s.camelize}Plugin"
     end
     # This is a generic method that initialize any possible filter defined by a
@@ -135,7 +138,7 @@ class Noosfero::Plugin
         filters = [filters]
       end
       filters.each do |plugin_filter|
-        filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
+        filter_method = "#{plugin.identifier}_#{plugin_filter[:method_name]}".to_sym
         controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
         controller_class.send(:define_method, filter_method) do
           instance_exec(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
@@ -76,7 +76,7 @@ class Noosfero::Plugin::Manager
   def enabled_plugins
     @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
-      plugin.constantize.new(context)
+      Noosfero::Plugin.load_plugin_identifier(plugin).new context
     end
   end
@@ -0,0 +1,62 @@
+class Noosfero::Plugin
+
+  # Plugins that are defined as modules should extend
+  # this module manually, for example:
+  #   module MyPlugin
+  #     extend Noosfero::Plugin::ParentMethods
+  #   end
+  module ParentMethods
+
+    def identifier
+      @identifier ||= (if self.parents.first.instance_of? Module then self.parents.first else self end).name.underscore
+    end
+
+    def public_name
+      @public_name ||= self.identifier.gsub '_plugin', ''
+    end
+
+    # Here the developer should specify the meta-informations that the plugin can
+    # inform.
+    def plugin_name
+      self.identifier.humanize
+    end
+    def plugin_description
+      _("No description informed.")
+    end
+
+    # Called for each ActiveRecord model with parents
+    # See http://apidock.com/rails/ActiveRecord/ModelSchema/ClassMethods/full_table_name_prefix
+    def table_name_prefix
+      @table_name_prefix ||= "#{self.identifier}_"
+    end
+
+    def public_path file = '', relative=false
+      File.join "#{if relative then '' else  '/' end}plugins", public_name, file
+    end
+
+    def root_path
+      Rails.root.join('plugins', public_name)
+    end
+
+    def view_path
+      File.join(root_path,'views')
+    end
+
+    def admin_url
+      {:controller => "#{self.identifier}_admin", :action => 'index'}
+    end
+
+    def has_admin_url?
+      File.exists?(File.join(root_path, 'controllers', "#{self.identifier}_admin_controller.rb"))
+    end
+
+    def controllers
+      @controllers ||= Dir.glob("#{self.root_path}/controllers/*/*").map do |controller_file|
+        next unless controller_file =~ /_controller.rb$/
+        controller = File.basename(controller_file).gsub(/.rb$/, '').camelize
+      end.compact
+    end
+
+  end
+
+end
@@ -0,0 +1,11 @@
+require_dependency 'models/vote'
+
+class Vote
+
+  validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id], :if => :allow_duplicated_vote?
+
+  def allow_duplicated_vote?
+    voter.present?
+  end
+
+end
@@ -1,11 +0,0 @@
-module ShortFilename
-
-  def short_filename(filename, limit_chars = 43)
-    return filename if filename.size <= limit_chars
-    extname = File.extname(filename)
-    basename = File.basename(filename,extname)
-    str_complement = '(...)'
-    return basename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement + extname
-  end
-
-end
@@ -13,7 +13,7 @@
     <ul>
     <% @comment.comment_classification_plugin_comment_status_users.each do |relation| %>
       <li>
-        <%= _("<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</i>.") % { :user => relation.profile.name, :status_name => relation.status.name, :created_at => time_ago_as_sentence(relation.created_at)} %>
+        <%= _("<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</i>.") % { :user => relation.profile.name, :status_name => relation.status.name, :created_at => time_ago_in_words(relation.created_at)} %>
         <% unless relation.reason.blank? %>
           <p><%= _("<i>Reason:</i> %s") % relation.reason %></p>
         <% end %>
@@ -6,7 +6,7 @@
         <%= instance_eval(&block.content_image(content)) if block.show_image %>
       </div>
       <% if block.show_name %>
-        <div class="name"><%= short_filename(content.name, 30) %></div>
+        <div class="name"><%= content.name %></div>
       <% end %>
     </a>
   </span>
@@ -14,8 +14,8 @@
   <%= form_for :submission do |f| %>
     <% if !user %>
-      <%= required labelled_form_field _('Author name'), text_field_tag(:author_name, @submission.author_name) %>
-      <%= required labelled_form_field _('Author email'), text_field_tag(:author_email, @submission.author_email) %>
+      <%= required labelled_form_field _('Name'), text_field_tag(:author_name, @submission.author_name) %>
+      <%= required labelled_form_field _('Email'), text_field_tag(:author_email, @submission.author_email) %>
     <% end %>
     <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
@@ -23,7 +23,7 @@ class MetadataPlugin &lt; Noosfero::Plugin
     },
     content_viewer: {
       variable: proc do
-        if profile and profile.home_page_id == @page.id
+        if profile and @page and profile.home_page_id == @page.id
           @profile
         elsif @page.respond_to? :encapsulated_file
           @page.encapsulated_file
@@ -48,4 +48,13 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/x.png/  }
   end
+  should 'render not_found page properly' do
+    assert_equal false, Article.exists?(:slug => 'non-existing-page')
+    assert_nothing_raised do
+      get :view_page, profile: profile.identifier, page: [ 'non-existing-page' ]
+      assert_response 404 # not found
+      assert_template 'not_found'
+    end
+  end
+
 end
@@ -1,11 +0,0 @@
-require_dependency 'models/vote'
-
-class Vote
-
-  validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id], :if => :allow_duplicated_vote?
-
-  def allow_duplicated_vote?
-    voter.present?
-  end
-
-end
@@ -117,6 +117,107 @@
 .icon-clock                   { background-image: url(Tango/16x16/actions/appointment.png) }
 .icon-fullscreen              { background-image: url(Tango/16x16/actions/view-fullscreen.png) }
+/******************BIG ICONS************************/
+.bigicon-embed     { background-image: url(Tango/scalable/apps/utilities-terminal.svg) }
+.bigicon-edit      { background-image: url(Tango/scalable/apps/text-editor.svg) }
+.bigicon-undo      { background-image: url(Tango/scalable/actions/edit-undo.svg) }
+.bigicon-home      { background-image: url(Tango/scalable/actions/go-home.svg) }
+.bigicon-home-not  { background-image: url(mod/scalable/actions/go-home-not.svg) }
+.bigicon-new,
+.bigicon-suggest   { background-image: url(Tango/scalable/actions/filenew.svg) }
+.bigicon-close     { background-image: url(Tango/scalable/actions/gtk-cancel.svg) }
+.bigicon-newfolder { background-image: url(Tango/scalable/actions/folder-new.svg) }
+.bigicon-folder    { background-image: url(Tango/scalable/places/folder.svg) }
+.bigicon-parent-folder { background-image: url(Tango/scalable/places/folder_home.svg) }
+.bigicon-newblog   { background-image: url(mod/scalable/apps/text-editor.svg) }
+.bigicon-blog      { background-image: url(mod/scalable/apps/text-editor.svg) }
+.bigicon-save      { background-image: url(Tango/scalable/actions/filesave.svg) }
+.bigicon-send      { background-image: url(Tango/scalable/actions/stock_mail-forward.svg) }
+.bigicon-cancel    { background-image: url(Tango/scalable/actions/gtk-cancel.svg) }
+.bigicon-person    { background-image: url(Tango/scalable/apps/system-config-users.svg) }
+.bigicon-product   { background-image: url(Tango/scalable/mimetypes/package.svg) }
+.bigicon-delete    { background-image: url(Tango/scalable/places/user-trash.svg) }
+.bigicon-back      { background-image: url(Tango/scalable/actions/back.svg) }
+.bigicon-next      { background-image: url(Tango/scalable/actions/go-next.svg) }
+.bigicon-add       { background-image: url(Tango/scalable/actions/add.svg) }
+.bigicon-remove    { background-image: url(Tango/scalable/actions/gtk-remove.svg) }
+.bigicon-more      { background-image: url(Tango/scalable/actions/add.svg) }
+.bigicon-up        { background-image: url(Tango/scalable/actions/go-up.svg) }
+.bigicon-down      { background-image: url(Tango/scalable/actions/go-down.svg) }
+.bigicon-left      { background-image: url(Tango/scalable/actions/go-previous.svg) }
+.bigicon-right     { background-image: url(Tango/scalable/actions/go-next.svg) }
+.bigicon-up-disabled    { background-image: url(Tango/scalable/actions/go-up.svg); opacity: 0.25; filter:alpha(opacity=25); }
+.bigicon-down-disabled  { background-image: url(Tango/scalable/actions/go-down.svg); opacity: 0.25; filter:alpha(opacity=25); }
+.bigicon-left-disabled  { background-image: url(Tango/scalable/actions/go-previous.svg); opacity: 0.25; filter:alpha(opacity=25); }
+.bigicon-right-disabled { background-image: url(Tango/scalable/actions/go-next.svg); opacity: 0.25; filter:alpha(opacity=25); }
+.bigicon-up-red    { background-image: url(mod/scalable/actions/go-up-red.svg) }
+.bigicon-forward   { background-image: url(Tango/scalable/actions/go-next.svg) }
+.bigicon-search    { background-image: url(Tango/scalable/actions/search.svg) }
+.bigicon-ok        { background-image: url(Tango/scalable/actions/media-playback-start.svg) }
+.bigicon-login     { background-image: url(mod/scalable/actions/log-in.svg) }
+.bigicon-help      { background-image: url(Tango/scalable/apps/gnome-help.svg) }
+.bigicon-help32on  { background-image: url(Tango/scalable/apps/gnome-help.svg) }
+.bigicon-help32off { background-image: url(mod/scalable/apps/gnome-help-red.svg) }
+.bigicon-spread    { background-image: url(mod/scalable/actions/spread.svg) }
+.bigicon-todo            { background-image: url(Tango/scalable/actions/stock_paste.svg) }
+.bigicon-eyes            { background-image: url(Tango/scalable/actions/find.svg) }
+.bigicon-menu-home       { background-image: url(Tango/scalable/actions/go-home.svg) }
+.bigicon-menu-product    { background-image: url(Tango/scalable/mimetypes/package.svg) }
+.bigicon-menu-enterprise { background-image: url(Tango/scalable/actions/go-home.svg) }
+.bigicon-menu-community  { background-image: url(Tango/scalable/apps/system-config-users.svg) }
+.bigicon-menu-ctrl-panel { background-image: url(Tango/scalable/categories/preferences-desktop.svg) }
+.bigicon-menu-admin      { background-image: url(Tango/scalable/categories/preferences-system.svg) }
+.bigicon-menu-my-groups  { background-image: url(Tango/scalable/apps/system-config-users.svg) }
+.bigicon-menu-login      { background-image: url(mod/scalable/actions/log-in.svg) }
+.bigicon-menu-logout     { background-image: url(mod/scalable/actions/log-out.svg) }
+.bigicon-menu-search     { background-image: url(Tango/scalable/actions/search.svg) }
+.bigicon-menu-events     { background-image: url(Tango/scalable/mimetypes/stock_calendar.svg) }
+.bigicon-event           { background-image: url(Tango/scalable/mimetypes/stock_calendar.svg) }
+.bigicon-newevent        { background-image: url(Tango/scalable/mimetypes/stock_calendar.svg) }
+.bigicon-menu-articles   { background-image: url(Tango/scalable/apps/text-editor.svg) }
+.bigicon-menu-people     { background-image: url(mod/scalable/apps/user.svg) }
+.bigicon-menu-mail       { background-image: url(Tango/scalable/apps/email.svg) }
+.bigicon-upload-file     { background-image: url(Tango/scalable/actions/filesave.svg) }
+.bigicon-newupload-file  { background-image: url(Tango/scalable/actions/filesave.svg) }
+.bigicon-slideshow       { background-image: url(Tango/scalable/mimetypes/x-office-presentation.svg) }
+.bigicon-photos          { background-image: url(Tango/scalable/devices/camera-photo.svg) }
+.bigicon-vertical-toggle { background-image: url(Tango/scalable/actions/mail-send-receive.svg) }
+.bigicon-text-html       { background-image: url(Tango/scalable/mimetypes/text-html.svg) }
+.bigicon-text-plain      { background-image: url(Tango/scalable/mimetypes/text-x-generic.svg) }
+.bigicon-image-svg-xml   { background-image: url(Tango/scalable/mimetypes/image-x-generic.svg) }
+.bigicon-application-octet-stream { background-image: url(Tango/scalable/mimetypes/binary.svg) }
+.bigicon-application-x-gzip       { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-x-gzip.svg) }
+.bigicon-application-postscript   { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-postscript.svg) }
+.bigicon-application-pdf          { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-pdf.svg) }
+.bigicon-application-ogg          { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-ogg.svg) }
+.bigicon-video, .icon-video-mpeg  { background-image: url(Tango/scalable/mimetypes/video-x-generic.svg) }
+.bigicon-application-vnd-oasis-opendocument-text         { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg) }
+.bigicon-application-vnd-oasis-opendocument-spreadsheet  { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg) }
+.bigicon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.svg) }
+.bigicon-welcome-page   { background-image: url(mod/scalable/mimetypes/welcome-page.svg) }
+.bigicon-blocks         { background-image: url(mod/scalable/mimetypes/blocks.svg) }
+.bigicon-header-footer  { background-image: url(mod/scalable/mimetypes/header-footer.svg) }
+.bigicon-appearance     { background-image: url(Tango/scalable/apps/preferences-desktop-wallpaper.svg) }
+.bigicon-media-pause  { background-image: url(Tango/scalable/actions/media-playback-pause.svg) }
+.bigicon-media-play   { background-image: url(Tango/scalable/actions/media-playback-start.svg) }
+.bigicon-media-prev   { background-image: url(Tango/scalable/actions/media-skip-backward.svg) }
+.bigicon-media-next   { background-image: url(Tango/scalable/actions/media-skip-forward.svg) }
+.bigicon-lock         { background-image: url(Tango/scalable/actions/lock.svg) }
+.bigicon-chat         { background-image: url(Tango/scalable/apps/internet-group-chat.svg); background-repeat: no-repeat }
+.bigicon-reply        { background-image: url(Tango/scalable/actions/mail-reply-sender.svg) }
+.bigicon-newforum     { background-image: url(Tango/scalable/apps/internet-group-chat.svg) }
+.bigicon-forum        { background-image: url(Tango/scalable/apps/system-users.svg) }
+.bigicon-gallery      { background-image: url(Tango/scalable/mimetypes/image-x-generic.svg) }
+.bigicon-newgallery   { background-image: url(Tango/scalable/mimetypes/image-x-generic.svg) }
+.bigicon-locale       { background-image: url(Tango/scalable/apps/preferences-desktop-locale.svg) }
+.bigicon-user-removed { background-image: url(Tango/scalable/actions/gtk-cancel.svg) }
+.bigicon-user-unknown { background-image: url(Tango/scalable/status/dialog-error.svg) }
+.bigicon-alert        { background-image: url(Tango/scalable/status/dialog-warning.svg) }
+.bigicon-clone        { background-image: url(Tango/scalable/actions/edit-copy.svg) }
+.bigicon-activate-user           { background-image: url(Tango/scalable/emblems/emblem-system.svg) }
+.bigicon-deactivate-user         { background-image: url(Tango/scalable/emblems/emblem-unreadable.svg) }
+.bigicon-clock                   { background-image: url(Tango/scalable/actions/appointment.svg) }
+
 /******************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) }
@@ -1401,3 +1401,17 @@ table.profile th {
 table#recaptcha_table tr:hover td {
   background-color: #fff;
 }
+
+/* product cateogories */
+#categories-container #product_category_id {
+  font-size: 18px;
+  width: 100%;
+  margin-bottom: 8px;
+}
+#categories-container #product_category_id:focus {
+  outline: none;
+  border-color: green;
+  box-shadow: 0 0 10px green;
+  color:#333;
+}
+
@@ -1230,7 +1230,10 @@ window.isHidden = function isHidden() { return (typeof(document.hidden) != &#39;unde
 function $_GET(id){
     var a = new RegExp(id+"=([^&#=]*)");
-    return decodeURIComponent(a.exec(window.location.search)[1]);
+    var result_of_search = a.exec(window.location.search)
+    if(result_of_search != null){
+      return decodeURIComponent(result_of_search[1]);
+    }
 }
 var fullwidth=false;
@@ -1258,4 +1261,3 @@ function fullscreenPageLoad(itemId){
     }
   });
 }
-
-var file_id = 1;
-
-jQuery('.view-all-media').on('click', '.pagination a', function(event) {
-  jQuery.ajax({
-    url: this.href,
-    beforeSend: function(){jQuery('.view-all-media').addClass('fetching')},
-    complete: function() {jQuery('.view-all-media').removeClass('fetching')},
-    dataType: 'script'
+(function($) {
+  "use strict";
+
+  var file_id = 1;
+
+  $('.view-all-media').on('click', '.pagination a', function(event) {
+    $.ajax({
+      url: this.href,
+      beforeSend: function(){$('.view-all-media').addClass('fetching')},
+      complete: function() {$('.view-all-media').removeClass('fetching')},
+      dataType: 'script'
+    });
+    return false;
   });
-  return false;
-});
-
-jQuery('#file').fileupload({
-  add: function(e, data){
-    data.files[0].id = file_id;
-    file_id++;
-    data.context = jQuery(tmpl("template-upload", data.files[0]));
-    jQuery('#media-upload-form').append(data.context);
-    data.submit();
-  },
-  progress: function (e, data) {
-    if (jQuery('#hide-uploads').data('bootstraped') == false) {
-      jQuery('#hide-uploads').show();
-      jQuery('#hide-uploads').data('bootstraped', true);
-    }
-    if (data.context) {
-      progress = parseInt(data.loaded / data.total * 100, 10);
-      data.context.find('.bar').css('width', progress + '%');
-      data.context.find('.percentage').text(progress + '%');
-    }
-  },
-  fail: function(e, data){
-    var file_id = '#file-'+data.files[0].id;
-    jQuery(file_id).find('.progress .bar').addClass('error');
-    jQuery(file_id).append("<div class='error-message'>" + data.jqXHR.responseText + "</div>")
-  }
-});
-
-jQuery('#hide-uploads').click(function(){
-  jQuery('#hide-uploads').hide();
-  jQuery('#show-uploads').show();
-  jQuery('.upload').slideUp();
-  return false;
-});
-
-jQuery('#show-uploads').click(function(){
-  jQuery('#hide-uploads').show();
-  jQuery('#show-uploads').hide();
-  jQuery('.upload').slideDown();
-  return false;
-});
-
-function loadPublishedMedia() {
-  var parent_id = jQuery('#published-media #parent_id').val();
-  var q = jQuery('#published-media #q').val();
-  var url = jQuery('#published-media').data('url');
-
-  jQuery('#published-media .items').addClass('fetching');
-  jQuery.ajax({
-    url: url,
-    data: {'parent_id': parent_id, 'q': q},
-    dataType: 'html',
-    success: function(response) {
-      jQuery("#published-media .items").html(response);
-      jQuery('#published-media .items').removeClass('fetching');
-      updateViewAllLinks();
+
+
+  $('#file').fileupload({
+    add: function(e, data){
+      data.files[0].id = file_id;
+      file_id++;
+      data.context = $(tmpl("template-upload", data.files[0]));
+      $('#media-upload-form').append(data.context);
+      data.submit();
+    },
+    progress: function (e, data) {
+      if ($('#hide-uploads').data('bootstraped') == false) {
+        $('#hide-uploads').show();
+        $('#hide-uploads').data('bootstraped', true);
+      }
+      if (data.context) {
+        var progress = parseInt(data.loaded / data.total * 100, 10);
+        data.context.find('.bar').css('width', progress + '%');
+        data.context.find('.percentage').text(progress + '%');
+      }
     },
-    error: function(response, textStatus, xhr) {
-      console.log(response);
-      console.log(textStatus);
+    fail: function(e, data){
+      var file_id = '#file-'+data.files[0].id;
+      $(file_id).find('.progress .bar').addClass('error');
+      $(file_id).append("<div class='error-message'>" + data.jqXHR.responseText + "</div>")
     }
   });
-}
-
-function updateViewAllLinks() {
-  var parent_id = jQuery('#published-media #parent_id').val();
-  var q = jQuery('#published-media #q').val();
-  jQuery('#published-media .view-all').each(function(){
-    var key = jQuery(this).data('key');
-    var params = {parent_id: parent_id, q: q, key: key}
-    var href = jQuery(this).attr('href');
-    href = href.replace(/\?.*/, '?'+jQuery.param(params));
-    jQuery(this).attr('href', href);
+
+
+  $('#hide-uploads').click(function(){
+    $('#hide-uploads').hide();
+    $('#show-uploads').show();
+    $('.upload').slideUp();
+    return false;
+  });
+
+
+  $('#show-uploads').click(function(){
+    $('#hide-uploads').show();
+    $('#show-uploads').hide();
+    $('.upload').slideDown();
+    return false;
   });
-}
-
-jQuery('#published-media #parent_id').change(function(){ loadPublishedMedia() });
-
-jQuery("#published-media #q").typeWatch({
-  callback: function (value) { loadPublishedMedia() },
-  wait: 750,
-  highlight: true,
-  captureLength: 2
-});
-
-jQuery("#published-media #q").bind('notext', function(){ loadPublishedMedia() });
-
-jQuery("#new-folder-dialog").submit(function( event ) {
-  var name = jQuery('#new_folder').val();
-  var parent_id = jQuery("#new-folder-dialog #parent_id").val();
-  jQuery.ajax({
-    url: this.action,
-    type: 'POST',
-    data: {
-      'parent_id': parent_id,
-      'article': {'name': name, 'published': true},
-      'type': jQuery('input[name=folder_type]:checked').val() },
-    dataType: 'json',
-    beforeSend: function(){jQuery("#new-folder-dialog").addClass('fetching')},
-    success: function(response) {
-      var option_selected = "<option value='"+ response.id +"' selected='selected'>"+ response.full_name +"</options>"
-      var option = "<option value='"+ response.id +"'>"+ response.full_name +"</options>"
-      jQuery('#media-upload-form #parent_id').append(option_selected);
-      jQuery('#published-media #parent_id').append(option);
-      jQuery('#new_folder').val('');
-    },
-    error: function(response, textStatus, xhr) {
-      console.log(response);
-      console.log(textStatus);
-    },
-    complete: function(response){
-      jQuery("#new-folder-dialog").removeClass('fetching');
-      jQuery("#new-folder-dialog").dialog('close');
-    }
+
+
+  function loadPublishedMedia() {
+    var parent_id = $('#published-media #parent_id').val();
+    var q = $('#published-media #q').val();
+    var url = $('#published-media').data('url');
+
+    $('#published-media .items').addClass('fetching');
+    $.ajax({
+      url: url,
+      data: {'parent_id': parent_id, 'q': q},
+      dataType: 'html',
+      success: function(response) {
+        $("#published-media .items").html(response);
+        $('#published-media .items').removeClass('fetching');
+        updateViewAllLinks();
+      },
+      error: function(response, textStatus, xhr) {
+        console.log(response);
+        console.log(textStatus);
+      }
+    });
+  }
+  // make it global for usage in media_upload.js.erb
+  window.loadPublishedMedia = loadPublishedMedia;
+
+
+  function updateViewAllLinks() {
+    var parent_id = $('#published-media #parent_id').val();
+    var q = $('#published-media #q').val();
+    $('#published-media .view-all').each(function(){
+      var key = $(this).data('key');
+      var params = {parent_id: parent_id, q: q, key: key}
+      var href = $(this).attr('href');
+      href = href.replace(/\?.*/, '?'+$.param(params));
+      $(this).attr('href', href);
+    });
+  }
+
+
+  $('#published-media #parent_id').change(function(){
+    loadPublishedMedia()
+  });
+
+
+  // Using a immediate function to make timer variable only visible for the keyup event
+  (function() {
+    var timer = null;
+
+    $("#published-media #q").keyup(function() {
+      if(this.value.length > 2) {
+        timer = setTimeout(loadPublishedMedia, 750);
+      }
+    }).keydown(function() {
+        clearTimeout(timer);
+    });
+  }) ();
+
+
+  $("#published-media #q").bind('notext', function(){
+    loadPublishedMedia()
+  });
+
+
+  $("#new-folder-dialog").submit(function( event ) {
+    var name = $('#new_folder').val();
+    var parent_id = $("#new-folder-dialog #parent_id").val();
+    $.ajax({
+      url: this.action,
+      type: 'POST',
+      data: {
+        'parent_id': parent_id,
+        'article': {'name': name, 'published': true},
+        'type': $('input[name=folder_type]:checked').val() },
+      dataType: 'json',
+      beforeSend: function(){$("#new-folder-dialog").addClass('fetching')},
+      success: function(response) {
+        var option_selected = "<option value='"+ response.id +"' selected='selected'>"+ response.full_name +"</options>"
+        var option = "<option value='"+ response.id +"'>"+ response.full_name +"</options>"
+        $('#media-upload-form #parent_id').append(option_selected);
+        $('#published-media #parent_id').append(option);
+        $('#new_folder').val('');
+      },
+      error: function(response, textStatus, xhr) {
+        console.log(response);
+        console.log(textStatus);
+      },
+      complete: function(response){
+        $("#new-folder-dialog").removeClass('fetching');
+        $("#new-folder-dialog").dialog('close');
+      }
+    });
+    return false;
+  });
+
+  $('.icon-vertical-toggle').click(function(){
+    $('#content').toggleClass('show-media-panel');
+    return false;
   });
-  return false;
-});
-
-jQuery('.text-editor-sidebar .header .icon-vertical-toggle').click(function(){
-  jQuery('#content').toggleClass('show-media-panel');
-  return false;
-});
-
-jQuery('#new-folder-button').click(function(){
-  jQuery('#new-folder-dialog').dialog({modal: true});
-  return false;
-});
+
+
+  $('#new-folder-button').click(function(){
+    $('#new-folder-dialog').dialog({modal: true});
+    return false;
+  });
+
+}) (jQuery);
@@ -0,0 +1,40 @@
+product_categories = {
+
+  autocomplete: {
+    search_url: '',
+    select_url: '',
+
+    load: function(elem) {
+      elem = jQuery(elem)
+
+      elem.autocomplete({
+        minLength: 3,
+        selectFirst: true,
+
+        //define callback to retrieve results
+        source: function(req, add) {
+          //pass request to server
+          //The alt attribute contains the wordpress callback action
+          var params = { term: req.term };
+          jQuery.getJSON(product_categories.autocomplete.search_url, params, function(data) {
+            add(data);
+          });
+        },
+
+        focus: function( event, ui ) {
+          jQuery(this).val(ui.item.label);
+          return false;
+        },
+
+        select: function(e, ui) {
+          jQuery('#categories-container').load(product_categories.autocomplete.select_url, {category_id: ui.item.value})
+
+          jQuery(this).val("")
+        },
+
+      });
+
+    },
+  },
+
+};
@@ -1560,6 +1560,32 @@ div.article-body p img {
 #content .blog-post .read-more a {
   margin: 0 10px;
 }
+
+#content #article .blog-posts .blog-post .article-compact-abstract{
+  position: relative;
+  float:left;
+  margin-left: 10px;
+  width: 100%;
+  word-wrap: break-word;
+}
+
+#content #article .blog-posts .blog-post .article-compact-image{
+  position:relative;
+  float:left;
+  width: 27%;
+  display: table-cell;
+  vertical-align: middle;
+  text-align: center;
+  margin-top: 15px;
+}
+
+#content #article .blog-posts .blog-post .article-compact-abstract-with-image{
+  position: relative;
+  float:left;
+  margin-left: 10px;
+  width: 70%;
+  word-wrap: break-word;
+}
 /* NOT PUBLISHED BLOG POSTS */
 .blog-post.not-published {
@@ -3829,6 +3855,11 @@ table.cms-articles .icon:hover {
 /* Folders */
+.article-body ul.folder-content {
+  list-style-type: none;
+  padding: 0;
+}
+
 .folder-content .folder-item img {
   vertical-align: middle;
   position: relative;
@@ -3894,6 +3925,62 @@ table.cms-articles .icon:hover {
   right: auto;
   left: auto;
 }
+
+/**************Folder Style**********************/
+
+.list-item{
+  font-family: arial;
+  color: #172738;
+}
+
+div.folder-description {
+  padding-bottom: 15px;
+}
+
+.list-item h2{
+  border-bottom:1px solid #ccc;
+  margin:0px;
+}
+
+.item-info{
+  border-top: 1px solid #ccc;
+  line-height: 25px;
+  padding:25px 20px;
+}
+
+.item-info a{
+  text-decoration: none !important;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.item-icon a {
+  float: left;
+  width: 50px;
+  height: 50px;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+span.item-type {
+  font-size: 12px;
+}
+
+.item-description{
+  display: block;
+  position:relative;
+  margin-left: 15%;
+  padding-left: 10px;
+}
+
+.item-date{
+  display:block;
+  position:relative;
+  font-size: 12px;
+  margin-left: 15%;
+  padding-left: 10px;
+}
+
 /************* enterprise homepage style *****************/
 div.event-info {
@@ -130,6 +130,19 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
   end
+  should 'save site article date format option' do
+    post :site_info, :environment => { :date_format => "numbers_with_year" }
+    assert_redirected_to :action => 'index'
+
+    assert_equal "numbers_with_year", Environment.default.date_format
+  end
+
+  should 'dont save site article date format option when a invalid option is passed' do
+    post :site_info, :environment => { :date_format => "invalid_format" }
+
+    assert_not_equal "invalid_format", Environment.default.date_format
+  end
+
   should 'set portal community' do
     e = Environment.default
     @controller.stubs(:environment).returns(e)
@@ -484,7 +484,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     should 'change postgresql schema' do
       uses_host 'schema1.com'
       Noosfero::MultiTenancy.expects(:on?).returns(true)
-      Noosfero::MultiTenancy.expects(:mapping).returns({ 'schema1.com' => 'schema1' })
+      Noosfero::MultiTenancy.expects(:mapping).returns({ 'schema1.com' => 'schema1' }).at_least_once
       exception = assert_raise(ActiveRecord::StatementInvalid) { get :index }
       assert_match /SET search_path TO schema1/, exception.message
     end
@@ -275,7 +275,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
-    assert_template "profile/_private_profile"
+    assert_template "shared/access_denied"
   end
   should 'not give access to private articles if logged in but not member' do
@@ -1540,12 +1540,12 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'use context method in extra toolbar actions on article from plugins' do
     class Plugin1 < Noosfero::Plugin
       def article_extra_toolbar_buttons(article)
-        if current_person.public?
+        if profile.public?
           {:title => 'some_title', :icon => 'some_icon', :url => '/someurl'}
         else
           {:title => 'another_title', :icon => 'another_icon', :url => '/anotherurl'}
         end
-      end
+       end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
@@ -1560,4 +1560,31 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/anotherurl" }}
   end
+  should  'show lead,image and title in compact blog visualization' do
+    community = Community.create(:name => 'test-community')
+    community.add_member(@profile)
+    community.save!
+
+    blog = community.articles.find_by_name("Blog")
+    blog.visualization_format = 'compact'
+    blog.save!
+
+    article = TinyMceArticle.create(:name => 'Article to be shared with images',
+                                    :body => 'This article should be shared with all social networks',
+                                    :profile => @profile,
+                                    :published => false,
+                                    :abstract => "teste teste teste",
+                                    :show_to_followers => true,
+                                    :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')} )
+    article.parent = blog
+    article.save!
+
+    login_as(@profile.identifier)
+
+
+    get :view_page, :profile => community.identifier, "page" => 'blog'
+
+    assert_tag :tag => 'div', :attributes => { :class => 'article-compact-image' }
+    assert_tag :tag => 'div', :attributes => { :class => 'article-compact-abstract-with-image' }
+  end
 end
@@ -86,22 +86,22 @@ class OrganizationsControllerTest &lt; ActionController::TestCase
   should 'activate organization profile' do
     organization = fast_create(Organization, :visible => false, :environment_id => environment.id)
-    assert organization.disabled?
+    assert !organization.visible?
     get :activate, {:id => organization.id}
     organization.reload
-    assert organization.enabled?
+    assert organization.visible
   end
   should 'deactivate organization profile' do
     organization = fast_create(Organization, :visible => true, :environment_id => environment.id)
-    assert organization.enabled?
+    assert organization.visible
     get :deactivate, {:id => organization.id}
     organization.reload
-    assert organization.disabled?
+    assert !organization.visible
   end
   should 'destroy organization profile' do
@@ -508,11 +508,15 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'show description of person' do
+    environment = Environment.default
+    environment.custom_person_fields = {:description => { :active => true, :required => false, :signup => false }}
+    environment.save!
+    environment.reload
     login_as(@profile.identifier)
-    @profile.description = 'Person\'s description'
-    @profile.save
+    @profile.description = 'Person description'
+    @profile.save!
     get :index, :profile => @profile.identifier
-    assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Person\'s description/
+    assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Person description/
   end
   should 'not show description of orgarnization if not filled' do
@@ -135,7 +135,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
   end
   def test_assets_routing
-    assert_routing('/assets/my-asset/a/b/c', :controller => 'search', :action => 'assets', :asset => 'my-asset', :category_path => 'a/b/c')
+    assert_routing('/search/assets/a/b/c', :controller => 'search', :action => 'assets', :category_path => 'a/b/c')
   end
   def test_content_view_with_dot
@@ -262,10 +262,6 @@ module NoosferoTestHelper
     arg
   end
-  def show_date(date)
-    date.to_s
-  end
-
   def strip_tags(html)
     html.gsub(/<[^>]+>/, '')
   end
@@ -564,18 +564,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal environment.theme, current_theme
   end
-  should 'trunc to 15 chars the big filename' do
-    assert_equal 'AGENDA(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15)
-  end
-
-  should 'trunc to default limit the big filename' do
-    assert_equal 'AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3')
-  end
-
-  should 'does not trunc short filename' do
-    assert_equal 'filename.mp3', short_filename('filename.mp3')
-  end
-
   should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do
     env = Environment.default
     env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false)
@@ -161,7 +161,16 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert_equal 'short', p.blog.visualization_format
   end
-  should 'allow only full and short as visualization_format' do
+  should 'update visualization_format setting to compact' do
+    p = create_user('testuser').person
+    p.articles << build(Blog, :profile => p, :name => 'Blog test')
+    blog = p.blog
+    blog.visualization_format = 'compact'
+    assert blog.save!
+    assert_equal 'compact', p.blog.visualization_format
+  end
+
+  should 'allow only full, short or compact as visualization_format' do
     blog = build(Blog, :name => 'blog')
     blog.visualization_format = 'wrong_format'
     blog.valid?
@@ -174,6 +183,10 @@ class BlogTest &lt; ActiveSupport::TestCase
     blog.visualization_format = 'full'
     blog.valid?
     assert !blog.errors[:visualization_format.to_s].present?
+
+    blog.visualization_format = 'compact'
+    blog.valid?
+    assert !blog.errors[:visualization_format.to_s].present?
   end
   should 'have posts' do
@@ -18,7 +18,7 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
     result = article_title(post)
     assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
   end
-  
+
   should 'display published-at for forum posts' do
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
     post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)
@@ -112,6 +112,42 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
     assert_match 'bt-bookmark.gif', addthis_image_tag
   end
+  should 'show date with mm/dd/yyyy' do
+    Environment.any_instance.stubs(:date_format).returns('numbers_with_year')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /2\/1\/2007/, result
+  end
+
+  should 'show date with mm/dd' do
+    Environment.any_instance.stubs(:date_format).returns('numbers')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /2\/1/, result
+  end
+
+  should 'show date with month name' do
+    Environment.any_instance.stubs(:date_format).returns('month_name')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /February 1/, result
+  end
+
+  should 'show date with month name and year' do
+    Environment.any_instance.stubs(:date_format).returns('month_name_with_year')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /February 1, 2007/, result
+  end
+
   protected
   include NoosferoTestHelper
   include ActionView::Helpers::TextHelper
@@ -146,4 +146,9 @@ class DatesHelperTest &lt; ActiveSupport::TestCase
     assert_equal Date.new(Date.today.year, Date.today.month, 1), build_date('', '')
   end
+  should 'show how long it has passed since a specific date' do
+    date = Time.zone.now
+    assert_equal show_date(date, false, false, true), time_ago_in_words(date)
+  end
+
 end
@@ -1703,4 +1703,32 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert !e.has_license?
   end
+  should 'validates_inclusion_of date format' do
+    environment = fast_create(Environment)
+
+    environment.date_format = "invalid_format"
+    environment.valid?
+    assert environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "numbers_with_year"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "numbers"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "month_name_with_year"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "month_name"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "past_time"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+  end
+
 end
@@ -8,27 +8,13 @@ class EventsHelperTest &lt; ActiveSupport::TestCase
     user = create_user('userwithevents').person
     stubs(:user).returns(user)
-    expects(:show_date_month).returns('')
-    expects(:_).with('Events for %s').returns('').once
-    expects(:_).with(' to ').returns('').twice
-    expects(:_).with('Place: ').returns('').twice
-    expects(:_).with('No events for this month').returns('').never
-
-    event1 = mock;
-    event1.expects(:display_to?).with(anything).returns(true).once;
-    event1.expects(:start_date).returns(Date.today).once
-    event1.expects(:end_date).returns(Date.today + 1.day).twice
-    event1.expects(:name).returns('Event 1').once
-    event1.expects(:url).returns({}).once
-    event1.expects(:address).returns('The Shire').times(3)
-
-    event2 = mock;
-    event2.expects(:display_to?).with(anything).returns(true).once
-    event2.expects(:start_date).returns(Date.today).once
-    event2.expects(:end_date).returns(Date.today + 1.day).twice
-    event2.expects(:name).returns('Event 2').once
-    event2.expects(:url).returns({}).once
-    event2.expects(:address).returns('Valfenda').times(3)
+    event1 = Event.new(name: "Event 1", start_date: Date.today, end_date: (Date.today + 1.day), address: 'The Shire')
+    event1.profile = user
+    event1.save
+
+    event2 = Event.new(name: 'Event 2', start_date: Date.today, end_date: (Date.today + 1.day), address: 'Valfenda')
+    event2.profile = user
+    event2.save
     result = list_events(Date.today, [event1, event2])
@@ -89,27 +89,14 @@ class FolderHelperTest &lt; ActionView::TestCase
     assert_not_includes result, article
   end
-  should 'list subitems as HTML content' do
+  should 'display the proper content icon' do
     profile = create_user('folder-owner').person
     folder = fast_create(Folder, {:name => 'Parent Folder', :profile_id => profile.id})
     article1 = fast_create(Article, {:name => 'Article1', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
     article2 = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
-    self.stubs(:params).returns({:npage => nil})
-
-    contents = folder.children.order('updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
-    expects(:user).returns(profile).at_least_once
-    expects(:list_type).returns(:folder).at_least_once
-    expects(:recursive).returns(false).at_least_once
-    expects(:pagination_links).with(anything, anything).returns('')
-    list = render 'shared/content_list', binding
-    expects(:render).with(:file => 'shared/content_list',
-      :locals => { :contents => contents, :recursive => false, :list_type => :folder }
-    ).returns(list)
-
-    result = list_contents(:contents=>contents)
-
-    assert_tag_in_string result, :tag => 'td', :descendant => { :tag => 'a', :attributes => { :href => /.*\/folder-owner\/my-article-[0-9]*(\?|$)/ } }, :content => /Article1/
-    assert_tag_in_string result, :tag => 'td', :descendant => { :tag => 'a', :attributes => { :href => /.*\/folder-owner\/my-article-[0-9]*(\?|$)/ } }, :content => /Article2/
+
+    assert_tag_in_string display_content_icon(article1), :tag => 'a', :attributes => { :href => /.*\/folder-owner\/my-article-[0-9]*(\?|$)/ }
+    assert_tag_in_string display_content_icon(article2), :tag => 'a', :attributes => { :href => /.*\/folder-owner\/my-article-[0-9]*(\?|$)/ }
   end
   should 'explictly advise if empty' do
@@ -7,6 +7,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
   include ContentViewerHelper
   include ActionView::Helpers::AssetTagHelper
   include ApplicationHelper
+  include ActionView::Helpers::DateHelper
   def setup
     @environment = Environment.default
@@ -41,7 +42,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     some_post = create(TextileArticle, :name => 'First post', :profile => profile, :parent => forum, :published => true, :author => author)
     assert some_post.comments.empty?
     out = last_topic_update(some_post)
-    assert_match some_post.updated_at.to_s, out
+    assert_match time_ago_in_words(some_post.updated_at), out
     assert_match /forum test author/, out
   end
@@ -53,10 +54,11 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     c = Comment.last
     assert_equal 2, some_post.comments.count
     out = last_topic_update(some_post)
-    assert_match c.created_at.to_s, out
+    result = time_ago_in_words(c.created_at)
+    assert_match result, out
     assert_match 'a2', out
-    assert_match(/#{Regexp.escape(c.created_at.to_s)} by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post))
+    assert_match(/#{result} by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post))
   end
   should "return last comment author's name from unauthenticated user" do
@@ -64,18 +66,15 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     some_post.comments << build(Comment, :name => 'John', :email => 'lenon@example.com', :title => 'test', :body => 'test')
     c = Comment.last
     out = last_topic_update(some_post)
-    assert_match "#{c.created_at.to_s} by John", out
+    result = time_ago_in_words(c.created_at)
+    assert_match "#{result} by John", out
     assert_match 'John', out
-    assert_match(/#{Regexp.escape(c.created_at.to_s)} by John/m, last_topic_update(some_post))
+    assert_match(/#{result} by John/m, last_topic_update(some_post))
   end
   protected
   include NoosferoTestHelper
-  def time_ago_as_sentence(t = Time.now)
-    t.to_s
-  end
-
 end
@@ -23,7 +23,7 @@ class PluginTest &lt; ActiveSupport::TestCase
   end
   should 'returns empty hash for class method extra_blocks by default if no blocks are defined on plugin' do
-    
+
     class SomePlugin1 < Noosfero::Plugin
     end
@@ -1,20 +0,0 @@
-require_relative "../test_helper"
-
-class NoosferoFilenamesTest < ActiveSupport::TestCase
-
-  include ShortFilename
-
-  should 'trunc to 15 chars the big filename' do
-    assert_equal 'AGENDA(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15)
-  end
-
-  should 'trunc to default limit the big filename' do
-    assert_equal 'AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3')
-  end
-
-  should 'does not trunc short filename' do
-    assert_equal 'filename.mp3', short_filename('filename.mp3')
-  end
-
-end
-
@@ -26,7 +26,7 @@ module PermissionCheck
     end
     def render_access_denied(c)
-      if c.respond_to?(:render_access_denied)
+      if c.respond_to?(:render_access_denied, true)
         c.send(:render_access_denied)
       else
         c.send(:render, :template => access_denied_template_path, :status => 403)
	@@ -35,7 +35,7 @@ class ManageProductsController < ApplicationController		@@ -35,7 +35,7 @@ class ManageProductsController < ApplicationController
35	end	35	end
36		36
37	def categories_for_selection	37	def categories_for_selection
38	- @category = Category.find(params[:category_id]) if params[:category_id]	38	+ @category = environment.categories.find_by_id params[:category_id]
39	@object_name = params[:object_name]	39	@object_name = params[:object_name]
40	if @category	40	if @category
41	@categories = @category.children	41	@categories = @category.children
	@@ -95,6 +95,20 @@ class ManageProductsController < ApplicationController		@@ -95,6 +95,20 @@ class ManageProductsController < ApplicationController
95	end	95	end
96	end	96	end
97		97
		98	+ def show_category_tree
		99	+ @category = environment.categories.find params[:category_id]
		100	+ render :partial => 'selected_category_tree'
		101	+ end
		102	+
		103	+ def search_categories
		104	+ @term = params[:term].downcase
		105	+ conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
		106	+ @categories = ProductCategory.all :conditions => conditions, :limit => 10
		107	+ render :json => (@categories.map do \|category\|
		108	+ {:label => category.name, :value => category.id}
		109	+ end)
		110	+ end
		111	+
98	def add_input	112	def add_input
99	@product = @profile.products.find(params[:id])	113	@product = @profile.products.find(params[:id])
100	@input = @product.inputs.build	114	@input = @product.inputs.build
	@@ -16,6 +16,7 @@ class MapsController < MyProfileController		@@ -16,6 +16,7 @@ class MapsController < MyProfileController
16		16
17	Profile.transaction do	17	Profile.transaction do
18	if profile.update_attributes!(params[:profile_data])	18	if profile.update_attributes!(params[:profile_data])
		19	+ BlockSweeper.expire_blocks profile.blocks.select{ \|b\| b.class == LocationBlock }
19	session[:notice] = _('Address was updated successfully!')	20	session[:notice] = _('Address was updated successfully!')
20	redirect_to :action => 'edit_location'	21	redirect_to :action => 'edit_location'
21	end	22	end
	@@ -1226,35 +1226,6 @@ module ApplicationHelper		@@ -1226,35 +1226,6 @@ module ApplicationHelper
1226	list.sort.inject(Hash.new(0)){\|h,i\| h[i] += 1; h }.collect{ \|x, n\| [n, connector, x].join(" ") }.sort	1226	list.sort.inject(Hash.new(0)){\|h,i\| h[i] += 1; h }.collect{ \|x, n\| [n, connector, x].join(" ") }.sort
1227	end	1227	end
1228		1228
1229	- #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
1230	- def time_ago_as_sentence(from_time, include_seconds = false)
1231	- to_time = Time.now
1232	- from_time = Time.parse(from_time.to_s)
1233	- from_time = from_time.to_time if from_time.respond_to?(:to_time)
1234	- to_time = to_time.to_time if to_time.respond_to?(:to_time)
1235	- distance_in_minutes = (((to_time - from_time).abs)/60).round
1236	- distance_in_seconds = ((to_time - from_time).abs).round
1237	- case distance_in_minutes
1238	- when 0..1
1239	- return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
1240	- case distance_in_seconds
1241	- when 0..4 then _('less than 5 seconds')
1242	- when 5..9 then _('less than 10 seconds')
1243	- when 10..19 then _('less than 20 seconds')
1244	- when 20..39 then _('half a minute')
1245	- when 40..59 then _('less than a minute')
1246	- else _('1 minute')
1247	- end
1248	-
1249	- when 2..44 then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
1250	- when 45..89 then _('about 1 hour ago')
1251	- when 90..1439 then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
1252	- when 1440..2879 then _('1 day ago')
1253	- when 2880..10079 then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
1254	- else show_time(from_time)
1255	- end
1256	- end
1257	-
1258	def comment_balloon(options = {}, &block)	1229	def comment_balloon(options = {}, &block)
1259	wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')	1230	wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
1260	(1..8).to_a.reverse.each { \|i\| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }	1231	(1..8).to_a.reverse.each { \|i\| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
1	module CommentHelper	1	module CommentHelper
		2	+ include DatesHelper
2		3
3	def article_title(article, args = {})	4	def article_title(article, args = {})
4	title = article.title	5	title = article.title
	@@ -2,6 +2,7 @@ module ContentViewerHelper		@@ -2,6 +2,7 @@ module ContentViewerHelper
2		2
3	include BlogHelper	3	include BlogHelper
4	include ForumHelper	4	include ForumHelper
		5	+ include DatesHelper
5		6
6	def display_number_of_comments(n)	7	def display_number_of_comments(n)
7	base_str = "<span class='comment-count hide'>#{n}</span>"	8	base_str = "<span class='comment-count hide'>#{n}</span>"
	@@ -24,8 +25,9 @@ module ContentViewerHelper		@@ -24,8 +25,9 @@ module ContentViewerHelper
24	unless args[:no_comments] \|\| !article.accept_comments	25	unless args[:no_comments] \|\| !article.accept_comments
25	comments = (" - %s") % link_to_comments(article)	26	comments = (" - %s") % link_to_comments(article)
26	end	27	end
		28	+ date_format = show_with_right_format_date article
27	title << content_tag('span',	29	title << content_tag('span',
28	- content_tag('span', show_date(article.published_at), :class => 'date') +	30	+ date_format +
29	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +	31	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	32	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	33	:class => 'created-at'
	@@ -34,6 +36,24 @@ module ContentViewerHelper		@@ -34,6 +36,24 @@ module ContentViewerHelper
34	title	36	title
35	end	37	end
36		38
		39	+ def show_with_right_format_date article
		40	+ date_format = article.environment.date_format
		41	+ use_numbers = false
		42	+ year = true
		43	+ left_time = false
		44	+ if date_format == 'numbers_with_year'
		45	+ use_numbers = true
		46	+ elsif date_format == 'numbers'
		47	+ use_numbers = true
		48	+ year = false
		49	+ elsif date_format == 'month_name'
		50	+ year = false
		51	+ elsif date_format == 'past_time'
		52	+ left_time = true
		53	+ end
		54	+ content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
		55	+ end
		56	+
37	def link_to_comments(article, args = {})	57	def link_to_comments(article, args = {})
38	return '' unless article.accept_comments?	58	return '' unless article.accept_comments?
39	reference_to_article number_of_comments(article), article, 'comments_list'	59	reference_to_article number_of_comments(article), article, 'comments_list'
1	module EventsHelper	1	module EventsHelper
2		2
		3	+ include DatesHelper
3	def list_events(date, events)	4	def list_events(date, events)
4	title = _('Events for %s') % show_date_month(date)	5	title = _('Events for %s') % show_date_month(date)
5	content_tag('h2', title) +	6	content_tag('h2', title) +
	@@ -28,7 +28,7 @@ class Article < ActiveRecord::Base		@@ -28,7 +28,7 @@ class Article < ActiveRecord::Base
28	def initialize(*params)	28	def initialize(*params)
29	super	29	super
30		30
31	- if !params.blank? && params.first.has_key?(:profile)	31	+ if !params.blank? && params.first.has_key?(:profile) && !params.first[:profile].blank?
32	profile = params.first[:profile]	32	profile = params.first[:profile]
33	self.published = false unless profile.public?	33	self.published = false unless profile.public?
34	end	34	end
	@@ -3,7 +3,17 @@		@@ -3,7 +3,17 @@
3	# domains.	3	# domains.
4	class Environment < ActiveRecord::Base	4	class Environment < ActiveRecord::Base
5		5
6	- attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount	6	+ attr_accessible :name, :is_default, :signup_welcome_text_subject,
		7	+ :signup_welcome_text_body, :terms_of_use,
		8	+ :message_for_disabled_enterprise, :news_amount_by_folder,
		9	+ :default_language, :languages, :description,
		10	+ :organization_approval_method, :enabled_plugins,
		11	+ :enabled_features, :redirection_after_login,
		12	+ :redirection_after_signup, :contact_email, :theme,
		13	+ :reports_lower_bound, :noreply_email,
		14	+ :signup_welcome_screen_body, :members_whitelist_enabled,
		15	+ :members_whitelist, :highlighted_news_amount,
		16	+ :portal_news_amount, :date_format
7		17
8	has_many :users	18	has_many :users
9		19
	@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base		@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base
14		24
15	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/	25	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/
16		26
		27	+ validates_inclusion_of :date_format,
		28	+ :in => [ 'numbers_with_year', 'numbers',
		29	+ 'month_name_with_year', 'month_name',
		30	+ 'past_time'],
		31	+ :if => :date_format
		32	+
17	def self.verify_filename(filename)	33	def self.verify_filename(filename)
18	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS	34	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
19	filename	35	filename
	@@ -3,6 +3,21 @@		@@ -3,6 +3,21 @@
3	<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>	3	<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
4	<% themes_options = Theme.system_themes.map {\|theme\| [theme.name, theme.id] }.sort %>	4	<% themes_options = Theme.system_themes.map {\|theme\| [theme.name, theme.id] }.sort %>
5	<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>	5	<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
		6	+
		7	+<%= labelled_form_field(
		8	+ _("Article's date format"),
		9	+ select(:environment, :date_format,
		10	+ options_for_select([
		11	+ [ _('mm/dd/yyyy'), 'numbers_with_year'],
		12	+ [ _('mm/dd'), 'numbers'],
		13	+ [ _('Month dd, yyyy'), 'month_name_with_year'],
		14	+ [ _('Month dd'), 'month_name'],
		15	+ [ _('X minutes/hours/days/months/years ago'), 'past_time']
		16	+ ], environment.date_format
		17	+ )
		18	+ )
		19	+) %>
		20	+
6	<%= required f.text_field(:reports_lower_bound, :size => 3) %>	21	<%= required f.text_field(:reports_lower_bound, :size => 3) %>
7	<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>	22	<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
8	<%= label_tag :languages, _('Available languages') %>	23	<%= label_tag :languages, _('Available languages') %>
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+<% @articles.each do \|article\| article = FilePresenter.for article %>
	2	+ <tr title="<%= article.title%>" >
	3	+ <td class="article-name">
	4	+ <%= link_to_article(article) %>
	5	+ </td>
	6	+ <% short_description = article.respond_to?(:short_description) ?
	7	+ article.short_description :
	8	+ article.class.short_description %>
	9	+ <td class="article-mime" title=<%= short_description.to_json %>>
	10	+ <%= short_description %>
	11	+ </td>
	12	+ <td class="last-update">
	13	+ <%= time_ago_in_words article.updated_at %>
	14	+ </td>
	15	+ <td class="article-controls">
	16	+ <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
	17	+ <%= button_without_text :eyes, _('Public view'), article.view_url %>
	18	+ <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
	19	+ <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
	20	+ <% if profile.home_page != article %>
	21	+ <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
	22	+ <% else %>
	23	+ <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>
	24	+ <% end %>
	25	+ <% end %>
	26	+ <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
	27	+ </td>
	28	+ </tr>
	29	+<% end %>