app/views/tasks/index.html.erb

Augusto_Serpro
2 parents f34aaed3 c523fd74
Showing 405 changed files with 39044 additions and 10438 deletions Show diff stats
Gemfile
INSTALL.md
INSTALL.multitenancy.md
SECURITY.md
app/controllers/admin/admin_panel_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/contact_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/home_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/block_helper.rb
app/helpers/boxes_helper.rb
app/helpers/categories_helper.rb
app/helpers/chat_helper.rb
app/helpers/colorbox_helper.rb
@@ -2,9 +2,7 @@ source &quot;https://rubygems.org&quot;
 gem 'rails',                    '~> 3.2.21'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
-gem 'acts-as-taggable-on',      '~> 3.0.2'
-gem 'prototype-rails',          '~> 3.2.1'
-gem 'prototype_legacy_helper',  '0.0.0', :path => 'vendor/prototype_legacy_helper'
+gem 'acts-as-taggable-on',      '~> 3.4.2'
 gem 'rails_autolink',           '~> 1.1.5'
 gem 'pg',                       '~> 0.13.2'
 gem 'rmagick',                  '~> 2.13.1'
@@ -13,19 +11,15 @@ gem &#39;will_paginate&#39;,            &#39;~&gt; 3.0.3&#39;
 gem 'ruby-feedparser',          '~> 0.7'
 gem 'daemons',                  '~> 1.1.5'
 gem 'thin',                     '~> 1.3.1'
-gem 'hpricot',                  '~> 0.8.6'
-gem 'nokogiri',                 '~> 1.6.0'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
 gem 'grape',					'~> 0.2.1'
 gem 'rest-client',              '~> 1.6.7'
 gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
 gem 'locale',                   '~> 2.0.5'
-
 gem 'whenever', :require => false
-
-# FIXME list here all actual dependencies (i.e. the ones in debian/control),
-# with their GEM names (not the Debian package names)
+gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
  
 group :production do
   gem 'dalli', '~> 2.7.0'
@@ -45,6 +39,9 @@ group :cucumber do
   gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
+# Requires custom dependencies
+eval(File.read('config/Gemfile'), binding) rescue nil
+
 # include gemfiles from enabled plugins
 # plugins in baseplugins/ are not included on purpose. They should not have any
 # dependencies.
@@ -21,7 +21,7 @@ Noosfero is written in Ruby with the &quot;[Rails framework](http://www.rubyonrails.o
 You need to install some packages Noosfero depends on. On Debian GNU/Linux or Debian-based systems, all of these packages are available through the Debian archive. You can install them with the following command:
  
     # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
-      libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
+      libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby \
       libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
       tango-icon-theme
  
@@ -40,7 +40,6 @@ On other systems, they may or may not be available through your regular package 
 * Daemons - http://daemons.rubyforge.org
 * Thin: http://code.macournoyer.com/thin
 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
-* Hpricot: http://hpricot.com
  
 If you manage to install Noosfero successfully on other systems than Debian,
 please feel free to contact the Noosfero development mailing with the
@@ -26,7 +26,7 @@ The file config/database.yml must follow a structure in order to achieve multite
  
 Each "hosted" environment must have an entry like this:
  
-    env1_production:
+    env1_production: &DEFAULT
       adapter: postgresql
       encoding: unicode
       database: noosfero
@@ -61,7 +61,7 @@ The &quot;hosted&quot; environments define, besides the `schema_search_path`, a list of do
 You must also tell the application which is the default environment.
  
     production:
-      env1_production
+      <<: *DEFAULT
  
 On the example above there are only three hosted environments, but it can be more than three. The schemas `env2` and `env3` must already exist in the same database of the hosting environment. As postgres user, you can create them typing:
  
@@ -0,0 +1,10 @@
+# Noosfero security
+
+## Reporting security issues in Noosfero
+
+Security vulnerabilities should be reported via an email to
+noosfero-security@listas.softwarelivre.org, which ia a private mailing list.
+Reported problems will be published after fixes are available.
+
+The members of the mailing list are people who provide Noosfero (Noosfero
+committers, mainly).
@@ -87,6 +87,6 @@ class AdminPanelController &lt; AdminController
     scope = scope.order('name ASC')
  
     @q = params[:q]
-    @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
+    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
   end
 end
@@ -33,6 +33,7 @@ class ApplicationController &lt; ActionController::Base
       unless environment.access_control_allow_methods.blank?
         response.headers["Access-Control-Allow-Methods"] = environment.access_control_allow_methods
       end
+      response.headers["Access-Control-Allow-Credentials"] = 'true'
     elsif environment.restrict_to_access_control_origins
       render_access_denied _('Origin not in allowed.')
     end
@@ -64,15 +65,7 @@ class ApplicationController &lt; ActionController::Base
   helper :document
   helper :language
  
-  def self.no_design_blocks
-    @no_design_blocks = true
-  end
-  def self.uses_design_blocks?
-    !@no_design_blocks
-  end
-  def uses_design_blocks?
-    !@no_design_blocks && self.class.uses_design_blocks?
-  end
+  include DesignHelper
  
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
@@ -8,7 +8,7 @@ class ProfileDesignController &lt; BoxOrganizerController
  
   def protect_fixed_block
     block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
-    if block.fixed && !current_person.is_admin?
+    if !block.nil? && block.fixed && !current_person.is_admin?
       render_access_denied
     end
   end
@@ -6,6 +6,7 @@ class ChatController &lt; PublicController
   def start_session
     login = user.jid
     password = current_user.crypted_password
+    session[:chat] ||= {:rooms => []}
     begin
       jid, sid, rid = RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind",
                                                   :wait => 30, :hold => 1, :window => 5)
@@ -16,6 +17,31 @@ class ChatController &lt; PublicController
     end
   end
  
+  def toggle
+    session[:chat][:status] = session[:chat][:status] == 'opened' ? 'closed' : 'opened'
+    render :nothing => true
+  end
+
+  def tab
+    session[:chat][:tab_id] = params[:tab_id]
+    render :nothing => true
+  end
+
+  def join
+    session[:chat][:rooms] << params[:room_id]
+    session[:chat][:rooms].uniq!
+    render :nothing => true
+  end
+
+  def leave
+    session[:chat][:rooms].delete(params[:room_id])
+    render :nothing => true
+  end
+
+  def my_session
+    render :text => session[:chat].to_json, :layout => false
+  end
+
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
@@ -51,18 +77,28 @@ class ChatController &lt; PublicController
       messages = ChatMessage.where('(to_id=:other and from_id=:me) or (to_id=:me and from_id=:other)', {:me => user.id, :other => other.id})
     end
  
-    messages = messages.order('created_at DESC').includes(:to, :from).limit(20)
+    messages = messages.order('created_at DESC').includes(:to, :from).offset(params[:offset]).limit(20)
     messages_json = messages.map do |message|
       {
         :body => message.body,
-        :to => {:id => message.to.identifier, :name => message.to.name, :type => message.to.type},
-        :from => {:id => message.from.identifier, :name => message.from.name, :type => message.from.type},
+        :to => {:id => message.to.identifier, :name => message.to.name},
+        :from => {:id => message.from.identifier, :name => message.from.name},
         :created_at => message.created_at
       }
     end
     render :json => messages_json.reverse
   end
  
+  def recent_conversations
+    conversations_order = ActiveRecord::Base.connection.execute("select profiles.identifier from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc").entries.map {|e| e['identifier']}
+    render :json => {:order => conversations_order.reverse, :domain => environment.default_hostname.gsub('.','-')}.to_json
+  end
+
+  #TODO Ideally this is done through roster table on ejabberd.
+  def roster_groups
+    render :text => user.memberships.map {|m| {:jid => m.jid, :name => m.name}}.to_json
+  end
+
   protected
  
   def check_environment_feature
 class ContactController < PublicController
  
   needs_profile
+  before_filter :allow_access_to_page
  
   def new
     @contact = build_contact
 class EventsController < PublicController
  
   needs_profile
+  before_filter :allow_access_to_page
  
   def events
     @events = []
@@ -2,13 +2,13 @@ class HomeController &lt; PublicController
  
   def index
     @has_news = false
-    if environment.enabled?('use_portal_community') && environment.portal_community
+    if environment.portal_enabled
       @has_news = true
       @news_cache_key = environment.portal_news_cache_key(FastGettext.locale)
       if !read_fragment(@news_cache_key)
         portal_community = environment.portal_community
-        @highlighted_news = portal_community.news(2, true)
-        @portal_news = portal_community.news(7, true) - @highlighted_news
+        @highlighted_news = portal_community.news(environment.highlighted_news_amount, true)
+        @portal_news = portal_community.news(environment.portal_news_amount, true).offset(environment.highlighted_news_amount)
         @area_news = environment.portal_folders
       end
     end
@@ -16,13 +16,7 @@ class ProfileController &lt; PublicController
       @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
     end
     @tags = profile.article_tags
-    unless profile.display_info_to?(user)
-      if profile.visible?
-        private_profile
-      else
-        invisible_profile
-      end
-    end
+    allow_access_to_page
   end
  
   def tags
@@ -399,17 +393,6 @@ class ProfileController &lt; PublicController
     end
   end
  
-  def private_profile
-    private_profile_partial_parameters
-    render :action => 'index', :status => 403
-  end
-
-  def invisible_profile
-    unless profile.is_template?
-      render_access_denied(_("This profile is inaccessible. You don't have the permission to view the content here."), _("Oops ... you cannot go ahead here"))
-    end
-  end
-
   def per_page
     Noosfero::Constants::PROFILE_PER_PAGE
   end
 class PublicController < ApplicationController
+  protected
+
+  def allow_access_to_page
+    unless profile.display_info_to?(user)
+      if profile.visible?
+        private_profile
+      else
+        invisible_profile
+      end
+    end
+  end
+
+  def private_profile
+    private_profile_partial_parameters
+    render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
+  end
+
+  def invisible_profile
+    unless profile.is_template?
+      render_access_denied(_("This profile is inaccessible. You don't have the permission to view the content here."), _("Oops ... you cannot go ahead here"))
+    end
+  end
 end
@@ -8,11 +8,7 @@ module ApplicationHelper
  
   include PermissionNameHelper
  
-  include LightboxHelper
-
-  include ThickboxHelper
-
-  include ColorboxHelper
+  include ModalHelper
  
   include BoxesHelper
  
@@ -46,6 +42,8 @@ module ApplicationHelper
  
   include CatalogHelper
  
