Merge branch 'master' into AI3279-block_store

Conflicts: Gemfile Gemfile.lock app/controllers/admin/environment_design_controller.rb app/helpers/layout_helper.rb app/models/block.rb script/quick-start

Merge branch 'master' into AI3279-block_store
Conflicts: Gemfile Gemfile.lock app/controllers/admin/environment_design_controller.rb app/helpers/layout_helper.rb app/models/block.rb script/quick-start
Victor Costa
2 parents eda464a0 90f4f1c1
Showing 851 changed files with 90339 additions and 137025 deletions Show diff stats
.ackrc
AUTHORS.md
Gemfile
Gemfile.lock
INSTALL.md
Rakefile
Vagrantfile
app/controllers/admin/environment_design_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
 --ignore-dir=log
 --ignore-dir=tmp
 --ignore-dir=pkg
+--ignore-dir=public/javascripts/cache
+--ignore-dir=public/stylesheets/cache
@@ -41,6 +41,7 @@ Alessandro Palmeira + Paulo Meirelles &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
 Ana Losnak <analosnak@gmail.com>
+Andre Bernardes <andrebsguedes@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
@@ -132,6 +133,7 @@ Francisco Marcelo de Araújo Lima Júnior &lt;maljunior@gmail.com&gt;
 Gabriela Navarro <navarro1703@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Gust <darksshades@hotmail.com>
+Hebert Douglas <hebertdougl@gmail.com>
 Hugo Melo <hugo@riseup.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
@@ -196,6 +198,7 @@ Martín Olivera &lt;molivera@solar.org.ar&gt;
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
@@ -230,6 +233,8 @@ Rodrigo Souto &lt;rodrigo@colivre.coop.br&gt;
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Tallys Martins <tallysmartins@gmail.com>
+tallys <tallys@tallys.(none)>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
 source "https://rubygems.org"
-gem 'rails'
-gem 'fast_gettext'
-gem 'acts-as-taggable-on'
-gem 'prototype-rails'
-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
-gem 'rails_autolink'
-gem 'pg'
-gem 'rmagick'
-gem 'RedCloth'
-gem 'will_paginate'
-gem 'ruby-feedparser'
-gem 'daemons'
-gem 'thin'
-gem 'hpricot'
-gem 'nokogiri'
+gem 'rails',                    '~> 3.2.19'
+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 'rails_autolink',           '~> 1.1.5'
+gem 'pg',                       '~> 0.13.2'
+gem 'rmagick',                  '~> 2.13.1'
+gem 'RedCloth',                 '~> 4.2.9'
+gem 'will_paginate',            '~> 3.0.3'
+gem 'ruby-feedparser',          '~> 0.7'
+gem 'daemons',                  '~> 1.1.5'
+gem 'thin',                     '~> 1.3.1'
+gem 'hpricot',                  '~> 0.8.6'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
-gem 'rest-client'
-gem 'exception_notification'
+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'
  
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
 group :production do
-  gem 'dalli'
+  gem 'dalli', '~> 2.7.0'
 end
  
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'mocha', :require => false
+  gem 'rspec',                  '~> 2.10.0'
+  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'mocha',                  '~> 1.1.0', :require => false
 end
  
 group :cucumber do
-  gem 'cucumber-rails', :require => false
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'database_cleaner'
-  gem 'selenium-webdriver'
+  gem 'cucumber-rails',         '~> 1.0.6', :require => false
+  gem 'capybara',               '~> 2.1.0'
+  gem 'cucumber',               '~> 1.0.6'
+  gem 'database_cleaner',       '~> 1.2.0'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
-# include plugin gemfiles
-Dir.glob(File.join('config', 'plugins', '*')).each do |plugin|
-  plugin_gemfile = File.join(plugin, 'Gemfile')
-  eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
+# include gemfiles from enabled plugins
+# plugins in baseplugins/ are not included on purpose. They should not have any
+# dependencies.
+Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
+  eval File.read(gemfile)
 end
@@ -1,191 +0,0 @@
-PATH
-  remote: vendor/prototype_legacy_helper
-  specs:
-    prototype_legacy_helper (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
-      mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.0.2)
-      rails (>= 3, < 5)
-    arel (3.0.2)
-    builder (3.0.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.5)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (0.12.10)
-    exception_notification (4.0.1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
-    fast_gettext (0.6.8)
-    ffi (1.0.11)
-    gherkin (2.4.21)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    hpricot (0.8.6)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.11.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    pg (0.13.2)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
-      bundler (~> 1.0)
-      railties (= 3.2.6)
-    rails_autolink (1.1.5)
-      rails (> 3.1)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.9.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rmagick (2.13.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    ruby-feedparser (0.7)
-    rubyzip (1.1.2)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.3)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  acts-as-taggable-on
-  capybara
-  cucumber
-  cucumber-rails
-  daemons
-  dalli
-  database_cleaner
-  exception_notification
-  fast_gettext
-  hpricot
-  mocha
-  nokogiri
-  pg
-  prototype-rails
-  prototype_legacy_helper (= 0.0.0)!
-  rails
-  rails_autolink
-  rake
-  rest-client
-  rmagick
-  rspec
-  rspec-rails
-  ruby-feedparser
-  selenium-webdriver
-  thin
-  will_paginate
@@ -186,8 +186,8 @@ Apache instalation
  
     # apt-get install apache2
  
-Apache configuration
---------------------
+Configuration - noosfero at /
+-----------------------------
  
 First you have to enable the following some apache modules:
  
@@ -257,6 +257,62 @@ Now restart your apache server (as root):
  
     # invoke-rc.d apache2 restart
  
+Configuration - noosfero at a /subdirectory
+-------------------------------------------
+
+This section describes how to configure noosfero at a subdirectory, what is
+specially useful when you want Noosfero to share a domain name with other
+applications. For example you can host noosfero at yourdomain.com/social, a
+webmail application at yourdomain.com/webmail, and have a static HTML website
+at yourdomain.com/.
+
+**NOTE:** Some plugins might not work well with this setting. Before deploying
+this setting, make sure you test that everything  you need works properly with
+it.
+
+The configuration is similar to the main configuration instructions, except for
+the following points. In the description below, replace '/subdirectory' with
+the actual subdirectory you want.
+
+1) add a `prefix: /subdirectory` line to your thin configuration file (thin.yml).
+
+1.1) remember to restart the noosfero application server whenever you make
+changes to that configuration file.
+
+    # service noosfero restart
+
+2) add a line saying `export RAILS_RELATIVE_URL_ROOT=/subdirectory` to
+/etc/default/noosfero (you can create it with just this line if it does not
+exist already).
+
+3) You should add the following apache configuration to an existing virtual
+host (plus the `<Proxy balancer://noosfero>` section as displayed above):
+
+```
+Alias /subdirectory /path/to/noosfero/public
+<Directory "/path/to/noosfero/public">
+  Options FollowSymLinks
+  AllowOverride None
+  Order Allow,Deny
+  Allow from all
+
+  Include /path/to/noosfero/etc/noosfero/apache/cache.conf
+
+  RewriteEngine On
+  RewriteBase /subdirectory
+  # Rewrite index to check for static index.html
+  RewriteRule ^$ index.html [QSA]
+  # Rewrite to check for Rails cached page
+  RewriteRule ^([^.]+)$ $1.html [QSA]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule ^(.*)$ http://localhost:3000%{REQUEST_URI} [P,QSA,L]
+</Directory>
+```
+
+3.1) remember to reload the apache server whenever any apache configuration
+file changes.
+
+    # sudo service apache2 reload
  
 Enabling exception notifications
 ================================
@@ -6,3 +6,13 @@
 require File.expand_path('../config/application', __FILE__)
  
 Noosfero::Application.load_tasks
