Merge branch 'master' into api

Rodrigo Souto
2 parents 0eba5453 a499eda4
Showing 67 changed files with 661 additions and 274 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
Gemfile
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/maps_controller.rb
app/helpers/application_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/helpers/manage_products_helper.rb
app/models/article.rb
app/models/event.rb
app/models/image.rb
app/models/organization.rb
app/models/uploaded_file.rb
app/models/user.rb
app/views/cms/_view_items.html.erb
app/views/cms/view.html.erb
app/views/content_viewer/_article_title.html.erb
@@ -0,0 +1,23 @@
+before_script:
+  - mkdir -p tmp/pids log
+  - script/noosfero-plugins disableall
+  - bundle check || bundle install
+# database
+  - cp config/database.yml.gitlab-ci config/database.yml
+  - createdb gitlab_ci_test || true
+  - bundle exec rake db:schema:load
+  - bundle exec rake db:migrate
+
+units:
+  script: 'bundle exec rake test:units'
+functionals:
+  script: 'bundle exec rake test:functionals'
+integration:
+  script: 'bundle exec rake test:integration'
+cucumber:
+  script: 'bundle exec rake cucumber'
+selenium:
+  script: 'bundle exec rake selenium'
+plugins:
+  script: 'bundle exec rake test:noosfero_plugins'
+
@@ -0,0 +1,35 @@
+language: ruby
+rvm:
+# for 2.2 support we need to upgrade the pg gem
+  - 2.1.6
+
+before_install:
+# dependencies
+  - sudo apt-get update
+  - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data openjdk-6-jre curl wget
+  - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
+# selenium support
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+before_script:
+  - mkdir -p tmp/pids log
+  - script/noosfero-plugins disableall
+  - bundle check || bundle install
+# database
+  - cp config/database.yml.travis config/database.yml
+  - psql -c 'create database myapp_test;' -U postgres
+  - bundle exec rake db:schema:load
+  - bundle exec rake db:migrate
+
+env:
+  - TASK=test:units
+  - TASK=test:functionals
+  - TASK=test:integration
+  - TASK=cucumber
+  - TASK=selenium
+  - TASK=test:noosfero_plugins
+
+script:
+  - bundle exec rake $TASK
+
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.21'
+gem 'rails',                    '~> 3.2.22'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.4.2'
@@ -44,6 +44,7 @@ group :test do
   gem 'rspec',                  '~> 2.14.0'
   gem 'rspec-rails',            '~> 2.14.1'
   gem 'mocha',                  '~> 1.1.0', :require => false
+  gem 'test-unit' if RUBY_VERSION >= '2.2.0'
 end
 group :cucumber do
@@ -94,6 +94,11 @@ class CmsController &lt; MyProfileController
     record_coming
     if request.post?
       @article.image = nil if params[:remove_image] == 'true'
+      if @article.image.present? && params[:article][:image_builder] &&
+        params[:article][:image_builder][:label]
+        @article.image.label = params[:article][:image_builder][:label]
+        @article.image.save!
+      end
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
@@ -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
@@ -1185,7 +1185,7 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     admin_link +
     manage_enterprises +
@@ -1233,7 +1233,7 @@ module ApplicationHelper
   def task_information(task)
     values = {}
-    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
+    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
     values.merge!(task.information[:variables]) if task.information[:variables]
@@ -16,7 +16,7 @@ module CommentHelper
         content_tag('span', show_date(article.published_at), :class => 'date') +
         content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
-        :class => 'created-at'
+        :class => 'publishing-info'
       )
     end
     title
@@ -30,7 +30,7 @@ module ContentViewerHelper
         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'
+        :class => 'publishing-info'
       )
     end
     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]
       )
@@ -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)
@@ -736,8 +736,9 @@ class Article &lt; ActiveRecord::Base
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
-  def lead
-    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+  def lead(length = nil)
+    content = abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+    length.present? ? content.truncate(length) : content
   end
   def short_lead
@@ -98,47 +98,19 @@ class Event &lt; Article
     start_date..(end_date||start_date)
   end
-  # FIXME this shouldn't be needed
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include DatesHelper
+  def first_paragraph
+    paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
   def to_html(options = {})
+    event = self
+    format = options[:format]
-    result = ''
-    html = ::Builder::XmlMarkup.new(:target => result)
-
-    html.div(:class => 'event-info' ) {
-      html.ul(:class => 'event-data' ) {
-        html.li(:class => 'event-dates' ) {
-          html.span _('When:')
-          html.text! show_period(start_date, end_date)
-        } if start_date.present? || end_date.present?
-        html.li {
-          html.span _('URL:')
-          html.a(self.link || "", 'href' => self.link || "")
-        } if self.link.present?
-        html.li {
-          html.span _('Address:')
-          html.text! self.address || ""
-        } if self.address.present?
-      }
-
-      # TODO: some good soul, please clean this ugly hack:
-      if self.body
-        html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
-      end
-    }
-
-    if self.body
-      if options[:format] == 'short'
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
-      else
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
-      end
+    proc do
+      render :file => 'content_viewer/event_page', :locals => { :event => event,
+        :format => format }
     end