+  include PluginsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -594,7 +592,7 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
-                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{CGI::escapeHTML(links.to_json)}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
     link_to(
       content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
@@ -606,6 +604,14 @@ module ApplicationHelper
       :class => 'vcard'), :class => 'common-profile-list-block')
   end
  
+  def popover_menu(title,menu_title,links,html_options={})
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " menu-submenu-trigger"
+    html_options[:onclick] = "toggleSubmenu(this, '#{menu_title}', #{CGI::escapeHTML(links.to_json)}); return false"
+
+    link_to(content_tag(:span, title), '#', html_options)
+  end
+
   def gravatar_default
     (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
   end
@@ -649,8 +655,8 @@ module ApplicationHelper
       ' onfocus="if(this.value==\''+s+'\'){this.value=\'\'} this.form.className=\'focus-in\'"'+
       ' onblur="if(/^\s*$/.test(this.value)){this.value=\''+s+'\'} this.form.className=\'focus-out\'">'+
       '</form>'
-    else #opt == 'lightbox_link' is default
-      lightbox_link_to '<span class="icon-menu-search"></span>'+ _('Search'), {
+    else
+      modal_link_to '<span class="icon-menu-search"></span>'+ _('Search'), {
                        :controller => 'search',
                        :action => 'popup',
                        :category_path => (@category ? @category.explode_path : nil)},
@@ -720,7 +726,7 @@ module ApplicationHelper
   class NoosferoFormBuilder < ActionView::Helpers::FormBuilder
     extend ActionView::Helpers::TagHelper
  
-    def self.output_field(text, field_html, field_id = nil)
+    def self.output_field(text, field_html, field_id = nil, options = {})
       # try to guess an id if none given
       if field_id.nil?
         field_html =~ /id=['"]([^'"]*)['"]/
@@ -1048,11 +1054,11 @@ module ApplicationHelper
       {s_('contents|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
     ]
     if logged_in?
-      links.push(_('New content') => colorbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
+      links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
     end
  
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +
-    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+    popover_menu(_('Contents menu'),'',links,:class => 'up', :id => 'submenu-contents-trigger')
   end
   alias :browse_contents_menu :search_contents_menu
  
@@ -1068,7 +1074,7 @@ module ApplicationHelper
      end
  
     link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
-    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
+    popover_menu(_('People menu'),'',links,:class => 'up', :id => 'submenu-people-trigger')
   end
   alias :browse_people_menu :search_people_menu
  
@@ -1084,7 +1090,7 @@ module ApplicationHelper
      end
  
     link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
-    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
+    popover_menu(_('Communities menu'),'',links,:class => 'up', :id => 'submenu-communities-trigger')
   end
   alias :browse_communities_menu :search_communities_menu
  
@@ -1408,16 +1414,16 @@ module ApplicationHelper
   end
  
   def convert_macro(html, source)
-    doc = Hpricot(html)
+    doc = Nokogiri::HTML.fragment html
     #TODO This way is more efficient but do not support macro inside of
     #     macro. You must parse them from the inside-out in order to enable
     #     that.
-    doc.search('.macro').each do |macro|
+    doc.css('.macro').each do |macro|
       macro_name = macro['data-macro']
       result = @plugins.parse_macro(macro_name, macro, source)
       macro.inner_html = result.kind_of?(Proc) ? self.instance_exec(&result) : result
     end
-    doc.html
+    doc.to_html
   end
  
   def default_folder_for_image_upload(profile)
 module ArticleHelper
  
-  include PrototypeHelper
   include TokenHelper
  
   def article_reported_version(article)
@@ -35,7 +34,7 @@ module ArticleHelper
         'div',
         check_box(:article, :notify_comments) +
         content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
-        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
+        observe_field(:article_accept_comments, :function => "jQuery('#article_notify_comments')[0].disabled = ! jQuery('#article_accept_comments')[0].checked;jQuery('#article_moderate_comments')[0].disabled = ! jQuery('#article_accept_comments')[0].checked")
       ) +
  
       content_tag(
@@ -19,7 +19,7 @@ module BlockHelper
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
-      <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>
+      <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', :confirm=>_('Are you sure you want to remove this highlight'))}</td>
     </tr>
     "
   end
@@ -38,8 +38,12 @@ module BoxesHelper
     end
   end
  
+  def boxes_limit holder
+    controller.send(:custom_design)[:boxes_limit] || holder.boxes_limit(controller.send(:custom_design)[:layout_template])
+  end
+
   def display_boxes(holder, main_content)
-    boxes = holder.boxes.with_position.first(holder.boxes_limit)
+    boxes = holder.boxes.with_position.first(boxes_limit(holder))
     content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
     content = main_content if (content.blank?)
  
@@ -65,11 +69,13 @@ module BoxesHelper
   end
  
   def display_box_content(box, main_content)
-    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
-    box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
+    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user, :controller => controller }
+    box_decorator.select_blocks(box, box.blocks.includes(:box), context).map do |item|
+      display_block item, main_content
+    end.join("\n") + box_decorator.block_target(box)
   end
  
-  def select_blocks(arr, context)
+  def select_blocks box, arr, context
     arr
   end
  
@@ -150,8 +156,22 @@ module BoxesHelper
     def self.block_edit_buttons(block)
       ''
     end
-    def self.select_blocks(arr, context)
-      arr.select { |block| block.visible?(context) }
+    def self.select_blocks box, arr, context
+      arr = arr.select{ |block| block.visible? context }
+
+      custom_design = context[:controller].send(:custom_design)
+      inserts = [custom_design[:insert]].flatten.compact
+      inserts.each do |insert_opts|
+        next unless box.position == insert_opts[:box]
+        position, block = insert_opts[:position], insert_opts[:block]
+        block = block.new box: box if block.is_a? Class
+
+        if not insert_opts[:uniq] or not box.blocks.map(&:class).include? block.klass
+          arr = arr.insert position, block
+        end
+      end
+
+      arr
     end
   end
  
@@ -171,7 +191,7 @@ module BoxesHelper
         "before-block-#{block.id}"
       end
     if block.nil? or modifiable?(block)
-      content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
+      content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'add_or_move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
     else
       ""
     end
@@ -204,14 +224,14 @@ module BoxesHelper
       # FIXME too much hardcoded stuff
       if holder.layout_template == 'default'
         if block.box.position == 2 # area 2, left side => move to right side
-          buttons << icon_button('right', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[2].id.to_s, :id => block.id }, :method => 'post' )
+          buttons << icon_button('right', _('Move to the opposite side'), { :action => 'add_or_move_block', :target => 'end-of-box-' + holder.boxes[2].id.to_s, :id => block.id }, :method => 'post' )
         elsif block.box.position == 3 # area 3, right side => move to left side
-          buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
+          buttons << icon_button('left', _('Move to the opposite side'), { :action => 'add_or_move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
         end
       end
  
       if block.editable?
-        buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+        buttons << modal_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
       end
  
       if !block.main?
@@ -221,7 +241,7 @@ module BoxesHelper
     end
  
     if block.respond_to?(:help)
-      buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), {}, "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
+      buttons << modal_inline_icon(:help, _('Help on this block'), {}, "#help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + modal_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
     end
  
     if block.embedable?
@@ -25,10 +25,13 @@ module CategoriesHelper
     )
   end
  
-  def update_categories_link(body, category_id=nil, html_options={})
+  #TODO: remove this function and, in views, use existing basic buttons
+  def update_categories_link(type, body, category_id=nil, html_options={})
+    html_class = 'select-subcategory-link'
+    html_class = " icon-#{type}  btn btn-primary btn-xs" if type.present?
     link_to body,
       { :action => "update_categories", :category_id => category_id, :id => @object },
-      {:id => category_id ? "select-category-#{category_id}-link" : nil, :remote => true, :class => 'select-subcategory-link'}.merge(html_options)
+      {:id => category_id ? "select-category-#{category_id}-link" : nil, :remote => true, :class => html_class}.merge(html_options)
   end
  
 end
@@ -6,8 +6,9 @@ module ChatHelper
       ['icon-menu-busy', _('Busy'), 'chat-busy'],
       ['icon-menu-offline', _('Sign out of chat'), 'chat-disconnect'],
     ]
+    avatar = profile_image(user, :portrait, :class => 'avatar')
     content_tag('span',
-      link_to(content_tag('span', user.name) + ui_icon('ui-icon-triangle-1-s'),
+      link_to(avatar + content_tag('span', user.name) + ui_icon('ui-icon-triangle-1-s'),
         '#',
         :onclick => 'toggleMenu(this); return false',
         :class => icon_class + ' simplemenu-trigger'
@@ -1,25 +0,0 @@
-module ColorboxHelper
-
-  def colorbox_close_button(text, options = {})
-    button(:close, text, '#', colorbox_options(options, :close))
-  end
-
-  def colorbox_button(type, label, url, options = {})
-    button(type, label, url, colorbox_options(options))
-  end
-
-  def colorbox_icon_button(type, label, url, options = {})
-    icon_button(type, label, url, colorbox_options(options))
-  end
-
-  # options must be an HTML options hash as passed to link_to etc.
-  #
-  # returns a new hash with colorbox class added. Keeps existing classes.
-  def colorbox_options(options, type=nil)
-    the_class = 'colorbox'
-    the_class += "-#{type.to_s}" unless type.nil?
-    the_class << " #{options[:class]}" if options.has_key?(:class)
-    options.merge(:class => the_class)
-  end
-
-end
@@ -65,7 +65,7 @@ module CommentHelper
  
   def link_for_edit(comment)
     if comment.can_be_updated_by?(user)
-      {:link => expirable_comment_link(comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox')}
+      {:link => expirable_comment_link(comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'modal')}
     end
   end
  
@@ -2,24 +2,14 @@ require &#39;noosfero/i18n&#39;
  
 module DatesHelper
  
-  # FIXME Date#strftime should translate this for us !!!!
-  MONTHS = [
-    N_('January'),
-    N_('February'),
-    N_('March'),
-    N_('April'),
-    N_('May'),
-    N_('June'),
-    N_('July'),
-    N_('August'),
-    N_('September'),
-    N_('October'),
-    N_('November'),
-    N_('December')
-  ]
-
-  def month_name(n)
-    _(MONTHS[n-1])
+  MONTHS = I18n.t('date.month_names')
+
+  def month_name(n, abbreviated = false)
+    if abbreviated
+      I18n.t('date.abbr_month_names')[n]
+    else
+      MONTHS[n]
+    end
   end
  
   # formats a date for displaying.
@@ -91,15 +81,7 @@ module DatesHelper
       _(date.strftime("%a"))
     else
       # FIXME Date#strftime should translate this for us !!!!
-      _([
-        N_('Sunday'),
-        N_('Monday'),
-        N_('Tuesday'),
-        N_('Wednesday'),
-        N_('Thursday'),
-        N_('Friday'),
-        N_('Saturday'),
-      ][date.wday])
+      I18n.t('date.day_names')[date.wday]
     end
   end
  
@@ -111,7 +93,7 @@ module DatesHelper
       date = date << 1
     end
     if opts[:only_month]
-      _('%{month}') % {:month => month_name(date.month.to_i) }
+      _('%{month}') % { :month => month_name(date.month.to_i) }
     else
       _('%{month} %{year}') % { :year => date.year, :month => month_name(date.month.to_i) }
     end
@@ -156,7 +138,7 @@ module DatesHelper
     else
       order = [:day, :month, :year]
     end
-    date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS.map {|item| gettext(item)})))
+    date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS)))
   end
  
 end
@@ -0,0 +1,50 @@
+module DesignHelper
+
+  extend ActiveSupport::Concern
+
+  included do
+    extend ClassMethods
+    include InstanceMethods
+    before_filter :load_custom_design if self.respond_to? :before_filter
+  end
+
+  module ClassMethods
+
+    def no_design_blocks
+      @no_design_blocks = true
+    end
+
+    def use_custom_design options = {}
+      @custom_design = options
+    end
+
+    def custom_design
+      @custom_design ||= {}
+    end
+
+    def uses_design_blocks?
+      !@no_design_blocks
+    end
+
+  end
+
+  module InstanceMethods
+
+    protected
+
+    def uses_design_blocks?
+      !@no_design_blocks && self.class.uses_design_blocks?
+    end
+
+    def load_custom_design
+      # see also: LayoutHelper#body_classes
+      @layout_template = self.class.custom_design[:layout_template]
+    end
+
+    def custom_design
+      @custom_design || self.class.custom_design
+    end
+
+  end
+
+end
 module LanguageHelper
   def language
-    locale
+    locale.to_s
   end
  
   def tinymce_language
@@ -20,7 +20,7 @@ module LanguageHelper
     separator = options[:separator] || ' &mdash; '
  
     if options[:element] == 'dropdown'
-      select_tag('lang', 
+      select_tag('lang',
         options_for_select(locales.map{|code,name| [name, code]}, current),
         :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",
         :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
@@ -31,12 +31,12 @@ module LayoutHelper
     plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
  
     output = ''
-    output += render :file =>  'layouts/_javascript'
-    output += javascript_tag 'render_all_jquery_ui_widgets()'
+    output += render 'layouts/javascript'
     unless plugins_javascripts.empty?
       output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
     end
     output += theme_javascript_ng.to_s
+    output += javascript_tag 'render_all_jquery_ui_widgets()'
  
     output
   end
@@ -45,8 +45,6 @@ module LayoutHelper
     standard_stylesheets = [
       'application',
       'search',
-      'thickbox',
-      'lightbox',
       'colorbox',
       'selectordie',
       'inputosaurus',
@@ -88,6 +86,7 @@ module LayoutHelper
     end
   end
  
+
   def icon_theme_stylesheet_path
     icon_themes = []
     theme_icon_themes = theme_option(:icon_theme) || []
@@ -118,8 +117,5 @@ module LayoutHelper
     end
   end
  
-  def meta_description_tag(article=nil)
-    article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
-  end
 end
  
@@ -1,36 +0,0 @@
-module LightboxHelper
-
-  def lightbox_link_to(text, url, options = {})
-    link_to(text, url, lightbox_options(options))
-  end
-
-  def lightbox_close_button(text, options = {})
-    button(:close, text, '#', lightbox_options(options, 'lbAction').merge(:rel => 'deactivate'))
-  end
-
-  def lightbox_button(type, label, url, options = {})
-    button(type, label, url, lightbox_options(options))
-  end
-
-  def lightbox_icon_button(type, label, url, options = {})
-    icon_button(type, label, url, lightbox_options(options))
-  end
-
-  # options must be an HTML options hash as passed to link_to etc.
-  #
-  # returns a new hash with lightbox class added. Keeps existing classes. 
-  def lightbox_options(options, lightbox_type = 'lbOn')
-    the_class = lightbox_type
-    the_class << " #{options[:class]}" if options.has_key?(:class)
-    options.merge(:class => the_class)
-  end
-
-  def lightbox?
-    request.xhr?
-  end
-
-  def lightbox_remote_button(type, label, url, options = {})
-    button(type, label, url, lightbox_options(options, 'remote-lbOn'))
-  end
-
-end
@@ -137,7 +137,7 @@ module ManageProductsHelper
     ui_button_to_remote(label,
                    {:update => "product-#{field}",
                    :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
-                   :complete => "$('edit-product-button-ui-#{field}').hide()",
+                   :complete => "jQuery('#edit-product-button-ui-#{field}').hide()",
                    :method => :get,
                    :loading => "loading_for_button('##{id}')"},
                    options)
@@ -0,0 +1,46 @@
+module ModalHelper
+
+  def modal_inline_link_to title, url, selector, options = {}
+    link_to title, url, modal_options(options.merge(:inline => selector))
+  end
+
+  def modal_inline_icon type, title, url, selector, options = {}
+    icon_button type, title, url, modal_options(options.merge(:inline => selector))
+  end
+
+  def modal_link_to title, url, options = {}
+    link_to title, url, modal_options(options)
+  end
+
+  def modal_close_link text, options = {}
+    link_to text, '#', modal_options(options, :close)
+  end
+
+  def modal_close_button(text, options = {})
+    button :close, text, '#', modal_options(options, :close).merge(:rel => 'deactivate')
+  end
+
+  def modal_button(type, label, url, options = {})
+    button type, label, url, modal_options(options)
+  end
+
+  def modal_icon_button(type, label, url, options = {})
+    icon_button type, label, url, modal_options(options)
+  end
+
+  # options must be an HTML options hash as passed to link_to etc.
+  #
+  # returns a new hash with modal class added. Keeps existing classes.
+  def modal_options(options, type=nil)
+    inline_selector = options.delete :inline
+    options[:onclick] = "return noosfero.modal.inline('#{inline_selector}')" if inline_selector
+
+    classes = if inline_selector then '' else 'modal-toggle' end
+    classes += " modal-#{type.to_s}" if type.present?
+    classes << " #{options[:class]}" if options.has_key? :class
+    options.merge!(:class => classes)
+
+    options
+  end
+
+end
@@ -0,0 +1,9 @@
+module PluginsHelper
+
+  def plugins_product_tabs
+    @plugins.dispatch(:product_tabs, @product).map do |tab|
+      {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content])}
+    end
+  end
+
+end
@@ -1,11 +0,0 @@
-module ThickboxHelper
-  def thickbox_inline_popup_link(title, url, id, options = {})
-    link_to(title, url_for(url) + "#TB_inline?height=300&width=500&inlineId=#{id}&modal=true", {:class => 'thickbox'}.merge(options))
-  end
-  def thickbox_inline_popup_icon(type, title, url, id, options = {})
-    icon_button(type, title, url_for(url) + "#TB_inline?height=300&width=500&inlineId=#{id}&modal=true", {:class => "thickbox"}.merge(options))
-  end
-  def thickbox_close_button(title)
-    button_to_function(:close, title, 'tb_remove();')
-  end
-end
-class Comment::Notifier < ActionMailer::Base
+class CommentNotifier < ActionMailer::Base
   def notification(comment)
     profile = comment.article.profile
     @recipient = profile.nickname || profile.name
-class Scrap::Notifier < ActionMailer::Base
+class ScrapNotifier < ActionMailer::Base
   def notification(scrap)
     sender, receiver = scrap.sender, scrap.receiver
     @recipient = receiver.name
-require 'hpricot'
  
 class Article < ActiveRecord::Base
  
@@ -400,6 +399,10 @@ class Article &lt; ActiveRecord::Base
     {}
   end
  
+  def alternate_languages
+    self.translations.map(&:language)
+  end
+
   scope :native_translations, :conditions => { :translation_of_id => nil }
  
   def translatable?
@@ -713,7 +716,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def first_paragraph
-    paragraphs = Hpricot(to_html).search('p')
+    paragraphs = Nokogiri::HTML.fragment(to_html).css('p')
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
  
@@ -735,8 +738,8 @@ class Article &lt; ActiveRecord::Base
  
   def body_images_paths
     require 'uri'
-    Hpricot(self.body.to_s).search('img[@src]').collect do |i|
-      (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, URI.escape(i.attributes['src'])).to_s : i.attributes['src']
+    Nokogiri::HTML.fragment(self.body.to_s).css('img[src]').collect do |i|
+      (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, URI.escape(i['src'])).to_s : i['src']
     end
   end
  
@@ -773,11 +776,11 @@ class Article &lt; ActiveRecord::Base
   end
  
   def first_image
-    img = Hpricot(self.lead.to_s).search('img[@src]').first || Hpricot(self.body.to_s).search('img').first
-    img.nil? ? '' : img.attributes['src']
+    img = Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first || Nokogiri::HTML.fragment(self.body.to_s).search('img').first
+    img.nil? ? '' : img['src']
   end
  
-  delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
+  delegate :lat, :lng, :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
  
   def has_macro?
     true
@@ -36,8 +36,7 @@ class BlogArchivesBlock &lt; Block
       results << content_tag('li', content_tag('strong', "#{year} (#{count})"))
       results << "<ul class='#{year}-archive'>"
       posts.except(:order).count(:all, :conditions => ['EXTRACT(YEAR FROM published_at)=?', year], :group => 'EXTRACT(MONTH FROM published_at)').sort_by {|month, count| -month.to_i}.each do |month, count|
-        month_name = gettext(MONTHS[month.to_i - 1])
-        results << content_tag('li', link_to("#{month_name} (#{count})", owner_blog.url.merge(:year => year, :month => month)))
+        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(:year => year, :month => month)))
       end
       results << "</ul>"
     end