+
+[
+  "baseplugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+].map do |pattern|
+  Dir.glob(pattern).sort
+end.flatten.each do |taskfile|
+  load taskfile
+end
@@ -3,7 +3,7 @@
  
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian-wheezy"
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
 class EnvironmentDesignController < BoxOrganizerController
-
+  
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    @blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
-    @blocks += plugins.dispatch(:extra_blocks, :type => Environment)
+    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
  
   def index
@@ -8,7 +8,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
   before_filter :login_required, :if => :private_environment?
-  before_filter :verify_members_whitelist, :if => :user
+  before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
  
   def verify_members_whitelist
     render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
@@ -40,7 +40,7 @@ class ApplicationController &lt; ActionController::Base
  
     theme_layout = theme_option(:layout)
     if theme_layout
-      theme_view_file('layouts/'+theme_layout) || theme_layout
+      (theme_view_file('layouts/'+theme_layout) || theme_layout).to_s
     else
      'application'
     end
@@ -227,7 +227,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     if request.post?
       @article.destroy
-      session[:notice] = _("\"#{@article.name}\" was removed.")
+      session[:notice] = _("\"%s\" was removed." % @article.name)
       referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
       if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
         redirect_to referer
@@ -20,7 +20,7 @@ class FriendsController &lt; MyProfileController
  
   class << self
     def per_page
-      10
+      12
     end
   end
   def per_page
@@ -5,47 +5,47 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
  
   def available_blocks
-    @blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
-    @blocks += plugins.dispatch(:extra_blocks)
+    @available_blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
+    @available_blocks += plugins.dispatch(:extra_blocks)
  
     # blocks exclusive to people
     if profile.person?
-      @blocks << FavoriteEnterprisesBlock
-      @blocks << CommunitiesBlock
-      @blocks << EnterprisesBlock
-      @blocks += plugins.dispatch(:extra_blocks, :type => Person)
+      @available_blocks << FavoriteEnterprisesBlock
+      @available_blocks << CommunitiesBlock
+      @available_blocks << EnterprisesBlock
+      @available_blocks += plugins.dispatch(:extra_blocks, :type => Person)
     end
  
     # blocks exclusive to communities
     if profile.community?
-      @blocks += plugins.dispatch(:extra_blocks, :type => Community)
+      @available_blocks += plugins.dispatch(:extra_blocks, :type => Community)
     end
  
     # blocks exclusive for enterprises
     if profile.enterprise?
-      @blocks << DisabledEnterpriseMessageBlock
-      @blocks << HighlightsBlock
-      @blocks << ProductCategoriesBlock
-      @blocks << FeaturedProductsBlock
-      @blocks << FansBlock
-      @blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
+      @available_blocks << DisabledEnterpriseMessageBlock
+      @available_blocks << HighlightsBlock
+      @available_blocks << ProductCategoriesBlock
+      @available_blocks << FeaturedProductsBlock
+      @available_blocks << FansBlock
+      @available_blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
     end
  
     # product block exclusive for enterprises in environments that permits it
     if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
-      @blocks << ProductsBlock
+      @available_blocks << ProductsBlock
     end
  
     # block exclusive to profiles that have blog
     if profile.has_blog?
-      @blocks << BlogArchivesBlock
+      @available_blocks << BlogArchivesBlock
     end
  
     if user.is_admin?(profile.environment)
-      @blocks << RawHTMLBlock
+      @available_blocks << RawHTMLBlock
     end
  
-    @blocks
+    @available_blocks
  
   end
  
@@ -16,14 +16,16 @@ class ProfileEditorController &lt; MyProfileController
     if request.post?
       params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
       Profile.transaction do
-      Image.transaction do
-        if @profile_data.update_attributes(params[:profile_data])
-          redirect_to :action => 'index', :profile => profile.identifier
-        else
-          profile.identifier = params[:profile] if profile.identifier.blank?
+        Image.transaction do
+          begin
+            @plugins.dispatch(:profile_editor_transaction_extras)
+            @profile_data.update_attributes!(params[:profile_data])
+            redirect_to :action => 'index', :profile => profile.identifier
+          rescue Exception => ex
+            profile.identifier = params[:profile] if profile.identifier.blank?
+          end
         end
       end
-      end
     end
   end
  
@@ -97,6 +97,7 @@ class AccountController &lt; ApplicationController
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
+
       if request.post?
         if may_be_a_bot
           set_signup_start_time_for_now
@@ -115,6 +116,14 @@ class AccountController &lt; ApplicationController
             invitation.update_attributes!({:friend => @user.person})
             invitation.finish
           end
+
+          unless params[:file].nil?
+            image = Image::new :uploaded_data=> params[:file][:image]
+
+            @user.person.image = image
+            @user.person.save
+          end
+
           if @user.activated?
             self.current_user = @user
             check_join_in_community(@user)
@@ -184,7 +193,7 @@ class AccountController &lt; ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
@@ -19,9 +19,13 @@ class ChatController &lt; PublicController
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
-    data = File.read(File.join(Rails.root, 'public', filename))
-    render :text => data, :layout => false, :content_type => mimetype
-    expires_in 24.hours
+    if filename =~ /^(https?:)?\/\//
+      redirect_to filename
+    else
+      data = File.read(File.join(Rails.root, 'public', filename))
+      render :text => data, :layout => false, :content_type => mimetype
+      expires_in 24.hours
+    end
   end
  
   def index
@@ -126,7 +126,7 @@ class ContentViewerController &lt; ApplicationController
     elsif !@page.display_to?(user)
       if !profile.public?
         private_profile_partial_parameters
-        render :template => 'profile/_private_profile', :status => 403
+        render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
         allowed = false
       else #if !profile.visible?
         render_access_denied
@@ -216,8 +216,6 @@ class ContentViewerController &lt; ApplicationController
     if @page.has_posts?
       posts = get_posts(params[:year], params[:month])
  
-      posts = posts.includes(:parent, {:profile => [:domains, :environment]}, :author)
-
       #FIXME Need to run this before the pagination because this version of
       #      will_paginate returns a will_paginate collection instead of a
       #      relation.
@@ -17,7 +17,11 @@ class ProfileController &lt; PublicController
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
-      profile.visible? ? private_profile : invisible_profile
+      if profile.visible?
+        private_profile
+      else
+        invisible_profile
+      end
     end
   end
  
@@ -61,13 +65,13 @@ class ProfileController &lt; PublicController
  
   def friends
     if is_cache_expired?(profile.friends_cache_key(params))
-      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
     end
   end
  
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
     end
   end
  
@@ -315,7 +319,7 @@ class ProfileController &lt; PublicController
         abuse_report = AbuseReport.new(params[:abuse_report])
         if !params[:content_type].blank?
           article = params[:content_type].constantize.find(params[:content_id])
-          abuse_report.content = instance_eval(&article.reported_version)
+          abuse_report.content = article_reported_version(article)
         end
  
         user.register_report(abuse_report, profile)
@@ -394,6 +398,7 @@ class ProfileController &lt; PublicController
  
   def private_profile
     private_profile_partial_parameters
+    render :action => 'index', :status => 403
   end
  
   def invisible_profile
@@ -90,10 +90,14 @@ class SearchController &lt; PublicController
   end
  
   def events
-    year = (params[:year] ? params[:year].to_i : Date.today.year)
-    month = (params[:month] ? params[:month].to_i : Date.today.month)
-    day = (params[:day] ? params[:day].to_i : Date.today.day)
-    @date = build_date(year, month, day)
+    if params[:year].blank? && params[:year].blank? && params[:day].blank?
+      @date = Date.today
+    else
+      year = (params[:year] ? params[:year].to_i : Date.today.year)
+      month = (params[:month] ? params[:month].to_i : Date.today.month)
+      day = (params[:day] ? params[:day].to_i : 1)
+      @date = build_date(year, month, day)
+    end
     date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month
  
     @events = []
@@ -304,7 +304,7 @@ module ApplicationHelper
   def partial_for_class(klass, prefix=nil, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
-    controller.view_paths.reverse_each do |view_path|
+    controller.view_paths.each do |view_path|
       partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
       return partial if partial
     end
@@ -482,7 +482,12 @@ module ApplicationHelper
             '/images/icons-app/enterprise-'+ size.to_s() +'.png'
           end
         else
-          '/images/icons-app/person-'+ size.to_s() +'.png'
+          pixels = Image.attachment_options[:thumbnails][size].split('x').first
+          gravatar_profile_image_url(
+            profile.email,
+            :size => pixels,
+            :d => gravatar_default
+          )
         end
       filename = default_or_themed_icon(icon)
     end
@@ -602,7 +607,7 @@ module ApplicationHelper
   end
  
   def gravatar_default
-    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
   end
  
   attr_reader :environment
@@ -902,13 +907,15 @@ module ApplicationHelper
   end
  
   def page_title
-    (@page ? @page.title + ' - ' : '') +
-    (@topic ? @topic.title + ' - ' : '') +
-    (@section ? @section.title + ' - ' : '') +
-    (@toc ? _('Online Manual') + ' - ' : '') +
-    (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    (profile ? profile.short_name : environment.name) +
-    (@category ? " - #{@category.full_name}" : '')
+    CGI.escapeHTML(
+      (@page ? @page.title + ' - ' : '') +
+      (@topic ? @topic.title + ' - ' : '') +
+      (@section ? @section.title + ' - ' : '') +
+      (@toc ? _('Online Manual') + ' - ' : '') +
+      (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
+      (profile ? profile.short_name : environment.name) +
+      (@category ? " - #{@category.full_name}" : '')
+    )
   end
  
   # DEPRECATED. Do not use this.
@@ -1280,11 +1287,13 @@ module ApplicationHelper
   end
  
   def delete_article_message(article)
-    if article.folder?
-      _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
-    else
-      _("Are you sure that you want to remove the item \"#{article.name}\"?")
-    end
+    CGI.escapeHTML(
+      if article.folder?
+        _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
+      else
+        _("Are you sure that you want to remove the item \"%s\"?") % article.name
+      end
+    )
   end
  
   def expirable_link_to(expired, content, url, options = {})
@@ -1372,7 +1381,7 @@ module ApplicationHelper
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
     end
-    html
+    html && html.html_safe
   end
  
   def convert_macro(html, source)
@@ -3,6 +3,12 @@ module ArticleHelper
   include PrototypeHelper
   include TokenHelper
  
+  def article_reported_version(article)
+    search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
+    partial_path = File.join('shared', 'reported_versions', 'profile', partial_for_class_in_view_path(article.class, search_path))
+    render_to_string(:partial => partial_path, :locals => {:article => article})
+  end
+
   def custom_options_for_article(article, tokenized_children)
     @article = article
  
@@ -28,7 +28,6 @@ module LayoutHelper
       'lightbox',
       'colorbox',
       'block_store',
-      'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
 module ProfileHelper
  
-  def display_field(title, profile, field, force = false)
+  COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
+  COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
+  COMMON_CATEGORIES[:interests] = [:interests]
+  COMMON_CATEGORIES[:general] = nil
+
+  PERSON_CATEGORIES = ActiveSupport::OrderedHash.new
+  PERSON_CATEGORIES[:basic_information] = [:nickname, :sex, :birth_date, :location, :privacy_setting, :created_at]
+  PERSON_CATEGORIES[:contact] = [:contact_phone, :cell_phone, :comercial_phone, :contact_information, :email, :personal_website, :jabber_id]
+  PERSON_CATEGORIES[:location] = [:address, :address_reference, :zip_code, :city, :state, :district, :country, :nationality]
+  PERSON_CATEGORIES[:work] = [:organization, :organization_website, :professional_activity]
+  PERSON_CATEGORIES[:study] = [:schooling, :formation, :area_of_study]
+  PERSON_CATEGORIES[:network] = [:friends, :communities, :enterprises]
+  PERSON_CATEGORIES.merge!(COMMON_CATEGORIES)
+
+  ORGANIZATION_CATEGORIES = ActiveSupport::OrderedHash.new
+  ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
+  ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
+  ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
+  ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
+
+  CATEGORY_MAP = ActiveSupport::OrderedHash.new
+  CATEGORY_MAP[:person] = PERSON_CATEGORIES
+  CATEGORY_MAP[:organization] = ORGANIZATION_CATEGORIES
+
+  FORCE = {
+    :person => [:privacy_setting],
+    :organization => [:privacy_setting, :location],
+  }
+
+  MULTIPLE = {
+    :person => [:blogs, :image_galleries, :interests],
+    :organization => [:blogs, :image_galleries, :interests],
+  }
+
+  CUSTOM_LABELS = {
+    :zip_code => _('ZIP code'),
+    :email => _('e-Mail'),
+    :jabber_id => _('Jabber'),
+    :birth_date => _('Date of birth'),
+    :created_at => _('Profile created at'),
+    :members_count => _('Members'),
+    :privacy_setting => _('Privacy setting'),
+    :article_tags => _('Tags')
+  }
+
+  EXCEPTION = {
+    :person => [:image, :preferred_domain, :description, :tag_list],
+    :organization => [:image, :preferred_domain, :description, :tag_list, :address, :zip_code, :city, :state, :country, :district]
+  }
+
+  def general_fields
+    categorized_fields = CATEGORY_MAP[kind].values.flatten
+    profile.class.fields.map(&:to_sym) - categorized_fields - EXCEPTION[kind]
+  end
+
+  def kind
+    if profile.kind_of?(Person)
+      :person
+    else
+      :organization
+    end
+  end
+
+  def title(field, entry = nil)
+    return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
+    CUSTOM_LABELS[field.to_sym] || _(field.to_s.humanize)
+  end
+
+  def display_field(field)
+    force = FORCE[kind].include?(field)
+    multiple = MULTIPLE[kind].include?(field)
     unless force || profile.may_display_field_to?(field, user)
       return ''
     end
-    value = profile.send(field)
-    if !value.blank?
-      if block_given?
-        value = yield(value)
-      end
-      content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
+    value = begin profile.send(field) rescue nil end
+    return '' if value.blank?
+    if value.kind_of?(Hash)
+      content = self.send("treat_#{field}", value)
+      content_tag('tr', content_tag('td', title(field), :class => 'field-name') + content_tag('td', content))
     else
-      ''
+      entries = multiple ? value : [] << value
+      entries.map do |entry|
+        content = self.send("treat_#{field}", entry)
+        unless content.blank?
+          content_tag('tr', content_tag('td', title(field, entry), :class => 'field-name') + content_tag('td', content))
+        end
+      end.join("\n")
     end
   end
  
-  def display_contact(profile)
-    fields = []
-    fields << display_field(_('Address:'), profile, :address).html_safe
-    fields << display_field(_('ZIP code:'), profile, :zip_code).html_safe
-    fields << display_field(_('Contact phone:'), profile, :contact_phone).html_safe
-    fields << display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }.html_safe
-    fields << display_field(_('Personal website:'), profile, :personal_website).html_safe
-    fields << display_field(_('Jabber:'), profile, :jabber_id).html_safe
-    if fields.reject!(&:blank?).empty?
-      ''
-    else
-      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + fields.join.html_safe
+  def treat_email(email)
+    link_to_email(email)
+  end
+
+  def treat_organization_website(url)
+    link_to(url, url)
+  end
+
+  def treat_sex(gender)
+    { 'male' => _('Male'), 'female' => _('Female') }[gender]
+  end
+
+  def treat_date(date)
+    show_date(date.to_date)
+  end
+  alias :treat_birth_date :treat_date
+  alias :treat_created_at :treat_date
+
+  def treat_friends(friends)
+     link_to friends.count, :controller => 'profile', :action => 'friends'
+  end
+
+  def treat_communities(communities)
+    link_to communities.count, :controller => "profile", :action => 'communities'
+  end
+
+  def treat_enterprises(enterprises)
+    if environment.disabled?('disable_asset_enterprises')
+      link_to enterprises.count, :controller => "profile", :action => 'enterprises'
+    end
+  end
+
+  def treat_members_count(count)
+    link_to count, :controller => 'profile', :action => 'members'
+  end
+
+  def treat_products(products)
+    if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises')
+      link_to _('Products/Services'), :controller => 'catalog', :action => 'index'
     end
   end
  
-  def display_work_info(profile)
-    organization = display_field(_('Organization:'), profile, :organization)
-    organization_site = display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }
-    if organization.blank? && organization_site.blank?
-      ''
+  def treat_admins(admins)
+    profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ')
+  end
+
+  def treat_blogs(blog)
+    link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url)
+  end
+
+  def treat_image_galleries(gallery)
+    link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url)
+  end
+
+  def treat_events(events)
+    link_to events.published.count, :controller => 'events', :action => 'events'
+  end
+
+  def treat_article_tags(tags)
+    tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10
+  end
+
+  def treat_interests(interest)
+    link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
+  end
+
+  def article_custom_title(article)
+    article.name
+  end
+  alias :blogs_custom_title :article_custom_title
+  alias :image_galleries_custom_title :article_custom_title
+
+  def interests_custom_title(interest)
+    ''
+  end
+
+  def method_missing(method, *args, &block)
+    if method.to_s =~ /^treat_(.+)$/
+      args[0]
+    elsif method.to_s =~ /^display_(.+)$/ && CATEGORY_MAP[kind].has_key?($1.to_sym)
+      category = $1.to_sym
+      fields = category == :general ? general_fields : CATEGORY_MAP[kind][category]
+      contents = []
+
+      fields.each do |field|
+        contents << display_field(field).html_safe
+      end
+
+      contents = contents.delete_if(&:blank?)
+
+      unless contents.empty?
+        content_tag('tr', content_tag('th', title(category), { :colspan => 2 })) + contents.join.html_safe
+      else
+        ''
+      end
     else