-
-    result
   end
   def duration
@@ -23,7 +23,7 @@ class Image &lt; ActiveRecord::Base
   postgresql_attachment_fu
-  attr_accessible :uploaded_data
+  attr_accessible :uploaded_data, :label
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
@@ -171,6 +171,12 @@ class Organization &lt; Profile
     ]
   end
+  def short_name chars = 40
+    s = self.display_name
+    s = super(chars) if s.blank?
+    s
+  end
+
   def notification_emails
     emails = [contact_email].select(&:present?) + admins.map(&:email)
     if emails.empty?
-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
@@ -332,6 +332,8 @@ class User &lt; ActiveRecord::Base
     {
       'login' => self.login,
+      'name' => self.person.name,
+      'email' => self.email,
       'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
@@ -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,20 @@
+<% if @page.belongs_to_blog? || @page.belongs_to_forum?%>
+  <h1 class="title">
+    <% if no_link %>
+      <%= h(@page.title) %>
+    <% else %>
+      <%= link_to(@page.name, @page.url) %>
+    <% end %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+  <% unless @page.abstract.blank? %>
+    <div class="preview">
+      <%= @page.lead %>
+    </div>
+  <% end %>
+<% else %>
+  <h1 class="title">
+    <%= h(@page.title) %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+<% end %>
@@ -64,7 +64,7 @@
     <% end %>
     <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
-    <%= article_title(@page, :no_link => true) %>
+    <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
   </div>
 </div>
@@ -16,6 +16,6 @@
     </div>
   <% end %>
   <div class = <%= className %> >
-      <%= article.abstract.truncate(400) %>
+      <%= article.lead(400) %>
   </div>
 </div>
@@ -0,0 +1,29 @@
+<span class="publishing-info">
+  <span class="date">
+    <%= show_date(@page.published_at) %>
+  </span>
+  <span class="author">
+    <%= _(", by %s") % (@page.author ? link_to(@page.author_name, @page.author_url) : @page.author_name) %>
+  </span>
+<% unless @no_comments %>
+  <span class="comments">
+    <%= (" - %s") % link_to_comments(@page)%>
+  </span>
+<% end %>
+</span>
+
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
@@ -0,0 +1,41 @@
+<div class="event-card">
+  <div class="event-image">
+    <% if event.image %>
+      <%= image_tag(event.image.public_filename(:big)) %>
+    <% end %>
+  </div>
+  <div class="about-event">
+    <% if event.start_date.present? || event.end_date.present? %>
+      <span class="event-date">
+        <%= show_period(event.start_date, event.end_date) %>
+      </span>
+    <% end %>
+    <% if event.link.present? %>
+      <span class="event-link">
+        <%= link_to event.link, event.link %>
+      </span>
+    <% end %>
+    <% if event.address.present? %>
+      <span class="event-address">
+        <span>
+          <%= event.address %>
+        </span>
+      </span>
+    <% end %>
+  </div>
+</div>
+
+<div class="event-body">
+  <% if format == 'short' %>
+    <%= display_short_format event, :comments_link => false, :read_more_link => false %>
+  <% else %>
+    <% unless event.abstract.blank? %>
+      <div class="event-lead">
+        <%= event.article_lead %>
+      </div>
+    <% end %>
+    <div class="event-content">
+      <%= event.body %>
+    </div>
+  <% end %>
+</div>
@@ -24,22 +24,6 @@
   <%= render :partial => 'article_toolbar' %>
 </div>
-<% if @page.display_hits? || @page.license.present? %>
-  <div id='article-sub-header'>
-    <% if @page.display_hits? %>
-      <div id="article-hits">
-        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-      </div>
-    <% end %>
-
-    <% if @page.license.present? %>
-      <div id="article-license">
-        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -47,6 +31,12 @@
 <% cache(@page.cache_key(params, user, language)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
+    <% if @page.image.present? && !@page.event? %>
+      <div class="article-body-img">
+        <%= image_tag(@page.image.public_filename) %>
+        <p><%= @page.image.label%></p>
+      </div>
+    <% end %>
     <%= article_to_html(@page, options) %>
     <br style="clear:both" />
   </div> <!-- end class="article-body" -->
@@ -27,6 +27,7 @@
     <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
+      noosfero.profile = <%= (@profile.identifier if @profile).to_json %>
     </script>
   </head>
@@ -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) %>
-  <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
-  <%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
+<%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
+<%= labelled_form_field(_("Image Label:"), i.text_field(:label)) %>
+<%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
@@ -4,8 +4,8 @@
       <%= display_content_icon(content) %>
     </div>
     <span class="item-description">
-      <%= link_to(short_filename_upper_ext(content.name), content.url) %>
+      <%= link_to(content.name, content.url) %>
     </span>
     <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
   </div>
-</div>
 \ No newline at end of file
+</div>
@@ -0,0 +1,6 @@
+test: &TEST
+  adapter: postgresql
+  database: gitlab_ci_test
+  username: gitlab_ci_runner
+development:
+  <<: *TEST
@@ -0,0 +1,5 @@
+# From http://about.travis-ci.org/docs/user/database-setup/
+test:
+  adapter: postgresql
+  database: myapp_test
+  username: postgres
@@ -0,0 +1,13 @@
+# inherit from production
+require_relative 'production'
+
+Noosfero::Application.configure do
+
+  # expose errors
+  config.consider_all_requests_local = true
+
+  # ease debug
+  config.assets.compress = false
+
+end
+
@@ -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,8 @@
+class AddLabelToImage < ActiveRecord::Migration
+  def up
+    add_column :images, :label, :string, :default => ""
+  end
+  def down
+    remove_column :images, :label
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150602142030) do
+ActiveRecord::Schema.define(:version => 20150603182105) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -376,6 +376,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150602142030) do
     t.integer "width"
     t.integer "height"
     t.boolean "thumbnails_processed", :default => false