@@ -14,8 +14,8 @@ class Box &lt; ActiveRecord::Base
   end
  
   def acceptable_blocks
-    blocks_classes = central?  ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => [2, 3])
-    to_css_class_name(blocks_classes)
+    blocks_classes = if central? then Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => 1) else Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => [2, 3]) end
+    to_css_selector blocks_classes
   end
  
   def central?
@@ -74,8 +74,8 @@ class Box &lt; ActiveRecord::Base
  
   private
  
-  def to_css_class_name(blocks_classes)
-    blocks_classes.map{ |block_class| block_class.name.to_css_class }
+  def to_css_selector(blocks_classes)
+    blocks_classes.map{ |block_class| ".#{block_class.name.to_css_class}" }.join(',')
   end
  
 end
@@ -150,11 +150,11 @@ class Comment &lt; ActiveRecord::Base
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
       if !notification_emails.empty?
-        Comment::Notifier.notification(self).deliver
+        CommentNotifier.notification(self).deliver
       end
       emails = article.followers - [author_email]
       if !emails.empty?
-        Comment::Notifier.mail_to_followers(self, emails).deliver
+        CommentNotifier.mail_to_followers(self, emails).deliver
       end
     end
   end
@@ -19,7 +19,8 @@ class Enterprise &lt; Organization
   has_many :inputs, :through => :products
   has_many :production_costs, :as => :owner
  