-      content_tag('tr', content_tag('th', _('Work'), { :colspan => 2 })) + organization + organization_site
+      super
     end
   end
  
 module RoleHelper
+
+  def role_available_permissions(role)
+    role.kind == "Environment" ? ['Environment', 'Profile'] : [role.kind]
+  end
+
 end
@@ -56,12 +56,12 @@ module SweeperHelper
     if profile
       profile.blocks.each {|block|
         conditions = block.class.expire_on
-        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+        blocks_to_expire << block unless (conditions[:profile] & causes).blank?
       }
     end
     environment.blocks.each {|block|
       conditions = block.class.expire_on
-      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+      blocks_to_expire << block unless (conditions[:environment] & causes).blank?
     }
  
     blocks_to_expire.uniq!
@@ -0,0 +1,51 @@
+module TinymceHelper
+  include MacrosHelper
+
+  def tinymce_js
+    output = ''
+    output += javascript_include_tag 'tinymce/js/tinymce/tinymce.min.js'
+    output += javascript_include_tag 'tinymce/js/tinymce/jquery.tinymce.min.js'
+    output += javascript_include_tag 'tinymce.js'
+    output += include_macro_js_files.to_s
+    output
+  end
+
+  def tinymce_init_js options = {}
+    options.merge! :document_base_url => environment.top_url,
+      :content_css => "/stylesheets/tinymce.css,#{macro_css_files}",
+      :plugins => %w[compat3x advlist autolink lists link image charmap print preview hr anchor pagebreak
+        searchreplace wordcount visualblocks visualchars code fullscreen
+        insertdatetime media nonbreaking save table contextmenu directionality
+        emoticons template paste textcolor colorpicker textpattern],
+      :language => tinymce_language
+
+    options[:toolbar1] = "insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+    if options[:mode] == 'simple'
+      options[:menubar] = false
+    else
+      options[:menubar] = 'edit insert view tools'
+      options[:toolbar2] = 'print preview code media | table'
+
+      options[:toolbar2] += ' | macros'
+      macros_with_buttons.each do |macro|
+        options[:toolbar2] += " #{macro.identifier}"
+      end
+    end
+
+    options[:macros_setup] = macros_with_buttons.map do |macro|
+      <<-EOS
+        ed.addButton('#{macro.identifier}', {
+          title: #{macro_title(macro).to_json},
+          onclick: #{generate_macro_config_dialog macro},
+          image : '#{macro.configuration[:icon_path]}'
+        });
+      EOS
+    end
+
+    #cleanup non tinymce options
+    options = options.except :mode
+
+    "noosfero.tinymce.init(#{options.to_json})"
+  end
+
+end
@@ -157,14 +157,17 @@ class Article &lt; ActiveRecord::Base
     self.profile
   end
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :name
       _('Title')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   def css_class_list
     [self.class.name.to_css_class]
@@ -282,13 +285,6 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
-  def reported_version(options = {})
-    article = self
-    search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
-    partial_path = File.join('shared', 'reported_versions', partial_for_class_in_view_path(article.class, search_path))
-    lambda { render_to_string(:partial => partial_path, :locals => {:article => article}) }
-  end
-
   # returns the data of the article. Must be overriden in each subclass to
   # provide the correct content for the article.
   def data
@@ -116,7 +116,7 @@ class Block &lt; ActiveRecord::Base
   # Must be redefined in subclasses to match the description of each block
   # type.
   def self.description
-    _('nothing')
+    ('dummy')
   end
  
   # returns a short description of the block, used when the user sees a list of
@@ -205,7 +205,7 @@ class Block &lt; ActiveRecord::Base
  
   # Override in your subclasses.
   # Define which events and context should cause the block cache to expire
-  # Possible events are: :article, :profile, :friendship, :category
+  # Possible events are: :article, :profile, :friendship, :category, :role_assignment
   # Possible contexts are: :profile, :environment
   def self.expire_on
     {
@@ -254,7 +254,7 @@ class Block &lt; ActiveRecord::Base
  
   def self.icon_path
     basename = self.name.split('::').last.underscore
-    File.join('blocks', basename, 'icon.png') 
+    File.join('blocks', basename, 'icon.png')
   end
  
   def self.default_icon_path
@@ -265,4 +265,9 @@ class Block &lt; ActiveRecord::Base
     "block_preview.png"
   end
  
+  def copy_from(block)
+    self.settings = block.settings
+    self.position = block.position
+  end
+
 end
@@ -2,16 +2,19 @@ class ChangePassword &lt; Task
  
   attr_accessor :password, :password_confirmation
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :password
       _('Password')
     when :password_confirmation
       _('Password Confirmation')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   validates_presence_of :requestor
  
@@ -50,16 +50,6 @@ class Community &lt; Organization
     super + FIELDS
   end
  
-  validate :presence_of_required_fieds
-
-  def presence_of_required_fieds
-    self.required_fields.each do |field|
-      if self.send(field).blank?
-        self.errors.add_on_blank(field)
-      end
-    end
-  end
-
   def active_fields
     environment ? environment.active_community_fields : []
   end
@@ -59,16 +59,6 @@ class Enterprise &lt; Organization
     super + FIELDS
   end
  
-  validate :presence_of_required_fieds
-
-  def presence_of_required_fieds
-    self.required_fields.each do |field|
-      if self.send(field).blank?
-        self.errors.add_on_blank(field)
-      end
-    end
-  end
-
   def active_fields
     environment ? environment.active_enterprise_fields : []
   end
@@ -660,6 +660,7 @@ class Environment &lt; ActiveRecord::Base
     url = 'http://'
     url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
     url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
+    url << Noosfero.root('')
     url
   end
  
@@ -804,7 +805,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def notification_emails
-    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
+    [contact_email].select(&:present?) + admins.map(&:email)
   end
  
   after_create :create_templates
@@ -13,6 +13,7 @@ class ExternalFeed &lt; ActiveRecord::Base
   attr_accessible :address, :enabled
  
   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
@@ -30,6 +31,7 @@ class ExternalFeed &lt; ActiveRecord::Base
     article.source = link 
     article.profile = blog.profile 
     article.parent = blog
+    article.author_name = self.feed_title
     unless blog.children.exists?(:slug => article.slug)
       article.save!
       article.delay.create_activity
@@ -85,8 +85,4 @@ class FeedReaderBlock &lt; Block
     block_title(title) + formatted_feed_content
   end
  
-  def editable?
-    true
-  end
-
 end
@@ -78,16 +78,17 @@ class LinkListBlock &lt; Block
       address
     end
     if add !~ /^[a-z]+:\/\// && add !~ /^\//
-      'http://' + add
+      '//' + add
     else
+      if root = Noosfero.root
+        if !add.starts_with?(root)
+          add = root + add
+        end
+      end
       add
     end
   end
  
-  def editable?
-    true
-  end
-
   def icons_options
     ICONS.map do |i|
       "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
@@ -100,4 +101,5 @@ class LinkListBlock &lt; Block
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
   end
+
 end
@@ -16,10 +16,6 @@ class MainBlock &lt; Block
     true
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -30,6 +30,16 @@ class Organization &lt; Profile
  
   scope :more_popular, :order => 'members_count DESC'
  
+  validate :presence_of_required_fieds, :unless => :is_template
+
+  def presence_of_required_fieds
+    self.required_fields.each do |field|
+      if self.send(field).blank?
+        self.errors.add_on_blank(field)
+      end
+    end
+  end
+
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
   end
@@ -135,7 +145,11 @@ class Organization &lt; Profile
   end
  
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    if emails.empty?
+      emails << environment.contact_email
+    end
+    emails
   end
  
   def already_request_membership?(person)
@@ -161,7 +161,7 @@ class Person &lt; Profile
     FIELDS
   end
  
-  validate :presence_of_required_fields
+  validate :presence_of_required_fields, :unless => :is_template
  
   def presence_of_required_fields
     self.required_fields.each do |field|
@@ -97,7 +97,7 @@ class Profile &lt; ActiveRecord::Base
   end
  
   def members_by_name
-    members.order(:name)
+    members.order('profiles.name')
   end
  
   class << self
@@ -346,16 +346,17 @@ class Profile &lt; ActiveRecord::Base
   end
  
   def copy_blocks_from(profile)
+    template_boxes = profile.boxes.select{|box| box.position}
     self.boxes.destroy_all
-    profile.boxes.each do |box|
-      new_box = Box.new
+    self.boxes = template_boxes.size.times.map { Box.new }
+
+    template_boxes.each_with_index do |box, i|
+      new_box = self.boxes[i]
       new_box.position = box.position
-      self.boxes << new_box
       box.blocks.each do |block|
         new_block = block.class.new(:title => block[:title])
-        new_block.settings = block.settings
-        new_block.position = block.position
-        self.boxes[-1].blocks << new_block
+        new_block.copy_from(block)
+        new_box.blocks << new_block
       end
     end
   end
@@ -23,10 +23,6 @@ class ProfileImageBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -23,10 +23,6 @@ class ProfileInfoBlock &lt; Block
     end
   end
  
-  def editable?
-    false
-  end
-
   def cacheable?
     false
   end
@@ -11,8 +11,4 @@ class ProfileSearchBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
 end
@@ -285,8 +285,9 @@ class Task &lt; ActiveRecord::Base
   # If
   def send_notification(action)
     if sends_email?
-      if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+      if self.requestor && !self.requestor.notification_emails.empty?
+        message = TaskMailer.generic_message("task_#{action}", self)
+        message.deliver if message
       end
     end
   end
@@ -16,15 +16,18 @@ class User &lt; ActiveRecord::Base
   end
  
   # FIXME ugly workaround
-  def self.human_attribute_name(attrib, options={})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
       when :login
         return [_('Username'), _('Email')].join(' / ')
       when :email
         return _('e-Mail')
-      else _(self.superclass.human_attribute_name(attrib))
+      else _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   before_create do |user|
     if user.environment.nil?
@@ -198,6 +201,10 @@ class User &lt; ActiveRecord::Base
     Digest::MD5.hexdigest(password)
   end
  
+  add_encryption_method :salted_md5 do |password, salt|
+    Digest::MD5.hexdigest(password+salt)
+  end
+
   add_encryption_method :clear do |password, salt|
     password
   end
@@ -347,6 +354,7 @@ class User &lt; ActiveRecord::Base
     end
  
     def delay_activation_check
+      return if person.is_template?
       Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
     end
 end
@@ -13,20 +13,22 @@ class RoleAssignmentSweeper &lt; ActiveRecord::Observer
 protected
  
   def expire_caches(role_assignment)
-    expire_cache(role_assignment.accessor)
-    expire_cache(role_assignment.resource) if role_assignment.resource.respond_to?(:cache_keys)
+    expire_cache(role_assignment.accessor) if role_assignment.accessor.kind_of?(Profile)
+    expire_cache(role_assignment.resource) if role_assignment.resource.kind_of?(Profile)
   end
  
   def expire_cache(profile)
     per_page = Noosfero::Constants::PROFILE_PER_PAGE
-    profile.cache_keys(:per_page => per_page).each { |ck|
-      expire_timeout_fragment(ck)
-    }
+
+    profile.cache_keys(:per_page => per_page).each { |ck| expire_timeout_fragment(ck) }
+    expire_timeout_fragment(profile.members_cache_key(:per_page => per_page))
  
     profile.blocks_to_expire_cache.each { |block|
       blocks = profile.blocks.select{|b| b.kind_of?(block)}
       BlockSweeper.expire_blocks(blocks)
     }
+
+    expire_blocks_cache(profile, [:role_assignment])
   end
  
 end
@@ -8,12 +8,12 @@
 <% end %>
  
 <% n_blocks_in_line = 0 %>
-<% last_block = @blocks.last %>
+<% last_block = @available_blocks.last %>
  
 <div id="block-types-container">
   <div id="block-types">
  
-    <% @blocks.each do |block| %>
+    <% @available_blocks.each do |block| %>
  
     <% if n_blocks_in_line == 0 %>
     <div class="block-types-group">
@@ -14,8 +14,8 @@
  
 <ul id="product-list">
   <% @products.each do |product| %>
-    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
-    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
+    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_exec(&content) } %>
+    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_exec(&content) } %>
  
     <% status = [] %>
     <% status << 'not-available' if !product.available %>