+    t.string  "label",                :default => ""
   end
   add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
@@ -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"
@@ -160,6 +160,7 @@ Feature: events
     When I am on /search/events
     Then I should see "Colivre.net's Events"
+
   @selenium
   Scenario: published events should be listed in the agenda too
     Given the following community
@@ -1,21 +0,0 @@
-module ShortFilename
-
-  def short_filename(filename, limit_chars = 43)
-    extname = File.extname(filename)
-    basename = File.basename(filename,extname)
-    return shrink(basename, extname, limit_chars) + extname
-  end
-
-  def short_filename_upper_ext(filename, limit_chars = 43)
-    extname = File.extname(filename)
-    display_name = shrink(File.basename(filename, extname), extname, limit_chars)
-     return extname.present? ? (display_name + ' - ' + extname.upcase.delete(".")) : display_name
-  end
-
-  def shrink(filename, extname, limit_chars)
-    return filename if filename.size <= limit_chars
-    str_complement = '(...)'
-    return filename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement
-  end
-
-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>
@@ -7,7 +7,7 @@ class Product
     url: proc{ |p, plugin| plugin.og_url_for p.url },
     gr_hascurrencyvalue: proc{ |p, plugin| p.price.to_f },
     gr_hascurrency: proc{ |p, plugin| p.environment.currency_unit },
-    title: proc{ |a, plugin| "#{p.name} - #{p.profile.name}" },
+    title: proc{ |p, plugin| "#{p.name} - #{p.profile.name}" if p },
     description: proc{ |p, plugin| ActionView::Base.full_sanitizer.sanitize p.description },
     image: proc{ |p, plugin| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
@@ -17,7 +17,7 @@ class Product
     see_also: [],
     site_name: proc{ |p, plugin| plugin.og_url_for p.profile.url },
-    updated_time: proc{ |p, plugin| p.updated_at.iso8601 },
+    updated_time: proc{ |p, plugin| p.updated_at.iso8601 if p.updated_at },
     'locale:locale' => proc{ |p, plugin| p.environment.default_language },
     'locale:alternate' => proc{ |p, plugin| p.environment.languages - [p.environment.default_language] if p.environment.languages },
@@ -12,7 +12,7 @@ class HomeControllerTest &lt; ActionController::TestCase
     @response   = ActionController::TestResponse.new
     Noosfero::Plugin.stubs(:all).returns([MetadataPlugin.name])
-    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new])
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new(@controller)])
   end
   should 'display meta tags for social media' do
@@ -0,0 +1,27 @@
+require 'test_helper'
+require 'home_controller'
+
+# Re-raise errors caught by the controller.
+class ManageProductsController; def rescue_action(e) raise e end; end
+
+class ManageProductsControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ManageProductsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @enterprise = fast_create(Enterprise, name: 'test', identifier: 'test_ent')
+    @user = create_user_with_permission('test_user', 'manage_products', @enterprise)
+    @environment = @enterprise.environment
+    @environment.enable('products_for_enterprises')
+    login_as :test_user
+
+    Noosfero::Plugin.stubs(:all).returns([MetadataPlugin.name])
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new(@controller)])
+  end
+
+  should "not crash on new products" do
+    get :new, profile: @enterprise.identifier
+  end
+
+end
 class ShoppingCartPlugin < Noosfero::Plugin
+  include ModalHelper
+  include ActionView::Helpers::UrlHelper
   class << self
     def plugin_name
@@ -63,4 +65,8 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
     buttons
   end
+
+  def controller
+    context
+  end
 end