-  has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
+  has_many :favorite_enterprise_people
+  has_many :fans, through: :favorite_enterprise_people, source: :person
  
   def product_categories
     ProductCategory.by_enterprise(self)
@@ -3,7 +3,7 @@
 # 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, :disabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist
+  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
  
   has_many :users
  
@@ -268,9 +268,12 @@ class Environment &lt; ActiveRecord::Base
   settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
   settings_items :local_docs, :type => Array, :default => []
   settings_items :news_amount_by_folder, :type => Integer, :default => 4
+  settings_items :highlighted_news_amount, :type => Integer, :default => 2
+  settings_items :portal_news_amount, :type => Integer, :default => 5
   settings_items :help_message_to_add_enterprise, :type => String, :default => ''
   settings_items :tip_message_enterprise_activation_question, :type => String, :default => ''
  
+  settings_items :currency_iso_unit, :type => String, :default => 'USD'
   settings_items :currency_unit, :type => String, :default => '$'
   settings_items :currency_separator, :type => String, :default => '.'
   settings_items :currency_delimiter, :type => String, :default => ','
@@ -292,8 +295,6 @@ class Environment &lt; ActiveRecord::Base
  
   settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
  
-  settings_items :disabled_blocks, :type => Array, :default => []
-
   settings_items :search_hints, :type => Hash, :default => {}
  
   # Set to return http forbidden to host not on the allow origin list bellow
@@ -359,10 +360,6 @@ class Environment &lt; ActiveRecord::Base
     enabled_plugins.include?(plugin.to_s)
   end
  
-  def block_disabled?(block)
-    disabled_blocks.include?(block.to_s)
-  end
-
   # enables the features identified by <tt>features</tt>, which is expected to
   # be an Enumarable object containing the identifiers of the desired features.
   # Passing <tt>nil</tt> is the same as passing an empty Array.
@@ -141,6 +141,10 @@ class Event &lt; Article
     result
   end
  
+  def duration
+    ((self.end_date || self.start_date) - self.start_date).to_i
+  end
+
   def lead
     content_tag('div',
       show_period(start_date, end_date),
@@ -14,9 +14,9 @@ class ExternalFeed &lt; ActiveRecord::Base
  
   def add_item(title, link, date, content)
     return if content.blank?
-    doc = Hpricot(content)
-    doc.search('*').each do |p|
-      if p.instance_of? Hpricot::Elem
+    doc = Nokogiri::HTML.fragment content
+    doc.css('*').each do |p|
+      if p.instance_of? Nokogiri::XML::Element
         p.remove_attribute 'style'
         p.remove_attribute 'class'
       end
@@ -26,10 +26,10 @@ class ExternalFeed &lt; ActiveRecord::Base
     article = TinyMceArticle.new
     article.name = title
     article.profile = blog.profile
-    article.body = content 
-    article.published_at = date 
-    article.source = link 
-    article.profile = blog.profile 
+    article.body = content
+    article.published_at = date
+    article.source = link
+    article.profile = blog.profile
     article.parent = blog
     article.author_name = self.feed_title
     unless blog.children.exists?(:slug => article.slug)
@@ -0,0 +1,8 @@
+class FavoriteEnterprisePerson < ActiveRecord::Base
+
+  self.table_name = :favorite_enteprises_people
+
+  belongs_to :enterprise
+  belongs_to :person
+
+end
@@ -54,7 +54,7 @@ class Forum &lt; Folder
  
   def first_paragraph
     return '' if body.blank?
-    paragraphs = Hpricot(body).search('p')
+    paragraphs = Nokogiri::HTML.fragment(body).css('p')
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
  
 class Input < ActiveRecord::Base
  
-  attr_accessible :product, :product_category, :product_category_id, :amount_used, :unit_id, :price_per_unit, :relevant_to_price
+  attr_accessible :product, :product_id, :product_category, :product_category_id,
+    :amount_used, :unit_id, :price_per_unit, :relevant_to_price, :is_from_solidarity_economy
  
   belongs_to :product
   belongs_to :product_category
@@ -10,7 +10,8 @@ class Product &lt; ActiveRecord::Base
     :display => %w[full map]
   }
  
-  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs, :qualifiers_list
+  attr_accessible :name, :product_category, :profile, :profile_id, :enterprise,
+    :highlighted, :price, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs, :qualifiers_list
  
   def self.default_search_display
     'full'
@@ -236,7 +237,7 @@ class Product &lt; ActiveRecord::Base
  
   def percentage_from_solidarity_economy
     se_i = t_i = 0
-    self.inputs(true).each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy }
+    self.inputs.each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy }
     t_i = 1 if t_i == 0 # avoid division by 0
     p = case (se_i.to_f/t_i)*100
         when 0 then [0, '']
@@ -25,7 +25,7 @@ class Scrap &lt; ActiveRecord::Base
  
   after_create do |scrap|
     scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
-    Scrap::Notifier.notification(scrap).deliver if scrap.send_notification?
+    ScrapNotifier.notification(scrap).deliver if scrap.send_notification?
   end
  
   before_validation :strip_all_html_tags
 require 'noosfero/translatable_content'
  
-# a base class for all text article types.  
+# a base class for all text article types.
 class TextArticle < Article
  
   xss_terminate :only => [ :name ], :on => 'validation'
@@ -26,10 +26,10 @@ class TextArticle &lt; Article
   before_save :set_relative_path
  
   def set_relative_path
-    parsed = Hpricot(self.body.to_s)
-    parsed.search('img[@src]').map { |i| change_element_path(i, 'src') }
-    parsed.search('a[@href]').map { |i| change_element_path(i, 'href') }
-    self.body = parsed.to_s
+    parsed = Nokogiri::HTML.fragment(self.body.to_s)
+    parsed.css('img[src]').each { |i| change_element_path(i, 'src') }
+    parsed.css('a[href]').each { |i| change_element_path(i, 'href') }
+    self.body = parsed.to_html
   end
  
   def change_element_path(el, attribute)
 require 'digest/sha1'
 require 'user_activation_job'
-require 'securerandom'
  
 # User models the system users, and is generated by the acts_as_authenticated
 # Rails generator.
@@ -55,7 +54,7 @@ class User &lt; ActiveRecord::Base
  
       user.person = p
     end
-    if user.environment.enabled?('skip_new_user_email_confirmation') 
+    if user.environment.enabled?('skip_new_user_email_confirmation')
       if user.environment.enabled?('admin_must_approve_new_users')
         create_moderate_task
       else
@@ -103,6 +102,7 @@ class User &lt; ActiveRecord::Base
   validates_length_of       :email,    :within => 3..100, :if => (lambda {|user| !user.email.blank?})
   validates_uniqueness_of   :login, :email, :case_sensitive => false, :scope => :environment_id
   before_save :encrypt_password
+  before_save :normalize_email, if: proc{ |u| u.email.present? }
   validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
  
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
@@ -115,16 +115,8 @@ class User &lt; ActiveRecord::Base
     u && u.authenticated?(password) ? u : nil
   end
  
-  #FIXME make this test
-  def generate_private_token!
-    self.private_token = SecureRandom.hex
-    self.private_token_generated_at = DateTime.now
-    save(:validate => false)
-  end
-
-  #FIXME make this test
-  def private_token_expired?
-    self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now)
+  def register_login
+    self.update_attribute :last_login_at, Time.now
   end
  
   # Activates the user in the database.
@@ -344,7 +336,25 @@ class User &lt; ActiveRecord::Base
     @is_password_required = false
   end
  
+  #FIXME make this test
+  def generate_private_token!
+    self.private_token = SecureRandom.hex
+    self.private_token_generated_at = DateTime.now
+    save(:validate => false)
+  end
+
+  #FIXME make this test
+  def private_token_expired?
+    self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now)
+  end
+
+
   protected
+
+    def normalize_email
+      self.email = self.email.squish.downcase
+    end
+
     # before filter
     def encrypt_password
       return if password.blank?
@@ -372,6 +382,6 @@ class User &lt; ActiveRecord::Base
  
     def delay_activation_check
       return if person.is_template?
-      Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
+      Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => (NOOSFERO_CONF['hours_until_user_activation_check'] || 72).hours.from_now})
     end
 end
 <%= labelled_form_for :user,
    :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }  do |f| %>
  
-<%= f.text_field :login,
-                 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
-                 :onchange => 'this.value = convToValidLogin( this.value )' %>
+<%= f.text_field :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin( this.value )' %>
  
-<%= f.password_field :password,
-                     :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %>
+<%= f.password_field :password, :id => 'user_password' %>
  
 <% if params[:enterprise_code] %>
   <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
@@ -16,7 +13,7 @@
  
 <% button_bar do %>
   <%= submit_button( 'login', _('Log in') )%>
-  <%= lightbox_close_button(_('Cancel')) if lightbox? %>
+  <%= modal_close_button _('Cancel') if request.xhr? %>
 <% end %>
  
 <% end %>
@@ -7,8 +7,8 @@
 <p><%= _('Do you have a personal user account in the system?') %></p>
  
 <div id="enterprise-activation-create-user-or-login-button">