@@ -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 => "$('events-of-the-day').addClassName('loading')",
+                :complete => "$('events-of-the-day').removeClassName('loading')"
               ) :
               date.day
             %>
 <span class="download-link">
   <span>Download</span>
-  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+  <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
 </span>
  
 <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
@@ -28,7 +28,7 @@
  
 <%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
  
-<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+<img src="<%= [Noosfero.root, image.public_filename(:display)].join %>" class="<%=image.css_class_name%>">
  
 <div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
   <%= image.abstract %>
@@ -61,9 +61,6 @@
         <%= submit_button(:search, _('Search')) %>
       </div>
  
-      <div>
-        <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
-      </div>
     <% end %>
   </div>
 <% end %>
@@ -17,7 +17,10 @@
     <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
     <meta property="og:title" content="<%= h page_title %>">
     <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
-    <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
+    <meta property="og:description" content="<%= meta_description_tag(@page) %>">
+
+    <!-- site root -->
+    <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
  
     <% if @page %>
       <meta property="article:published_time" content="<%= show_date(@page.published_at) %>">
 <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
 <%= remote_form_for(@product,
                    :loading => "small_loading('product-description-form')",
-                   :before => ("tinyMCE.triggerSave()" unless Rails.env == 'test'),
                    :update => 'product-description',
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'description'},
                    :html => {:id => 'product-description-form', :method => 'post'}) do |f| %>
@@ -13,7 +13,7 @@
       <%= render :partial => 'manage_products/display_image' %>
     </div>
     <div id='product-extra-content'>
-      <% extra_content = @plugins.dispatch(:product_info_extras, @product).collect { |content| instance_eval(&content) } %>
+      <% extra_content = @plugins.dispatch(:product_info_extras, @product).collect { |content| instance_exec(&content) } %>
       <%= extra_content.join("\n") %>
     </div>
     <div id='product-info'>
 <% unless @action %>
   <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
-    <tr>
-      <th colspan='2'>
-        <%= _('Content') %>
-      </th>
-    </tr>
-
-    <% profile.blogs.each do |blog| %>
-      <tr>
-        <td><%= blog.name + ':' %></td>
-        <td>
-          <%= link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url) %>
-        </td>
-      </tr>
-    <% end %>
-    <% profile.image_galleries.each do |gallery| %>
-      <tr>
-        <td><%= gallery.name + ':' %></td>
-        <td>
-          <%= link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url) %>
-        </td>
-      </tr>
-    <% end %>
-
-    <tr>
-      <td><%= _('Events:') %></td>
-      <td>
-        <%= link_to profile.events.published.count, :controller => 'events', :action => 'events' %>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <%= _('Tags:') %>
-      </td>
-      <td>
-        <%= tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10%>
-      </td>
-    </tr>
+    <%= display_content %>
  
     <% if !environment.enabled?('disable_categories') && !profile.interests.empty? %>
-      <tr>
-        <th colspan='2'><%= _('Interests') %></th>
-      </tr>
-      <% profile.interests.each do |item| %>
-        <tr>
-          <td></td>
-          <td><%= link_to item.name, :controller => 'search', :action => 'category_index', :category_path => item.explode_path %></td>
-        </tr>
-      <% end %>
+      <%= display_interests %>
     <% end %>
+
+    <%= display_general %>
   <% end %>
 <% end %>
 <table>
-  <tr>
-    <th colspan='2'><%= _('Basic information')%></th>
-  </tr>
-
-  <tr>
-    <td class='field-name'><%= _('Members') %></td>
-    <td>
-      <%= link_to profile.members_count, :controller => 'profile', :action => 'members' %>
-    </td>
-  </tr>
-
-  <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
-
-  <%= display_field(_('Location:'), profile, :location, true) %>
-
-  <tr>
-    <td class='field-name'><%= _('Profile created at:')  %></td>
-    <td><%= show_date(profile.created_at) %></td>
-  </tr>
-
-  <% if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises') %>
-    <tr>
-      <td></td>
-      <td>
-        <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
-      </td>
-    </tr>
-  <% end %>
-
-  <tr>
-    <td class='field-name'><%= _('Administrators:') %></td>
-    <td>
-      <%= profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ') %>
-    </td>
-  </tr>
-
+  <%= display_basic_information %>
+  <%= display_contact %>
+  <%= display_economic %>
   <%= render :partial => 'common' %>
 </table>
 <table>
-  <tr>
-    <th colspan='2'><%= _('Basic information')%></th>
-  </tr>
-  <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
-  <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
-  <%= display_field _('Location:'), profile, :location %>
-
-  <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
-
-  <tr>
-    <td class='field-name'><%= _('Profile created at:')  %></td>
-    <td><%= show_date(profile.created_at) %></td>
-  </tr>
-
-  <%= display_contact profile %>
+  <%= display_basic_information %>
+  <%= display_contact %>
+  <%= display_location %>
  
   <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
-    <%= display_work_info profile %>
-
-    <tr>
-      <th colspan='2'><%= _('Network')%></th>
-    </tr>
-    <tr>
-      <td><%= _('Friends') + ':' %></td>
-      <td><%= link_to  profile.friends.count, { :controller => 'profile', :action => 'friends' } %></td>
-    </tr>
-    <tr>
-      <td><%= _('Communities') + ':' %></td>
-      <td><%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %></td>
-    </tr>
-    <% if environment.disabled?('disable_asset_enterprises') %>
-      <tr id="person-profile-network-enterprises">
-        <td><%= _('Enterprises') + ':' %></td>
-        <td><%= link_to profile.enterprises.count, :controller => "profile", :action => 'enterprises' %></td>
-      </tr>
-    <% end %>
+    <%= display_work %>
+    <%= display_study %>
+    <%= display_network %>
  
     <%= render :partial => 'common' %>
-
   <% end %>
 </table>
  
@@ -10,8 +10,8 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment'),
                                  :style => 'color: #ccc' %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
@@ -9,8 +9,8 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment') %>
         <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
         <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
@@ -25,6 +25,11 @@
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
 <%= optional_field(@person, 'address_reference', labelled_form_field(_('Address reference'), text_field(:profile_data, :address_reference, :rel => _('Address reference')))) %>
 <%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
+<%= optional_field(@person, 'image', labelled_form_field(_('Image'), file_field(:file, :image, :rel => _('Image')))) %>
+
+<% @plugins.dispatch(:extra_optional_fields).each do |field| %>
+  <%= optional_field(@person, field[:name], labelled_form_field(field[:label], text_field(field[:object_name], field[:method], :rel => field[:label], :value => field[:value]))) %>
+<% end %>
  
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
@@ -6,10 +6,14 @@
  
   <%= required f.text_field(:name) %>
  
-  <p><%= _('Permissions:') %><p>
-  <% permissions.keys.each do |p| %>
-    <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
-    <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+  <% permissions.each do |key| %>
+  <div class="permissions <%= key.downcase %>">
+    <h4><%= _('%s Permissions:' % key) %></h4>
+    <% ActiveRecord::Base::PERMISSIONS[key].keys.each do |p| %>
+      <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
+      <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+    <% end %>
+  </div>
   <% end %>
  
   <% button_bar do %>
 <h2> <%= _("Editing #{@role.name}") %> </h2>
  
-<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
 <h2> <%= _("Create a new role") %> </h2>
  