@@ -42,7 +42,7 @@ module ShoppingCartPlugin::CartHelper
       else
         delivery = Product.new(:name => delivery_option || _('Delivery'), :price => settings.delivery_options[delivery_option])
       end
-      delivery.save(false)
+      delivery.save(validate: false)
       items << [delivery.id, '']
     end
@@ -41,5 +41,19 @@ class ShoppingCartPlugin::CartHelperTest &lt; ActiveSupport::TestCase
     assert_equal "#{environment.currency_unit}13#{environment.currency_separator}70", float_to_currency_cart(value,environment)
   end
-end
+  should 'return a table of items' do
+    enterprise = Enterprise.new(name: "Test Enterprise", identifier: "test-enterprise")
+    enterprise.environment = Environment.default
+    enterprise.save!
+
+    product_category = fast_create(ProductCategory, :name => 'Products')
+    product = fast_create(Product, :name => 'test product1', :product_category_id => product_category.id, :profile_id => enterprise.id)
+    setting = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    setting.delivery = true
+    setting.save!
+
+    assert_match 'table id="cart-items-table"', items_table([product], enterprise)
+    assert_match '<td>test product1</td>', items_table([product], enterprise)
+  end
+end
@@ -5,7 +5,7 @@
       <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a>
       <ul class="cart-items"></ul>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
-      <a href="/plugin/shopping_cart/buy" class="cart-buy modal"><%=_('Shopping checkout')%></a>
+      <%= modal_link_to _('Shopping checkout'), { controller: 'shopping_cart_plugin', action: 'buy' }, { class: "cart-buy modal" } %>
     </div>
     <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
       <span class="str-show"><%=_('Show basket')%></span>
@@ -24,7 +24,6 @@
   <% end %>
   <% delivery_option = @settings.delivery_options.first && @settings.delivery_options.first.first %>
   <%= items_table(@cart[:items], @profile, delivery_option) %>
-  <%= link_to_function '', "noosfero.modal.close();", :class => 'cart-box-close icon-cancel' %>
 </div>
 <%= javascript_include_tag '../plugins/shopping_cart/buy' %>
@@ -17,7 +17,6 @@
     </div>
   <% end %>
   <%= items_table(session[:cart][:items], profile) %>
-  <%= link_to_function '', "noosfero.modal.close();", :class => 'cart-box-close icon-cancel' %>
 </div>
 <script type="text/javascript">
@@ -19,12 +19,14 @@ class SocialSharePrivacyPlugin &lt; Noosfero::Plugin
   def article_extra_contents(article)
     proc do
       settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin)
+      modules = settings.get_setting(:networks).map { |service| "/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }
       locale = FastGettext.locale
-      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') + 
-      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
-      javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) + 
-      (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
-      javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
+      javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') +
+      javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
+      (modules.present? ? javascript_include_tag(*modules) : '') +
+      javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/facebook.js") +
+      (locale != 'en' ? javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
+      javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '/plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
       content_tag(:div, '', :class => "social-buttons")
     end
   end
@@ -23,7 +23,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
     assert_tag :tag => 'div', :attributes => {:class => "social-buttons"}
   end
@@ -34,8 +34,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
   end
   should 'add javascript with string translations if not english' do
@@ -45,12 +45,12 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
     FastGettext.stubs(:locale).returns('en')
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_no_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
+    assert_no_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
   end
 end
@@ -1061,15 +1061,18 @@ hr.pre-posts, hr.sep-posts {
   text-decoration: none;
 }
-#content .main-block .created-at {
+#content .main-block .publishing-info {
   text-align: left;
   color: #AAA;
+  font-size: 11px;
+  /*padding-top: 20px;*/
+  margin-bottom:15px;
 }
-#content .main-block .created-at a {
+#content .main-block .publishing-info a {
   color: #AAA;
   text-decoration: none;
 }
-#content .main-block .created-at a:hover {
+#content .main-block .publishing-info a:hover {
   color: #555;
   text-decoration: underline;
 }