-  <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %> 
-  <%= button_to_function 'add', _('No'),  "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
+  <%= button_to_function 'login', _('Yes'), "jQuery('#enterprise-activation-create-user-form').hide(); jQuery('#enterprise-activation-login-form').show()" %>
+  <%= button_to_function 'add', _('No'),  "jQuery('#enterprise-activation-login-form').hide(); jQuery('#enterprise-activation-create-user-form').show()" %>
 </div>
  
 <div id="enterprise-activation-create-user-form" style="display: none">
 <h1><%= _('Identify yourself') %></h1>
  
 <p>
-<%= lightbox_link_to _('Login.'), { :controller => 'account', :action => 'login_popup' } %>
+<%= modal_link_to _('Login.'), { :controller => 'account', :action => 'login_popup' } %>
  
 <%= _('You need to login to be able to use all the features in this environment.') %>
 </p>
@@ -3,11 +3,11 @@
 <h2><%= _('Login') %></h2>
  
 <% @user ||= User.new %>
-<% is_thickbox ||= false %>
+<% is_popin ||= false %>
  
 <%= @message %>
  
-<%= labelled_form_for :user, :url => login_url do |f| %>
+<%= labelled_form_for :user, :url => login_url, :horizontal => true do |f| %>
  
      <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
  
@@ -17,8 +17,8 @@
  
      <% button_bar do %>
        <%= submit_button( 'login', _('Log in') )%>
-       <% if is_thickbox %>
-         <%= thickbox_close_button(_('Cancel')) %>
+       <% if is_popin %>
+         <%= modal_close_button(_('Cancel')) %>
        <% end %>
      <% end %>
  
@@ -20,9 +20,7 @@
       <% button_bar do %>
         <%= submit_button( 'login', _('Log in') )%>
         <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-          <%= link_to content_tag( 'span', _('New user') ),
-              { :controller => 'account', :action => 'signup' },
-              :class => 'button with-text icon-add' %>
+          <%= button(:add, _('New user'), { :controller => 'account', :action => 'signup' }) %>
         <% end %>
       <% end %>
  
@@ -2,6 +2,6 @@
 <p>
 <% button_bar do %>
   <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
-  <%= lightbox_close_button _('No, I want to stay.') %>
+  <%= modal_close_button _('No, I want to stay.') %>
 <% end %>
 </p>
@@ -18,7 +18,7 @@
       <%= button 'ok', _('Enable'), {:action => 'manage_portal_community', :activate => 1} %>
     <% end %>
     <%= button 'folder', _('Select Portal Folders'), {:action => 'set_portal_folders'} %>
-    <%= button 'edit', _('Define Amount by Folder'), {:action => 'set_portal_news_amount'} %>
+    <%= button 'edit', _('Define news amount on portal'), {:action => 'set_portal_news_amount'} %>
     <%= button 'delete', _('Remove'), { :action => 'unset_portal_community'} %>
   <% end %>
 <% end %>
-<h1><%= _('News amount by folder') %></h1>
+<h1><%= _('News amount on portal') %></h1>
  
 <%= labelled_form_for :environment do |f| %>
  