-<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
+<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => role_available_permissions(@role) } %>
@@ -1,10 +0,0 @@
-<ul>
-  <li><%= (content_tag('strong', _('Title') + ': ') + article.title)  if article.title %> </li>
-  <li><%= (content_tag('strong', _('Type') + ': ') + article.class.short_description) %> </li>
-  <li>
-  <%= (content_tag('strong', _('Original content') + ': ') + link_to(article.name, article.url)) %> <br />
-    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
-  </li>
-</ul>
-
-<%= article_to_html(article) %>
@@ -1,10 +0,0 @@
-<ul>
-  <li><%= (content_tag('strong', _('Title') + ': ') + comment.title)  if comment.title %> </li>
-  <li><%= content_tag('strong', _('Type') + ': ') + _('Comment') %> </li>
-  <li>
-    <%= (content_tag('strong', _('Original content') + ': ') + link_to(comment.title || url_for(comment.url), comment.url)) %> <br />
-    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
-  </li>
-</ul>
-
-<p><%= article_to_html(comment) %></p>
@@ -1 +0,0 @@
-<%= _('Reported folder') + ': ' + link_to(article.name, article.url) %>
@@ -0,0 +1,10 @@
+<ul>
+  <li><%= (content_tag('strong', _('Title') + ': ') + article.title)  if article.title %> </li>
+  <li><%= (content_tag('strong', _('Type') + ': ') + article.class.short_description) %> </li>
+  <li>
+  <%= (content_tag('strong', _('Original content') + ': ') + link_to(article.name, article.url)) %> <br />
+    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
+  </li>
+</ul>
+
+<%= article_to_html(article) %>
@@ -0,0 +1,10 @@
+<ul>
+  <li><%= (content_tag('strong', _('Title') + ': ') + comment.title)  if comment.title %> </li>
+  <li><%= content_tag('strong', _('Type') + ': ') + _('Comment') %> </li>
+  <li>
+    <%= (content_tag('strong', _('Original content') + ': ') + link_to(comment.title || url_for(comment.url), comment.url)) %> <br />
+    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
+  </li>
+</ul>
+
+<p><%= article_to_html(comment) %></p>
@@ -0,0 +1 @@
+<%= _('Reported folder') + ': ' + link_to(article.name, article.url) %>
-<% extend MacrosHelper %>
-<%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
-<%= include_macro_js_files %>
-<script type="text/javascript">
-  var myplugins = "searchreplace,print,table,contextmenu,-macrosPlugin";
-  var first_line, second_line;
-  var mode = '<%= mode ||= false %>'
-  <% if mode %>
-    first_line = "fontsizeselect,bold,italic,underline,bullist,numlist,justifyleft,justifycenter,justifyright,link,unlink"
-    second_line = ""
-  <% else %>
-    first_line = "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,forecolor,fontsizeselect,formatselect"
-    second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,macros"
-    <% macros_with_buttons.each do |macro| %>
-      second_line += ',<%=macro.identifier %>'
-    <% end %>
-  <% end %>
-
-  if (tinymce.isIE) {
-    // the paste plugin is only useful in Internet Explorer
-    myplugins = "paste," + myplugins;
-  }
+<%
+extend TinymceHelper
+mode ||= false
+%>
  