@@ -1401,3 +1404,129 @@ 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;
+}
+
+/************************* Article Page *****************************/
+
+#article-header .preview {
+  font-size: 15px;
+}
+
+.article-body-img {
+  float: left;
+  margin-right: 20px;
+  margin-top: 5px;
+}
+
+#content #article .article-body .article-body-img img {
+  height: auto;
+  width: auto;
+  min-height: 120px;
+  max-height: 180px;
+  max-width: 250px;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+#content #article .article-body .article-body-img p {
+  margin-bottom: 10px;
+  font-size: 10px;
+  min-height: 20px;
+}
+/* Noosfero Events */
+
+.event-card {
+  float: left;
+  padding-top: 25px;
+  width: 494px;
+  height: 116px;
+  background-repeat: no-repeat;
+  margin-bottom: 30px;
+}
+
+.event-image {
+  position: relative;
+  float: left;
+  padding-right: 22px;
+  max-width: 130px;
+  height: 130px;
+}
+
+#content #article .article-body img{
+  max-height: 100%;
+}
+
+.about-event {
+  position: relative;
+  float: left;
+  height: 160px;
+  width: 300px;
+  max-width: 300px;
+}
+
+.about-event > span {
+  display: block;
+  max-width: inherit;
+  margin-left: 20px;
+  padding-left: 21px;
+  line-height: 13px;
+  margin-right: 11px;
+}
+
+.about-event .event-date {
+  margin-top: 3px;
+}
+
+.about-event .event-address {
+  margin-top: 19px;
+}
+
+.about-event .event-address span {
+  display: block;
+  margin-left: 0px;
+  margin-top: 4.4px;
+  line-height: 14px;
+}
+
+.event-date {
+  background: url('/images/calendar_date_select/calendar-icon.png') no-repeat left center;
+  padding: 5px;
+}
+
+.event-link {
+  background: url('/images/globe-icon.png') no-repeat left center;
+  margin-top: 18px;
+}
+
+.event-link a {
+}
+
+.event-address {
+  background: url('/images/icone_pin.png') no-repeat left top;
+}
+
+.event-body {
+  float: left;
+}
+
+.event-body .event-lead {
+  font-size: 15px;
+}
+
+.event-body .event-content p {
+  margin-top: 20px;
+  width: 494px;
+  padding-left: 2px;
+}
@@ -14,6 +14,7 @@
 *= require jquery.ba-bbq.min.js
 *= require jquery.tokeninput.js
 *= require jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js
+*= require select-or-die/_src/selectordie
 *= require inputosaurus.js
 *= require reflection.js
 *= require rails.js
@@ -830,7 +831,7 @@ Array.min = function(array) {
 function hideAndGetUrl(link) {
   document.body.style.cursor = 'wait';
-  link.hide();
+  jQuery(link).hide();
   url = jQuery(link).attr('href');
   jQuery.get(url, function( data ) {
     document.body.style.cursor = 'default';
@@ -1178,7 +1179,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;
@@ -1206,4 +1210,3 @@ function fullscreenPageLoad(itemId){
     }
   });
 }
-
@@ -345,7 +345,7 @@ $.TokenList = function (input, url_or_data, options) {
     dropdown.appendTo("body");
     if (!settings.permanentDropdown)
         dropdown.appendTo("body");
-    else 
+    else
         $(input).after(dropdown.show());
     if (settings.permanentDropdown || settings.showAllResults) {
@@ -382,7 +382,7 @@ $.TokenList = function (input, url_or_data, options) {
     if(li_data && li_data.length) {
         $.each(li_data, function (index, value) {
             insert_token(value);
-            checkTokenLimit();
+            checkTokenLimit({init: true});
         });
     }
@@ -425,12 +425,12 @@ $.TokenList = function (input, url_or_data, options) {
     // Private functions
     //
-    function checkTokenLimit() {
+    function checkTokenLimit(options) {
         if(settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
             input_box.hide();
             hide_dropdown();
             return;
-        } else {
+        } else if (options && !options.init) {
             input_box.focus();
         }
     }
@@ -618,7 +618,7 @@ $.TokenList = function (input, url_or_data, options) {
             if (!settings.showAllResults)
               dropdown.empty();
             selected_dropdown_item = null;
-        } 
+        }
         if (settings.showAllResults)
             show_dropdown_hint();
     }
@@ -728,7 +728,7 @@ $.TokenList = function (input, url_or_data, options) {
             item.addClass(settings.classes.selectedDropdownItem);
             selected_dropdown_item = item.get(0);
-            isBefore = item[0].offsetTop <= (dropdown[0].scrollTop + dropdown[0].scrollWidth); 
+            isBefore = item[0].offsetTop <= (dropdown[0].scrollTop + dropdown[0].scrollWidth);
             isAfter = item[0].offsetTop >= dropdown[0].scrollTop;
             visible = isBefore && isAfter;
             if (!visible) {
@@ -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("")
+        },
+
+      });
+
+    },
+  },
+
+};
@@ -1054,6 +1054,11 @@ code input {
   margin-top: 10px;
   display: none;
 }
+
+#change-image {
+  display: table-caption;
+}
+
 .zoomable-image {
   position: relative;
   display: inline-block;
@@ -1520,13 +1525,13 @@ a.comment-picture {
   text-align: right;
   color: gray;
 }
-#content .created-at {
+#content .publishing-info {
   color: gray;
   font-size: 12px;
   display: block;
   text-align: right;
 }
-#content .blog-post .created-at {
+#content .blog-post .publishing-info {
   text-align: left;
 }
 #content #article .pagination .prev_page {