-  <%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
+  <%= labelled_form_field _('Number of highlighted news'), select(:environment, :highlighted_news_amount, (0..10).to_a) %>
+  <%= labelled_form_field _('Number of portal news'), select(:environment, :portal_news_amount, (0..10).to_a) %>
+  <%= labelled_form_field _('Number of news by folder'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
  
   <% button_bar do %>
     <%= submit_button(:save, _('Save')) %>
@@ -6,7 +6,7 @@
       <li><%= link_to _('Homepage'), user.public_profile_url %></li>
     </ul>
     <div class="user-actions">
-      <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
     </div>
   </div>
 <% else %>
@@ -5,11 +5,11 @@
   <% if logged_in? %>
     <% if profile.enable_contact? %>
       <li>
-      <%= link_to content_tag('span', _('Send an e-mail')),
-        { :profile => profile.identifier,
-          :controller => 'contact',
-          :action => 'new' },
-        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
+        <%= button(:'menu-mail', _('Send an e-mail'),
+                   { :profile => profile.identifier,
+                     :controller => 'contact',
+                     :action => 'new' },
+                   { :title => _('Send an e-mail to the administrators')}) %>
       </li>
     <% end %>
  
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
+      <li><%= button(:add, _('Add as favorite'), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :title => _('Add enterprise as favorite')) %></li>
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
+      <li><%= button(:'menu-mail', _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button'} ) %></li>
   <% end %>
  
   <li><%= report_abuse(profile, :button) %></li>
@@ -22,8 +22,6 @@
       <% end %>
     <% end %>
   <% else %>
-    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
-      :class => 'button with-text icon-add',
-      :title => _('Join this community') %>
+      <%= button(:add, _('Join'), profile.join_not_logged_url, :title => _('Join this community')) %>
   <% end %>
 </div>
@@ -8,7 +8,7 @@
     <% end %>
  
     <% if user.is_a_friend?(profile) && profile.enable_contact? %>
-      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+      <li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
     <% end %>
  
     <li><%= report_abuse(profile, :button) %></li>
@@ -15,7 +15,7 @@
   </tbody>
 </table>
  
-<%= link_to(_('New highlight'), '#', :class => 'button icon-add with-text new-highlight-button')%>
+<%= button(:add, _('New highlight'), '#', class: 'new-highlight-button') %>
  
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
  
@@ -27,7 +27,7 @@
  
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
-      <%= colorbox_close_button(_('Cancel')) %>
+      <%= modal_close_button(_('Cancel')) %>
     <% end %>
  
   <% end %>
@@ -6,3 +6,4 @@ page.replace_html(to, display_updated_box(@target_box))
  
 page.visual_effect(:highlight, from)
 page.visual_effect(:highlight, to) unless (from == to)
+
@@ -10,7 +10,8 @@
  
 <script type="text/javascript">
   function submit_button(index) {
-     return $("article_slug").form.select("input.submit")[index];
+    var form = $($("#article_slug")[0].form)
+     return form.find("input[type=submit]")[index];
   }
   function warn_value_change() {
      show_warning('article-formitem', "slug-change-confirmation");
@@ -23,7 +24,7 @@
      hide_warning('slug-change-confirmation');
   }
   function no_change() {
-     $("article_slug").value = $("old_article_slug").value;
+     jQuery("#article_slug").val(jQuery("#old_article_slug").val());
      enable_button(submit_button(0));
      enable_button(submit_button(1));
      hide_warning('slug-change-confirmation');
@@ -78,7 +79,7 @@
   <div id='fetch-external-feed'>
     <% enabled = @article.external_feed && @article.external_feed.enabled %>
     <% only_once = @article.external_feed ? @article.external_feed.only_once : true %>
-    <%= labelled_check_box(_('Fetch posts from an external feed'), 'article[external_feed_builder][enabled]', 'true', enabled, {:onchange => "$('external-feed-options').toggle()"}) %>
+    <%= labelled_check_box(_('Fetch posts from an external feed'), 'article[external_feed_builder][enabled]', 'true', enabled, {:onchange => "jQuery('#external-feed-options').toggle()"}) %>
     <div id='external-feed-options' style="display: <%= enabled ? 'block' : 'none' %>">
       <%= efeed.hidden_field(:id) %>
       <%= labelled_form_field( _('Feed address'), efeed.text_field(:address) ) %>
 <p><%= file_field_tag('uploaded_files[]', :size => size) %></p>
-<%= javascript_tag("$('uploaded_files').scrollTop = $('uploaded_files').scrollHeight") %>
+<%= javascript_tag("jQuery('#uploaded_files')[0].scrollTop = jQuery('#uploaded_files')[0].scrollHeight") %>
@@ -28,7 +28,7 @@
   <% end %>
  
   <div style='float: right'>
-    <%= lightbox_button :help, _('Why categorize?'), :action => 'why_categorize' %>
+    <%= modal_button :help, _('Why categorize?'), :action => 'why_categorize' %>
   </div>
  
   <%= select_categories(:article, _('Categorize your article')) %>
@@ -15,6 +15,6 @@
 </ul>
 <br style="clear:both" />
  
-<%= colorbox_close_button(_('Cancel')) %>
+<%= modal_close_button(_('Cancel')) %>
  
 </div>
@@ -17,7 +17,7 @@
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
  
-  <%= colorbox_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>
+  <%= modal_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>
   <%= button(:back, _('Back to control panel'), :controller => 'profile_editor', :action => "index") %>
 <% end %>
  
@@ -5,5 +5,5 @@
 </p>
  
 <% button_bar do %>
-  <%= lightbox_close_button _('Close') %>
+  <%= modal_close_button _('Close') %>
 <% end %>
@@ -2,7 +2,7 @@
   <% if !links_submenu.empty? %>
     <div class="comment-actions">
       <li class="vcard">
-        <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links_submenu.to_json)}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
+        <%= popover_menu(_('Contents menu'),'',links_submenu,:class => 'comment-trigger', :url => url) %>
       </li>
     </div>
   <% end %>
@@ -10,7 +10,7 @@
     <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
     <% button_bar do %>
       <%= button_to_function :add, _('Confirm'), "return false", :id => "confirm-captcha" %>
-      <%= button_to_function :cancel, _('Cancel'), "jQuery.colorbox.close()" %>
+      <%= button_to_function :cancel, _('Cancel'), "noosfero.modal.close()" %>
     <% end %>
   </div>
  
@@ -31,10 +31,10 @@ function check_captcha(button, confirm_action) {
   return true;
   <% else %>
   jQuery('#recaptcha-container').show();
-  jQuery.colorbox({ html: jQuery('#recaptcha-container').html(), maxWidth : '600px', maxHeight : '300px' });
+  noosfero.modal.inline('#recaptcha-container', {maxWidth :'600px', maxHeight : '300px' });
   jQuery('#confirm-captcha').unbind('click');
   jQuery('#confirm-captcha').bind('click', function() {
-    jQuery.colorbox.close();
+    noosfero.modal.close();
     button.form.recaptcha_response_field.value = jQuery('#recaptcha_response_field').val();
     button.form.recaptcha_challenge_field.value = jQuery('#recaptcha_challenge_field').val();
     button.form.confirm.value = 'true';
@@ -88,7 +88,7 @@ function check_captcha(button, confirm_action) {
     <% if !edition_mode %>
       <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
     <% else %>
-      <%= button :cancel, _('Cancel'), '#', :onclick => "jQuery.colorbox.close();" %>
+      <%= button :cancel, _('Cancel'), '#', :onclick => "noosfero.modal.close();" %>
     <% end %>
   <% end %>
 <% end %>
@@ -1,22 +0,0 @@
-<%= _('Hi!') %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
-
-<%= word_wrap(_('Title: %s') % @comment_title) if @comment_title %>
-
-<%= _("Comment:") %>
--------------------------------------------------------------------------------
-<%= word_wrap(@comment_body) %>
--------------------------------------------------------------------------------
-
-<%= _('Click on the address below to view this comment:') %>
-<%= url_for @comment_url %>
-
-<%= _('Click on the address below to cancel the notification of new comments:') %>
-<%= url_for @unsubscribe_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -1,19 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
-
-<%= word_wrap(_('Title: %s') % @comment_title) %>
-
-<%= _("Comment:") %>
--------------------------------------------------------------------------------
-<%= word_wrap(@comment_body) %>
--------------------------------------------------------------------------------
-
-<%= _('Access the address below to view this comment:') %>
-<%= url_for @comment_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,22 @@
+<%= _('Hi!') %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) if @comment_title %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Click on the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _('Click on the address below to cancel the notification of new comments:') %>
+<%= url_for @unsubscribe_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -0,0 +1,19 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Access the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -29,14 +29,14 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
  
-      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
+      <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
     <% end %>
  
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
       <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload, @page)%>
     <% end %>
  
-    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest, @page) %>
+    <% if !@page.allow_create?(user) && profile.organization? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest, @page) %>
       <% content = content_tag( 'span', _('Suggest an article') ) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
       <% options = {:id => 'suggest-article-link'} %>
@@ -7,10 +7,10 @@ function submit_comment_form(button) {
   return true;
   <% else %>
   jQuery('#recaptcha-container').show();
-  jQuery.colorbox({ inline : true, href : '#recaptcha-container', maxWidth : '600px', maxHeight : '300px' });
+  noosfero.modal.inline('#recaptcha-container', {maxWidth :'600px', maxHeight : '300px' });
   jQuery('#confirm-captcha').unbind('click');
   jQuery('#confirm-captcha').bind('click', function() {
-    jQuery.colorbox.close();
+    noosfero.modal.close();
     button.form.recaptcha_response_field.value = jQuery('#recaptcha_response_field').val();
     button.form.recaptcha_challenge_field.value = jQuery('#recaptcha_challenge_field').val();
     button.form.confirm.value = 'true';
@@ -38,7 +38,7 @@ function submit_comment_form(button) {
     <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
     <% button_bar do %>
       <%= button_to_function :add, _('Confirm'), "return false", :id => "confirm-captcha" %>
-      <%= button_to_function :cancel, _('Cancel'), "jQuery.colorbox.close()" %>
+      <%= button_to_function :cancel, _('Cancel'), "noosfero.modal.close()" %>
     <% end %>
   </div>
  
@@ -13,8 +13,8 @@
                 date.day,
                 :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
                 :update => 'events-of-the-day',
-                :loading => "$('events-of-the-day').addClassName('loading')",
-                :complete => "$('events-of-the-day').removeClassName('loading')"
+                :loading => "jQuery('#events-of-the-day').addClass('loading')",
+                :complete => "jQuery('#events-of-the-day').removeClass('loading')"
               ) :
               date.day
             %>
@@ -9,10 +9,7 @@
                         enterprise.identifier, :class => 'profile-link' %>
     <%# profile_image_link enterprise, :portrait, 'div' %>
     <div class="controll">
-      <%= link_to content_tag('span',_('remove')),
-          { :action => 'remove', :id => enterprise.id },
-            :class => 'button icon-delete',
-            :title => _('remove') %>
+      <%= button(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
     </div><!-- end class="controll" -->
   </li>
 <% end %>
@@ -12,16 +12,16 @@
  
   <script type="text/javascript">
     function hide_invite_friend_login_password() {
-      $('invite-friends-login-password').hide();
+      jQuery('#invite-friends-login-password').hide();
     }
     function show_invite_friend_login_password(option) {
       if (option == 'hotmail') {
-        $('hotmail_username_tip').show();
+        jQuery('#hotmail_username_tip').show();
       } else {
-        $('hotmail_username_tip').hide();
+        jQuery('#hotmail_username_tip').hide();
       }
-      $('invite-friends-login-password').show();
-      $('login').focus();
+      jQuery('#invite-friends-login-password').show();
+      jQuery('#login').focus();
     }
   </script>
   <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
@@ -24,8 +24,8 @@
   </div>
   <% if @import_from != 'manual' %>
     <div>
-      <%= link_to_function _('Check all'), "$$('input.contact_to_invite').each(function(checkbox) { checkbox.checked = true; });" %>
-      <%= link_to_function _('Uncheck all'), "$$('input.contact_to_invite').each(function(checkbox) { checkbox.checked = false; });" %>
+      <%= link_to_function _('Check all'), "jQuery('input.contact_to_invite').each(function(index,checkbox) { checkbox.checked = true; });" %>
+      <%= link_to_function _('Uncheck all'), "jQuery('input.contact_to_invite').each(function(index,checkbox) { checkbox.checked = false; });" %>
       <div id='contacts-list'></div>
     </div>
   <% end -%>
-<%= javascript_include_tag 'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js',
-'jquery-2.1.1.min', 'jquery-migrate-1.2.1',
-'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
-'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow', 'select-or-die/_src/selectordie',
-'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', 'inputosaurus.js', :cache => 'cache/application' %>
+<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1', 'jrails', 'rails.js',
+  'jquery.cycle.all.min.js', 'jquery.colorbox-min.js',
+  'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
+  'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',
+  'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'inputosaurus.js', 'select-or-die/_src/selectordie',
+  # noosfero libraries
+  'application.js', 'modal.js',
+  'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
+  :cache => 'cache/application' %>
  
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -7,11 +7,11 @@
     </span>
   <% else %>
     <span class='not-logged-in'>
-      <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+      <%= _("<span class='login'>%s</span>") % modal_inline_link_to('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, '#inlineLoginBox', :id => 'link_login') %>
       <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
  
     <div id='inlineLoginBox' style='display: none;'>
-      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+      <%= render :file => 'account/login', :locals => { :is_popin => true } %>
     </div>
  
     <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
@@ -7,11 +7,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="description" content="<%= @environment.name %>" />
  
-    <!-- Twitter Card -->
-    <meta name="twitter:card" value="summary">
-    <meta name="twitter:title" content="<%= h page_title %>">
-    <meta name="twitter:description" content="<%= meta_description_tag(@page) %>">
-
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
  
@@ -23,7 +18,7 @@
     <%= yield :head %>
     <%=
       @plugins.dispatch(:head_ending).map do |content|
-        if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end
+        if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
       end.join("\n")
     %>
  
@@ -37,7 +32,7 @@
  
     <%=
       @plugins.dispatch(:body_beginning).map do |content|
-        if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end
+        if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
       end.join("\n")
     %>
  
@@ -89,5 +84,57 @@
     </script>
     <!-- End Piwik Code -->
  
+    <!-- Feedback -->
+
+    <link href='//feedback.participa.br/assets/feedback.css' media='all' rel='stylesheet'>
+    <script src='//feedback.participa.br/assets/feedback_client.js'></script>
+    
+    <script type=text/javascript>
+        $(document).ready(function() {
+          Feedback(
+                  {
+                      label: "Dê um Feedback!",
+                      header: "Registro do Feedback",
+                      url: "//feedback.participa.br/api/v1/feedbacks?access_token=pINDdceSPik_4vRCleHTQg",
+                      nextLabel: "Continuar",
+                      reviewLabel: "Revisar",
+                      sendLabel:  "Enviar",
+                      closeLabel: "Fechar",
+                      highlightBlackoutHelp: "Você pode destacar informações úteis ou ocultar informações sensíveis.",
+                      blackoutButtonLabel: "Ocultar",
+                      highlightButtonLabel: "Destacar",
+                      messageSuccess: "O seu relato foi enviado com sucesso!",
+                      messageError: "Houve um erro ao enviar o feedback...",
+                      pages: [
+                              new window.Feedback.Form([
+                                      {
+                                          type: "select",
+                                          name: "tipo_relato",
+                                          label: "Tipo de Relato",
+                                          options: ["Sugestão", "Erro", "Elogio"],
+                                          required: true
+                                      },
+                                      {
+                                          type: "starrating",
+                                          name: "starrating",
+                                          label: "Avalie",
+                                          options: ["1", "2", "3", "4", "5"],
+                                          required: true
+                                      },
+                                     {
+                                          type: "textarea",
+                                          name: "observacao",
+                                          label: "Observação"
+                                      }
+                                      ]
+                              ),
+                              new window.Feedback.Screenshot(),
+                              new window.Feedback.Review()
+                      ]
+                   });
+        });
+    
+    </script>
+    <!-- End Feedback Code -->
   </body>
 </html>
 <%= select_for_categories(categories, level) %>
  
 <%= javascript_tag do %>
-  jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
-  $('selected_category_id').value = <%= @category && @category.id %>
-  $('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')
-  toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
+  jQuery(document).ready(function() {
+    jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
+    jQuery('#selected_category_id').val(<%= @category.id rescue nil %>)
+    jQuery('#hierarchy_navigation').html(<%= hierarchy_category_navigation(@category, :make_links => true).to_json %>)
+    toggleDisabled(<%= (!!(@category && @category.accept_products?)).to_json %>, jQuery('#save_and_continue'))
+  });
 <% end %>
@@ -3,7 +3,7 @@
   <%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
 </div>
 <%= javascript_tag do %>
-  $$('#display-product-category .hierarchy-category')[0].update('<%=
+  jQuery('#display-product-category .hierarchy-category').first().html('<%=
     escape_javascript(hierarchy_category_navigation(
       @product.product_category,
       :make_links => false,
@@ -26,5 +26,5 @@
 <% end %>
  
 <%= javascript_tag do %>
-  toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
+  toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, jQuery('#save_and_continue')[0])
 <% end %>
@@ -24,6 +24,8 @@
   <br style='clear: both'/>
  
   <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty? && !@product.price_described? ) %>
+    <% plugins_tabs = plugins_product_tabs %>
+
     <div class='ui-tabs' id='product-<%= @product.id %>-tabs'>
       <ul>
         <% if !@product.description.blank? || @allowed_user %>
@@ -35,19 +37,32 @@
         <% if @product.price_described? || @allowed_user %>
           <li class='tab'><a href='#product-price-details'><%= _('Price composition') %></a></li>
         <% end %>
+
+        <% plugins_tabs.each do |tab| %>
+          <li class='tab'><a href='#<%=tab[:id]%>'><%= tab[:title] %></a></li>
+        <% end %>
+
       </ul>
+
       <div id='product-description'>
         <%= render :partial => 'manage_products/display_description' %>
       </div>
+
       <div id='product-inputs'>
         <%= render :partial => 'manage_products/display_inputs' %>
       </div>
+
       <% if @product.price_described? || @allowed_user %>
         <div id='product-price-details'>
           <%= render :partial => 'manage_products/display_price_details' %>
           <%= render :partial => 'manage_products/price_details_button' %>
         </div>
       <% end %>
+
+      <% plugins_tabs.each do |tab| %>
+        <div id='<%=tab[:id]%>'><%= raw tab[:content] %></div>
+      <% end %>
+
     </div>
   <% end %>
  
@@ -9,7 +9,7 @@ var mapZoom = 15;
 var delay_autocomplete = 500;
  
 function pointToAddress(latlng) {
-  $('location-fields').addClassName("loading");
+  jQuery('#location-fields').addClass("loading");
  
   if (latlng == null)
     return;
@@ -22,11 +22,11 @@ function pointToAddress(latlng) {
  
     var place = results[0];
  
-    $('location-fields').removeClassName("loading");
+    jQuery('#location-fields').removeClass("loading");
  
     var position = marker.getPosition();
-    $('profile_data_lat').value = position.lat();
-    $('profile_data_lng').value = position.lng();
+    jQuery('#profile_data_lat').val(position.lat());
+    jQuery('#profile_data_lng').val(position.lng());
  
     form = jQuery('#location-form')[0];
     form.lat = marker.getPosition().lat();
@@ -85,26 +85,26 @@ function pointToAddress(latlng) {
     }
  
     if (country_code)
-      $('profile_data_country').value = country_code;
+      jQuery('#profile_data_country').val(country_code);
     if (state)
-      $('profile_data_state').value = state;
+      jQuery('#profile_data_state').val(state);
     if (city)
-      $('profile_data_city').value = city;
+      jQuery('#profile_data_city').val(city);
     if (zip_code)
-      $('profile_data_zip_code').value = zip_code;
+      jQuery('#profile_data_zip_code').val(zip_code);
     if (address)
-      $('profile_data_address').value = address;
+      jQuery('#profile_data_address').val(address);
  
     map.setCenter(marker.getPosition());
   });
 }
  
 function addressToPoint() {
-  $('location-fields').addClassName("loading");
+  jQuery('#location-fields').addClass("loading");
  
-  var country_option = $('profile_data_country').value;
-  var address = $('profile_data_address').value + ", " + $('profile_data_zip_code').value + ", "
-    + $('profile_data_city').value+ ", " + $('profile_data_state').value + ", " + country_option;
+  var country_option = jQuery('#profile_data_country').val();
+  var address = jQuery('#profile_data_address').val() + ", " + jQuery('#profile_data_zip_code').val() + ", "
+    + jQuery('#profile_data_city').val() + ", " + jQuery('#profile_data_state').val() + ", " + country_option;
  
   if (geocoder) {
    geocoder.geocode({ 'address': address}, function(results, status) {
@@ -113,12 +113,12 @@ function addressToPoint() {
        marker.setPosition(results[0].geometry.location);
        pointToAddress(marker.getPosition());
  
-       $('profile_data_lat').value = results[0].geometry.location.lat();
-       $('profile_data_lng').value = results[0].geometry.location.lng();
-       $('location-fields').removeClassName("loading");
+       jQuery('#profile_data_lat').val(results[0].geometry.location.lat());
+       jQuery('#profile_data_lng').val(results[0].geometry.location.lng());
+       jQuery('#location-fields').removeClass("loading");
        enable_save();
      } else {
-       $('location-fields').removeClassName("loading");
+       jQuery('#location-fields').removeClass("loading");
        alert('<%=_("Address not found, reason:")%>' + statusErrorMessage(status));
      }
    });
@@ -175,7 +175,6 @@ function initializeMap() {
  
 }
  
-jQuery.noConflict();
 jQuery(document).ready(function () {
  
   initializeMap();
@@ -198,7 +197,7 @@ jQuery(document).ready(function () {
     source: "../maps/search_city",
     minLength: 3,
     delay: delay_autocomplete,
-    select: function( event, ui ) { $('profile_data_state').value =( ui.item ? ui.item.category : this.value ); }
+    select: function( event, ui ) { jQuery('#profile_data_state').val( ui.item ? ui.item.category : this.value ); }
   });
  
   jQuery("#profile_data_state").autocomplete({
@@ -9,7 +9,7 @@
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
-        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);jQuery('#reply_content_#{scrap.id}').val('');jQuery('#reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
       </span>
     <% end %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]), _('Are you sure you want to remove this scrap and all its replies?')]) if logged_in? && user.can_control_scrap?(scrap) %>
@@ -9,7 +9,7 @@
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
-        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);jQuery('#reply_content_#{scrap.id}').val('');jQuery('#reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
       </span>
     <% end %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]), _('Are you sure you want to remove this scrap and all its replies?')]) if logged_in? && user.can_control_scrap?(scrap) %>
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
+  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val('')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2, :class => 'autogrow' %>
     <%= submit_button :new, _('Share') %>
   <% end %>
@@ -9,7 +9,7 @@
   <%= hidden_field_tag(:confirmation, 1) %>
   <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
   <% if logged_in? && request.xhr? %>
-    <%= lightbox_close_button(_("No, I don't want")) %>
+    <%= modal_close_button _("No, I don't want") %>
   <% else %>
     <%= button(:cancel, _("No, I don't want."), profile.url) %>
   <% end %>
@@ -9,7 +9,7 @@
   <%= hidden_field_tag(:back_to, @back_to) %>
   <%= submit_button(:ok, _("Yes, I want to leave.") % profile.name) %>
   <% if logged_in? && request.xhr? %>
-    <%= lightbox_close_button(_("No, I don't want")) %>
+    <%= modal_close_button _("No, I don't want") %>
   <% else %>
     <%= button(:cancel, _("No, I don't want."), profile.url) %>
   <% end %>
@@ -9,7 +9,7 @@
   <% end %>
  
   <%= submit_button(:send, _('Report profile'), :style => 'float: left; cursor: pointer;', :id => 'report-abuse-submit-button', :onclick => "jQuery('#form-submit-loading').show()") %>
-  <%= button(:cancel, _('Cancel'), {}, :style => 'float: left; padding-top: 0px; padding-bottom: 0px;', :onclick => 'jQuery.colorbox.close(); return false;')%>
+  <%= button(:cancel, _('Cancel'), {}, :style => 'float: left; padding-top: 0px; padding-bottom: 0px;', :onclick => 'noosfero.modal.close(); return false;')%>
   <div id="form-submit-loading" class="small-loading" style="width: 16px; height: 16px; margin-top: 3px; float: left; display: none;"></div>
 <% end %>
  
@@ -30,7 +30,7 @@
       success: function(data, status, ajax){
         if ( !data.ok ) display_notice(data.error.message);
         else {
-          $.colorbox.close();
+          noosfero.modal.close();
           display_notice(data.message);
           window.location.reload();
         }
@@ -19,7 +19,7 @@
 <% if @environment.enabled?('enable_organization_url_change') %>
   <script type="text/javascript">
     function submit_button() {
-       return $("profile-data").select("input.submit")[0];
+       return jQuery("#profile-data").find("input.submit")[0];
     }
     function warn_value_change() {
        show_warning('profile-identifier-formitem', "identifier-change-confirmation");
@@ -30,7 +30,7 @@
        hide_warning('identifier-change-confirmation');
     }
     function no_change() {
-       $("profile_data_identifier").value = $("old_profile_identifier").value;
+       jQuery("#profile_data_identifier").val(jQuery("#old_profile_identifier").val());
        enable_button(submit_button());
        hide_warning('identifier-change-confirmation');
     }
 <h2><%= _('Add admins to %s') % profile.name %></h2>
  
-<%= form_remote_tag :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")' do %>
+<%= form_remote_tag :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :loading => 'jQuery("#users-list").addClass("loading")', :complete => 'jQuery("#users-list").removeClass("loading")' do %>
   <%= text_field_tag('query', '', :autocomplete => 'off') %>
   <%= submit_tag(_('Search')) %>
 <% end %>
  
-<%= observe_field('query', :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :frequency => 1, :with => 'query', :condition => '$("query").value.length > 2', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")') %>
-<%= observe_field('query', :frequency => 1, :condition => '$("query").value.length <= 2', :function => '$("users-list").update($("empty-query").innerHTML)') %>
+<%= observe_field('query', :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :frequency => 1, :with => 'query', :condition => 'jQuery("#query").val().length > 2', :loading => 'jQuery("#users-list").addClass("loading")', :complete => 'jQuery("#users-list").removeClass("loading")') %>
+<%= observe_field('query', :frequency => 1, :condition => 'jQuery("#query").val().length <= 2', :function => 'jQuery("#users-list").html(jQuery("#empty-query").html())') %>
  
 <div id="users-list">
   <%= render :partial => 'find_users' %>
@@ -21,10 +21,10 @@
 </div>
 <%= drop_receiving_element('members-list',
                            :url => {:action => 'add_admin', :profile => profile.identifier, :leaving_admin => @person},
-                           :before => '$("tr-" + element.id).hide()',
-                           :loading => '$("members-list").addClassName("loading")',
+                           :before => 'jQuery("#tr-" + element.id).hide()',
+                           :loading => 'jQuery("#members-list").addClass("loading")',
                            :update => 'members-list',
-                           :success => '$("tr-" + element.id).hide(); $(element.id).show();',
-                           :complete => '$("members-list").removeClassName("loading")') %>
+                           :success => 'jQuery("#tr-" + element.id).hide(); jQuery("#"+element.id).show();',
+                           :complete => 'jQuery("#members-list").removeClass("loading")') %>
  
 <br style="clear:both" />
@@ -17,9 +17,9 @@
           <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
           <%= button_to_remote_without_text(:remove, _('Remove'),
                 :update => 'members-list',
-                :loading => "$('members-list').addClassName('loading')",
-                :success => "$('tr-#{m.identifier}').show()",
-                :complete => "$('members-list').removeClassName('loading')",
+                :loading => "jQuery('#members-list').addClass('loading')",
+                :success => "jQuery('#tr-#{m.identifier}').show()",
+                :complete => "jQuery('#members-list').removeClass('loading')",
                 :url => { :id => m }.merge(remove_action)) if m != user %>
         </div>
       </td>
@@ -5,7 +5,7 @@
  
   <% button_bar do %>
     <%= submit_button(:add, _('Add')) %>
-    <%= lightbox_close_button(_('Cancel')) %>
+    <%= modal_close_button _('Cancel') %>
   <% end %>
  
 <% end %>
@@ -16,7 +16,7 @@
     <% end %>
   </ul>
   <% button_bar do %>
-    <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
+    <%= modal_button :add, _('New CSS'), :action => 'add_css', :id => @theme.id %>
   <% end %>
 </div>
  
@@ -25,10 +25,10 @@
   <ul>
     <% for image in @image_files %>
       <li><%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %></li>
-    <% end %> 
+    <% end %>
   </ul>
   <% button_bar do %>
-    <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id =>  @theme.id) %>
+    <%= modal_button :add, _('Add image'), :action => 'add_image', :id =>  @theme.id %>
   <% end %>
 </div>
...	...	@@ -2,9 +2,7 @@ source "https://rubygems.org"
2	2	gem 'rails', '~> 3.2.21'
3	3	gem 'minitest', '~> 3.2.0'
4	4	gem 'fast_gettext', '~> 0.6.8'
5		-gem 'acts-as-taggable-on', '~> 3.0.2'
6		-gem 'prototype-rails', '~> 3.2.1'
7		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	5	+gem 'acts-as-taggable-on', '~> 3.4.2'
8	6	gem 'rails_autolink', '~> 1.1.5'
9	7	gem 'pg', '~> 0.13.2'
10	8	gem 'rmagick', '~> 2.13.1'
...	...	@@ -13,19 +11,15 @@ gem 'will_paginate', '~> 3.0.3'
13	11	gem 'ruby-feedparser', '~> 0.7'
14	12	gem 'daemons', '~> 1.1.5'
15	13	gem 'thin', '~> 1.3.1'
16		-gem 'hpricot', '~> 0.8.6'
17		-gem 'nokogiri', '~> 1.6.0'
	14	+gem 'nokogiri', '~> 1.5.5'
18	15	gem 'rake', :require => false
19	16	gem 'grape', '~> 0.2.1'
20	17	gem 'rest-client', '~> 1.6.7'
21	18	gem 'exception_notification', '~> 4.0.1'
22	19	gem 'gettext', '~> 2.2.1', :require => false, :group => :development
23	20	gem 'locale', '~> 2.0.5'
24		-
25	21	gem 'whenever', :require => false
26		-
27		-# FIXME list here all actual dependencies (i.e. the ones in debian/control),
28		-# with their GEM names (not the Debian package names)
	22	+gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
29	23
30	24	group :production do
31	25	gem 'dalli', '~> 2.7.0'
...	...	@@ -45,6 +39,9 @@ group :cucumber do
45	39	gem 'selenium-webdriver', '~> 2.39.0'
46	40	end
47	41
	42	+# Requires custom dependencies
	43	+eval(File.read('config/Gemfile'), binding) rescue nil
	44	+
48	45	# include gemfiles from enabled plugins
49	46	# plugins in baseplugins/ are not included on purpose. They should not have any
50	47	# dependencies.
...	...
...	...	@@ -21,7 +21,7 @@ Noosfero is written in Ruby with the "[Rails framework](http://www.rubyonrails.o
21	21	You need to install some packages Noosfero depends on. On Debian GNU/Linux or Debian-based systems, all of these packages are available through the Debian archive. You can install them with the following command:
22	22
23	23	# apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
24		- libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
	24	+ libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby \
25	25	libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
26	26	tango-icon-theme
27	27
...	...	@@ -40,7 +40,6 @@ On other systems, they may or may not be available through your regular package
40	40	* Daemons - http://daemons.rubyforge.org
41	41	* Thin: http://code.macournoyer.com/thin
42	42	* tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
43		-* Hpricot: http://hpricot.com
44	43
45	44	If you manage to install Noosfero successfully on other systems than Debian,
46	45	please feel free to contact the Noosfero development mailing with the
...	...
...	...	@@ -26,7 +26,7 @@ The file config/database.yml must follow a structure in order to achieve multite
26	26
27	27	Each "hosted" environment must have an entry like this:
28	28
29		- env1_production:
	29	+ env1_production: &DEFAULT
30	30	adapter: postgresql
31	31	encoding: unicode
32	32	database: noosfero
...	...	@@ -61,7 +61,7 @@ The "hosted" environments define, besides the `schema_search_path`, a list of do
61	61	You must also tell the application which is the default environment.
62	62
63	63	production:
64		- env1_production
	64	+ <<: *DEFAULT
65	65
66	66	On the example above there are only three hosted environments, but it can be more than three. The schemas `env2` and `env3` must already exist in the same database of the hosting environment. As postgres user, you can create them typing:
67	67
...	...
...	...	@@ -0,0 +1,10 @@
	1	+# Noosfero security
	2	+
	3	+## Reporting security issues in Noosfero
	4	+
	5	+Security vulnerabilities should be reported via an email to
	6	+noosfero-security@listas.softwarelivre.org, which ia a private mailing list.
	7	+Reported problems will be published after fixes are available.
	8	+
	9	+The members of the mailing list are people who provide Noosfero (Noosfero
	10	+committers, mainly).
...	...
...	...	@@ -87,6 +87,6 @@ class AdminPanelController < AdminController
87	87	scope = scope.order('name ASC')
88	88
89	89	@q = params[:q]
90		- @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
	90	+ @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
91	91	end
92	92	end
...	...
...	...	@@ -33,6 +33,7 @@ class ApplicationController < ActionController::Base
33	33	unless environment.access_control_allow_methods.blank?
34	34	response.headers["Access-Control-Allow-Methods"] = environment.access_control_allow_methods
35	35	end
	36	+ response.headers["Access-Control-Allow-Credentials"] = 'true'
36	37	elsif environment.restrict_to_access_control_origins
37	38	render_access_denied _('Origin not in allowed.')
38	39	end
...	...	@@ -64,15 +65,7 @@ class ApplicationController < ActionController::Base
64	65	helper :document
65	66	helper :language
66	67
67		- def self.no_design_blocks
68		- @no_design_blocks = true
69		- end
70		- def self.uses_design_blocks?
71		- !@no_design_blocks
72		- end
73		- def uses_design_blocks?
74		- !@no_design_blocks && self.class.uses_design_blocks?
75		- end
	68	+ include DesignHelper
76	69
77	70	# Be sure to include AuthenticationSystem in Application Controller instead
78	71	include AuthenticatedSystem
...	...
...	...	@@ -8,7 +8,7 @@ class ProfileDesignController < BoxOrganizerController
8	8
9	9	def protect_fixed_block
10	10	block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
11		- if block.fixed && !current_person.is_admin?
	11	+ if !block.nil? && block.fixed && !current_person.is_admin?
12	12	render_access_denied
13	13	end
14	14	end
...	...
...	...	@@ -6,6 +6,7 @@ class ChatController < PublicController
6	6	def start_session
7	7	login = user.jid
8	8	password = current_user.crypted_password
	9	+ session[:chat] \|\|= {:rooms => []}
9	10	begin
10	11	jid, sid, rid = RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind",
11	12	:wait => 30, :hold => 1, :window => 5)
...	...	@@ -16,6 +17,31 @@ class ChatController < PublicController
16	17	end
17	18	end
18	19
	20	+ def toggle
	21	+ session[:chat][:status] = session[:chat][:status] == 'opened' ? 'closed' : 'opened'
	22	+ render :nothing => true
	23	+ end
	24	+
	25	+ def tab
	26	+ session[:chat][:tab_id] = params[:tab_id]
	27	+ render :nothing => true
	28	+ end
	29	+
	30	+ def join
	31	+ session[:chat][:rooms] << params[:room_id]
	32	+ session[:chat][:rooms].uniq!
	33	+ render :nothing => true
	34	+ end
	35	+
	36	+ def leave
	37	+ session[:chat][:rooms].delete(params[:room_id])
	38	+ render :nothing => true
	39	+ end
	40	+
	41	+ def my_session
	42	+ render :text => session[:chat].to_json, :layout => false
	43	+ end
	44	+
19	45	def avatar
20	46	profile = environment.profiles.find_by_identifier(params[:id])
21	47	filename, mimetype = profile_icon(profile, :minor, true)
...	...	@@ -51,18 +77,28 @@ class ChatController < PublicController
51	77	messages = ChatMessage.where('(to_id=:other and from_id=:me) or (to_id=:me and from_id=:other)', {:me => user.id, :other => other.id})
52	78	end
53	79
54		- messages = messages.order('created_at DESC').includes(:to, :from).limit(20)
	80	+ messages = messages.order('created_at DESC').includes(:to, :from).offset(params[:offset]).limit(20)
55	81	messages_json = messages.map do \|message\|
56	82	{
57	83	:body => message.body,
58		- :to => {:id => message.to.identifier, :name => message.to.name, :type => message.to.type},
59		- :from => {:id => message.from.identifier, :name => message.from.name, :type => message.from.type},
	84	+ :to => {:id => message.to.identifier, :name => message.to.name},
	85	+ :from => {:id => message.from.identifier, :name => message.from.name},
60	86	:created_at => message.created_at
61	87	}
62	88	end
63	89	render :json => messages_json.reverse
64	90	end
65	91
	92	+ def recent_conversations
	93	+ conversations_order = ActiveRecord::Base.connection.execute("select profiles.identifier from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc").entries.map {\|e\| e['identifier']}
	94	+ render :json => {:order => conversations_order.reverse, :domain => environment.default_hostname.gsub('.','-')}.to_json
	95	+ end
	96	+
	97	+ #TODO Ideally this is done through roster table on ejabberd.
	98	+ def roster_groups
	99	+ render :text => user.memberships.map {\|m\| {:jid => m.jid, :name => m.name}}.to_json
	100	+ end
	101	+
66	102	protected
67	103
68	104	def check_environment_feature
...	...
1	1	class ContactController < PublicController
2	2
3	3	needs_profile
	4	+ before_filter :allow_access_to_page
4	5
5	6	def new
6	7	@contact = build_contact
...	...
1	1	class EventsController < PublicController
2	2
3	3	needs_profile
	4	+ before_filter :allow_access_to_page
4	5
5	6	def events
6	7	@events = []
...	...