+<%= tinymce_js %>
+<script type="text/javascript">
 tinymce.create('tinymce.plugins.MacrosPlugin', {
   createControl: function(n, cm) {
     switch (n) {
@@ -49,56 +33,21 @@ tinymce.create(&#39;tinymce.plugins.MacrosPlugin&#39;, {
   }
 });
  
+function tinymce_macros_setup(editor) {
+  <% macros_with_buttons.each do |macro| %>
+    editor.addButton('<%= macro.identifier %>', {
+      title: <%= macro_title(macro).to_json %>,
+      onclick: <%= generate_macro_config_dialog(macro) %>,
+      image : '<%= macro.configuration[:icon_path]%>'
+    });
+  <% end %>
+}
+
 // Register plugin with a short name
 tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
  
-tinyMCE.init({
-  mode : "textareas",
-  editor_selector : "mceEditor",
-  theme : "advanced",
-  relative_urls : false,
-  remove_script_host : false,
-  document_base_url : <%= environment.top_url.to_json %>,
-  plugins: myplugins,
-  theme_advanced_toolbar_location : "top",
-  theme_advanced_layout_manager: 'SimpleLayout',
-  theme_advanced_buttons1 : first_line,
-  theme_advanced_buttons2 : second_line,
-  theme_advanced_buttons3 : "",
-  theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
-  paste_auto_cleanup_on_paste : true,
-  paste_insert_word_content_callback : "convertWord",
-  paste_use_dialog: false,
-  apply_source_formatting : true,
-  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width],audio[controls|autoplay],video[controls|autoplay],source[src|type]",
-  content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
-  language: <%= tinymce_language.inspect %>,
-  entity_encoding: 'raw',
-  setup : function(ed) {
-    <% macros_with_buttons.each do |macro| %>
-           ed.addButton('<%= macro.identifier %>', {
-               title: <%= macro_title(macro).to_json %>,
-               onclick: <%= generate_macro_config_dialog(macro) %>,
-               image : '<%= macro.configuration[:icon_path]%>'
-             });
-    <% end %>
-  }
+jQuery(document).ready(function () {
+  <%= tinymce_init_js :mode => mode %>
 });
-
-function convertWord(type, content) {
-  switch (type) {
-    // Gets executed before the built in logic performes it's cleanups
-    case "before":
-      //content = content.toLowerCase(); // Some dummy logic
-      break;
-
-    // Gets executed after the built in logic performes it's cleanups
-    case "after":
-      content = content.replace(/<!--\s*-->/, '');
-      break;
-  }
-
-  return content;
-}
-
 </script>
+
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -108,13 +108,19 @@ module Noosfero
  
     # Your secret key for verifying cookie session data integrity.
     # If you change this key, all old sessions will become invalid!
-    # Make sure the secret is at least 30 characters and all random, 
+    # Make sure the secret is at least 30 characters and all random,
     # no regular words or you'll be exposed to dictionary attacks.
     config.secret_token = noosfero_session_secret
     config.action_dispatch.session = {
       :key    => '_noosfero_session',
     }
  
+    config.time_zone = File.read('/etc/timezone').split("\n").first
+    config.active_record.default_timezone = :local
+
+    config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"
+    config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}"
+
     Noosfero::Plugin.setup(config)
  
   end
 <% base_requires = '-r features/support -r features/step_definitions' %>
-<% default_options = "--color --format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" %>
+<% default_options = "--format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" %>
+<%
+  default_options += ' --color' if $stdout.isatty
+%>
 <% selenium_options = "--strict --tags @selenium #{base_requires}" %>
  
 default: <%= default_options %>
-if Delayed::Backend::ActiveRecord::Job.table_exists?
+if Delayed::Backend::ActiveRecord::Job.table_exists? &&
+  Delayed::Backend::ActiveRecord::Job.attribute_names.include?('queue')
   job = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%ActivitiesCounterCacheJob%"]
   if job.blank?
     Delayed::Backend::ActiveRecord::Job.enqueue(ActivitiesCounterCacheJob.new, {:priority => -3})
 # necessary for I18n.default_locale to work
 require 'i18n/backend/fallbacks'
 I18n.backend.class.send :include, I18n::Backend::Fallbacks
-
+I18n.enforce_available_locales = false
@@ -1,5 +0,0 @@
-if Delayed::Backend::ActiveRecord::Job.table_exists?
-  jobs = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%LogMemoryConsumptionJob%"]
-  jobs.map(&:destroy) if jobs.present?
-  Delayed::Backend::ActiveRecord::Job.enqueue(LogMemoryConsumptionJob.new)
-end
@@ -0,0 +1,2 @@
+# Load newrelic agent if its config file is defined.
+require 'newrelic_rpm' if File.exist?(File.dirname(__FILE__) + '/../newrelic.yml')
-if Delayed::Backend::ActiveRecord::Job.table_exists?
+if Delayed::Backend::ActiveRecord::Job.table_exists? &&
+  Delayed::Backend::ActiveRecord::Job.attribute_names.include?('queue')
   PersonNotifier.schedule_all_next_notification_mail
 end
@@ -0,0 +1,10 @@
+class IndexDomainsFilteredFields < ActiveRecord::Migration
+
+  def self.up
+    add_index :domains, [:name]
+    add_index :domains, [:is_default]
+    add_index :domains, [:owner_id, :owner_type]
+    add_index :domains, [:owner_id, :owner_type, :is_default]
+  end
+
+end
@@ -0,0 +1,12 @@
+class IndexArticlesFilteredFields < ActiveRecord::Migration
+  def self.up
+    %w[articles article_versions].each do |table|
+      add_index table.to_sym, [:path]
+      add_index table.to_sym, [:path, :profile_id]
+    end
+    add_index :articles, [:type]
+    add_index :articles, [:type, :parent_id]
+    add_index :articles, [:type, :profile_id]
+  end
+
+end
@@ -2,7 +2,10 @@ class AddSpamCommentsCounterCacheToArticles &lt; ActiveRecord::Migration
   def self.up
     add_column :articles, :spam_comments_count, :integer, :default => 0
     add_column :article_versions, :spam_comments_count, :integer, :default => 0
-    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+
+    execute("SELECT comments.source_id as source_id, count(comments.id) as comments_count FROM comments LEFT OUTER JOIN articles ON articles.id = source_id WHERE comments.source_type = 'Article' AND comments.spam = 't' GROUP BY comments.source_id;").each do |data|
+      execute("UPDATE articles SET spam_comments_count = '#{data['comments_count']}' WHERE id = #{data['source_id']}")
+    end
   end
  
   def self.down
@@ -4,8 +4,10 @@ class CreateRealRelationBetweenArticleAndAuthor &lt; ActiveRecord::Migration
     add_column :article_versions, :author_id, :integer
  
     # Set article's author as the first version's last_changed_by_id.
-    execute "update articles set author_id = (select article_versions.last_changed_by_id from article_versions where article_versions.article_id = articles.id and article_versions.version = 1 limit 1)"
-  end
+    execute("UPDATE article_versions SET author_id = last_changed_by_id")
+
+    execute("UPDATE articles SET author_id = article_versions.author_id FROM article_versions WHERE article_versions.article_id = articles.id AND article_versions.version = 1")
+ end
  
   def self.down
     remove_column :articles, :author_id
 class FixYamlEncoding < ActiveRecord::Migration
   def self.up
-    fix_encoding(Block, 'settings')
-    fix_encoding(Product, 'data')
-    fix_encoding(Environment, 'settings')
-    fix_encoding(Profile, 'data')
-    fix_encoding(ActionTracker::Record, 'params')
-    fix_encoding(Article, 'setting')
-    fix_encoding(Task, 'data')
+    ActiveRecord::Base.transaction do
+      fix_encoding(Environment, 'settings')
+      fix_encoding(Profile, 'data')
+      fix_encoding(Product, 'data')
+      fix_encoding(ActionTracker::Record, 'params')
+      fix_encoding(Article, 'setting')
+      fix_encoding(Task, 'data')
+      fix_encoding(Block, 'settings')
+    end
   end
  
   def self.down
@@ -16,15 +18,34 @@ class FixYamlEncoding &lt; ActiveRecord::Migration
   private
  
   def self.fix_encoding(model, param)
-    result = model.find(:all, :conditions => "#{param} LIKE '%!binary%'")
+    result = model.all
     puts "Fixing #{result.count} rows of #{model} (#{param})"
-    result.each {|r| r.update_column(param, deep_fix(r.send(param)).to_yaml)}
+    result.each do |r|
+      begin
+        yaml = r.send(param)
+        # if deserialization failed then a string is returned
+        if yaml.is_a? String
+          yaml.gsub! ': `', ': '
+          yaml = YAML.load yaml
+        end
+        r.update_column param, deep_fix(yaml).to_yaml
+      rescue => e
+        puts "FAILED #{r.inspect}"
+        puts e.message
+      end
+    end
   end
  
   def self.deep_fix(hash)
     hash.each do |value|
-      value.force_encoding('UTF-8') if value.is_a?(String) && !value.frozen? && value.encoding == Encoding::ASCII_8BIT
       deep_fix(value) if value.respond_to?(:each)
+      if value.is_a? String and not value.frozen?
+        if value.encoding == Encoding::ASCII_8BIT
+          value.force_encoding "utf-8"
+        else
+          value.encode!("iso-8859-1").force_encoding("utf-8")
+        end
+      end
     end
   end
  
@@ -0,0 +1,13 @@
+class AddIndexToBlogPostsSort < ActiveRecord::Migration
+  def self.up
+     %w[articles article_versions].each do |table|
+      add_index table.to_sym, [:published_at, :id]
+    end
+ end
+
+  def self.down
+     %w[articles article_versions].each do |table|
+      remove_index table.to_sym, [:published_at, :id]
+    end
+  end
+end
@@ -95,12 +95,15 @@ ActiveRecord::Schema.define(:version =&gt; 20140827191326) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
-    t.integer  "created_by_id"
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
+    t.integer  "created_by_id"
   end
  
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
+  add_index "article_versions", ["path", "profile_id"], :name => "index_article_versions_on_path_and_profile_id"
+  add_index "article_versions", ["path"], :name => "index_article_versions_on_path"
+  add_index "article_versions", ["published_at", "id"], :name => "index_article_versions_on_published_at_and_id"
  
   create_table "articles", :force => true do |t|
     t.string   "name"
@@ -143,9 +146,9 @@ ActiveRecord::Schema.define(:version =&gt; 20140827191326) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
-    t.integer  "created_by_id"
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
+    t.integer  "created_by_id"
   end
  
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -153,9 +156,15 @@ ActiveRecord::Schema.define(:version =&gt; 20140827191326) do
   add_index "articles", ["hits"], :name => "index_articles_on_hits"
   add_index "articles", ["name"], :name => "index_articles_on_name"
   add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
+  add_index "articles", ["path", "profile_id"], :name => "index_articles_on_path_and_profile_id"
+  add_index "articles", ["path"], :name => "index_articles_on_path"
   add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
+  add_index "articles", ["published_at", "id"], :name => "index_articles_on_published_at_and_id"
   add_index "articles", ["slug"], :name => "index_articles_on_slug"
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
+  add_index "articles", ["type", "parent_id"], :name => "index_articles_on_type_and_parent_id"
+  add_index "articles", ["type", "profile_id"], :name => "index_articles_on_type_and_profile_id"
+  add_index "articles", ["type"], :name => "index_articles_on_type"
  
   create_table "articles_categories", :id => false, :force => true do |t|
     t.integer "article_id"
@@ -278,6 +287,11 @@ ActiveRecord::Schema.define(:version =&gt; 20140827191326) do
     t.string  "google_maps_key"
   end
  
+  add_index "domains", ["is_default"], :name => "index_domains_on_is_default"
+  add_index "domains", ["name"], :name => "index_domains_on_name"
+  add_index "domains", ["owner_id", "owner_type", "is_default"], :name => "index_domains_on_owner_id_and_owner_type_and_is_default"
+  add_index "domains", ["owner_id", "owner_type"], :name => "index_domains_on_owner_id_and_owner_type"
+
   create_table "environments", :force => true do |t|
     t.string   "name"
     t.string   "contact_email"
@@ -1,3 +0,0 @@
----
-BUNDLE_WITHOUT: test:cucumber
-
+noosfero (1.0~rc4) wheezy-test; urgency=low
+
+  * Fourth release candidate
+
+ -- Antonio Terceiro <vagrant@wheezy-base>  Wed, 19 Nov 2014 10:31:16 -0300
+
+noosfero (1.0~rc3) wheezy-test; urgency=low
+
+  * Third release candidate to Noosfero 1.0
+
+ -- Antonio Terceiro <terceiro@debian.org>  Fri, 12 Sep 2014 16:20:58 -0300
+
+noosfero (1.0~rc2) wheezy-test; urgency=low
+
+  * Second 1.0 release candidate
+
+ -- Antonio Terceiro <terceiro@debian.org>  Fri, 12 Sep 2014 13:01:11 -0300
+
 noosfero (1.0~rc1) wheezy-test; urgency=low
  
   * First 1.0 release candidate
@@ -10,6 +28,18 @@ noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
  
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
  
+noosfero (0.47.5) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Thu, 23 Oct 2014 02:24:14 +0000
+
+noosfero (0.47.4) unstable; urgency=low
+
+  * Bugfixes and performance optimizations
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Thu, 21 Aug 2014 19:25:37 +0000
+
 noosfero (0.47.3) unstable; urgency=low
  
   * Bugfixes release
@@ -9,7 +9,7 @@ Build-Depends:
  ruby-gettext,
  ruby-sqlite3,
  rake,
- rails3 (>= 3.2.6-1~),
+ rails3 (>= 3.2.19-1~),
  ruby-rspec,
  ruby-rspec-rails,
  ruby-will-paginate,
@@ -30,12 +30,14 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
  
 Package: noosfero
 Architecture: all
+Pre-Depends: ruby1.8 (>= 1.8.7.358)
 Depends:
  rails3 (>= 3.2.6-1~),
  ruby (>= 1:1.9.3),
  rake,
  ruby-dalli,
  ruby-exception-notification,
+ ruby-gettext,
  ruby-fast-gettext,
  ruby-pg,
  ruby-rmagick,
@@ -49,6 +51,7 @@ Depends:
  ruby-hpricot,
  ruby-nokogiri,
  ruby-acts-as-taggable-on,
+ ruby-progressbar,
  ruby-prototype-rails,
  ruby-rails-autolink,
  memcached,
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+sed -e '/^group\s*:\(test\|cucumber\)/,/^end/ d' Gemfile
@@ -7,10 +7,6 @@ util                              usr/share/noosfero
 Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
  
-Gemfile                           usr/share/noosfero
-Gemfile.lock                      usr/share/noosfero
-debian/bundle/config              usr/share/noosfero/.bundle
-
 config/application.rb             usr/share/noosfero/config
 config/boot.rb                    usr/share/noosfero/config
 config/environment.rb             usr/share/noosfero/config
@@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
+/dev/null                                           usr/share/noosfero/Gemfile.lock
@@ -20,6 +20,10 @@ override_dh_link:
 		dh_link usr/lib/noosfero/dbinstall usr/share/dbconfig-common/scripts/noosfero/install/$$db; \
 	done
  
+override_dh_auto_install:
+	dh_auto_install
+	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
+
 override_dh_installinit:
 	dh_installinit -pnoosfero --onlyscripts
  
@@ -45,7 +45,7 @@ if [ -z &quot;$NOOSFERO_DIR&quot; ] || [ -z &quot;$NOOSFERO_USER&quot; ]; then
 fi
  
 if test -x /usr/sbin/noosfero-check-dbconfig ; then
-  if ! noosfero-check-dbconfig; then
+  if ! /usr/sbin/noosfero-check-dbconfig; then
     echo "Noosfero database access not configured, service disabled."
     exit 0
   fi
@@ -6,7 +6,14 @@ C{
 /*
  * Accept-language header normalization
  *
- * Cosimo, 21/01/2010
+ * - Parses client Accept-Language HTTP header
+ * - Tries to find the best match with the supported languages
+ * - Writes the best match as req.http.X-Varnish-Accept-Language
+ *
+ * First version: Cosimo, 21/Jan/2010
+ * Last update:   Cosimo, 03/Nov/2011
+ *
+ * http://github.com/cosimo/varnish-accept-language
  *
  */
  
@@ -16,11 +23,12 @@ C{
 #include <string.h>
  
 #define DEFAULT_LANGUAGE "en"
-#define SUPPORTED_LANGUAGES ":de:fr:es:ru:pt:hy:en:"
+#define SUPPORTED_LANGUAGES ":de:eo:es:fr:hy:it:pt:ru:"
  
 #define vcl_string char
-#define LANG_LIST_SIZE 16 
-#define LANG_MAXLEN 16
+#define LANG_LIST_SIZE 16
+#define HDR_MAXLEN 256
+#define LANG_MAXLEN 8
 #define RETURN_LANG(x) { \
     strncpy(lang, x, LANG_MAXLEN); \
     return; \
@@ -64,9 +72,8 @@ int is_supported(vcl_string *lang) {
     strncat(match_str, lang, LANG_MAXLEN);
     strncat(match_str, ":\0", 2);
  
-    if (strstr(supported_languages, match_str)) {
+    if (strstr(supported_languages, match_str))
         is_supported = 1;
-    }
  
     return is_supported;
 }
@@ -90,6 +97,7 @@ void select_language(const vcl_string *incoming_header, char *lang) {
     vcl_string *lang_tok = NULL;
     vcl_string root_lang[3];
     vcl_string *header;
+    vcl_string header_copy[HDR_MAXLEN];
     vcl_string *pos = NULL;
     vcl_string *q_spec = NULL;
     unsigned int curr_lang = 0, i = 0;
@@ -106,7 +114,7 @@ void select_language(const vcl_string *incoming_header, char *lang) {
         RETURN_DEFAULT_LANG;
  
     /* Tokenize Accept-Language */
-    header = (vcl_string *) incoming_header;
+    header = strncpy(header_copy, incoming_header, sizeof(header_copy));
  
     while ((lang_tok = strtok_r(header, " ,", &pos))) {
  
@@ -137,7 +145,8 @@ void select_language(const vcl_string *incoming_header, char *lang) {
         header = NULL;
  
         /* Break out if stored max no. of languages */
-        if (curr_lang >= LANG_MAXLEN) break;
+        if (curr_lang >= LANG_LIST_SIZE)
+            break;
     }
  
     /* Sort by priority */
@@ -157,12 +166,11 @@ void vcl_rewrite_accept_language(const struct sess *sp) {
     vcl_string *in_hdr;
     vcl_string lang[LANG_MAXLEN];
  
-    memset(lang, 0, LANG_MAXLEN);
-
     /* Get Accept-Language header from client */
     in_hdr = VRT_GetHdr(sp, HDR_REQ, "\020Accept-Language:");
  
     /* Normalize and filter out by list of supported languages */
+    memset(lang, 0, sizeof(lang));
     select_language(in_hdr, lang);
  
     /* By default, use a different header name: don't mess with backend logic */
@@ -191,3 +199,4 @@ sub vcl_fetch {
     set beresp.http.Vary = "X-Varnish-Accept-Language";
   }
 }
+
@@ -1,36 +0,0 @@
-Feature: change organization name
-  As an organization's admin
-  I want to change it's name
-  In order to keep it's name consistent
-
-  Scenario: changing community's name
-    Given the following communities
-      | identifier | name |
-      | sample-community | Sample Community |
-    And the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And "Joao Silva" is admin of "Sample Community"
-    And I am logged in as "joaosilva"
-    And I am on sample-community's control panel
-    And I follow "Community Info and settings"
-    And I fill in "Name" with "New Sample Community"
-    When I press "Save"
-    Then I should be on sample-community's control panel
-    And I should see "New Sample Community" within "title"
-
-  Scenario: changing enterprise's name
-    Given the following enterprises
-      | identifier | name |
-      | sample-enterprise | Sample Enterprise |
-    And the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And "Joao Silva" is admin of "Sample Enterprise"
-    And I am logged in as "joaosilva"
-    And I am on sample-enterprise's control panel
-    And I follow "Enterprise Info and settings"
-    And I fill in "Name" with "New Sample Enterprise"
-    When I press "Save"
-    Then I should be on sample-enterprise's control panel
-    And I should see "New Sample Enterprise" within "title"
@@ -1,145 +0,0 @@
-Feature: chat
-  As a Noosfero user
-  I want to chat with my friends
-
-  Background:
-    Given the following users
-      | login | name |
-      | tame | Tame |
-      | mariasilva | Maria Silva |
-      | josesilva  | Jose Silva  |
-    And "tame" is online in chat
-    And "mariasilva" is online in chat
-    And "josesilva" is online in chat
-    And "tame" is friend of "mariasilva"
-    And "tame" is friend of "josesilva"
-
-  @selenium
-  Scenario: provide link to open chat
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    Then I should see "Open chat" within "#user"
-
-  @selenium
-  Scenario: provide the chat online users content
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    Then I should see "Friends in chat "
-
-  @selenium
-  Scenario: provide the chat online users list
-    Given the profile "tame" has no blocks
-    And feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    And I go to tame's profile
-    When I follow "chat-online-users-title"
-    Then I should see "Maria Silva"
-    And I should see "Jose Silva"
-
-  Scenario: not provide link to chat when environment not support that
-    Given I am logged in as "tame"
-    Then I should not see "Open chat" within "#user"
-
-  Scenario: not provide link to chat when the user is logged out
-    Given I am on tame's homepage
-    Then I should not see "Open chat" within "#user"
-
-  @selenium
-  Scenario: not provide the chat online users list when environment not support that
-    Given I am logged in as "tame"
-    Then I should not see "Friends in chat "
-
-  Scenario: block access to chat when environment not support that
-    Given I am logged in as "tame"
-    When I go to chat
-    Then I should see "There is no such page"
-
-  Scenario: block access to chat for guest users
-    Given feature "xmpp_chat" is enabled on environment
-    When I go to chat
-    Then I should be on login page
-
-  @selenium
-  Scenario: open chat in a new window
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    When I follow "Open chat"
-    And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends online (0)"
-
-  @selenium
-  Scenario: open chat with an online user in a new window
-    Given the profile "tame" has no blocks
-    And feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    And I go to tame's profile
-    When I follow "chat-online-users-title"
-    And I follow "Maria Silva"
-    And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends online (0)"
-
-  @selenium
-  Scenario: chat starts disconnected by default
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    When I follow "Open chat"
-    And I select window "noosfero_chat"
-    Then I should see "Offline" within "a"
-
-  @selenium
-  Scenario: view options to change my chat status through menu
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    And I follow "Open chat"
-    When I select window "noosfero_chat"
-    Then "Online" should not be visible within "#user-status"
-    And "Busy" should not be visible within "#user-status"
-    And "Sign out of chat" should not be visible within "#user-status"
-    When I follow "Offline"
-    Then "Online" should be visible within "#user-status"
-    And "Busy" should be visible within "#user-status"
-    And "Sign out of chat" should be visible within "#user-status"
-
-  @selenium
-  Scenario: link to open chatroom of a community
-    Given the following communities
-      | identifier | name |
-      | autoramas | Autoramas |
-    And "Tame" is a member of "Autoramas"
-    And feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    When I go to autoramas's profile
-    Then I should see "Enter chat room"
-
-  @selenium
-  Scenario: not see link to open chatroom of a community if not a member
-    Given the following communities
-      | identifier | name |
-      | autoramas | Autoramas |
-    And feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    When I go to autoramas's profile
-    Then I should not see "Enter chat room" within "a"
-
-  @selenium
-  Scenario: not see link to open chatroom of a community if xmpp_chat disabled
-    Given the following communities
-      | identifier | name |
-      | autoramas | Autoramas |
-    And "Tame" is a member of "Autoramas"
-    And I am logged in as "tame"
-    When I go to autoramas's profile
-    Then I should not see "Enter chat room" within "a"
-
-  @selenium
-  Scenario: open chatroom of a community in a new window
-    Given feature "xmpp_chat" is enabled on environment
-    And the following communities
-      | identifier | name |
-      | autoramas | Autoramas |
-    And "Tame" is a member of "Autoramas"
-    And I am logged in as "tame"
-    When I go to autoramas's profile
-    And I follow "Enter chat room"
-    And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends online (0)"
@@ -27,44 +27,3 @@ Feature: edit profile
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
-
-  @selenium
-  Scenario: Alert about url change
-    Given the following community
-      | identifier | name | owner |
-      | o-rappa | O Rappa | joao  |
-    And feature "enable_organization_url_change" is enabled on environment
-    And I go to o-rappa's control panel
-    When I follow "Community Info and settings"
-    Then I should not see "WARNING" within "#identifier-change-confirmation"
-    And I fill in "Address" with "banda-o-rappa"
-    When I leave the "#profile_data_identifier" field
-    Then I should see "WARNING" within "#identifier-change-confirmation"
-
-  @selenium
-  Scenario: Confirm url change
-    Given the following community
-      | identifier | name | owner |
-      | o-rappa | O Rappa | joao  |
-    And feature "enable_organization_url_change" is enabled on environment
-    And I go to o-rappa's control panel
-    And I follow "Community Info and settings"
-    And I fill in "Address" with "banda-o-rappa"
-    When I leave the "#profile_data_identifier" field
-    Then I should see "WARNING" within "#identifier-change-confirmation"
-    When I follow "Yes"
-    Then I should not see "WARNING" within "#identifier-change-confirmation"
-
-  @selenium
-  Scenario: Cancel url change
-    Given the following community
-      | identifier | name | owner |
-      | o-rappa | O Rappa | joao  |
-    And feature "enable_organization_url_change" is enabled on environment
-    And I go to o-rappa's control panel
-    And I follow "Community Info and settings"
-    And I fill in "Address" with "banda-o-rappa"
-    When I leave the "#profile_data_identifier" field
-    Then I should see "WARNING" within "#identifier-change-confirmation"
-    When I follow "No"
-    Then I should not see "WARNING" within "#identifier-change-confirmation"
1	1	--ignore-dir=log
2	2	--ignore-dir=tmp
3	3	--ignore-dir=pkg
	4	+--ignore-dir=public/javascripts/cache
	5	+--ignore-dir=public/stylesheets/cache
...	...
...	...	@@ -41,6 +41,7 @@ Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
41	41	Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
42	42	Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43	43	Ana Losnak <analosnak@gmail.com>
	44	+Andre Bernardes <andrebsguedes@gmail.com>
44	45	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
45	46	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
46	47	Antonio Terceiro <terceiro@colivre.coop.br>
...	...	@@ -132,6 +133,7 @@ Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
132	133	Gabriela Navarro <navarro1703@gmail.com>
133	134	Grazieno Pellegrino <grazieno@gmail.com>
134	135	Gust <darksshades@hotmail.com>
	136	+Hebert Douglas <hebertdougl@gmail.com>
135	137	Hugo Melo <hugo@riseup.net>
136	138	Isaac Canan <isaac@intelletto.com.br>
137	139	Italo Valcy <italo@dcc.ufba.br>
...	...	@@ -196,6 +198,7 @@ Martín Olivera <molivera@solar.org.ar>
196	198	Moises Machado <moises@colivre.coop.br>
197	199	Naíla Alves <naila@colivre.coop.br>
198	200	Nanda Lopes <nanda.listas+psl@gmail.com>
	201	+Parley Martins <parleypachecomartins@gmail.com>
199	202	Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
200	203	Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
201	204	Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
...	...	@@ -230,6 +233,8 @@ Rodrigo Souto <rodrigo@colivre.coop.br>
230	233	Ronny Kursawe <kursawe.ronny@googlemail.com>
231	234	root <root@debian.sdr.serpro>
232	235	Samuel R. C. Vale <srcvale@holoscopio.com>
	236	+Tallys Martins <tallysmartins@gmail.com>
	237	+tallys <tallys@tallys.(none)>
233	238	Valessio Brito <contato@valessiobrito.com.br>
234	239	Valessio Brito <contato@valessiobrito.info>
235	240	Valessio Brito <valessio@gmail.com>
...	...
1	1	source "https://rubygems.org"
2		-gem 'rails'
3		-gem 'fast_gettext'
4		-gem 'acts-as-taggable-on'
5		-gem 'prototype-rails'
6		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
7		-gem 'rails_autolink'
8		-gem 'pg'
9		-gem 'rmagick'
10		-gem 'RedCloth'
11		-gem 'will_paginate'
12		-gem 'ruby-feedparser'
13		-gem 'daemons'
14		-gem 'thin'
15		-gem 'hpricot'
16		-gem 'nokogiri'
	2	+gem 'rails', '~> 3.2.19'
	3	+gem 'fast_gettext', '~> 0.6.8'
	4	+gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'prototype-rails', '~> 3.2.1'
	6	+gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	7	+gem 'rails_autolink', '~> 1.1.5'
	8	+gem 'pg', '~> 0.13.2'
	9	+gem 'rmagick', '~> 2.13.1'
	10	+gem 'RedCloth', '~> 4.2.9'
	11	+gem 'will_paginate', '~> 3.0.3'
	12	+gem 'ruby-feedparser', '~> 0.7'
	13	+gem 'daemons', '~> 1.1.5'
	14	+gem 'thin', '~> 1.3.1'
	15	+gem 'hpricot', '~> 0.8.6'
	16	+gem 'nokogiri', '~> 1.5.5'
17	17	gem 'rake', :require => false
18		-gem 'rest-client'
19		-gem 'exception_notification'
	18	+gem 'rest-client', '~> 1.6.7'
	19	+gem 'exception_notification', '~> 4.0.1'
	20	+gem 'gettext', '~> 2.2.1', :require => false, :group => :development
	21	+gem 'locale', '~> 2.0.5'
20	22
21	23	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
22	24	# with their GEM names (not the Debian package names)
23	25
24	26	group :production do
25		- gem 'dalli'
	27	+ gem 'dalli', '~> 2.7.0'
26	28	end
27	29
28	30	group :test do
29		- gem 'rspec'
30		- gem 'rspec-rails'
31		- gem 'mocha', :require => false
	31	+ gem 'rspec', '~> 2.10.0'
	32	+ gem 'rspec-rails', '~> 2.10.1'
	33	+ gem 'mocha', '~> 1.1.0', :require => false
32	34	end
33	35
34	36	group :cucumber do
35		- gem 'cucumber-rails', :require => false
36		- gem 'capybara'
37		- gem 'cucumber'
38		- gem 'database_cleaner'
39		- gem 'selenium-webdriver'
	37	+ gem 'cucumber-rails', '~> 1.0.6', :require => false
	38	+ gem 'capybara', '~> 2.1.0'
	39	+ gem 'cucumber', '~> 1.0.6'
	40	+ gem 'database_cleaner', '~> 1.2.0'
	41	+ gem 'selenium-webdriver', '~> 2.39.0'
40	42	end
41	43
42		-# include plugin gemfiles
43		-Dir.glob(File.join('config', 'plugins', '*')).each do \|plugin\|
44		- plugin_gemfile = File.join(plugin, 'Gemfile')
45		- eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
	44	+# include gemfiles from enabled plugins
	45	+# plugins in baseplugins/ are not included on purpose. They should not have any
	46	+# dependencies.
	47	+Dir.glob('config/plugins/*/Gemfile').each do \|gemfile\|
	48	+ eval File.read(gemfile)
46	49	end
...	...
...	...	@@ -1,191 +0,0 @@
1		-PATH
2		- remote: vendor/prototype_legacy_helper
3		- specs:
4		- prototype_legacy_helper (0.0.0)
5		-
6		-GEM
7		- remote: https://rubygems.org/
8		- specs:
9		- RedCloth (4.2.9)
10		- actionmailer (3.2.6)
11		- actionpack (= 3.2.6)
12		- mail (~> 2.4.4)
13		- actionpack (3.2.6)
14		- activemodel (= 3.2.6)
15		- activesupport (= 3.2.6)
16		- builder (~> 3.0.0)
17		- erubis (~> 2.7.0)
18		- journey (~> 1.0.1)
19		- rack (~> 1.4.0)
20		- rack-cache (~> 1.2)
21		- rack-test (~> 0.6.1)
22		- sprockets (~> 2.1.3)
23		- activemodel (3.2.6)
24		- activesupport (= 3.2.6)
25		- builder (~> 3.0.0)
26		- activerecord (3.2.6)
27		- activemodel (= 3.2.6)
28		- activesupport (= 3.2.6)
29		- arel (~> 3.0.2)
30		- tzinfo (~> 0.3.29)
31		- activeresource (3.2.6)
32		- activemodel (= 3.2.6)
33		- activesupport (= 3.2.6)
34		- activesupport (3.2.6)
35		- i18n (~> 0.6)
36		- multi_json (~> 1.0)
37		- acts-as-taggable-on (3.0.2)
38		- rails (>= 3, < 5)
39		- arel (3.0.2)
40		- builder (3.0.0)
41		- capybara (2.1.0)
42		- mime-types (>= 1.16)
43		- nokogiri (>= 1.3.3)
44		- rack (>= 1.0.0)
45		- rack-test (>= 0.5.4)
46		- xpath (~> 2.0)
47		- childprocess (0.3.3)
48		- ffi (~> 1.0.6)
49		- cucumber (1.0.6)
50		- builder (>= 2.1.2)
51		- diff-lcs (>= 1.1.2)
52		- gherkin (~> 2.4.18)
53		- json (>= 1.4.6)
54		- term-ansicolor (>= 1.0.6)
55		- cucumber-rails (1.0.6)
56		- capybara (>= 1.1.1)
57		- cucumber (>= 1.0.6)
58		- nokogiri (>= 1.5.0)
59		- daemons (1.1.5)
60		- dalli (2.7.0)
61		- database_cleaner (1.2.0)
62		- diff-lcs (1.1.3)
63		- erubis (2.7.0)
64		- eventmachine (0.12.10)
65		- exception_notification (4.0.1)
66		- actionmailer (>= 3.0.4)
67		- activesupport (>= 3.0.4)
68		- fast_gettext (0.6.8)
69		- ffi (1.0.11)
70		- gherkin (2.4.21)
71		- json (>= 1.4.6)
72		- hike (1.2.1)
73		- hpricot (0.8.6)
74		- i18n (0.6.0)
75		- journey (1.0.3)
76		- json (1.7.3)
77		- mail (2.4.4)
78		- i18n (>= 0.4.0)
79		- mime-types (~> 1.16)
80		- treetop (~> 1.4.8)
81		- metaclass (0.0.1)
82		- mime-types (1.19)
83		- mocha (0.11.3)
84		- metaclass (~> 0.0.1)
85		- multi_json (1.3.6)
86		- nokogiri (1.5.5)
87		- pg (0.13.2)
88		- polyglot (0.3.3)
89		- prototype-rails (3.2.1)
90		- rails (~> 3.2)
91		- rack (1.4.1)
92		- rack-cache (1.2)
93		- rack (>= 0.4)
94		- rack-ssl (1.3.2)
95		- rack
96		- rack-test (0.6.1)
97		- rack (>= 1.0)
98		- rails (3.2.6)
99		- actionmailer (= 3.2.6)
100		- actionpack (= 3.2.6)
101		- activerecord (= 3.2.6)
102		- activeresource (= 3.2.6)
103		- activesupport (= 3.2.6)
104		- bundler (~> 1.0)
105		- railties (= 3.2.6)
106		- rails_autolink (1.1.5)
107		- rails (> 3.1)
108		- railties (3.2.6)
109		- actionpack (= 3.2.6)
110		- activesupport (= 3.2.6)
111		- rack-ssl (~> 1.3.2)
112		- rake (>= 0.8.7)
113		- rdoc (~> 3.4)
114		- thor (>= 0.14.6, < 2.0)
115		- rake (0.9.2.2)
116		- rdoc (3.9.4)
117		- rest-client (1.6.7)
118		- mime-types (>= 1.16)
119		- rmagick (2.13.1)
120		- rspec (2.10.0)
121		- rspec-core (~> 2.10.0)
122		- rspec-expectations (~> 2.10.0)
123		- rspec-mocks (~> 2.10.0)
124		- rspec-core (2.10.1)
125		- rspec-expectations (2.10.0)
126		- diff-lcs (~> 1.1.3)
127		- rspec-mocks (2.10.1)
128		- rspec-rails (2.10.1)
129		- actionpack (>= 3.0)
130		- activesupport (>= 3.0)
131		- railties (>= 3.0)
132		- rspec (~> 2.10.0)
133		- ruby-feedparser (0.7)
134		- rubyzip (1.1.2)
135		- selenium-webdriver (2.39.0)
136		- childprocess (>= 0.2.5)
137		- multi_json (~> 1.0)
138		- rubyzip (~> 1.0)
139		- websocket (~> 1.0.4)
140		- sprockets (2.1.3)
141		- hike (~> 1.2)
142		- multi_json (~> 1.0)
143		- rack (~> 1.0)
144		- tilt (~> 1.1, != 1.3.0)
145		- term-ansicolor (1.0.7)
146		- thin (1.3.1)
147		- daemons (>= 1.0.9)
148		- eventmachine (>= 0.12.6)
149		- rack (>= 1.0.0)
150		- thor (0.15.3)
151		- tilt (1.3.3)
152		- treetop (1.4.10)
153		- polyglot
154		- polyglot (>= 0.3.1)
155		- tzinfo (0.3.33)
156		- websocket (1.0.7)
157		- will_paginate (3.0.3)
158		- xpath (2.0.0)
159		- nokogiri (~> 1.3)
160		-
161		-PLATFORMS
162		- ruby
163		-
164		-DEPENDENCIES
165		- RedCloth
166		- acts-as-taggable-on
167		- capybara
168		- cucumber
169		- cucumber-rails
170		- daemons
171		- dalli
172		- database_cleaner
173		- exception_notification
174		- fast_gettext
175		- hpricot
176		- mocha
177		- nokogiri
178		- pg
179		- prototype-rails
180		- prototype_legacy_helper (= 0.0.0)!
181		- rails
182		- rails_autolink
183		- rake
184		- rest-client
185		- rmagick
186		- rspec
187		- rspec-rails
188		- ruby-feedparser
189		- selenium-webdriver
190		- thin
191		- will_paginate
...	...	@@ -186,8 +186,8 @@ Apache instalation
186	186
187	187	# apt-get install apache2
188	188
189		-Apache configuration
190		---------------------
	189	+Configuration - noosfero at /
	190	+-----------------------------
191	191
192	192	First you have to enable the following some apache modules:
193	193
...	...	@@ -257,6 +257,62 @@ Now restart your apache server (as root):
257	257
258	258	# invoke-rc.d apache2 restart
259	259
	260	+Configuration - noosfero at a /subdirectory
	261	+-------------------------------------------
	262	+
	263	+This section describes how to configure noosfero at a subdirectory, what is
	264	+specially useful when you want Noosfero to share a domain name with other
	265	+applications. For example you can host noosfero at yourdomain.com/social, a
	266	+webmail application at yourdomain.com/webmail, and have a static HTML website
	267	+at yourdomain.com/.
	268	+
	269	+NOTE: Some plugins might not work well with this setting. Before deploying
	270	+this setting, make sure you test that everything you need works properly with
	271	+it.
	272	+
	273	+The configuration is similar to the main configuration instructions, except for
	274	+the following points. In the description below, replace '/subdirectory' with
	275	+the actual subdirectory you want.
	276	+
	277	+1) add a `prefix: /subdirectory` line to your thin configuration file (thin.yml).
	278	+
	279	+1.1) remember to restart the noosfero application server whenever you make
	280	+changes to that configuration file.
	281	+
	282	+ # service noosfero restart
	283	+
	284	+2) add a line saying `export RAILS_RELATIVE_URL_ROOT=/subdirectory` to
	285	+/etc/default/noosfero (you can create it with just this line if it does not
	286	+exist already).
	287	+
	288	+3) You should add the following apache configuration to an existing virtual
	289	+host (plus the `<Proxy balancer://noosfero>` section as displayed above):
	290	+
	291	+```
	292	+Alias /subdirectory /path/to/noosfero/public
	293	+<Directory "/path/to/noosfero/public">
	294	+ Options FollowSymLinks
	295	+ AllowOverride None
	296	+ Order Allow,Deny
	297	+ Allow from all
	298	+
	299	+ Include /path/to/noosfero/etc/noosfero/apache/cache.conf
	300	+
	301	+ RewriteEngine On
	302	+ RewriteBase /subdirectory
	303	+ # Rewrite index to check for static index.html
	304	+ RewriteRule ^$ index.html [QSA]
	305	+ # Rewrite to check for Rails cached page
	306	+ RewriteRule ^([^.]+)$ $1.html [QSA]
	307	+ RewriteCond %{REQUEST_FILENAME} !-f
	308	+ RewriteRule ^(.*)$ http://localhost:3000%{REQUEST_URI} [P,QSA,L]
	309	+</Directory>
	310	+```
	311	+
	312	+3.1) remember to reload the apache server whenever any apache configuration
	313	+file changes.
	314	+
	315	+ # sudo service apache2 reload
260	316
261	317	Enabling exception notifications
262	318	================================
...	...
...	...	@@ -6,3 +6,13 @@
6	6	require File.expand_path('../config/application', __FILE__)
7	7
8	8	Noosfero::Application.load_tasks
	9	+
	10	+[
	11	+ "baseplugins//{tasks,lib/tasks,rails/tasks}//.rake",
	12	+ "config/plugins//{tasks,lib/tasks,rails/tasks}//.rake",
	13	+ "config/plugins//vendor/plugins//{tasks,lib/tasks,rails/tasks}/*/.rake",
	14	+].map do \|pattern\|
	15	+ Dir.glob(pattern).sort
	16	+end.flatten.each do \|taskfile\|
	17	+ load taskfile
	18	+end
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	VAGRANTFILE_API_VERSION = "2"
5	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6		- config.vm.box = "debian-wheezy"
	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
7	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	8	config.vm.provision :shell do \|shell\|
9	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
...	...
1	1	class EnvironmentDesignController < BoxOrganizerController
2		-
	2	+
3	3	protect 'edit_environment_design', :environment
4	4
5	5	def available_blocks
6		- @blocks \|\|= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
7		- @blocks += plugins.dispatch(:extra_blocks, :type => Environment)
	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
	7	+ @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
8	8	end
9	9
10	10	def index
...	...
...	...	@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
8	8	before_filter :init_noosfero_plugins
9	9	before_filter :allow_cross_domain_access
10	10	before_filter :login_required, :if => :private_environment?
11		- before_filter :verify_members_whitelist, :if => :user
	11	+ before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
12	12
13	13	def verify_members_whitelist
14	14	render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)
...	...	@@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
40	40
41	41	theme_layout = theme_option(:layout)
42	42	if theme_layout
43		- theme_view_file('layouts/'+theme_layout) \|\| theme_layout
	43	+ (theme_view_file('layouts/'+theme_layout) \|\| theme_layout).to_s
44	44	else
45	45	'application'
46	46	end
...	...
...	...	@@ -227,7 +227,7 @@ class CmsController < MyProfileController
227	227	@article = profile.articles.find(params[:id])
228	228	if request.post?
229	229	@article.destroy
230		- session[:notice] = _("\"#{@article.name}\" was removed.")
	230	+ session[:notice] = _("\"%s\" was removed." % @article.name)
231	231	referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
232	232	if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
233	233	redirect_to referer
...	...