@@ -1598,7 +1603,7 @@ div.article-body p img {
 .blog-post.not-published a {
   text-decoration: none;
 }
-#content .blog-post.not-published .created-at {
+#content .blog-post.not-published .publishing-info {
   text-align: left;
 }
 .blog-post.not-published .metadata {
@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-# These just forward the signals to the whole process group and
-# then immediately exit.
-pgid = Process.getpgid Process.pid
-Signal.trap(:TERM) { Process.kill(:TERM, -pgid); exit }
-Signal.trap(:INT)  { Process.kill(:INT,  -pgid); exit }
-
-def run command, options = {}
-  command = "#{command} 2>&1 > /dev/null" if options[:output] == false
-  #command = "time #{command}" unless options[:runtime] == false
-  puts "== #{command}"
-  system command
-end
-
-@id = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
-@db = "gitlab-ci-#{@id}"
-
-def config
-  require 'yaml'
-  db_config = {
-    'adapter' => 'postgresql', 'encoding' => 'unicode', 
-    'database' => @db, 'username' => ENV['USER'],
-  }
-  File.write 'config/database.yml', YAML.dump('test' => db_config, 'development' => db_config)
-end
-
-def prepare
-  run("createdb #{@db}") and
-  run('mkdir -p tmp/pids log') and
-  run('bundle check || bundle install') and
-  run('rake db:schema:load', output: false) and
-  run('script/noosfero-plugins disableall') and
-  run('rake db:migrate')
-end
-
-def test
-  %w[
-    test:units
-    test:functionals
-    test:integration
-    cucumber 
-    test:noosfero_plugins
-  ].each do |task|
-    run "rake #{task}"
-  end
-end
-
-def cleanup
-  run "dropdb #{@db}"
-end
-
-ret = config and prepare and test
-cleanup
-
-exit (if ret == true then 0 else 1 end)
@@ -80,4 +80,5 @@ packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debi
 run sudo apt-get -y install $packages
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
+run rm -f Gemfile.lock
 run bundle --local
@@ -223,6 +223,20 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal profile, a.last_changed_by
   end
+  should 'be able to set label to article image' do
+    login_as(profile.identifier)
+    post :new, :type => TextileArticle.name, :profile => profile.identifier,
+         :article => {
+           :name => 'adding-image-label',
+           :image_builder => {
+             :uploaded_data => fixture_file_upload('/files/tux.png', 'image/png'),
+             :label => 'test-label'
+           }
+         }
+     a = Article.last
+     assert_equal a.image.label, 'test-label'
+  end
+
   should 'edit by using the correct template to display the editor depending on the mime-type' do
     a = profile.articles.build(:name => 'test document')
     a.save!
@@ -318,6 +332,20 @@ class CmsControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'be able to edit an image label' do
+    image = fast_create(Image, :content_type => 'image/png', :filename => 'event-image.png', :label => 'test_label', :size => 1014)
+    article = fast_create(Article, :profile_id => profile.id, :name => 'test_label_article', :body => 'test_content')
+    article.image = image
+    article.save
+    assert_not_nil article
+    assert_not_nil article.image
+    assert_equal 'test_label', article.image.label
+
+    post :edit, :profile => profile.identifier, :id => article.id, :article => {:image_builder => { :label => 'test_label_modified'}}
+    article.reload
+    assert_equal 'test_label_modified', article.image.label
+  end
+
    should 'be able to upload more than one file at once' do
     assert_difference 'UploadedFile.count', 2 do
       post :upload_files, :profile => profile.identifier, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain'), fixture_file_upload('/files/rails.png', 'text/plain')]
@@ -124,6 +124,19 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => { :id => 'article-tags' }, :descendant => { :content => /This article's tags:/ }
   end
+  should "display image label on article image" do
+    page = TinyMceArticle.create!(
+             :profile => profile,
+             :name => 'myarticle',
+             :image_builder => {
+               :uploaded_data => fixture_file_upload('/files/tux.png', 'image/png'),
+               :label => 'test-label'
+             }
+           )
+    get :view_page, page.url
+    assert_match /test-label/, @response.body
+  end
+
   should "not display current article's tags" do
     page = profile.articles.create!(:name => 'myarticle', :body => 'test article')
@@ -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)
@@ -109,17 +109,20 @@ class EventTest &lt; ActiveSupport::TestCase
   end
   should 'provide nice display format' do
-    e = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => 'my somewhat short description')
+    event = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => '<p>my somewhat short description</p>')
+    display = instance_eval(&event.to_html)
-    assert_tag_in_string e.to_html, :content => Regexp.new("January 1, 2008")
-    assert_tag_in_string e.to_html, :content => 'my somewhat short description'
-    assert_tag_in_string e.to_html, :tag => 'a', :attributes => { :href  => 'http://www.myevent.org' }, :content => 'http://www.myevent.org'
+    assert_tag_in_string display, :content => Regexp.new("January 1, 2008")
+    assert_tag_in_string display, :content => Regexp.new('my somewhat short description')
+    assert_tag_in_string display, :content => Regexp.new('http://www.myevent.org')
   end
   should 'not crash when body is blank' do
     e = Event.new
     assert_nil e.body
-    assert_no_match(/_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____/, e.to_html)
+    assert_nothing_raised  do
+      instance_eval(&e.to_html)
+    end
   end
   should 'add http:// to the link if not already present' do
@@ -141,10 +144,19 @@ class EventTest &lt; ActiveSupport::TestCase
     assert_equal '', a.link
   end
+  should 'get the first paragraph' do
+    profile = create_user('testuser').person
+    event = create(Event, :profile => profile, :name => 'test',
+    :body => '<p>first paragraph </p><p>second paragraph </p>',
+    :link => 'www.colivre.coop.br', :start_date => Date.today)
+
+    assert_match '<p>first paragraph </p>', event.first_paragraph
+  end
+
   should 'not escape HTML in body' do
     a = build(Event, :body => '<p>a paragraph of text</p>', :link => 'www.gnu.org')
-    assert_match '<p>a paragraph of text</p>', a.to_html
+    assert_match '<p>a paragraph of text</p>', instance_eval(&a.to_html)
   end
   should 'filter HTML in body' do
@@ -324,7 +336,7 @@ class EventTest &lt; ActiveSupport::TestCase
     environment = fast_create(Environment)
     environment.languages = nil
     profile = fast_create(Person, :environment_id => environment.id)
- 
+
     event = Event.new(:profile => profile)
     assert !event.translatable?
@@ -337,11 +349,11 @@ class EventTest &lt; ActiveSupport::TestCase
     event = fast_create(Event, :profile_id => profile.id)
     assert !event.translatable?
- 
+
     environment.languages = ['en','pt','fr']
     environment.save
-    event.reload 
+    event.reload
     assert event.translatable?
   end
@@ -1,34 +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
-
-  should 'highlight the file extansion' do
-    assert_equal 'AGENDA(...) - MP3', short_filename_upper_ext('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15)
-
-    assert_equal 'AGENDA - MP3', short_filename_upper_ext('AGENDA.mp3',15)
-  end
-
-  should 'return the full filename if its size is smaller than the limit' do
-    assert_equal 'AGENDA', shrink('AGENDA', 'mp3', 15)
-  end
-
-  should 'shrink the filename if its size is bigger than the limit' do
-    assert_equal 'AGENDA(...)', shrink('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA', 'mp3', 14)
-  end
-
-end
-
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+before_script:
	2	+ - mkdir -p tmp/pids log
	3	+ - script/noosfero-plugins disableall
	4	+ - bundle check \|\| bundle install
	5	+# database
	6	+ - cp config/database.yml.gitlab-ci config/database.yml
	7	+ - createdb gitlab_ci_test \|\| true
	8	+ - bundle exec rake db:schema:load
	9	+ - bundle exec rake db:migrate
	10	+
	11	+units:
	12	+ script: 'bundle exec rake test:units'
	13	+functionals:
	14	+ script: 'bundle exec rake test:functionals'
	15	+integration:
	16	+ script: 'bundle exec rake test:integration'
	17	+cucumber:
	18	+ script: 'bundle exec rake cucumber'
	19	+selenium:
	20	+ script: 'bundle exec rake selenium'
	21	+plugins:
	22	+ script: 'bundle exec rake test:noosfero_plugins'
	23	+
@@ -0,0 +1,35 @@		@@ -0,0 +1,35 @@
	1	+language: ruby
	2	+rvm:
	3	+# for 2.2 support we need to upgrade the pg gem
	4	+ - 2.1.6
	5	+
	6	+before_install:
	7	+# dependencies
	8	+ - sudo apt-get update
	9	+ - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data openjdk-6-jre curl wget
	10	+ - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
	11	+# selenium support
	12	+ - export DISPLAY=:99.0
	13	+ - sh -e /etc/init.d/xvfb start
	14	+
	15	+before_script:
	16	+ - mkdir -p tmp/pids log
	17	+ - script/noosfero-plugins disableall
	18	+ - bundle check \|\| bundle install
	19	+# database
	20	+ - cp config/database.yml.travis config/database.yml
	21	+ - psql -c 'create database myapp_test;' -U postgres
	22	+ - bundle exec rake db:schema:load
	23	+ - bundle exec rake db:migrate
	24	+
	25	+env:
	26	+ - TASK=test:units
	27	+ - TASK=test:functionals
	28	+ - TASK=test:integration
	29	+ - TASK=cucumber
	30	+ - TASK=selenium
	31	+ - TASK=test:noosfero_plugins
	32	+
	33	+script:
	34	+ - bundle exec rake $TASK
	35	+
	@@ -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
	@@ -1185,7 +1185,7 @@ module ApplicationHelper		@@ -1185,7 +1185,7 @@ module ApplicationHelper
1185	pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))	1185	pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1186	end	1186	end
1187		1187
1188	- (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +	1188	+ (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
1189	render_environment_features(:usermenu) +	1189	render_environment_features(:usermenu) +
1190	admin_link +	1190	admin_link +
1191	manage_enterprises +	1191	manage_enterprises +
	@@ -1233,7 +1233,7 @@ module ApplicationHelper		@@ -1233,7 +1233,7 @@ module ApplicationHelper
1233		1233
1234	def task_information(task)	1234	def task_information(task)
1235	values = {}	1235	values = {}
1236	- values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor	1236	+ values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
1237	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject	1237	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
1238	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject	1238	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
1239	values.merge!(task.information[:variables]) if task.information[:variables]	1239	values.merge!(task.information[:variables]) if task.information[:variables]
	@@ -16,7 +16,7 @@ module CommentHelper		@@ -16,7 +16,7 @@ module CommentHelper
16	content_tag('span', show_date(article.published_at), :class => 'date') +	16	content_tag('span', show_date(article.published_at), :class => 'date') +
17	content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +	17	content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
18	content_tag('span', comments, :class => 'comments'),	18	content_tag('span', comments, :class => 'comments'),
19	- :class => 'created-at'	19	+ :class => 'publishing-info'
20	)	20	)
21	end	21	end
22	title	22	title
	@@ -30,7 +30,7 @@ module ContentViewerHelper		@@ -30,7 +30,7 @@ module ContentViewerHelper
30	date_format +	30	date_format +
31	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') +
32	content_tag('span', comments, :class => 'comments'),	32	content_tag('span', comments, :class => 'comments'),
33	- :class => 'created-at'	33	+ :class => 'publishing-info'
34	)	34	)
35	end	35	end
36	title	36	title
	@@ -98,47 +98,19 @@ class Event < Article		@@ -98,47 +98,19 @@ class Event < Article
98	start_date..(end_date\|\|start_date)	98	start_date..(end_date\|\|start_date)
99	end	99	end
100		100
101	- # FIXME this shouldn't be needed
102	- include ActionView::Helpers::TagHelper
103	- include ActionView::Helpers::UrlHelper
104	- include DatesHelper	101	+ def first_paragraph
		102	+ paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
		103	+ paragraphs.empty? ? '' : paragraphs.first.to_html
		104	+ end
105		105
106	def to_html(options = {})	106	def to_html(options = {})
		107	+ event = self
		108	+ format = options[:format]
107		109
108	- result = ''
109	- html = ::Builder::XmlMarkup.new(:target => result)
110	-
111	- html.div(:class => 'event-info' ) {
112	- html.ul(:class => 'event-data' ) {
113	- html.li(:class => 'event-dates' ) {
114	- html.span _('When:')
115	- html.text! show_period(start_date, end_date)
116	- } if start_date.present? \|\| end_date.present?
117	- html.li {
118	- html.span _('URL:')
119	- html.a(self.link \|\| "", 'href' => self.link \|\| "")
120	- } if self.link.present?
121	- html.li {
122	- html.span _('Address:')
123	- html.text! self.address \|\| ""
124	- } if self.address.present?
125	- }
126	-
127	- # TODO: some good soul, please clean this ugly hack:
128	- if self.body
129	- html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
130	- end
131	- }
132	-
133	- if self.body
134	- if options[:format] == 'short'
135	- result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
136	- else
137	- result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
138	- end	110	+ proc do
		111	+ render :file => 'content_viewer/event_page', :locals => { :event => event,
		112	+ :format => format }
139	end	113	end
140	-
141	- result
142	end	114	end
143		115
144	def duration	116	def duration
	@@ -23,7 +23,7 @@ class Image < ActiveRecord::Base		@@ -23,7 +23,7 @@ class Image < ActiveRecord::Base
23		23
24	postgresql_attachment_fu	24	postgresql_attachment_fu
25		25
26	- attr_accessible :uploaded_data	26	+ attr_accessible :uploaded_data, :label
27		27
28	def current_data	28	def current_data
29	File.file?(full_filename) ? File.read(full_filename) : nil	29	File.file?(full_filename) ? File.read(full_filename) : nil
	@@ -171,6 +171,12 @@ class Organization < Profile		@@ -171,6 +171,12 @@ class Organization < Profile
171	]	171	]
172	end	172	end
173		173
		174	+ def short_name chars = 40
		175	+ s = self.display_name
		176	+ s = super(chars) if s.blank?
		177	+ s
		178	+ end
		179	+
174	def notification_emails	180	def notification_emails
175	emails = [contact_email].select(&:present?) + admins.map(&:email)	181	emails = [contact_email].select(&:present?) + admins.map(&:email)
176	if emails.empty?	182	if emails.empty?