Merge branch 'master' into rails-2.3.5

Conflicts: app/controllers/application.rb lib/noosfero.rb lib/noosfero/i18n.rb test/test_helper.rb test/unit/consumption_test.rb

Merge branch 'master' into rails-2.3.5
Conflicts: app/controllers/application.rb lib/noosfero.rb lib/noosfero/i18n.rb test/test_helper.rb test/unit/consumption_test.rb
Antonio Terceiro
2 parents 1d97315c a125dc04
Showing 1595 changed files with 105574 additions and 92651 deletions Show diff stats
.gitignore.example
.mailmap
AUTHORS
HACKING
INSTALL
INSTALL.chat
INSTALL.varnish
Rakefile.pkg
UPGRADE
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/categories_controller.rb
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/environment_role_manager_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/plugins_controller.rb
app/controllers/admin/role_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
@@ -1,28 +0,0 @@
-.gitignore
-vendor/rails
-doc/api
-doc/plugins
-tmp
-config/database.yml
-config/session.secret
-config/mail.yml
-config/ferret_server.yml
-config/mongrel_cluster.yml
-index
-locale
-log
-public/articles
-public/images/0000
-public/thumbnails
-public/user_themes
-public/designs/themes/default
-public/javascripts/cache*.js
-public/stylesheets/cache*.css
-db/development.db
-db/production.db
-db/test.db
-doc/noosfero/*.xhtml
-doc/noosfero/*/*.xhtml
-tags
-pkg
-*~
 Antonio Terceiro <terceiro@colivre.coop.br> <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Antonio Terceiro <terceiro@colivre.coop.br> <terceiro@softwarelivre.org>
 Aurelio A. Heckert <aurelio@colivre.coop.br> <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
+Aurelio A. Heckert <aurelio@colivre.coop.br> <aurelio@colivre.coop.br>
+Aurelio A. Heckert <aurelio@colivre.coop.br> <aurium@gmail.com>
+Caio SBA <caiosba@gmail.com> <caiosba@safernet.org.br>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <DanielaFeitosa@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <danielafeitosa@colivre.coop.br>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <daniela@sede.colivre.coop.br>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <dani@lindinha.(none)>
+Daniel Cunha <daniel@colivre.coop.br> <daniel.ccunha@gmail.com>
+Grazieno Pellegrino <grazieno@gmail.com> <GrazienoPellegrino@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Joenio Costa <joenio@colivre.coop.br> <JoenioCosta@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Joenio Costa <joenio@colivre.coop.br> <joenio@perl.org.br>
-Grazieno Pellegrino <grazieno@gmail.com> <GrazienoPellegrino@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Leandro Nunes dos Santos <leandronunes@gmail.com> <LeandroNunes@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Moises Machado <moises@colivre.coop.br> <MoisesMachado@3f533792-8f58-4932-b0fe-aaf55b0a4547>
 Valessio Brito <valessio@gmail.com> <ValessioBrito@3f533792-8f58-4932-b0fe-aaf55b0a4547>
@@ -8,13 +8,18 @@ Developers
  
 Antonio Terceiro <terceiro@colivre.coop.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
+Bráulio Bhavamitra <brauliobo@gmail.com>
+Caio SBA <caiosba@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Cunha <daniel@colivre.coop.br>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Italo Valcy <italo@dcc.ufba.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Keilla Menezes <keilla@colivre.coop.br>
 Leandro Nunes dos Santos <leandronunes@gmail.com>
+LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
@@ -22,6 +27,7 @@ Raphaël Rousseau &lt;raph@r4f.org&gt;
 Raquel Lira <raquel.lira@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
+Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
  
@@ -61,3 +61,26 @@ The above command makes the server available at http://localhost:9999/
  
 The sample-data data scripts creates one administrator user with login "ze" and
 password "test".
+
+Note that some operations, like generating image thumbnails, sending e-mails,
+etc, are done in background in the context of a service independent from the
+Rails application server. To have those tasks performed in a development
+environment, you must run the delayed_job server like this:
+
+ ./script/delayed_job run
+
+This will block your terminal. To stop the delayed_job server, hit Control-C.
+
+== Enabling exceptions notification
+
+By default, exception notifications are disabled in development environment. If
+you want to enable it then you need to change some files:
+
+1) Add in config/environments/development.rb:
+   config.action_controller.consider_all_requests_local = false
+
+2) Add in app/controller/application.rb:
+   local_addresses.clear
+
+3) Add in config/noosfero.yml at development section:
+   exception_recipients: [admin@example.com]
@@ -13,13 +13,14 @@ You need to install some packages Noosfero depends on.  On Debian GNU/Linux or
 Debian-based systems, all of these packages are available through the Debian
 archive. You can install them with the following command:
  
- # aptitude install ruby rake libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby mongrel mongrel-cluster tango-icon-theme
+ # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby-data libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby mongrel mongrel-cluster tango-icon-theme libhpricot-ruby
  
 On other systems, they may or may not be available through your regular package
 management system. Below are the links to their homepages.
  
 * Ruby: http://www.ruby-lang.org/
 * Rake: http://rake.rubyforge.org/
+* po4a: http://po4a.alioth.debian.org/
 * Ruby-GetText: http://www.yotabanana.com/hiki/ruby-gettext.html?ruby-gettext (at least version 1.9.0)
 * Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
 * rcov: http://eigenclass.org/hiki/rcov
@@ -32,79 +33,268 @@ management system. Below are the links to their homepages.
 * Daemons - http://daemons.rubyforge.org/
 * Mongrel: http://mongrel.rubyforge.org/
 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
+* Hpricot: http://hpricot.com/
  
-If you manage to install Noosfero successfully, please feel free to contact the
-Noosfero development mailing with the instructions for doing so, and we'll
-include it here.
+Note: the tango-icon-theme package is not available in Debian Lenny's main
+repository, because back then it was not DFSG-free (Debian Squeeze will have it
+in main). You can either add the non-free repository to your sources.list file,
+or download the .deb directly and install it manually with `dpkg -i`. In this
+case will need do install hicolor-icon-theme as well bacause tango-icon-theme
+depends on it.  After that you can try the command line above again, but
+without "tango-icon-theme".
+
+If you manage to install Noosfero successfully on other systems than Debian,
+please feel free to contact the Noosfero development mailing with the
+instructions for doing so, and we'll include it here.
  
 === Setting up a production environment
  
+DISCLAIMER: this installation procedure is tested with Debian stable, which is
+currently the only recommended operating system for production usage. It is
+possible that you can install it on other systems, and if you do so, please
+report it on one of the Noosfero mailing lists, and please send a patch
+updating these instructions.
+
+As root user
+============
+
 NOTE: these instructions are for seting up a *production* environment. If you
-are going to do Noosfero development, you don't need to do these steps. See the
-HACKING file instead.
+are going to do Noosfero development, you don't need to do these steps. Stop
+here and see the HACKING file instead.
+
+Install memcached. On Debian:
+
+# apt-get install memcached
+
+Study whether you need to raise the ammount of memory it uses for caching,
+depending on the demand you expect for your site. If you are going to run a
+high-traffic site, you will want to raise the ammount of memory reserved for
+caching.
+
+It is recommended that you run noosfero with its own user account. To create
+such an account, please do the following:
+
+# adduser --system --group noosfero --shell /bin/sh --home /var/lib/noosfero
+
+(note that you can change the $HOME directory of the user if you wish, here we
+are using /var/lib/noosfero)
+
+The --system option will tell adduser to create a system user, i.e. this user
+will not have a password and cannot login to the system directly. To become
+this user, you have to use sudo:
+
+# sudo -u noosfero -i
+
+or
+
+# su - noosfero
+
+As noosfero user
+================
+
+downloading from git
+--------------------
+
+Here we are cloning the noosfero repository from git. Note: you will need to
+install git before.
+
+$ git clone git://git.colivre.coop.br/noosfero.git current
+$ cd current
+$ git checkout -b stable origin/stable
+
+downloading tarball
+-------------------
+
+Note: replace 0.27.1 below from the latest stable version.
+
+$ wget http://noosfero.org/pub/Development/NoosferoVersion00x27x01/noosfero-0.27.1.tar.gz
+$ tar -zxvf noosfero-0.27.1.tar.gz
+$ ln -s noosfero-0.27.1 current
+$ cd current
+
+Copy config/ferret_server.yml.dist to config/ferret_server.yml. You will
+probably not need to customize this configuration, but have a look at it.
+
+Create the mongrel configuration file:
+
+$ mongrel_rails cluster::configure
+
+Edit config/mongrel_cluster.yml to suit your needs. Make sure your apache
+configuration matches the mongrel cluster configuration, specially in respect
+to the ports and numbers of mongrel instances.
+
+Note: currently Noosfero only supports Rails 2.1.0, which is the version in
+Debian Lenny. If you have a Rails version newer than that, Noosfero will
+probably not work. You can install Rails 2.1.0 into your Noosfero installation
+with the following procedure:
+
+$ cd /var/lib/noosfero/current/vendor
+$ wget http://ftp.de.debian.org/debian/pool/main/r/rails/rails_2.1.0.orig.tar.gz
+$ tar xzf rails_2.1.0.orig.tar.gz
+$ ln -s rails-2.1.0 rails
+
+As root user
+============
+
+Setup Noosfero log and tmp directories:
+
+# cd /var/lib/noosfero/current
+# ./etc/init.d/noosfero setup
+
+Now it's time to setup the database. In this example we are using PostgreSQL,
+so if you are planning to use a different database this steps won't apply.
+
+# apt-get install postgresql libpgsql-ruby
+# su postgres -c 'createuser noosfero -S -d -R'
+
+By default Rails will try to connect on postgresql through 5432 port, but
+Debian start postgresql on port 5433, then is needed to change postgresql to
+start on port 5432 in /etc/postgresql/8.3/main/postgresql.conf file.
+
+Restart postgresql:
+
+# invoke-rc.d postgresql-8.3 restart
+
+Noosfero needs a functional e-mail setup to work: the local mail system should
+be able to deliver e-mail to the internet, either directly or through an
+external SMTP server.
+
+If you know mail systems well, you just need to make sure thet the local MTA,
+listening on localhost:25, is able to deliver e-mails to the internet. Any mail
+server will do it.
+
+If you are not a mail specialist, we suggest that you use the Postfix mail
+server, since it is easy to configure and very reliable. Just follow the
+instructions below.
+
+To install Postfix:
+
+# apt-get install postfix
+
+During the installation process, you will be asked a few questions. Your answer
+to them will vary in 2 cases:
+
+Case 1: you can send e-mails directly to the internet. This will be the case
+for most commercial private servers. Your answers should be:
+
+  General type of mail configuration: Internet site
+  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+
+Case 2: you cannot, or don't want to, send e-mail directly to the internet.
+This happens for example if your server is not allowed to make outbound
+connections on port 25, or if you want to concentrate all your outbound mail
+through a single SMTP server. Your answers in this case should be:
+
+  General type of mail configuration: Internet with smarthost
+  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+  SMTP relay host: smtp.yourprovider.com
+
+Note that smtp.yourprovider.com must allow your server to deliver e-mails
+through it. You should probably ask your servive provider about this.
+
+There is another possibility: if you are installing on a shared server, and
+don't have permission to configure the local MTA, you can instruct Noosfero to
+send e-mails directly through an external server. Please note that this should
+be your last option, since contacting an external SMTP server directly may slow
+down your Noosfero application server. To configure Noosfero to send e-mails
+through an external SMTP server, follow the instructions on
+http://noosfero.org/Development/SMTPMailSending
  
-* install memcached. Study whether you need to raise the ammount of memory it uses for caching, depending on the demand you expect for your site.
-* enter the directory where you unpacked noosfero
-* copy config/ferret_server.yml.dist to config/ferret_server.yml
-* create the mongrel configuration file: `mongrel_rails cluster::configure`
-** then edit config/mongrel_cluster.yml to suit your environment. Make sure your apache configuration matches the mongrel cluster configuration, specially in respect to the ports and numbers of mongrel instances.
-* create needed temporary directories:
-  mkdir tmp
-  mkdir tmp/pids
-  mkdir log
-* create database (example using PostgreSQL, YMMV)
+As noosfero user
+================
  
-  root user
-  =========
-  # sudo apt-get install postgresql libpgsql-ruby
-  # su - postgres
+Now create the databases:
  
-  postgres user
-  =============
-  postgres@HOST:~$ createuser noosfero
-  Shall the new role be a superuser? (y/n) n
-  Shall the new role be allowed to create databases? (y/n) y
-  Shall the new role be allowed to create more new roles? (y/n) n
+$ cd /var/lib/noosfero/current
+$ createdb noosfero_production
+$ createdb noosfero_development
+$ createdb noosfero_test
  
-  noosfero_user
-  =============
-  createdb noosfero_production
-  createdb noosfero_development
-  createdb noosfero_test
+The development and test databases are actually optional. If you are creating a
+stricly production server, you will probably not need them.
  
-* configure database access in config/database.yml
+Now we want to configure Noosfero for accessing the database we just created.
+To do that, you can 1) copy config/database.yml.pgsql to config/database.yml,
+or create config/database.yml from scratch with the following content:
  
-* test database access:
-** first create the development database
-   rake db:schema:load
-** if everything goes right, then create the production database:
-   RAILS_ENV=production rake db:schema:load
+  production:
+    adapter: postgresql
+    encoding: unicode
+    database: noosfero_production
+    username: noosfero
  
-* create sample data:
-  RAILS_ENV=production rake db:populate
+Now, to test the database access, you can fire the Rails database console:
  
-* Add the domain name you will be using for your noosfero site to the list of
-  environment domain, like this:
+$ ./script/dbconsole production
  
-  ./script/runner "Environment.default.domains << Domain.new(:name => 'your.domain.com')"
+If it connects to your database, then everything is fine. If you got an error
+message, then you have to check your database configuration.
  
-  (of course, replace your.domain.com with your real domain)
+Create the database structure:
  
-* compile the translations:
-  rake makemo
+$ RAILS_ENV=production rake db:schema:load
  
-* start the server:
-  ./script/production start
+Now we have to create some initial data. To create your default environment
+(the first one), run the command below:
  
-* to stop the server:
+$ RAILS_ENV=production ./script/runner 'Environment.create!(:name => "My environment", :is_default => true)'
  
-  ./script/production stop
+(of course, replace "My environment" with your environment's name!)
  
-* to restart the server:
+And now you have to add the domain name you will be using for your noosfero
+site to the list of domains of that default environment you just created:
  
-  ./script/production restart
+$ RAILS_ENV=production ./script/runner "Environment.default.domains << Domain.new(:name => 'your.domain.com')"
  
-* enable the following apache modules:
+(replace "your.domain.com" with your actual domain name)
+
+Add at least one user as admin of environment:
+
+$ RAILS_ENV=production ./script/runner "User.create(:login => 'adminuser', :email => 'admin@example.com', :password => 'admin', :password_confirmation => 'admin', :environment => Environment.default)"
+
+(replace "adminuser", "admin@example.com", "admin" with the login, email
+and password of your environment admin)
+
+Compile the translations:
+
+$ RAILS_ENV=production rake noosfero:translations:compile
+
+To start the Noosfero application servers:
+
+$ ./script/production start
+
+At this point you have a functional Noosfero installation running, the only
+thing left is to configure your webserver as a reverse proxy to pass requests
+to them.
+
+Enabling exception notifications
+================================
+
+This is an optional step. You will need it only if you want to receive e-mail
+notifications when some exception occurs on Noosfero.
+
+First, install this version of the gem.
+Others versions may not be compatible with Noosfero:
+
+# gem install exception_notification -v 1.0.20090728
+
+You can configure the e-mails that will receive the notifications.
+Change the file config/noosfero.yml as the following example, replacing the
+e-mails by real ones:
+
+  production:
+    exception_recipients: [admin@example.com, you@example.com]
+
+==================
+Apache instalation
+==================
+
+# apt-get install apache2
+
+Apache configuration
+--------------------
+
+First you have to enable the following some apache modules:
  
   deflate
   expires
@@ -113,26 +303,32 @@ HACKING file instead.
   proxy_http
   rewrite
  
-  On Debian GNU/Linux system, these modules can be enabled with the following
-  command line, as root:
+On Debian GNU/Linux system, these modules can be enabled with the following
+command line, as root:
  
-  a2enmod deflate expires proxy proxy_balancer proxy_http rewrite
+# a2enmod deflate expires proxy proxy_balancer proxy_http rewrite
  
-  In other systems the way by which you enable apache modules may be different.
+In other systems the way by which you enable apache modules may be different.
  
-* Configure apache web server as a reverse proxy. You can use the template
-  below, replacing /path/to/noosfero with the directory in which your noosfero
-  installation is, your.domain.com with the domain name of your noosfero site.
-  We are assuming that you are running two mongrel instances on ports 4000 and
-  4001. If your setup is different you'll need to adjust <Proxy> section. If
-  you don't understand something in the configuration, please refer to the
-  apache documentation.
+Now with the Apache configuration. You can use the template below, replacing
+/var/lib/noosfero/current with the directory in which your noosfero
+installation is, your.domain.com with the domain name of your noosfero site.
+We are assuming that you are running two mongrel instances on ports 3000 and
+3001. If your setup is different you'll need to adjust <Proxy> section. If you
+don't understand something in the configuration, please refer to the apache
+documentation.
+
+Add a file called "mysite" (or whatever name you want to give to your noosfero
+site) to /etc/apache2/sites-available with the following content, and customize
+as needed (as usual, make sure you replace "your.domain.com" with you actual
+domain name, and "/var/lib/noosfero/current" with the directory where Noosfero
+is installed):
  
   <VirtualHost *:80>
     ServerName your.domain.com
  
-    DocumentRoot "/path/to/noosfero/public"
-    <Directory "/path/to/noosfero/public">
+    DocumentRoot "/var/lib/noosfero/current/public"
+    <Directory "/var/lib/noosfero/current/public">
       Options FollowSymLinks
       AllowOverride None
       Order Allow,Deny
@@ -156,18 +352,110 @@ HACKING file instead.
     LogLevel warn
     CustomLog /var/log/apache2/noosfero.access.log combined
  
-    Include /path/to/noosfero/etc/noosfero/apache/cache.conf
+    Include /var/lib/noosfero/current/etc/noosfero/apache/cache.conf
  
   </VirtualHost>
  
   <Proxy balancer://noosfero>
-    BalancerMember http://127.0.0.1:4000
-    BalancerMember http://127.0.0.1:4001
+    BalancerMember http://127.0.0.1:3000
+    BalancerMember http://127.0.0.1:3001
     Order Allow,Deny
     Allow from All
   </Proxy>
  
-  The cache.conf file included in the end of the <VirtualHost> section is
-  important, since it will tell apache to pass expiration and cache headers to
-  clients so that the site feels faster for users. Do we need to say that using
-  that configuration is strongly recommended?
+The cache.conf file included in the end of the <VirtualHost> section is
+important, since it will tell apache to pass expiration and cache headers to
+clients so that the site feels faster for users. Do we need to say that using
+that configuration is strongly recommended?
+
+Enable that site with (as root, replace "mysite" with the actual name you gave
+to your site configuration):
+
+# a2ensite mysite
+
+Now restart your apache server (as root):
+
+# invoke-rc.d apache2 restart
+
+============
+Maintainance
+============
+
+To ease the maintainance, install a symbolic link for the Noosfero startup
+script in your server and add it to the system initialization and shutdown
+sequences (as root):
+
+# ln -s /var/lib/noosfero/current/etc/init.d/noosfero /etc/init.d/noosfero
+# update-rc.d noosfero defaults
+ Adding system startup for /etc/init.d/noosfero ...
+   /etc/rc0.d/K20noosfero -> ../init.d/noosfero
+   /etc/rc1.d/K20noosfero -> ../init.d/noosfero
+   /etc/rc6.d/K20noosfero -> ../init.d/noosfero
+   /etc/rc2.d/S20noosfero -> ../init.d/noosfero
+   /etc/rc3.d/S20noosfero -> ../init.d/noosfero
+   /etc/rc4.d/S20noosfero -> ../init.d/noosfero
+   /etc/rc5.d/S20noosfero -> ../init.d/noosfero
+
+Now to start Noosfero, you do as root:
+
+# invoke-rc.d noosfero start
+
+To stop Noosfero:
+
+# invoke-rc.d noosfero start
+
+To restart Noosfero:
+
+# invoke-rc.d noosfero restart
+
+Noosfero will be automatically started during system boot, and automatically
+stopped if the system shuts down for some reason (or during the shutdown part
+of a reboot).
+
+=============
+Rotating logs
+=============
+
+Noosfero provides an example logrotate configuation to rotate its logs. To use
+it, create a symbolic link in /etc/logrotate.d/:
+
+# cd /etc/logrotate.d/
+# ln -s /var/lib/noosfero/current/etc/logrotate.d/noosfero
+
+Note that the provided file assumes Noosfero logging is being done in
+/var/log/noosfero (which is the case if you followed the instructions above
+correctly). If the logs are stored elsewhere, it's recommended that you copy
+the file over to /etc/logrotate.d/ and modify it to point to your local log
+directly.
+
+=========
+Upgrading
+=========
+
+If you followed the steps in this document and installed Noosfero from the git
+repository, then upgrading is easy. First, you need to allow the noosfero user
+to restart the memcached server with sudo, by adding the following line in
+/etc/sudoers:
+
+noosfero ALL=NOPASSWD: /etc/init.d/memcached
+
+Then, to perform an upgrade, do the following as the noosfero user:
+
+$ cd /var/lib/noosfero/current
+$ ./script/git-upgrade
+
+The git-upgrade script will take care of everything for you. It will first stop
+the service, then fetch the current source code, upgrade database, compile
+translations, and then start the service again.
+
+Note 1: make sure your local git repository is following the "stable" branch,
+just like the instructions above. The "master" branch is not recommended for
+use in production environments.
+
+Note 2: always read the release notes before upgrading. Sometimes there will be
+steps that must be performed manually. If that is the case, you can invoke the
+git-upgrade script with the special parameter "--shell" that will give you a
+shell after the upgrade, which you can use to perform any manual steps
+required:
+
+$ ./script/git-upgrade --shell
@@ -0,0 +1,255 @@
+== XMPP/Chat Client Setup
+
+To configure XMPP/BOSH in Noosfero you need:
+
+* REST Client - http://github.com/archiloque/rest-client
+* SystemTimer - http://ph7spot.com/musings/system-timer
+* Pidgin data files - http://www.pidgin.im/
+
+If you use Debian Lenny:
+
+# apt-get install librestclient-ruby (from backports)
+# apt-get install pidgin-data
+# apt-get install ruby1.8-dev
+# gem install SystemTimer
+
+Take a look at util/chat directory to see samples of config file to configure a
+XMPP/BOSH server with ejabberd, postgresql and apache2.
+
+== XMPP/Chat Server Setup
+
+This is a step-by-step guide to get a XMPP service working, in a Debian system.
+
+1. Install the required packages
+
+# apt-get -t lenny-backports install ejabberd
+# apt-get install odbc-postgresql
+
+2. Ejabberd configuration
+
+All the following changes must be done in config file:
+
+ /etc/ejabberd/ejabberd.cfg
+
+ 2.1. Set the default admin user
+
+{ acl, admin, { user, "john", "www.example.com" } }.
+{ acl, admin, { user, "bart", "www.example.com" } }.
+
+ 2.2. Set the default host
+
+{ hosts, [ "www.example.com" ] }.
+
+ 2.3. Http-Bind activation
+
+{ 5280, ejabberd_http, [
+      http_bind,
+      web_admin
+   ]
+}
+
+(...)
+
+{ modules, [
+   {mod_http_bind, []},
+   ...
+] }.
+
+Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client
+needs non-anonymous room, then we need to change default params of creation
+rooms in ejabberd to create non-anonymous rooms.
+
+In non-anonymous rooms the jabber service sends the new occupant's full JID to
+all occupants in the room[1].
+
+Add option "{default_room_options, [{anonymous, false}]}" to
+/etc/ejabberd/ejabberd.cfg in mod_muc session. See below:
+
+{ mod_muc, [
+   %%{host, "conference.@HOST@"},
+   {access, muc},
+   {access_create, muc},
+   {access_persistent, muc},
+   {access_admin, muc_admin},
+   {max_users, 500},
+   {default_room_options, [{anonymous, false}]}
+]},
+
+[1] - http://xmpp.org/extensions/xep-0045.html#enter-nonanon
+
+
+ 2.4. Authentication method
+
+To use Postgresql through ODBC, the following modifications must be done:
+
+ * Disable the default method:
+
+{auth_method, internal}.
+
+ * Enable autheticantion through ODBC:
+
+{auth_method, odbc}.
+
+ * Set database server name
+
+{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.
+
+
+ 2.5. Increase the shaper traffic limit
+
+{ shaper, normal, { maxrate, 10000000 } }.
+
+
+ 2.6. Disable unused modules
+
+Unused modules can be disabled, for example:
+
+ * s2s
+ * web_admin
+ * mod_pubsub
+ * mod_irc
+ * mod_offine
+ * mod_admin_extra
+ * mod_register
+
+
+ 2.7. Enable ODBC modules
+
+ * mod_privacy -> mod_privacy_odbc
+ * mod_private -> mod_private_odbc
+ * mod_roster  -> mod_roster_odbc
+
+3. Configuring Postgresql
+
+Login as noosfero user, and execute:
+
+   $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
+
+Where 'noosfero' may need to be replace by the name of the database used for
+Noosfero.
+
+This will create a new schema inside the noosfero database, called 'ejabberd'.
+
+Note 'noosfero' user should have permission to create Postgresql schemas. Also,
+there should be at least one domain with 'is_default = true' in 'domains'
+table, otherwise people couldn't see your friends online.
+
+
+4. ODBC configuration
+
+The following files must be created:
+
+ * /etc/odbc.ini
+
+[PostgreSQLEjabberdNoosfero]
+Description      = PostgreSQL Noosfero ejabberd database
+Driver           = PostgreSQL Unicode
+Trace            = No
+TraceFile        = /tmp/psqlodbc.log
+Database         = noosfero
+Servername       = localhost
+UserName         = <DBUSER>
+Password         = <DBPASS>
+Port             =
+ReadOnly         = No
+RowVersioning    = No
+ShowSystemTables = No
+ShowOidColumn    = No
+FakeOidIndex     = No
+ConnSettings     = SET search_path TO ejabberd
+
+ * /etc/odbcinst.ini
+
+[PostgreSQL Unicode]
+Description = PostgreSQL ODBC driver (Unicode version)
+Driver      = /usr/lib/odbc/psqlodbcw.so
+Setup       = /usr/lib/odbc/libodbcpsqlS.so
+Debug       = 0
+CommLog     = 1
+UsageCount  = 3
+
+ * testing all:
+
+# isql 'PostgreSQLEjabberdNoosfero' DBUSER
+
+
+5. Enabling kernel polling and SMP in /etc/default/ejabberd
+
+POLL=true
+SMP=auto
+
+
+6. Increase the file descriptors limit for user ejabberd
+
+ 6.1. Uncomment this line in file /etc/pam.d/su:
+
+session required pam_limits.so
+
+
+ 6.2. Add this lines to file /etc/security/limits.conf:
+
+ejabberd       hard    nofile  65536
+ejabberd       soft    nofile  65536
+
+Now, test the configuration:
+
+# cat /proc/<EJABBERD_BEAM_PROCESS_PID>/limits
+
+
+7. Apache Configuration
+
+Apache server must be configurated as follow:
+
+ * /etc/apache2/sites-enabled/noosfero
+
+RewriteEngine On
+Include /usr/share/noosfero/util/chat/apache/xmpp.conf
+
+ * /etc/apache2/apache2.conf:
+
+<IfModule mpm_worker_module>
+   StartServers          8
+   MinSpareThreads       25
+   MaxSpareThreads       75
+   ThreadLimit           128
+   ThreadsPerChild       128
+   MaxClients            2048
+   MaxRequestsPerChild   0
+</IfModule>
+
+Note: module proxy_http must be enabled:
+
+# a2enmod proxy_http
+
+
+8. DNS configuration
+
+ * /etc/bind/db.colivre:
+
+_xmpp-client._tcp   SRV   5 100 5222 master
+(...)
+conference   CNAME master
+_xmpp-client._tcp.conference   SRV   5 100 5222 master
+
+
+9. Testing this Setup
+
+Adjust shell limits to proceed with some benchmarks and load tests: 
+
+# ulimit −s 256
+# ulimit −n 8192
+# echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
+
+To measure the bandwidth between server and client:
+
+ * at server side:
+
+# iperf −s
+
+ * at client side:
+
+# iperf −c server_ip
+
+For heavy load tests, clone and use this software:
+
+git clone http://git.holoscopio.com/git/metal/tester.git
@@ -0,0 +1,67 @@
+= Setting up Varnish for your Noosfero site
+
+Varnish is a HTTP caching server, and using it together with Noosfero is highly
+recommended. See http://www.varnish-cache.org/ for more information on Varnish.
+
+Varnish can be set up to use with Noosfero with the following steps:
+
+1) setup Noosfero with apache according to the INSTALL file.
+
+2) install Varnish
+
+  # apt-get install varnish
+
+Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
+should, unless Debian already released Squeeze by now), make sure you install
+varnish from the lenny-backports suite.
+
+3) Enable varnish logging:
+
+3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
+
+VARNISHNCSA_ENABLED=1
+
+The varnish log will be written to /var/log/varnish/varnishncsa.log in an
+apache-compatible format. You should change your statistics generation software
+(e.g. awstats) to use that instead of apache logs.
+
+3b) Restart Varnish Logging service
+
+  # invoke-rc.d varnishncsa start
+
+4) Change Apache to listen on port 8080 instead of 80
+
+4a) Edit /etc/apache2/ports.conf, and:
+
+  * change 'Listen 80' to 'Listen 127.0.0.1:8080'
+  * change 'NameVirtualHost *:80' to 'NameVirtualHost *:8080'
+
+4b) Edit /etc/apache2/sites-enabled/*, and change '<VirtualHost *:80>' to '<VirtualHost *:8080>'
+
+4c) Restart apache
+
+  # invoke-rc.d apache2 restart
+
+5) Change Varnish to listen on port 80
+
+5a) Edit /etc/default/varnish and change '-a :6081' to '-a :80'
+
+5b) Restart Varnish
+
+  # invoke-rc.d varnish restart
+
+6) Configure varnish to store separate caches for each language
+
+6a) Add the following line to your /etc/varnish/default.vcl file (assuming
+Noosfero is installed in /var/lib/noosfero):
+
+  include "/var/lib/noosfero/etc/noosfero/varnish-accept-language.vcl";
+
+6b) Restart Varnish
+
+  # invoke-rc.d varnish restart
+
+Thanks to Cosimo Streppone for varnish-accept-language. See
+http://github.com/cosimo/varnish-accept-language for more information.
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Sat, 04 Sep 2010 17:29:27 -0300
@@ -1,101 +0,0 @@
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'noosfero'
-
-Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do |p|
-  p.need_tar_gz = true
-
-  # cleaning temporary files
-  FileUtils.rm_rf('tmp')
-  FileUtils.mkdir_p('tmp/cache')
-  FileUtils.mkdir_p('tmp/sessions')
-  FileUtils.mkdir_p('tmp/sockets')
-
-  # application files
-  p.package_files.include('app/**/*.{rb,rhtml,rjs,rxml,erb}')
-  p.package_files.include('config/**/*.{rb,sqlite3}')
-  p.package_files.include('config/ferret_server.yml.dist')
-  p.package_files.include('db/migrate/*.rb')
-  p.package_files.include('db/schema.rb')
-  p.package_files.include('doc/README_FOR_APP')
-  p.package_files.include('lib/**/*.{rake,rb}')
-  p.package_files.include('Rakefile')
-  p.package_files.include('Rakefile.pkg')
-
-  # translation files
-  p.package_files.include('po/*/*.po')
-  p.package_files.include('po/noosfero.pot')
-
-  # templates
-  p.package_files.include('public/designs/templates/**/*')
-
-  # icon sets
-  p.package_files.include('public/designs/icons/tango/**/*')
-  p.package_files.exclude('public/designs/icons/tango/Tango')
-  p.package_files.exclude('public/designs/icons/default')
-
-  # themes
-  p.package_files.include('public/designs/themes/noosfero/**/*')
-  p.package_files.include('public/designs/themes/base/**/*')
-  p.package_files.exclude('public/designs/themes/default')
-
-  # static files
-  p.package_files.include('public/dispatch.*')
-  p.package_files.include('public/favicon.ico')
-  p.package_files.include('public/*.html')
-  p.package_files.include('public/*.html.erb')
-  p.package_files.include('public/images/**/*')
-  p.package_files.include('public/javascripts/**/*')
-  p.package_files.include('public/robots.txt')
-  p.package_files.include('public/stylesheets/**/*')
-
-  # top-level docs
-  p.package_files.include('README')
-  p.package_files.include('COPYING')
-  p.package_files.include('COPYRIGHT')
-  p.package_files.include('INSTALL')
-  p.package_files.include('HACKING')
-
-  # scripts
-  p.package_files.include('script/**/*')
-
-  # test files
-  p.package_files.include('test/**/*.{rb,yml}')
-  p.package_files.include('test/fixtures/files/*')
-  p.package_files.include('features/**/*')
-  p.package_files.include('config/cucumber.yml')
-
-  # empty directories that must exist
-  p.package_files.include('tmp/cache')
-  p.package_files.include('tmp/sessions')
-  p.package_files.include('tmp/sockets')
-  p.package_files.include('log')
-
-  # symbolic links
-  p.package_files.include('app/views/profile_design/*')
-  p.package_files.include('app/views/environment_design/*')
-
-  # util
-  p.package_files.include('util/**/*')
-
-  # external resources
-  p.package_files.include('vendor/**/*')
-  p.package_files.exclude('vendor/rails')
-
-  # online documentation
-  p.package_files.include('doc/noosfero/**/*')
-
-  # do not install locally generated files
-  p.package_files.exclude('coverage/**/*')
-  p.package_files.exclude('public/images/[0-9][0-9][0-9][0-9]/**/*')
-
-end
-
-task :default => :package
-task :clean => :clobber_package
-
-# vim: ft=ruby
@@ -1,49 +0,0 @@
-0 - All modified code have the tag UPGRADE on it.
-
-1 - I Changed acts_as_versioned plugin code to the new one:
-
-  http://github.com/technoweenie/acts_as_versioned/tree/master
-
-2 - I removed the 'build_person' calls after create the user on UserTest
-
-3 - The settings_items method generated a lot of bugs. Theses bugs are explained here:
-  Solution 1: http://casperfabricius.com/site/2008/06/12/serialize-doesnt-play-nice-with-rails-21-partial-updates/
-  Solution 2: http://www.kalzumeus.com/2008/06/28/rails-fails-to-update-serialized-columns-on-save/
-
-The problem is how rails is working with ActiveRecord. The serialization data was not save on database.
-
-I add this code
-
-  send(self.class.settings_field.to_s + '_will_change!')
-
-on lib/acts_as_having_settings
-
-I used the solution 1.
-
-I choose solution number 2 for Environment model. I think it is more clear in this situation.
-I put the code:
-
-  self.partial_updates = false
-
-on Environment model.
-
-
-4 - acts_as_searchable -> find_by_contents
-
-I solved an incompatibility between paginate and geokit with an work around like this the one explained on the link:
-
-   http://groups.google.com/group/will_paginate/browse_thread/thread/1bbb1f0c5810f1c1
-
-5 - The test of this method 'theme_include' of application helper was not passing.
-
-I changed the tests
-  -  "should 'render theme footer' do"
-  - "  should 'ignore unexisting theme footer' do"
-
- to make the test usefull
-
-
-6 - I changed the way as the product is created on ManageProducts controller. I removed the line:
-    @product.build_image unless @product.image
-
-because the image was never saved. It don't have valid values to be saved.
@@ -40,7 +40,7 @@ class AdminPanelController &lt; AdminController
         end
         redirect_to :action => 'set_portal_folders'
       else
-        flash[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
+        session[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
       end
     end
   end
@@ -54,7 +54,7 @@ class AdminPanelController &lt; AdminController
        folders = params[:folders].map{|fid| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} if params[:folders]
        env.portal_folders = folders
        if env.save
-         flash[:notice] = _('Saved the portal folders')
+         session[:notice] = _('Saved the portal folders')
          redirect_to :action => 'set_portal_news_amount'
        end
      end
@@ -63,7 +63,7 @@ class AdminPanelController &lt; AdminController
   def set_portal_news_amount
     if request.post?
       if @environment.update_attributes(params[:environment])
-        flash[:notice] = _('Saved the number of news on folders')
+        session[:notice] = _('Saved the number of news on folders')
         redirect_to :action => 'index'
       end
     end
@@ -5,9 +5,9 @@ class CategoriesController &lt; AdminController
   helper :categories
  
   def index
-    # WORKAROUND: restricting the category trees to display. Region and
-    # ProductCategory have VERY LARGE trees.
     @categories = environment.categories.find(:all, :conditions => "parent_id is null AND type is null")
+    @regions = environment.regions.find(:all, :conditions => {:parent_id => nil})
+    @product_categories = environment.product_categories.find(:all, :conditions => {:parent_id => nil})
   end
  
   ALLOWED_TYPES = CategoriesHelper::TYPES.map {|item| item[1] }
@@ -3,7 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
   end
  
 end
@@ -14,9 +14,9 @@ class EnvironmentRoleManagerController &lt; AdminController
     @roles = params[:roles] ? Role.find(params[:roles]) : []
     @person = Person.find(params[:person])
     if @person.define_roles(@roles, environment)
-      flash[:notice] = _('Roles successfuly updated')
+      session[:notice] = _('Roles successfuly updated')
     else
-      flash[:notice] = _('Couldnt change the roles')
+      session[:notice] = _('Couldnt change the roles')
     end
     redirect_to :action => :index
   end
@@ -42,9 +42,9 @@ class EnvironmentRoleManagerController &lt; AdminController
   def remove_role
     @association = RoleAssignment.find(params[:id])
     if @association.destroy
-      flash[:notice] = _('Member succefully unassociated')
+      session[:notice] = _('Member succefully unassociated')
     else
-      flash[:notice] = _('Failed to unassociate member')
+      session[:notice] = _('Failed to unassociate member')
     end
     redirect_to :aciton => 'index'
   end
@@ -52,9 +52,9 @@ class EnvironmentRoleManagerController &lt; AdminController
   def unassociate
     @association = RoleAssignment.find(params[:id])
     if @association.destroy
-      flash[:notice] = _('Member succefully unassociated')
+      session[:notice] = _('Member succefully unassociated')
     else
-      flash[:notice] = _('Failed to unassociate member')
+      session[:notice] = _('Failed to unassociate member')
     end
     redirect_to :aciton => 'index'
   end
@@ -8,7 +8,7 @@ class FeaturesController &lt; AdminController
   post_only :update
   def update
     if @environment.update_attributes(params[:environment])
-      flash[:notice] = _('Features updated successfully.')
+      session[:notice] = _('Features updated successfully.')
       redirect_to :action => 'index'
     else
       render :action => 'index'
@@ -24,7 +24,7 @@ class FeaturesController &lt; AdminController
   def manage_person_fields
     environment.custom_person_fields = params[:person_fields]
     if environment.save!
-      flash[:notice] = _('Person fields updated successfully.')
+      session[:notice] = _('Person fields updated successfully.')
     else
       flash[:error] = _('Person fields not updated successfully.')
     end
@@ -34,9 +34,9 @@ class FeaturesController &lt; AdminController
   def manage_enterprise_fields
     environment.custom_enterprise_fields = params[:enterprise_fields]
     if environment.save!
-      flash[:notice] = _('Enterprise fields updated successfully.')
+      session[:notice] = __('Enterprise fields updated successfully.')
     else
-      flash[:error] = _('Enterprise fields not updated successfully.')
+      flash[:error] = __('Enterprise fields not updated successfully.')
     end
     redirect_to :action => 'manage_fields'
   end
@@ -44,7 +44,7 @@ class FeaturesController &lt; AdminController
   def manage_community_fields
     environment.custom_community_fields = params[:community_fields]
     if environment.save!
-      flash[:notice] = _('Community fields updated successfully.')
+      session[:notice] = _('Community fields updated successfully.')
     else
       flash[:error] = _('Community fields not updated successfully.')
     end
@@ -0,0 +1,18 @@
+class PluginsController < AdminController
+
+  def index
+    @active_plugins = Noosfero::Plugin.all.map {|plugin_name| plugin_name.constantize }.compact
+  end
+
+  post_only :update
+  def update
+    params[:environment][:enabled_plugins].delete('')
+    if @environment.update_attributes(params[:environment])
+      session[:notice] = _('Plugins updated successfully.')
+    else
+      session[:error] = _('Plugins were not updated successfully.')
+    end
+    redirect_to :action => 'index'
+  end
+
+end
@@ -19,7 +19,7 @@ class RoleController &lt; AdminController
     if @role.save
       redirect_to :action => 'show', :id => @role
     else
-      flash[:notice] = _('Failed to create role')
+      session[:notice] = _('Failed to create role')
       render :action => 'new'
     end
   end
@@ -33,7 +33,7 @@ class RoleController &lt; AdminController
     if @role.update_attributes(params[:role])
       redirect_to :action => 'show', :id => @role
     else
-      flash[:notice] = _('Failed to edit role')
+      session[:notice] = _('Failed to edit role')
       render :action => 'edit'
     end
   end
@@ -43,7 +43,7 @@ class RoleController &lt; AdminController
     if @role.destroy
       redirect_to :action => 'index'
     else
-      flash[:notice] = _('Failed to edit role')
+      session[:notice] = _('Failed to edit role')
       redirect_to :action => 'index'
     end
   end
@@ -0,0 +1,36 @@
+class UsersController < AdminController
+
+  protect 'manage_environment_users', :environment
+
+  def index
+    @users = environment.users
+    respond_to do |format|
+      format.html
+      format.xml do
+        render :xml => @users.to_xml(
+          :skip_types => true,
+          :only => %w[email login created_at updated_at],
+          :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }
+        )
+      end
+      format.csv do
+        render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
+      end
+    end
+  end
+
+  def send_mail
+    @mailing = environment.mailings.build(params[:mailing])
+    if request.post?
+      @mailing.locale = locale
+      @mailing.person = user
+      if @mailing.save
+        session[:notice] = _('The e-mails are being sent')
+        redirect_to :action => 'index'
+      else
+        session[:notice] = _('Could not create the e-mail')
+      end
+    end
+  end
+
+end
@@ -96,7 +96,7 @@ class BoxOrganizerController &lt; ApplicationController
       expire_timeout_fragment(@block.cache_keys)
       redirect_to :action => 'index'
     else
-      flash[:notice] = _('Failed to remove block')
+      session[:notice] = _('Failed to remove block')
     end
   end
  
@@ -14,7 +14,8 @@ class CmsController &lt; MyProfileController
     end
   end
  
-  protect_if :except => [:set_home_page, :edit, :destroy, :publish] do |c, user, profile|
+  before_filter :login_required, :except => [:suggest_an_article]
+  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
  
@@ -40,15 +41,11 @@ class CmsController &lt; MyProfileController
   def available_article_types
     articles = [
       TinyMceArticle,
-      TextileArticle
+      TextileArticle,
+      Event
     ]
-    articles << Event unless profile.environment.enabled?(:disable_asset_events)
+    articles += special_article_types if params && params[:cms]
     parent_id = params ? params[:parent_id] : nil
-    if !parent_id or !Article.find(parent_id).blog?
-      articles += [
-        RssFeed
-      ]
-    end
     if profile.enterprise?
       articles << EnterpriseHomepage
     end
@@ -56,22 +53,31 @@ class CmsController &lt; MyProfileController
   end
  
   def special_article_types
-    [Folder, Blog, UploadedFile]
+    [Folder, Blog, UploadedFile, Forum, Gallery, RssFeed]
   end
  
   def view
     @article = profile.articles.find(params[:id])
-    @subitems = @article.children.reject {|item| item.folder? }
-    if @article.blog?
-      @subitems.reject! {|item| item.class == RssFeed }
+    conditions = []
+    if @article.has_posts?
+      conditions = ['type != ?', 'RssFeed']
     end
-    @folders = @article.children.select {|item| item.folder? }
+
+    @articles = @article.children.paginate(
+      :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC",
+      :conditions => conditions,
+      :per_page => per_page,
+      :page => params[:npage]
+    )
   end
  
   def index
     @article = nil
-    @subitems = profile.top_level_articles.reject {|item| item.folder? }
-    @folders = profile.top_level_articles.select {|item| item.folder?}
+    @articles = profile.top_level_articles.paginate(
+      :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC",
+      :per_page => per_page,
+      :page => params[:npage]
+    )
     render :action => 'view'
   end
  
@@ -79,17 +85,21 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     @parent_id = params[:parent_id]
     @type = params[:type] || @article.class.to_s
+    translations if @article.translatable?
+    continue = params[:continue]
  
     refuse_blocks
-    if !@article.nil? && @article.blog? || !@type.nil? && @type == 'Blog'
-      @back_url = url_for(:controller => 'profile_editor', :profile => profile.identifier)
-    end
-    record_coming_from_public_view
+    record_coming
     if request.post?
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
-        redirect_back
-        return
+        if !continue
+          if @article.content_type.nil? || @article.image?
+            redirect_to @article.view_url
+          else
+            redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
+          end
+        end
       end
     end
   end
@@ -99,6 +109,7 @@ class CmsController &lt; MyProfileController
  
     # user must choose an article type first
  
+    record_coming
     @type = params[:type]
     if @type.blank?
       @article_types = []
@@ -110,12 +121,9 @@ class CmsController &lt; MyProfileController
         })
       end
       @parent_id = params[:parent_id]
-      render :action => 'select_article_type', :layout => false
+      render :action => 'select_article_type', :layout => false, :back_to => @back_to
       return
     else
-      if @type == 'Blog'
-        @back_url = url_for(:controller => 'profile_editor', :profile => profile.identifier)
-      end
       refuse_blocks
     end
  
@@ -131,13 +139,19 @@ class CmsController &lt; MyProfileController
       @parent_id = parent.id
     end
  
-    record_creating_from_public_view
+    translations if @article.translatable?
  
     @article.profile = profile
     @article.last_changed_by = user
+
+    continue = params[:continue]
     if request.post?
       if @article.save
-        redirect_back
+        if continue
+          redirect_to :action => 'edit', :id => @article
+        else
+          redirect_to @article.view_url
+        end
         return
       end
     end
@@ -150,7 +164,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     profile.home_page = @article
     profile.save(false)
-    flash[:notice] = _('"%s" configured as home page.') % @article.name
+    session[:notice] = _('"%s" configured as home page.') % @article.name
     redirect_to :action => 'view', :id => @article.id
   end
  
@@ -159,29 +173,36 @@ class CmsController &lt; MyProfileController
     @article = @parent = check_parent(params[:parent_id])
     @target = @parent ? ('/%s/%s' % [profile.identifier, @parent.full_name]) : '/%s' % profile.identifier
     @folders = Folder.find(:all, :conditions => { :profile_id => profile })
-    record_coming_from_public_view if @article
+    @media_listing = params[:media_listing]
+    if @article && !@media_listing
+      record_coming
+    end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
         @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent) unless file == ''
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
-      @back_to = params[:back_to]
       if @errors.any?
-        if @back_to && @back_to == 'media_listing'
+        if @media_listing
           flash[:notice] = _('Could not upload all files')
-          redirect_back
+          redirect_to :action => 'media_listing'
         else
           render :action => 'upload_files', :parent_id => @parent_id
         end
       else
-        if params[:back_to]
-          redirect_back
+        if @media_listing
+          flash[:notice] = _('All files were uploaded successfully')
+          redirect_to :action => 'media_listing'
         else
-          redirect_to( if @parent
-            {:action => 'view', :id => @parent.id}
+          if @back_to
+            redirect_to @back_to
           else
-            {:action => 'index'}
-          end)
+            redirect_to( if @parent
+              {:action => 'view', :id => @parent.id}
+            else
+              {:action => 'index'}
+            end)
+          end
         end
       end
     end
@@ -212,11 +233,11 @@ class CmsController &lt; MyProfileController
  
   def publish
     @article = profile.articles.find(params[:id])
-    record_coming_from_public_view
+    record_coming
     @groups = profile.memberships - [profile]
     @marked_groups = []
     groups_ids = profile.memberships.map{|m|m.id.to_s}
-    @marked_groups = params[:marked_groups].map do |item|
+    @marked_groups = params[:marked_groups].map do |key, item|
       if groups_ids.include?(item[:group_id])
         item.merge :group => Profile.find(item.delete(:group_id))
       end
@@ -232,8 +253,47 @@ class CmsController &lt; MyProfileController
         end
       end
       if @failed.blank?
-        flash[:notice] = _("Your publish request was sent successfully")
-        redirect_back
+        session[:notice] = _("Your publish request was sent successfully")
+        if @back_to
+          redirect_to @back_to
+        else
+          redirect_to @article.view_url
+        end
+      end
+    end
+  end
+
+  def publish_on_portal_community
+    @article = profile.articles.find(params[:id])
+    if request.post?
+      if environment.portal_community
+        task = ApproveArticle.create!(:article => @article, :name => params[:name], :target => environment.portal_community, :requestor => user)
+        begin
+          task.finish unless environment.portal_community.moderated_articles?
+          flash[:notice] = _("Your publish request was sent successfully")
+        rescue
+          flash[:error] = _("Your publish request couldn't be sent.")
+        end
+      else
+        flash[:notice] = _("There is no portal community to publish your article.")
+      end
+
+      if @back_to
+        redirect_to @back_to
+      else
+        redirect_to @article.view_url
+      end
+    end
+  end
+
+  def suggest_an_article
+    @back_to = params[:back_to] || request.referer || url_for(profile.public_profile_url)
+    @task = SuggestArticle.new(params[:task])
+    if request.post?
+       @task.target = profile
+      if @task.save
+        session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
+        redirect_to @back_to
       end
     end
   end
@@ -241,24 +301,24 @@ class CmsController &lt; MyProfileController
   def media_listing
     if params[:image_folder_id]
       folder = profile.articles.find(params[:image_folder_id]) if !params[:image_folder_id].blank?
-      @images = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.image? }
+      @images = (folder ? folder.children : profile.top_level_articles).images
     elsif params[:document_folder_id]
       folder = profile.articles.find(params[:document_folder_id]) if !params[:document_folder_id].blank?
-      @documents = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.kind_of?(UploadedFile) && !c.image? }
+      @documents = (folder ? folder.children : profile.top_level_articles)
     else
-      @documents = UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])
-      @images = @documents.select(&:image?)
+      @documents = profile.articles
+      @images = @documents.images
       @documents -= @images
     end
  
-    @images = @images.paginate(:per_page => per_page, :page => params[:ipage]) if @images
-    @documents = @documents.paginate(:per_page => per_page, :page => params[:dpage]) if @documents
+    @images = @images.paginate(:per_page => per_page, :page => params[:ipage], :order => "updated_at desc") if @images
+    @documents = @documents.paginate(:per_page => per_page, :page => params[:dpage], :order => "updated_at desc", :conditions => {:is_image => false}) if @documents
  
-    @folders = Folder.find(:all, :conditions => { :profile_id => profile })
+    @folders = profile.folders
     @image_folders = @folders.select {|f| f.children.any? {|c| c.image?} }
     @document_folders = @folders.select {|f| f.children.any? {|c| !c.image? && c.kind_of?(UploadedFile) } }
  
-    @back_to = 'media_listing'
+    @media_listing = true
  
     respond_to do |format|
       format.html { render :layout => false}
@@ -273,42 +333,11 @@ class CmsController &lt; MyProfileController
  
   protected
  
-  def redirect_back
-    if params[:back_to] == 'control_panel'
-      redirect_to :controller => 'profile_editor', :profile => @profile.identifier
-    elsif params[:back_to] == 'public_view'
-      redirect_to @article.view_url.merge(Noosfero.url_options)
-    elsif params[:back_to] == 'media_listing'
-      redirect_to :action => 'media_listing'
-    elsif @article.parent
-      redirect_to :action => 'view', :id => @article.parent
-    elsif @article.folder? && !@article.blog? && @article.parent
-      redirect_to :action => 'index'
+  def record_coming
+    if request.post?
+      @back_to = params[:back_to]
     else
-      redirect_back_or_default :action => 'index'
-    end
-  end
-
-  def record_coming_from_public_view
-    referer = request.referer
-    referer.gsub!(/\?.*/, '') unless referer.nil?
-    if (maybe_ssl(url_for(@article.url)).include?(referer)) || (@article == profile.home_page && maybe_ssl(url_for(profile.url)).include?(referer))
-      @back_to = 'public_view'
-      @back_url = @article.view_url
-    end
-    if !request.post? and @article.blog?
-      store_location(request.referer)
-    end
-  end
-
-  def record_creating_from_public_view
-    referer = request.referer
-    if (referer =~ Regexp.new("^#{(url_for(profile.url).sub('https:', 'https?:'))}")) || params[:back_to] == 'public_view'
-      @back_to = 'public_view'
-      @back_url = referer
-    end
-    if !request.post? and @article.blog?
-      store_location(request.referer)
+      @back_to = params[:back_to] || request.referer
     end
   end
  
@@ -341,5 +370,11 @@ class CmsController &lt; MyProfileController
   def per_page
     10
   end
+
+  def translations
+    @locales = Noosfero.locales.invert.reject { |name, lang| !@article.possible_translations.include?(lang) }
+    @selected_locale = @article.language || FastGettext.locale
+  end
+
 end
  
@@ -8,18 +8,6 @@ class FriendsController &lt; MyProfileController
     end
   end
  
-  def add
-    @friend = Person.find(params[:id])
-    if request.post? && params[:confirmation]
-      # FIXME this shouldn't be in Person model?
-      AddFriend.create!(:person => profile, :friend => @friend, :group_for_person => params[:group])
-
-      flash[:notice] = _('%s still needs to accept being your friend.') % @friend.name
-      # FIXME shouldn't redirect to the friend's page?
-      redirect_to :action => 'index' 
-    end
-  end
-
   def remove
     @friend = profile.friends.find(params[:id])
     if request.post? && params[:confirmation]
@@ -20,20 +20,20 @@ class MailconfController &lt; MyProfileController
     @task = EmailActivation.new(:target => environment, :requestor => profile)
     begin
       @task.save!
-      flash[:notice] = _('Please fill your personal information below in order to get your mailbox approved by one of the administrators')
+      session[:notice] = _('Please fill your personal information below in order to get your mailbox approved by one of the administrators')
       redirect_to :controller => 'profile_editor', :action => 'edit'
     rescue Exception => ex
-      flash[:notice] = _('e-Mail was not enabled successfully.')
+      session[:notice] = _('e-Mail was not enabled successfully.')
       render :action => 'index'
     end
   end
   post_only :disable
   def disable
     if profile.user.disable_email!
-      flash[:notice] = _('e-Mail disabled successfully.')
+      session[:notice] = _('e-Mail disabled successfully.')
       redirect_to :controller => 'profile_editor'
     else
-      flash[:notice] = _('e-Mail was not disabled successfully.')
+      session[:notice] = _('e-Mail was not disabled successfully.')
       redirect_to :action => 'index'
     end
   end
 class ManageProductsController < ApplicationController
   needs_profile
  
-  protect 'manage_products', :profile
+  protect 'manage_products', :profile, :except => [:show]
   before_filter :check_environment_feature
+  before_filter :login_required, :except => [:show]
  
   protected  
+
   def check_environment_feature
     if profile.environment.enabled?('disable_products_for_enterprises')
       render_not_found
@@ -13,104 +15,147 @@ class ManageProductsController &lt; ApplicationController
   end
  
   public
+
   def index
-    @products = @profile.products
-    @consumptions = @profile.consumptions
+    @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
   end
  
   def show
     @product = @profile.products.find(params[:id])
+    @inputs = @product.inputs
+    @allowed_user = user && user.has_permission?('manage_products', profile)
+  end
+
+  def categories_for_selection
+    @category = Category.find(params[:category_id]) if params[:category_id]
+    @object_name = params[:object_name]
+    if @category
+      @categories = @category.children
+      @level = @category.leaf? ? @category.level : @categories.first.level
+    else
+      @categories = ProductCategory.top_level_for(environment)
+      @level = 0
+    end
+    render :partial => 'categories_for_selection', :locals => { :categories => @categories, :level => @level }
   end
  
   def new
-    @object = Product.new
-    @categories = @current_category.nil? ? ProductCategory.top_level_for(environment) : @current_category.children
-    @product = @profile.products.build(params[:product])
+    @product = @profile.products.build(:product_category_id => params[:selected_category_id])
+    @category = @product.product_category
+    @categories = ProductCategory.top_level_for(environment)
+    @level = 0
     if request.post?
       if @product.save
-        flash[:notice] = _('Product succesfully created')
-        redirect_to :action => 'show', :id => @product
+        session[:notice] = _('Product succesfully created')
+        render :partial => 'shared/redirect_via_javascript',
+          :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
       else
-        flash[:notice] = _('Could not create the product')
+        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
       end
     end
   end
  
   def edit
     @product = @profile.products.find(params[:id])
-    @object = @profile.products.find(params[:id])
-    @current_category = @product.product_category
-    @categories = @current_category.nil? ? [] : @current_category.children
+    field = params[:field]
+    if request.post?
+      begin
+        @product.update_attributes!(params[:product])
+        render :partial => "display_#{field}", :locals => {:product => @product}
+      rescue Exception => e
+        render :partial => "edit_#{field}", :locals => {:product => @product, :errors => true}
+      end
+    else
+      render :partial => "edit_#{field}", :locals => {:product => @product, :errors => false}
+    end
+  end
+
+  def edit_category
+    @product = @profile.products.find(params[:id])
+    @category = @product.product_category
+    @categories = ProductCategory.top_level_for(environment)
+    @edit = true
+    @level = @category.level
+    if request.post?
+      if @product.update_attributes(:product_category_id => params[:selected_category_id])
+        render :partial => 'shared/redirect_via_javascript',
+          :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
+      else
+        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
+      end
+    end
+  end
+
+  def add_input
+    @product = @profile.products.find(params[:id])
+    @input = @product.inputs.build
+    @categories = ProductCategory.top_level_for(environment)
+    @level = 0
     if request.post?
-      if @product.update_attributes(params[:product])
-        flash[:notice] = _('Product succesfully updated')
-        redirect_back_or_default :action => 'show', :id => @product
+      if @input.update_attributes(:product_category_id => params[:selected_category_id])
+        @inputs = @product.inputs
+        render :partial => 'display_inputs'
       else
-        flash[:notice] = _('Could not update the product')
+        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
       end
+    else
+      render :partial => 'add_input'
     end
   end
  
   def destroy
     @product = @profile.products.find(params[:id])
     if @product.destroy
-      flash[:notice] = _('Product succesfully removed')
+      session[:notice] = _('Product succesfully removed')
       redirect_back_or_default :action => 'index'
     else
-      flash[:notice] = _('Could not remove the product')
+      session[:notice] = _('Could not remove the product')
       redirect_back_or_default :action => 'show', :id => @product
     end
   end
  
-  def update_categories
-    @object = params[:id] ? @profile.products.find(params[:id]) : Product.new
-    if params[:category_id]
-      @current_category = Category.find(params[:category_id])
-      @categories = @current_category.children
-    else
-      @current_category = ProductCategory.top_level_for(environment).first
-      @categories = @current_category.nil? ? [] : @current_category.children
+  def edit_input
+    if request.xhr?
+      @input = @profile.inputs.find_by_id(params[:id])
+      if @input
+        if request.post?
+          if @input.update_attributes(params[:input])
+            render :partial => 'display_input', :locals => {:input => @input}
+          else
+            render :partial => 'edit_input'
+          end
+        else
+          render :partial => 'edit_input'
+        end
+      else
+        render :text => _('The input was not found')
+      end
     end
-    render :partial => 'shared/select_categories', :locals => {:object_name => 'product', :multiple => false}, :layout => false
   end
  
-  def update_subcategories
-    @current_category = ProductCategory.find(params[:id]) if params[:id]
-    @categories = @current_category ? @current_category.children : ProductCategory.top_level_for(environment)
-    render :partial => 'subcategories'
+  def order_inputs
+    @product = @profile.products.find(params[:id])
+    @product.order_inputs!(params[:input]) if params[:input]
+    render :nothing => true
   end
-  
-  def new_consumption
-    @consumption = @profile.consumptions.build(params[:consumption])
+
+  def remove_input
+    @input = @profile.inputs.find(params[:id])
+    @product = @input.product
     if request.post?
-      if @consumption.save
-        flash[:notice] = _('Raw material succesfully created')
-        redirect_to :action => 'index'
+      if @input.destroy
+        @inputs = @product.inputs
+        render :partial => 'display_inputs'
       else
-        flash[:notice] = _('Could not create the raw material')
+        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'input' }
       end
     end
   end
  
-  def destroy_consumption
-    @consumption = @profile.consumptions.find(params[:id])
-    if @consumption.destroy
-      flash[:notice] = _('Raw material succesfully removed')
-    else
-      flash[:notice] = _('Could not remove the raw material')
-    end
-    redirect_back_or_default :action => 'index'
-  end
- 
-  def edit_consumption
-    @consumption = @profile.consumptions.find(params[:id])
-    if request.post?
-      if @consumption.update_attributes(params[:consumption])
-        flash[:notice] = _('Raw material succesfully updated')
-        redirect_back_or_default :action => 'index'
-      else
-        flash[:notice] = _('Could not update the raw material')
-      end
+  def certifiers_for_selection
+    @qualifier = Qualifier.exists?(params[:id]) ? Qualifier.find(params[:id]) : nil
+    render :update do |page|
+      page.replace_html params[:certifier_area], :partial => 'certifiers_for_selection'
     end
   end
  
@@ -8,7 +8,7 @@ class MapsController &lt; MyProfileController
       begin
         Profile.transaction do
           if profile.update_attributes!(params[:profile_data])
-            flash[:notice] = _('Address was updated successfully!')
+            session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
           end
         end
@@ -7,32 +7,12 @@ class MembershipsController &lt; MyProfileController
   end
  
   def new_community
-    @wizard = params[:wizard].blank? ? false : params[:wizard]
     @community = Community.new(params[:community])
     @community.environment = environment
     if request.post? && @community.valid?
       @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]))
-      if @wizard
-        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
-        return
-      else
-        redirect_to :action => 'index'
-        return
-      end
-    end
-    if @wizard
-      render :layout => 'wizard'
+      redirect_to :action => 'index'
+      return
     end
   end
-
-  def destroy_community
-    @community = Community.find(params[:id])
-    if request.post?
-      if @community.destroy
-        flash[:notice] = _('%s was removed.') % @community.short_name
-        redirect_to :action => 'index'
-      end
-    end
-  end
-
 end
@@ -5,7 +5,7 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
  
   def available_blocks
-    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock ]
+    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
  
     # blocks exclusive for organizations
     if profile.has_members?
@@ -24,6 +24,7 @@ class ProfileDesignController &lt; BoxOrganizerController
     if profile.enterprise?
       blocks << DisabledEnterpriseMessageBlock
       blocks << HighlightsBlock
+      blocks << FeaturedProductsBlock
     end
  
     # product block exclusive for enterprises in environments that permits it
 class ProfileEditorController < MyProfileController
  
-  protect 'edit_profile', :profile
+  protect 'edit_profile', :profile, :except => [:destroy_profile]
+  protect 'destroy_profile', :profile, :only => [:destroy_profile]
  
   def index
     @pending_tasks = profile.all_pending_tasks.select{|i| user.has_permission?(i.permission, profile)}
@@ -25,7 +26,7 @@ class ProfileEditorController &lt; MyProfileController
         if profile.identifier.blank?
           profile.identifier = params[:profile]
         end
-        flash[:notice] = _('Cannot update profile')
+        session[:notice] = _('Cannot update profile')
       end
     end
   end
@@ -34,7 +35,7 @@ class ProfileEditorController &lt; MyProfileController
     @to_enable = profile
     if request.post? && params[:confirmation]
       unless @to_enable.update_attribute('enabled', true)
-        flash[:notice] = _('%s was not enabled.') % @to_enable.name
+        session[:notice] = _('%s was not enabled.') % @to_enable.name
       end
       redirect_to :action => 'index'
     end
@@ -44,7 +45,7 @@ class ProfileEditorController &lt; MyProfileController
     @to_disable = profile
     if request.post? && params[:confirmation]
       unless @to_disable.update_attribute('enabled', false)
-        flash[:notice] = _('%s was not disabled.') % @to_disable.name
+        session[:notice] = _('%s was not disabled.') % @to_disable.name
       end
       redirect_to :action => 'index'
     end
@@ -72,4 +73,14 @@ class ProfileEditorController &lt; MyProfileController
     end
   end
  
+  def destroy_profile
+    if request.post?
+      if @profile.destroy
+        session[:notice] = _('The profile was deleted.')
+        redirect_to :controller => 'home'
+      else
+        session[:notice] = _('Could not delete profile')
+      end
+    end
+  end
 end
@@ -10,23 +10,34 @@ class ProfileMembersController &lt; MyProfileController
   def update_roles
     @roles = params[:roles] ? environment.roles.find(params[:roles].select{|r|!r.to_i.zero?}) : []
     @roles = @roles.select{|r| r.has_kind?('Profile') }
-    @person = profile.members.find { |m| m.id == params[:person].to_i }
-    if @person && @person.define_roles(@roles, profile)
-      flash[:notice] = _('Roles successfuly updated')
+    begin
+      @person = profile.members.find(params[:person])
+    rescue ActiveRecord::RecordNotFound
+      @person = nil
+    end
+    if !params[:confirmation] && @person && @person.is_last_admin_leaving?(profile, @roles)
+      redirect_to :action => :last_admin, :roles => params[:roles], :person => @person
     else
-      flash[:notice] = _('Couldn\'t change the roles')
+      if @person && @person.define_roles(@roles, profile)
+        session[:notice] = _('Roles successfuly updated')
+      else
+        session[:notice] = _('Couldn\'t change the roles')
+      end
+      if params[:confirmation]
+        redirect_to profile.url
+      else
+        redirect_to :action => :index
+      end
     end
-    redirect_to :action => :index
   end
  
-  def change_role
-    @roles = Profile::Roles.organization_member_roles(environment.id)
-    @member = profile.members.find { |m| m.id == params[:id].to_i }
-    if @member
-      @associations = @member.find_roles(@profile)
-    else
-      redirect_to :action => :index
-    end
+  def last_admin
+    @person = params[:person]
+    @roles = params[:roles] || []
+    @members = profile.members.select {|member| !profile.admins.include?(member)}
+    @title = _('Current admins')
+    @collection = :profile_admins
+    @remove_action = {:action => 'remove_admin'}
   end
  
   def add_role
@@ -44,21 +55,35 @@ class ProfileMembersController &lt; MyProfileController
   def remove_role
     @association = RoleAssignment.find(:all, :conditions => {:id => params[:id], :target_id => profile.id})
     if @association.destroy
-      flash[:notice] = 'Member succefully unassociated'
+      session[:notice] = 'Member succefully unassociated'
     else
-      flash[:notice] = 'Failed to unassociate member'
+      session[:notice] = 'Failed to unassociate member'
     end
     render :layout => false
   end
  
+  def change_role
+    @roles = Profile::Roles.organization_member_roles(environment.id)
+    begin
+      @member = profile.members.find(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      @member = nil
+    end
+    if @member
+      @associations = @member.find_roles(@profile)
+    else
+      redirect_to :action => :index
+    end
+  end
+
   def unassociate
     member = Person.find(params[:id])
     associations = member.find_roles(profile)
     RoleAssignment.transaction do
       if associations.map(&:destroy)
-        flash[:notice] = 'Member succefully unassociated'
+        session[:notice] = _('Member succesfully unassociated')
       else
-        flash[:notice] = 'Failed to unassociate member'
+        session[:notice] = _('Failed to unassociate member')
       end
     end
     render :layout => false
@@ -69,19 +94,61 @@ class ProfileMembersController &lt; MyProfileController
  
   def add_member
     if profile.enterprise?
-      member = Person.find_by_identifier(params[:id])
+      member = Person.find(params[:id])
       member.define_roles(Profile::Roles.all_roles(environment), profile)
     end
     render :layout => false
   end
  
+  def add_admin
+    @title = _('Current admins')
+    @collection = :profile_admins
+
+    if profile.community?
+      member = profile.members.find_by_identifier(params[:id])
+      profile.add_admin(member)
+    end
+    render :layout => false
+  end
+
+  def remove_admin
+    @title = _('Current admins')
+    @collection = :profile_admins
+
+    if profile.community?
+      member = profile.members.find_by_identifier(params[:id])
+      profile.remove_admin(member)
+    end
+    render :layout => false
+  end
+
   def find_users
     if !params[:query] || params[:query].length <= 2
       @users_found = []
-    else
-      @users_found = Person.find_by_contents(params[:query] + '*')
+    elsif params[:scope] == 'all_users'
+      @users_found = Person.find_by_contents(params[:query] + '*').select {|user| !profile.members.include?(user)}
+      @button_alt = _('Add member')
+      @add_action = {:action => 'add_member'}
+    elsif params[:scope] == 'new_admins'
+      @users_found = Person.find_by_contents(params[:query] + '*').select {|user| profile.members.include?(user) && !profile.admins.include?(user)}
+      @button_alt = _('Add member')
+      @add_action = {:action => 'add_admin'}
     end
     render :layout => false
   end
  
+  def send_mail
+    @mailing = profile.mailings.build(params[:mailing])
+    if request.post?
+      @mailing.locale = locale
+      @mailing.person = user
+      if @mailing.save
+        session[:notice] = _('The e-mails are being sent')
+        redirect_to :action => 'index'
+      else
+        session[:notice] = _('Could not create the e-mail')
+      end
+    end
+  end
+
 end
@@ -4,26 +4,38 @@ class TasksController &lt; MyProfileController
  
   def index
     @tasks = profile.all_pending_tasks.sort_by(&:created_at)
+    @failed = params ? params[:failed] : {}
   end
  
   def processed
     @tasks = profile.all_finished_tasks.sort_by(&:created_at)
   end
  
-  VALID_DECISIONS = [ 'finish', 'cancel' ]
+  VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
  
   def close
-    decision = params[:decision]
-    if request.post? && VALID_DECISIONS.include?(decision) && params[:id]
-      task = profile.find_in_all_tasks(params[:id])
-      task.update_attributes!(params[:task])
-      begin
-        task.send(decision)
-      rescue Exception => ex
-        flash[:notice] = ex.clean_message
+    failed = {}
+
+    params[:tasks].each do |id, value|
+      decision = value[:decision]
+      if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
+        task = profile.find_in_all_tasks(id)
+        task.update_attributes!(value[:task])
+        begin
+          task.send(decision)
+        rescue Exception => ex
+          message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
+          failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
+        end
       end
     end
-    redirect_to :action => 'index'
+
+    if failed.blank?
+      session[:notice] = _("All decisions were applied successfully.")
+    else
+      session[:notice] = _("Some decisions couldn't be applied.")
+    end
+    redirect_to params.merge!(:action => 'index', :failed => failed)
   end
  
   def new
@@ -8,6 +8,11 @@ class ThemesController &lt; MyProfileController
     redirect_to :action => 'index'
   end
  
+  def unset
+    profile.update_theme(nil)
+    redirect_to :action => 'index'
+  end
+
   def index
     @themes = profile.environment.themes + Theme.approved_themes(profile)
     @current_theme = profile.theme
@@ -18,7 +23,7 @@ class ThemesController &lt; MyProfileController
  
   def new
     if !request.xhr?
-      id = params[:name].to_slug
+      id = params[:name] ? params[:name].to_slug : 'my-theme'
       t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
       t.save
       redirect_to :action => 'index'
 class AccountController < ApplicationController
  
+  no_design_blocks
+
   inverse_captcha :field => 'e_mail'
  
-  require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
+  require_ssl :except => [ :login_popup, :logout_popup, :profile_details ]
  
   before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
@@ -28,10 +30,10 @@ class AccountController &lt; ApplicationController
       end
       if redirect?
         go_to_initial_page
-        flash[:notice] = _("Logged in successfully")
+        session[:notice] = _("Logged in successfully")
       end
     else
-      flash[:notice] = _('Incorrect username or password') if redirect?
+      session[:notice] = _('Incorrect username or password') if redirect?
       redirect_to :back if redirect?
     end
   end
@@ -48,8 +50,6 @@ class AccountController &lt; ApplicationController
   # action to register an user to the application
   def signup
     @invitation_code = params[:invitation_code]
-    @wizard = params[:wizard].blank? ? false : params[:wizard]
-    @step = 1
     begin
       @user = User.new(params[:user])
       @user.terms_of_use = environment.terms_of_use
@@ -68,38 +68,17 @@ class AccountController &lt; ApplicationController
           invitation.update_attributes!({:friend => @user.person})
           invitation.finish
         end
-        flash[:notice] = _("Thanks for signing up!")
-        if @wizard
-          redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
-          return
-        else
-          go_to_initial_page if redirect?
-        end
+        session[:notice] = _("Thanks for signing up!")
+        go_to_initial_page if redirect?
       end
-    if @wizard
-      render :layout => 'wizard'
-    end
     rescue ActiveRecord::RecordInvalid
       @person.valid?
       @person.errors.delete(:identifier)
       @person.errors.delete(:user_id)
-      if @wizard
-        render :action => 'signup', :layout => 'wizard'
-      else
-        render :action => 'signup'
-      end
+      render :action => 'signup'
     end
   end
  
-  def wizard
-    render :layout => false
-  end
-
-  def profile_details
-    @profile = Profile.find_by_identifier(params[:profile])
-    render :partial => 'profile_details', :layout => 'wizard'
-  end
-
   # action to perform logout from the application
   def logout
     if logged_in?
@@ -107,7 +86,7 @@ class AccountController &lt; ApplicationController
     end
     cookies.delete :auth_token
     reset_session
-    flash[:notice] = _("You have been logged out.")
+    session[:notice] = _("You have been logged out.")
     redirect_to :controller => 'home', :action => 'index'
   end
  
@@ -118,10 +97,10 @@ class AccountController &lt; ApplicationController
         @user.change_password!(params[:current_password],
                                params[:new_password],
                                params[:new_password_confirmation])
-        flash[:notice] = _('Your password has been changed successfully!')
+        session[:notice] = _('Your password has been changed successfully!')
         redirect_to :action => 'index'
       rescue User::IncorrectPassword => e
-        flash[:notice] = _('The supplied current password is incorrect.')
+        session[:notice] = _('The supplied current password is incorrect.')
         render :action => 'change_password'
       end
     else
@@ -233,6 +212,21 @@ class AccountController &lt; ApplicationController
     render :partial => 'identifier_status'
   end
  
+  def user_data
+    user_data =
+      if logged_in?
+        current_user.data_hash
+      else
+        { }
+      end
+    if session[:notice]
+      user_data['notice'] = session[:notice]
+      session[:notice] = nil # consume the notice
+    end
+
+    render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
+  end
+
   protected
  
   def redirect?
@@ -0,0 +1,58 @@
+class BrowseController < PublicController
+
+  no_design_blocks
+
+  FILTERS = %w(
+    more_recent
+    more_active
+    more_popular
+  )
+
+  def people
+    @filter = filter
+    @title = self.filter_description(params[:action] + '_' + @filter )
+
+    @results = @environment.people.visible.send(@filter)
+
+    if params[:query].blank?
+      @results = @results.paginate(:per_page => 27, :page => params[:page])
+    else
+      @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
+    end
+  end
+
+  def communities
+    @filter = filter
+    @title = self.filter_description(params[:action] + '_' + @filter )
+
+    @results = @environment.communities.visible.send(@filter)
+
+    if params[:query].blank?
+      @results = @results.paginate(:per_page => 27, :page => params[:page])
+    else
+      @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
+    end
+  end
+
+  protected
+
+  def filter
+    if FILTERS.include?(params[:filter])
+      params[:filter]
+    else
+      'more_recent'
+    end
+  end
+
+  def filter_description(str)
+    {
+      'people_more_recent' => _('More recent people'),
+      'people_more_active' => _('More active people'),
+      'people_more_popular' => _('More popular people'),
+      'communities_more_recent' => _('More recent communities'),  
+      'communities_more_active' => _('More active communities'),  
+      'communities_more_popular' => _('More popular communities'),
+    }[str] || str
+  end
+
+end
 class CatalogController < PublicController
   needs_profile
+
   before_filter :check_enterprise_and_environment
  
   def index
-    @products = @profile.products
+    @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
   end
  
-  def show
-    @product = @profile.products.find(params[:id])
-  end
-  
   protected
   def check_enterprise_and_environment
     unless @profile.kind_of?(Enterprise) && !@profile.environment.enabled?('disable_products_for_enterprises')
@@ -0,0 +1,52 @@
+class ChatController < PublicController
+
+  before_filter :login_required
+  before_filter :check_environment_feature
+
+  def start_session
+    login = user.jid
+    password = current_user.crypted_password
+    begin
+      jid, sid, rid = RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind",
+                                                  :wait => 30, :hold => 1, :window => 5)
+      session_data = { :jid => jid, :sid => sid, :rid => rid }
+      render :text => session_data.to_json, :layout => false, :content_type => 'application/javascript'
+    rescue
+      render :action => 'start_session_error', :layout => false, :status => 500
+    end
+  end
+
+  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
+  end
+
+  def index
+    presence = current_user.last_chat_status
+    if presence.blank? or presence == 'chat'
+      render :action => 'auto_connect_online'
+    else
+      render :action => 'auto_connect_busy'
+    end
+  end
+
+  def update_presence_status
+    if request.xhr?
+      current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
+    end
+    render :nothing => true
+  end
+
+  protected
+
+  def check_environment_feature
+    unless environment.enabled?('xmpp_chat')
+      render_not_found
+      return
+    end
+  end
+
+end
@@ -12,10 +12,10 @@ class ContactController &lt; PublicController
       @contact.city = (!params[:city].blank? && City.exists?(params[:city])) ? City.find(params[:city]).name : nil
       @contact.state = (!params[:state].blank? && State.exists?(params[:state])) ? State.find(params[:state]).name : nil
       if @contact.deliver
-        flash[:notice] = _('Contact successfully sent')
+        session[:notice] = _('Contact successfully sent')
         redirect_to :action => 'new'
       else
-        flash[:notice] = _('Contact not sent')
+        session[:notice] = _('Contact not sent')
       end
     else
       @contact = user.build_contact(profile)
@@ -51,6 +51,8 @@ class ContentViewerController &lt; ApplicationController
       return
     end
  
+    redirect_to_translation
+
     # At this point the page will be showed
     @page.hit
  
@@ -67,9 +69,6 @@ class ContentViewerController &lt; ApplicationController
       return
     end
  
-    # store location if the page is not a download
-    store_location
-
     @form_div = params[:form]
  
     if request.post? && params[:comment] && params[self.icaptcha_field].blank? && params[:confirm] == 'true' && @page.accept_comments?
@@ -80,22 +79,28 @@ class ContentViewerController &lt; ApplicationController
       remove_comment
     end
  
-    if @page.blog?
+    if @page.has_posts?
       posts = if params[:year] and params[:month]
         filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
-        @page.posts.by_range(filter_date..Article.last_day_of_month(filter_date))
+        @page.posts.by_range(filter_date..filter_date.at_end_of_month)
       else
         @page.posts
       end
-      @posts = available_articles(posts, user).paginate :page => params[:npage], :per_page => @page.posts_per_page
+
+      posts = posts.native_translations if @page.blog? && @page.display_posts_in_current_language?
+
+      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile)))
+
+      @posts.map!{ |p| p.get_translation_to(FastGettext.locale) } if @page.blog? && @page.display_posts_in_current_language?
     end
  
-    if @page.folder? && @page.view_as == 'image_gallery'
+    if @page.folder? && @page.gallery?
       @images = @page.images
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
  
-    @comments = @page.comments(true)
+    @comments = @page.comments(true).as_thread
+    @comments_count = @page.comments.count
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
     end
@@ -110,8 +115,9 @@ class ContentViewerController &lt; ApplicationController
     if @comment.save
       @page.touch
       @comment = nil # clear the comment form
+      redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
     else
-      @form_div = 'opened'
+      @form_div = 'opened' if params[:comment][:reply_of_id].blank?
     end
   end
  
@@ -119,7 +125,7 @@ class ContentViewerController &lt; ApplicationController
     @comment = @page.comments.find(params[:remove_comment])
     if (user == @comment.author || user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
       @comment.destroy
-      flash[:notice] = _('Comment succesfully deleted')
+      session[:notice] = _('Comment succesfully deleted')
     end
     redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
   end
@@ -127,4 +133,24 @@ class ContentViewerController &lt; ApplicationController
   def per_page
     12
   end
+
+  def redirect_to_translation
+    locale = FastGettext.locale
+    if !@page.language.nil? && @page.language != locale
+      translations = [@page.native_translation] + @page.native_translation.translations
+      urls = translations.map{ |t| URI.parse(url_for(t.url)).path }
+      urls << URI.parse(url_for(profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }))).path
+      urls << URI.parse(url_for(profile.admin_url.merge(:controller => 'cms', :action => 'new'))).path
+      referer = URI.parse(url_for(request.referer)).path unless request.referer.blank?
+      unless urls.include?(referer)
+        translations.each do |translation|
+          if translation.language == locale
+            @page = translation
+            redirect_to :profile => @page.profile.identifier, :page => @page.explode_path
+          end
+        end
+      end
+    end
+  end
+
 end
@@ -16,9 +16,9 @@ class EnterpriseRegistrationController &lt; ApplicationController
         @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
       end
     elsif @validation == :admin || @validation == :none
-        @create_enterprise.target = @create_enterprise.environment
+        @create_enterprise.target = environment
     end
-    @create_enterprise.requestor = current_user.person
+    @create_enterprise.requestor = user
     the_action =
       if request.post?
         if @create_enterprise.valid_before_selecting_target?
@@ -13,7 +13,7 @@ class EventsController &lt; PublicController
       @events_of_the_day = profile.events.by_day(@selected_day)
     end
  
-    events = profile.events.by_range(Event.first_day_of_month(date - 1.month)..Event.last_day_of_month(date + 1.month))
+    events = profile.events.by_range((date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month)
  
     @calendar = populate_calendar(date, events)
     @previous_calendar = populate_calendar(date - 1.month, events)
@@ -7,8 +7,8 @@ class HomeController &lt; PublicController
       @news_cache_key = environment.portal_news_cache_key
       if !read_fragment(@news_cache_key)
         portal_community = environment.portal_community
-        @portal_news = portal_community.news(5)
         @highlighted_news = portal_community.news(2, true)
+        @portal_news = portal_community.news(7, true) - @highlighted_news
         @area_news = environment.portal_folders
       end
     end
@@ -2,40 +2,57 @@ class InviteController &lt; PublicController
  
   needs_profile
   before_filter :login_required
-  before_filter :check_permissions_to_invite, :only => 'friends'
+  before_filter :check_permissions_to_invite
  
-  def friends
-    step = params[:step]
+  def select_address_book
+    @import_from = params[:import_from] || "manual"
     if request.post?
-      if step == '1'
-        begin
-          @contacts = Invitation.get_contacts(params[:import_from], params[:login], params[:password])
-        rescue
-          @login = params[:login]
-          flash.now[:notice] = _('There was an error while looking for your contact list. Did you enter correct login and password?')
-        end
-      elsif step == '2'
-        manual_import_addresses = params[:manual_import_addresses]
-        webmail_import_addresses = params[:webmail_import_addresses]
-        contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
-        if !params[:mail_template].match(/<url>/)
-          flash.now[:notice] = _('&lt;url&gt; is needed in invitation mail.')
-        elsif !contacts_to_invite.empty?
-          Invitation.invite(current_user.person, contacts_to_invite, params[:mail_template], profile)
-          flash[:notice] = _('Your invitations have been sent.')
-          redirect_back_or_default :controller => 'profile'
+      contact_list = ContactList.create
+      Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'
+      redirect_to :action => 'select_friends', :contact_list => contact_list.id, :import_from => @import_from
+    end
+  end
+
+  def select_friends
+    @contact_list = ContactList.find(params[:contact_list])
+    @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
+    @import_from = params[:import_from] || "manual"
+    if request.post?
+      manual_import_addresses = params[:manual_import_addresses]
+      webmail_import_addresses = params[:webmail_import_addresses]
+      contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
+      if !contacts_to_invite.empty?
+        Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
+        session[:notice] = _('Your invitations are being sent.')
+        if profile.person?
+          redirect_to :controller => 'profile', :action => 'friends'
         else
-          flash.now[:notice] = _('Please enter a valid email address.')
+          redirect_to :controller => 'profile', :action => 'members'
         end
-        @contacts = params[:webmail_friends] ? params[:webmail_friends].map {|e| YAML.load(e)} : []
-        @manual_import_addresses = manual_import_addresses || ""
-        @webmail_import_addresses = webmail_import_addresses || []
+        return
+      else
+        session[:notice] = _('Please enter a valid email address.')
       end
-    else
-      store_location(request.referer)
+      @manual_import_addresses = manual_import_addresses || ""
+      @webmail_import_addresses = webmail_import_addresses || []
     end
-    @import_from = params[:import_from] || "manual"
-    @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
+  end
+
+  def invitation_data
+    contact_list = ContactList.find(params[:contact_list])
+    render :text => contact_list.data.to_json, :layout => false, :content_type => "application/javascript"
+  end
+
+  def add_contact_list
+    contact_list = ContactList.find(params[:contact_list])
+    contacts = contact_list.list
+    render :partial => 'invite/contact_list', :locals => {:contacts => contacts}
+  end
+
+  def cancel_fetching_emails
+    contact_list = ContactList.find(params[:contact_list])
+    contact_list.destroy
+    redirect_to :action => 'select_address_book'
   end
  
   protected
 class ProfileController < PublicController
  
   needs_profile
-  before_filter :check_access_to_profile, :except => [:join, :refuse_join, :refuse_for_now, :index]
-  before_filter :store_before_join, :only => [:join]
-  before_filter :login_required, :only => [:join, :refuse_join, :leave, :unblock]
+  before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
+  before_filter :store_before_join, :only => [:join, :join_not_logged]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities]
  
   helper TagsHelper
  
   def index
+    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
+    @wall_items = []
+    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) : []
+    if logged_in? && current_person.follows?(@profile)
+      @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
+      @wall_items = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
+    end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
       profile.visible? ? private_profile : invisible_profile
@@ -73,20 +80,27 @@ class ProfileController &lt; PublicController
   end
  
   def join
-    @wizard = params[:wizard]
-    if request.post? && params[:confirmation]
-      profile.add_member(current_user.person)
-      flash[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
-      if @wizard
-        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+    if !user.memberships.include?(profile)
+      profile.add_member(user)
+      if !profile.members.include?(user)
+        render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
       else
-        redirect_to_before_join
+        render :text => {:message => _('You just became a member of %s.') % profile.name}.to_json
       end
     else
-      store_location(request.referer)
-      if current_user.person.memberships.include?(profile)
-        flash[:notice] = _('You are already a member of "%s"') % profile.name
-        redirect_back_or_default profile.url
+      render :text => {:message => _('You are already a member of %s.') % profile.name}.to_json
+    end
+  end
+
+  def join_not_logged
+    if request.post?
+      profile.add_member(user)
+      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
+      redirect_to_before_join
+    else
+      if user.memberships.include?(profile)
+        session[:notice] = _('You are already a member of %s.') % profile.name
+        redirect_to profile.url
         return
       end
       if request.xhr?
@@ -96,47 +110,109 @@ class ProfileController &lt; PublicController
   end
  
   def leave
-    @wizard = params[:wizard]
-    if request.post? && params[:confirmation]
-      profile.remove_member(current_user.person)
-      if @wizard
-        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+    if current_person.memberships.include?(profile)
+      if current_person.is_last_admin?(profile)
+        render :text => {:redirect_to => url_for({:controller => 'profile_members', :action => 'last_admin', :person => current_person.id})}.to_json
       else
-        redirect_back_or_default profile.url
+        render :text => current_person.leave(profile, params[:reload])
       end
     else
-      store_location(request.referer)
-      if request.xhr?
-        render :layout => false
-      end
+      render :text => {:message => _('You are not a member of %s.') % profile.name}.to_json
     end
   end
  
-  def refuse_join
-    p = current_user.person
-    p.refused_communities << profile
-    p.save
-    redirect_to profile.url
+  def check_membership
+    unless logged_in?
+      render :text => ''
+      return
+    end
+    if user.memberships.include?(profile)
+      render :text => 'true'
+    else
+      render :text => 'false'
+    end
   end
  
-  def refuse_for_now
-    session[:no_asking] ||= []
-    session[:no_asking].shift if session[:no_asking].size >= 10
-    session[:no_asking] << profile.id
-    render :text => '', :layout => false
+  def add
+    # FIXME this shouldn't be in Person model?
+    if !user.memberships.include?(profile)
+      AddFriend.create!(:person => user, :friend => profile)
+      render :text => _('%s still needs to accept being your friend.') % profile.name
+    else
+      render :text => _('You are already a friend of %s.') % profile.name
+    end
+  end
+
+  def check_friendship
+    unless logged_in?
+      render :text => ''
+      return
+    end
+    if user == profile || user.already_request_friendship?(profile) || user.is_a_friend?(profile)
+      render :text => 'true'
+    else
+      render :text => 'false'
+    end
   end
  
   def unblock
     if current_user.person.is_admin?(profile.environment)
       profile.unblock
-      flash[:notice] = _("You have unblocked %s successfully. ") % profile.name
+      session[:notice] = _("You have unblocked %s successfully. ") % profile.name
       redirect_to :controller => 'profile', :action => 'index'
     else
-      message = _('You are not allowed to unblock enterprises in this environment.')
+      message = __('You are not allowed to unblock enterprises in this environment.')
       render_access_denied(message)
     end
   end
  
+  def leave_scrap
+    sender = params[:sender_id].nil? ? current_user.person : Person.find(params[:sender_id])
+    receiver = params[:receiver_id].nil? ? @profile : Person.find(params[:receiver_id])
+    @scrap = Scrap.new(params[:scrap])
+    @scrap.sender= sender
+    @scrap.receiver= receiver
+    @tab_action = params[:tab_action]
+    @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
+    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
+    render :partial => 'leave_scrap'
+  end
+
+  def view_more_scraps
+    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
+    render :partial => 'profile_scraps', :locals => {:scraps => @scraps}
+  end
+
+  def view_more_activities
+    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
+    render :partial => 'profile_activities', :locals => {:activities => @activities}
+  end
+
+  def view_more_network_activities
+    @activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) 
+    render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
+  end
+
+  def remove_scrap
+    begin
+      scrap = current_user.person.scraps(params[:scrap_id])
+      scrap.destroy
+      render :text => _('Scrap successfully removed.')
+    rescue
+      render :text => _('You could not remove this scrap')
+    end
+  end
+
+  def remove_activity
+    begin
+      activity = current_person.tracked_actions.find(params[:activity_id])
+      activity.destroy
+      render :text => _('Activity successfully removed.')
+    rescue
+      render :text => _('You could not remove this activity')
+    end
+  end
+
   protected
  
   def check_access_to_profile
@@ -146,7 +222,9 @@ class ProfileController &lt; PublicController
   end
  
   def store_before_join
-    session[:before_join] = request.referer unless logged_in?
+    if session[:before_join].nil?
+      session[:before_join] = request.referer
+    end
   end
  
   def redirect_to_before_join
@@ -155,14 +233,14 @@ class ProfileController &lt; PublicController
       session[:before_join] = nil
       redirect_to back
     else
-      redirect_back_or_default profile.url
+      redirect_to profile.url
     end
   end
  
   def private_profile
     if profile.person?
       @action = :add_friend
-      @message = _("The content here is available to %s's friends only." % profile.short_name)
+      @message = _("The content here is available to %s's friends only.") % profile.short_name
     else
       @action = :join
       @message = _('The contents in this community is available to members only.')
@@ -0,0 +1,28 @@
+class ProfileSearchController < PublicController
+
+  include SearchHelper
+
+  needs_profile
+  before_filter :check_access_to_profile
+
+  def index
+    @q = params[:q]
+    unless @q.blank?
+      @filtered_query = remove_stop_words(@q)
+      if params[:where] == 'environment'
+        redirect_to :controller => 'search', :query => @q
+      else
+        @results = profile.articles.published.find_by_contents(@filtered_query).paginate(:per_page => 10, :page => params[:page])
+      end
+    end
+  end
+
+  protected
+
+  def check_access_to_profile
+    unless profile.display_info_to?(user)
+      redirect_to :controller => 'profile', :action => 'index'
+    end
+  end
+
+end
@@ -102,7 +102,7 @@ class SearchController &lt; PublicController
  
     if month || year
       date = Date.new(year.to_i, month.to_i, 1)
-      result[:date_range] = (date - 1.month)..Event.last_day_of_month(date + 1.month)
+      result[:date_range] = (date - 1.month)..(date + 1.month).at_end_of_month
     end
  
     result
@@ -148,8 +148,6 @@ class SearchController &lt; PublicController
   end
  
   def index
-    @wizard = params[:wizard].blank? ? false : params[:wizard]
-    @step = 2
     @query = params[:query] || ''
     @filtered_query = remove_stop_words(@query)
     @product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
@@ -174,20 +172,12 @@ class SearchController &lt; PublicController
       if respond_to?(specific_action)
         @asset_name = getterm(@names[@results.keys.first])
         send(specific_action)
-        if @wizard
-          render :action => specific_action, :layout => 'wizard'
-        else
-          render :action => specific_action
-        end
+        render :action => specific_action
         return
       end
     end
  
-    if @wizard
-      render :action => 'index', :layout => 'wizard'
-    else
-      render :action => 'index'
-    end
+    render :action => 'index'
   end
  
   alias :assets :index
@@ -223,10 +213,10 @@ class SearchController &lt; PublicController
   end
  
   def tag
-    @tag = environment.tags.find_by_name(params[:tag])
+    @tag = params[:tag]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key, true)
-      @tagged = environment.articles.find_tagged_with(@tag.name).paginate(:per_page => 10, :page => params[:npage])
+      @tagged = environment.articles.find_tagged_with(@tag).paginate(:per_page => 10, :page => params[:npage])
     end
   end
  
 module AccountHelper
  
-
-  def button_to_step(type, step, current_step, html_options = {})
-    if current_step == step
-      the_class = 'active'
-      if html_options.has_key?(:class)
-        html_options[:class] << " #{the_class}"
-      else
-        html_options[:class] = the_class
-      end
-    end
-    if step == 1
-      url = '#'
-    else
-      url = send('url_step_' + step.to_s)
-    end
-    button(type, step.to_s, url, html_options)
-  end
-
-  def button_to_step_without_text(type, step, html_options = {})
-    url = 'url_step_' + step
-    button_without_text(type, step, send(url), html_options)
-  end
-
-  def button_to_previous_step(step, html_options = {})
-    step = step - 1
-    if step > 1
-      button_to_step_without_text(:left, step.to_s, html_options)
-    end
-  end
-
-  def button_to_next_step(step, html_options = {})
-    step = step + 1
-    if step < 4
-      button_to_step_without_text(:forward, step.to_s, html_options)
-    end
-  end
-
-  def url_step_1
-    options = {:controller => 'account', :action => 'signup', :wizard => true}
-    Noosfero.url_options.merge(options)
-  end
-
-  def url_step_2
-    options = {:controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true}
-    Noosfero.url_options.merge(options)
-  end
-
-  def url_step_3
-    options = {:controller => 'friends', :action => 'invite', :profile => user.identifier, :wizard => true}
-    Noosfero.url_options.merge(options)
-  end
-
 end
@@ -27,18 +27,7 @@ module ApplicationHelper
   include AccountHelper
  
   def locale
-    FastGettext.locale
-  end
-
-  def load_web2_conf
-    if File.exists?( RAILS_ROOT + '/config/web2.0.yml')
-      YAML.load_file( RAILS_ROOT + '/config/web2.0.yml' )
-    else
-      {}
-    end
-  end
-  def web2_conf
-    @web_conf ||= load_web2_conf
+    (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
  
   # Displays context help. You can pass the content of the help message as the
@@ -217,7 +206,8 @@ module ApplicationHelper
     if html_options.has_key?(:class)
       the_class << ' ' << html_options[:class]
     end
-    link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => label))
+    the_title = html_options[:title] || label
+    link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
   end
  
   def button_to_function(type, label, js_code, html_options = {}, &block)
@@ -278,6 +268,19 @@ module ApplicationHelper
     end
   end
  
+  def partial_for_task_class(klass, action)
+    if klass.nil?
+      raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
+    end
+
+    name = "#{klass.name.underscore}_#{action.to_s}"
+    if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], "_#{name}.rhtml"))
+      name
+    else
+      partial_for_task_class(klass.superclass, action)
+    end
+  end
+
   def user
     @controller.send(:user)
   end
@@ -339,7 +342,7 @@ module ApplicationHelper
           if ENV['RAILS_ENV'] == 'development' && environment.theme == 'random'
             @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
             @random_theme
-          elsif ENV['RAILS_ENV'] == 'development' && params[:theme]
+          elsif ENV['RAILS_ENV'] == 'development' && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
             params[:theme]
           else
             if profile && !profile.theme.nil?
@@ -371,6 +374,24 @@ module ApplicationHelper
     nil
   end
  
+  def theme_favicon
+    return '/designs/themes/' + current_theme + '/favicon.ico' if profile.nil? || profile.theme.nil?
+    if File.exists?(File.join(RAILS_ROOT, 'public', theme_path, 'favicon.ico'))
+      '/designs/themes/' + profile.theme + '/favicon.ico'
+    else
+      favicon = profile.articles.find_by_path('favicon.ico')
+      if favicon
+        favicon.public_filename
+      else
+        '/designs/themes/' + environment.theme + '/favicon.ico'
+      end
+    end
+  end
+
+  def theme_site_title
+    theme_include('site_title')
+  end
+
   def theme_header
     theme_include('header')
   end
@@ -395,6 +416,7 @@ module ApplicationHelper
   #
   # If the profile has no image set yet, then a default image is used.
   def profile_image(profile, size=:portrait, opt={})
+    return '' if profile.nil?
     opt[:alt]   ||= profile.name()
     opt[:title] ||= ''
     opt[:class] ||= ''
@@ -402,21 +424,33 @@ module ApplicationHelper
     image_tag(profile_icon(profile, size), opt )
   end
  
-  def profile_icon( profile, size=:portrait )
+  def profile_icon( profile, size=:portrait, return_mimetype=false )
+    filename, mimetype = '', 'image/png'
     if profile.image
-      profile.image.public_filename( size )
+      filename = profile.image.public_filename( size )
+      mimetype = profile.image.content_type
     else
-      if profile.organization?
-        if profile.kind_of?(Community)
-          '/images/icons-app/users_size-'+ size.to_s() +'.png'
+      icon =
+        if profile.organization?
+          if profile.kind_of?(Community)
+            '/images/icons-app/community-'+ size.to_s() +'.png'
+          else
+            '/images/icons-app/enterprise-'+ size.to_s() +'.png'
+          end
         else
-          '/images/icons-app/enterprise-default-pic-'+ size.to_s() +'.png'
+          '/images/icons-app/person-'+ size.to_s() +'.png'
         end
-      else
-        '/images/icons-app/user_icon_size-'+ size.to_s() +'.png'
-      end
+      filename = default_or_themed_icon(icon)
     end
+    return_mimetype ? [filename, mimetype] : filename
+  end
  
+  def default_or_themed_icon(icon)
+    if File.exists?(File.join(Rails.root, 'public', theme_path, icon))
+      theme_path + icon
+    else
+      icon
+    end
   end
  
   def profile_sex_icon( profile )
@@ -455,71 +489,69 @@ module ApplicationHelper
     end
   end
  
-  # displays a link to add the profile with its image (as generated by
-  # #profile_image) or only its name below.
-  def profile_add_link( profile, image=false, size=:portrait, tag='li')
-    the_class = profile.members.include?(user) ? 'profile_member' : ''
-    name = h(profile.short_name)
-    if image
-      display = content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-                content_tag( 'span', name, :class => 'org' ) +
-                profile_cat_icons( profile )
-      the_class << ' vcard'
-    else
-      display = content_tag( 'span', name, :class => 'org' )
+  def links_for_balloon(profile)
+    if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
+      if profile.kind_of?(Person)
+        [
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
+          {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
+          {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
+        ]
+      elsif profile.kind_of?(Community)
+        [
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
+          {_('Leave') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
+        ]
+      elsif profile.kind_of?(Enterprise)
+        [
+          {_('Products') => {:href => catalog_path(profile.identifier)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
+        ]
+      else
+        []
+      end
     end
-    content_tag tag,
-        link_to_remote( display,
-	    :update => 'search-results-and-pages',
-            :url => {:controller => 'account', :action => 'profile_details', :profile => profile.identifier},
-            :onclick => 'document.location.href = this.href', # work-arround for ie.
-            :class => 'profile_link url',
-            :help => _('Click on this icon to add <b>%s</b> to your network') % profile.name,
-            :title => profile.name ),
-        :class => the_class
   end
  
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
-  def profile_image_link( profile, size=:portrait, tag='li' )
-    if profile.class == Person
-      name = profile.short_name
-      city = content_tag 'span', content_tag( 'span', profile.city, :class => 'locality' ), :class => 'adr'
+  def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    name = profile.short_name
+    if profile.person?
+      url = url_for(profile.check_friendship_url)
+      trigger_class = 'person-trigger'
     else
-      name = profile.short_name
       city = ''
+      url = url_for(profile.check_membership_url)
+      if profile.community?
+        trigger_class = 'community-trigger'
+      elsif profile.enterprise?
+        trigger_class = 'enterprise-trigger'
+      end
     end
+    extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
+    links = links_for_balloon(profile)
     content_tag tag,
+        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
         link_to(
             content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
             content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-            city + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+            extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
             profile.url,
-            :onclick => 'document.location.href = this.href', # work-arround for ie.
             :class => 'profile_link url',
             :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
             :title => profile.name ),
         :class => 'vcard'
   end
  
-  # displays a link to the community homepage with its image (as generated by
-  # #profile_image) and its name and number of members beside it.
-  def community_image_link( profile, size=:portrait, tag='li' )
-    name = h(profile.name)
-    content_tag tag,
-        link_to(
-            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', name, :class => 'org' ) +
-            content_tag( 'span', n_('1 member', '%s members', profile.members.count) % profile.members.count, :class => 'community-member-count' ),
-            profile.url,
-            :onclick => 'document.location.href = this.href', # work-arround for ie.
-            :class => 'profile_link url',
-            :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-            :title => profile.name ) +
-            '<br class="may-clear"/>',
-        :class => 'vcard'
-  end
-
   def gravatar_url_for(email, options = {})
     # Ta dando erro de roteamento
     url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
@@ -527,12 +559,12 @@ module ApplicationHelper
                :protocol => 'http://',
                :only_path => false,
                :controller => 'avatar.php',
-               :d => web2_conf['gravatar'] ? web2_conf['gravatar']['default'] : nil
+               :d => NOOSFERO_CONF['gravatar'] ? NOOSFERO_CONF['gravatar'] : nil
              }.merge(options) )
   end
  
   def str_gravatar_url_for(email, options = {})
-    default = web2_conf['gravatar'] ? web2_conf['gravatar']['default'] : nil
+    default = NOOSFERO_CONF['gravatar'] ? NOOSFERO_CONF['gravatar'] : nil
     url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
            Digest::MD5.hexdigest(email)
     {
@@ -591,7 +623,16 @@ module ApplicationHelper
   end
  
   def select_folder(label, object, method, collection, html_options = {}, js_options = {})
-    labelled_form_field(label, select(object, method, collection.map {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))
+    root = profile ? profile.identifier : _("root")
+    labelled_form_field(label, select(object, method,
+                                      collection.map {|f| [ root + '/' + f.full_name, f.id ]},
+                                      {:include_blank => root}, html_options.merge(js_options)))
+  end
+
+  def select_profile_folder(label, object, method, profile, html_options = {}, js_options = {})
+    labelled_form_field(label, select(object, method,
+                                      profile.folders.map {|f| [ profile.identifier + '/' + f.full_name, f.id ]},
+                                      {:include_blank => profile.identifier}, html_options.merge(js_options)))
   end
  
   def theme_option(opt = nil)
@@ -851,6 +892,7 @@ module ApplicationHelper
  
   def helper_for_article(article)
     article_helper = ActionView::Base.new
+    article_helper.controller = controller
     article_helper.extend ArticleHelper
     begin
       class_name = article.class.name + 'Helper'
@@ -877,37 +919,27 @@ module ApplicationHelper
     end
   end
  
-  def ask_to_join?
-    return if !environment.enabled?(:join_community_popup)
-    return if params[:action] == 'join'
-    return unless profile && profile.kind_of?(Community)
-    if (session[:no_asking] && session[:no_asking].include?(profile.id))
-      return false
-    end
-    if logged_in?
-      user.ask_to_join?(profile)
-    else
-      true
-    end
-  end
-
   def icon_theme_stylesheet_path
-    theme_path = "/designs/icons/#{environment.icon_theme}/style.css"
-    if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
-      theme_path
-    else
-      '/designs/icons/default/style.css'
+    icon_themes = []
+    theme_icon_themes = theme_option(:icon_theme) || []
+    for icon_theme in theme_icon_themes do
+      theme_path = "/designs/icons/#{icon_theme}/style.css"
+      if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
+        icon_themes << theme_path
+      end
     end
+    icon_themes
   end
  
   def page_title
-    (@page ? @page.name + ' - ' : '') +
+    (@page ? @page.title + ' - ' : '') +
     (profile ? profile.short_name + ' - ' : '') +
     (@topic ? @topic.title + ' - ' : '') +
     (@section ? @section.title + ' - ' : '') +
     (@toc ? _('Online Manual') + ' - ' : '') +
+    (@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
     environment.name +
-    (@category ? "&rarr; #{@category.full_name}" : '')
+    (@category ? " - #{@category.full_name}" : '')
   end
  
   def noosfero_javascript
@@ -946,7 +978,7 @@ module ApplicationHelper
   end
  
   def article_to_html(article, options = {})
-    options.merge(:page => params[:npage])
+    options.merge!(:page => params[:npage])
     content = article.to_html(options)
     return self.instance_eval(&content) if content.kind_of?(Proc)
     content
@@ -960,4 +992,221 @@ module ApplicationHelper
     text_field_tag(name, value, options.merge(:class => 'colorpicker_field'))
   end
  
+  def ui_icon(icon_class, extra_class = '')
+    "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>"
+  end
+
+  def ui_button(label, url, html_options = {})
+    link_to(label, url, html_options.merge(:class => 'ui_button fg-button'))
+  end
+
+  def ui_button_to_remote(label, options, html_options = {})
+    link_to_remote(label, options, html_options.merge(:class => 'ui_button fg-button'))
+  end
+
+  def jquery_theme
+    theme_option(:jquery_theme) || 'smoothness_mod'
+  end
+
+  def jquery_ui_theme_stylesheet_path
+    'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
+  end
+
+  def ui_error(message)
+    content_tag('div', ui_icon('ui-icon-alert') + message, :class => 'alert fg-state-error ui-state-error')
+  end
+
+  def ui_highlight(message)
+    content_tag('div', ui_icon('ui-icon-info') + message, :class => 'alert fg-state-highlight ui-state-highlight')
+  end
+
+  def float_to_currency(value)
+    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
+  end
+
+  def collapsed_item_icon
+    "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>"
+  end
+  def expanded_item_icon
+    "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>"
+  end
+  def leaf_item_icon
+    "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>"
+  end
+
+  def display_category_menu(block, categories, root = true)
+    categories = categories.sort{|x,y| x.name <=> y.name}
+    return "" if categories.blank?
+    content_tag(:ul,
+      categories.map do |category|
+        category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
+        category.display_in_menu? ?
+        content_tag(:li,
+          ( !category.is_leaf_displayable_in_menu? ? content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => 'category-link-expand ' + (root ? 'category-root' : 'category-no-root'), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => 'display: none') : leaf_item_icon) +
+          link_to(content_tag(:span, category.name, :class => 'category-name'), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
+          content_tag(:div, display_category_menu(block, category.children, false), :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category')
+        ) : ''
+      end
+    ) +
+    content_tag(:p) +
+    (root ? javascript_tag("
+      jQuery('.child-category').hide();
+      jQuery('.category-link-expand').show();
+      var expanded_icon = \"#{ expanded_item_icon }\";
+      var collapsed_icon = \"#{ collapsed_item_icon }\";
+      var category_expanded = { 'block' : 0, 'category' : 0 };
+    ") : '')
+  end
+
+  def browse_people_menu
+     links = [
+       {s_('people|More Recent') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_recent'})}},
+       {s_('people|More Active') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_active'})}},
+       {s_('people|More Popular') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_popular'})}}
+     ]
+     if logged_in?
+       links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
+       links.push(_('Invite friends') => {:href => url_for({:profile => current_user.login, :controller => 'invite', :action => 'friends'})})
+     end
+
+    link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "browse", :action => 'people'}, :id => 'submenu-people') +
+    link_to(content_tag(:span, _('People Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
+  end
+
+  def browse_communities_menu
+     links = [
+       {s_('communities|More Recent') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_recent'})}},
+       {s_('communities|More Active') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_active'})}},
+       {s_('communities|More Popular') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_popular'})}}
+     ]
+     if logged_in?
+       links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
+       links.push(_('New community') => {:href => url_for({:profile => current_user.login, :controller => 'memberships', :action => 'new_community'})})
+     end
+
+    link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "browse", :action => 'communities'}, :id => 'submenu-communities') +
+    link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
+  end
+
+  def pagination_links(collection, options={})
+    options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
+    will_paginate(collection, options)
+  end
+
+  def render_environment_features(folder)
+    result = ''
+    environment.enabled_features.keys.each do |feature|
+      file = File.join(@controller.view_paths, 'shared', folder.to_s, "#{feature}.rhtml")
+      if File.exists?(file)
+        result << render(:file => file, :use_full_path => false)
+      end
+    end
+    result
+  end
+
+  def usermenu_logged_in
+    pending_tasks_count = ''
+    if user && user.all_pending_tasks.count > 0
+      pending_tasks_count = link_to(user.all_pending_tasks.count.to_s, '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
+    end
+
+    (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    render_environment_features(:usermenu) +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    pending_tasks_count +
+    link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
+  end
+
+  def limited_text_area(object_name, method, limit, text_area_id, options = {})
+    content_tag(:div, [
+      text_area(object_name, method, { :id => text_area_id, :onkeyup => "limited_text_area('#{text_area_id}', #{limit})" }.merge(options)),
+      content_tag(:p, content_tag(:span, limit) + ' ' + _(' characters left'), :id => text_area_id + '_left'),
+      content_tag(:p, _('Limit of characters reached'), :id => text_area_id + '_limit', :style => 'display: none')
+    ], :class => 'limited-text-area')
+  end
+
+  def pluralize_without_count(count, singular, plural = nil)
+    count == 1 ? singular : (plural || singular.pluralize)
+  end
+
+  def unique_with_count(list, connector = 'for')
+    list.sort.inject(Hash.new(0)){|h,i| h[i] += 1; h }.collect{ |x, n| [n, connector, x].join(" ") }.sort
+  end
+
+  #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
+  def time_ago_as_sentence(from_time, include_seconds = false)
+    to_time = Time.now
+    from_time = from_time.to_time if from_time.respond_to?(:to_time)
+    to_time = to_time.to_time if to_time.respond_to?(:to_time)
+    distance_in_minutes = (((to_time - from_time).abs)/60).round
+    distance_in_seconds = ((to_time - from_time).abs).round
+    case distance_in_minutes
+      when 0..1
+        return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
+        case distance_in_seconds
+          when 0..4   then _('less than 5 seconds')
+          when 5..9   then _('less than 10 seconds')
+          when 10..19 then _('less than 20 seconds')
+          when 20..39 then _('half a minute')
+          when 40..59 then _('less than a minute')
+          else             _('1 minute')
+        end
+
+      when 2..44           then _('%{distance} minutes') % { :distance => distance_in_minutes }
+      when 45..89          then _('about 1 hour')
+      when 90..1439        then _('about %{distance} hours') % { :distance => (distance_in_minutes.to_f / 60.0).round }
+      when 1440..2879      then _('1 day')
+      when 2880..43199     then _('%{distance} days') % { :distance => (distance_in_minutes / 1440).round }
+      when 43200..86399    then _('about 1 month')
+      when 86400..525599   then _('%{distance} months') % { :distance => (distance_in_minutes / 43200).round }
+      when 525600..1051199 then _('about 1 year')
+      else                      _('over %{distance} years') % { :distance => (distance_in_minutes / 525600).round }
+    end
+  end
+
+  def comment_balloon(options = {}, &block)
+    wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
+    (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
+    classes = options.delete(:class) || options.delete("class") || ''
+    concat(content_tag('div', wrapper + tag('br', :style => 'clear: both;'), { :class => 'comment-balloon ' + classes.to_s }.merge(options)), block.binding)
+  end
+
+  def display_source_info(page)
+    if !page.source.blank?
+      source_url = link_to(page.source_name.blank? ? page.source : page.source_name, page.source)
+    elsif page.reference_article
+      source_url = link_to(page.reference_article.profile.name, page.reference_article.url)
+    end
+    content_tag(:div, _('Source: %s') % source_url, :id => 'article-source') unless source_url.nil?
+  end
+
+  def task_information(task)
+    values = {}
+    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
+    values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
+    values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
+    values.merge!(task.information[:variables]) if task.information[:variables]
+    task.information[:message] % values
+  end
+
+  def add_zoom_to_images
+    if environment.enabled?(:show_zoom_button_on_article_images)
+      stylesheet_link_tag('fancybox') +
+      javascript_include_tag('jquery.fancybox-1.3.4.pack') +
+      javascript_tag("jQuery(function($) {
+        $('#article .article-body img').each( function(index) {
+          var original = original_image_dimensions($(this).attr('src'));
+          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
+            $(this).wrap('<div class=\"zoomable-image\" />');
+            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
+            $(this).attr('style', '');
+            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
+          }
+        });
+        $('.zoomify-image').fancybox();
+      });" % _('Zoom in'))
+    end
+  end
+
 end
@@ -8,12 +8,13 @@ module ArticleHelper
         'div',
         check_box(:article, :published) +
         content_tag('label', _('This article must be published (visible to other people)'), :for => 'article_published')
-      ) +
+      ) + (article.parent && article.parent.forum? && controller.action_name == 'new' ?
+      hidden_field_tag('article[accept_comments]', 1) :
       content_tag(
         'div',
         check_box(:article, :accept_comments) +
-        content_tag('label', _('I want to receive comments about this article'), :for => 'article_accept_comments')
-      ) +
+        content_tag('label', (article.parent && article.parent.forum? ? _('This topic is opened for replies') : _('I want to receive comments about this article')), :for => 'article_accept_comments')
+      )) +
       content_tag(
         'div',
         check_box(:article, :notify_comments) +
@@ -9,7 +9,7 @@ module AssetsHelper
       [ options.merge(:asset => 'products'), "icon-menu-product",    _('Products') ],
       [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", __('Enterprises') ],
       [ options.merge(:asset => 'communities'), "icon-menu-community",  __('Communities') ],
-      [ options.merge(:asset => 'events'), "icon-menu-events",   __('Events') ],
+      [ options.merge(:asset => 'events'), "icon-event",   __('Events') ],
  
     ].select do |target, css_class, name|
       !environment.enabled?('disable_asset_' + target[:asset])
@@ -3,7 +3,7 @@ module BlockHelper
   def block_title(title)
     tag_class = 'block-title'
     tag_class += ' empty' if title.empty?
-    content_tag 'h3', title, :class => tag_class
+    content_tag 'h3', content_tag('span', title), :class => tag_class
   end
  
 end
@@ -11,7 +11,7 @@ module BlogHelper
   end
  
   def cms_label_for_edit
-    _('Edit blog')
+    _('Configure blog')
   end
  
   def list_posts(articles, format = 'full')
@@ -48,7 +48,7 @@ module BlogHelper
  
   def display_short_format(article)
     html = content_tag('div',
-             article.first_paragraph +
+             article.lead +
              content_tag('div',
                link_to_comments(article) +
                link_to( _('Read more'), article.url),
@@ -65,7 +65,7 @@ module BoxesHelper
   end
  
   def display_box_content(box, main_content)
-    context = { :article => @page }
+    context = { :article => @page, :request_path => request.path, :locale => locale }
     box_decorator.select_blocks(box.blocks, context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
  
 module CatalogHelper
  
 include DisplayHelper
+include ManageProductsHelper
  
   def display_products_list(profile, products)
     data = ''
@@ -19,7 +20,7 @@ include DisplayHelper
     content_tag('h1', _('Products/Services')) + content_tag('ul', data, :id => 'product_list')
   end
  
-private
+  private
  
   def product_category_name(profile, product_category)
     if profile.enabled?
@@ -34,8 +34,7 @@ module CategoriesHelper
  
   def select_category_type(field)
     value = params[field]
-    types = TYPES.select { |title,typename| environment.category_types.include?(typename) }
-    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(types, value)))
+    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
  
 end
@@ -0,0 +1,24 @@
+module ChatHelper
+
+  def user_status_menu(icon_class, status)
+    links = [
+      ['icon-menu-online', _('Online'), 'chat-connect'],
+      ['icon-menu-busy', _('Busy'), 'chat-busy'],
+      ['icon-menu-offline', _('Sign out of chat'), 'chat-disconnect'],
+    ]
+    content_tag('span',
+      link_to(content_tag('span', status) + ui_icon('ui-icon-triangle-1-s'),
+        '#',
+        :onclick => 'toggleMenu(this); return false',
+        :class => icon_class + ' simplemenu-trigger'
+      ) +
+      content_tag('ul',
+        links.map{|link| content_tag('li', link_to(link[1], '#', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
+        :style => 'display: none; z-index: 100',
+        :class => 'simplemenu-submenu'
+      ),
+      :class => 'user-status'
+    )
+  end
+
+end
@@ -27,4 +27,34 @@ module CmsHelper
     article_helper.custom_options_for_article(article)
   end
  
+  def link_to_article(article)
+    article_name = short_filename(article.title, 30)
+    if article.folder?
+      link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
+    else
+      if article.image?
+         image_tag(icon_for_article(article)) + link_to(article_name, article.url)
+      else
+        link_to article_name, article.url, :class => icon_for_article(article)
+      end
+    end
+  end
+
+  def display_spread_button(profile, article)
+    if profile.person?
+      button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
+    elsif profile.community? && environment.portal_community
+      button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
+    end
+  end
+
+  def display_delete_button(article)
+    confirm_message = if article.folder?
+        _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!')
+      else
+        _('Are you sure that you want to remove this item?')
+      end
+
+    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => confirm_message
+  end
 end
 module ContentViewerHelper
  
   include BlogHelper
+  include ForumHelper
  
   def number_of_comments(article)
     n = article.comments.size
@@ -20,7 +21,7 @@ module ContentViewerHelper
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
       comments = args[:no_comments] ? '' : (("- %s") % link_to_comments(article))
-      title << content_tag('span', _("%s, by %s %s") % [show_date(article.published_at), link_to(article.author.name, article.author.url), comments], :class => 'created-at')
+      title << content_tag('span', _("%s, by %s %s") % [show_date(article.published_at), link_to(article.author_name, article.author.url), comments], :class => 'created-at')
     end
     title
   end
@@ -30,8 +31,20 @@ module ContentViewerHelper
   end
  
   def image_label(image)
-    text = image.title || image.abstract
+    text = image.abstract || image.title
     text && (text.first(40) + (text.size > 40 ? '…' : ''))
   end
  
+  def article_translations(article)
+    unless article.native_translation.translations.empty?
+      links = (article.native_translation.translations + [article.native_translation]).map do |translation|
+        { Noosfero.locales[translation.language] => { :href => url_for(translation.url) } }
+      end
+      content_tag(:div, link_to(_('Translations'), '#',
+                                :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
+                                :class => 'article-translations-menu simplemenu-trigger up'),
+                  :class => 'article-translations')
+    end
+  end
+
 end
@@ -36,7 +36,7 @@ module DatesHelper
   # formats a datetime for displaying. 
   def show_time(time)
     if time
-      _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.min }
+      _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
     else
       ''
     end
@@ -46,7 +46,7 @@ module DatesHelper
     if (date1 == date2) || (date2.nil?)
       show_date(date1)
     else
-      _('from %s to %s') % [show_date(date1), show_date(date2)]
+      _('from %{date1} to %{date2}') % {:date1 => show_date(date1), :date2 => show_date(date2)}
     end
   end
  
@@ -2,12 +2,16 @@ module DisplayHelper
  
   def link_to_product(product, opts={})
     return _('No product') unless product
-    target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url
+    target = product_path(product)
     link_to content_tag( 'span', product.name ),
             target,
             opts
   end
  
+  def product_path(product)
+    product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
+  end
+
   def link_to_category(category, full = true)
     return _('Uncategorized product') unless category
     name = full ? category.full_name(' &rarr; ') : category.name
@@ -27,9 +31,10 @@ module DisplayHelper
       gsub( /\n\s*\n/, ' <p/> ' ).
       gsub( /\n/, ' <br/> ' ).
       gsub( /(^|\s)(www\.[^\s])/, '\1http://\2' ).
-      gsub( /(https?:\/\/([^\s]+))/,
-            '<a href="\1" target="_blank" rel="nofolow" onclick="return confirm(\'' +
-            escape_javascript( _('Are you sure you want to visit this web site?') ) +
-            '\n\n\'+this.href)">\2</a>' )
+      gsub( /(https?:\/\/([^\s]+))/ ) do
+        href, content = $1, $2.scan(/.{4}/).join('&#x200B;')
+        content_tag(:a, content, :href => href, :target => '_blank', :rel => 'nofolow',
+                    :onclick => "return confirm('%s')" % escape_javascript(_('Are you sure you want to visit this web site?')))
+      end
   end
 end
@@ -6,7 +6,7 @@ module EventsHelper
     content_tag('h2', title) +
     content_tag('div',
       (events.any? ?
-        content_tag('table', events.select { |item| item.public? }.map {|item| display_event_in_listing(item)}.join('')) :
+        content_tag('table', events.select { |item| item.display_to?(user) }.map {|item| display_event_in_listing(item)}.join('')) :
         content_tag('em', _('No events for this date'), :class => 'no-events')
       ), :id => 'agenda-items'
     )
@@ -15,7 +15,7 @@ module EventsHelper
   def display_event_in_listing(article)
     content_tag(
       'tr',
-      content_tag('td', link_to(image_tag(icon_for_article(article)) + article.name, article.url)),
+      content_tag('td', link_to(article.name, article.url, :class => icon_for_article(article))),
       :class => 'agenda-item'
     )
   end
@@ -26,7 +26,7 @@ module EventsHelper
         # the day itself
         date,
         # is there any events in this date?
-        events.any? do |event|
+        events.select {|event| event.display_to?(user)}.any? do |event|
           event.date_range.include?(date)
         end,
         # is this date in the current month?
@@ -0,0 +1,27 @@
+module FloatHelper
+
+  def decimal_to_float( num )
+    if num.count('.') == 1 && num.count(',') == 0
+      # number like "12.34"
+      return num.to_f
+    end
+
+    if num.count('.') == 0 && num.count(',') == 1
+      # number like "12,34"
+      return num.tr(',','.').to_f
+    end
+
+    if num.count('.') > 0 && num.count(',') > 0
+      # number like "12.345.678,90" or "12,345,678.90"
+      dec_sep = num.tr('0-9','')[-1].chr
+      return num.tr('^0-9'+dec_sep,'').tr(dec_sep,'.').to_f
+    end
+
+    # if you are here is because there is only one
+    # separator and this appears 2 times or more.
+    # number like "12.345.678" or "12,345,678"
+
+    return num.tr(',.','').to_f
+  end
+
+end
 module FolderHelper
  
+  include ShortFilename
+
   def list_articles(articles, recursive = false)
     if !articles.blank?
-      content_tag(
-        'table',
-        content_tag('tr', content_tag('th', _('Title')) + content_tag('th', _('Last update'))) +
-        articles.map {|item| display_article_in_listing(item, recursive, 0)}.join('')
+      articles = articles.paginate(
+        :order => "updated_at DESC",
+        :per_page => 10,
+        :page => params[:npage]
       )
+
+      render :file => 'shared/articles_list', :locals => {:articles => articles, :recursive => recursive}
     else
       content_tag('em', _('(empty folder)'))
     end
@@ -17,9 +21,14 @@ module FolderHelper
   end
  
   def display_article_in_listing(article, recursive = false, level = 0)
+    article_link = if article.image?
+         link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
+       else
+         link_to('&nbsp;' * (level * 4) + short_filename(article.name), article.url.merge(:view => true), :class => icon_for_article(article))
+       end
     result = content_tag(
       'tr',
-      content_tag('td', link_to(('&nbsp;' * (level * 4) ) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true)))+
+      content_tag('td', article_link )+
       content_tag('td', show_date(article.updated_at), :class => 'last-update'),
       :class => 'sitemap-item'
     )
@@ -31,18 +40,22 @@ module FolderHelper
   end
  
   def icon_for_article(article)
-    icon = article.icon_name
+    icon = article.class.icon_name(article)
     if (icon =~ /\//)
       icon
     else
-      if File.exists?(File.join(RAILS_ROOT, 'public', 'images', 'icons-mime', "#{icon}.png"))
-        "icons-mime/#{icon}.png"
-      else
-        "icons-mime/unknown.png"
+      klasses = 'icon icon-' + icon
+      if article.kind_of?(UploadedFile)
+        klasses += ' icon-upload-file'
       end
+      klasses
     end
   end
  
+  def icon_for_new_article(type)
+    "icon-new icon-new%s" % type.constantize.icon_name
+  end
+
   def custom_options_for_article(article)
     @article = article
     content_tag('h4', _('Options')) +
@@ -69,11 +82,4 @@ module FolderHelper
     _('Edit folder')
   end
  
-  def short_filename(filename, limit_chars = 43)
-    return filename if filename.size <= limit_chars
-    extname = File.extname(filename)
-    basename = File.basename(filename,extname)
-    str_complement = '(...)'
-    return basename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement + extname
-  end
 end
@@ -41,8 +41,7 @@ module FormsHelper
       the_class << ' ' << html_options[:class]
     end
  
-    # FIXME: should be in stylesheet
-    bt_submit = submit_tag(label, html_options.merge(:style => 'height:28px; cursor:pointer', :class => the_class))
+    bt_submit = submit_tag(label, html_options.merge(:class => the_class))
  
     bt_submit + bt_cancel
   end
@@ -60,6 +59,10 @@ module FormsHelper
  
     state_id = 'state-' + FormsHelper.next_id_number
     city_id = 'city-' + FormsHelper.next_id_number
+
+    if states.length < 1
+      return
+    end
  
     if simple
       states = [State.new(:name => _('Select the State'))] + states
@@ -108,6 +111,18 @@ module FormsHelper
     ))
   end
  
+  def options_for_select_with_title(container, selected = nil)
+    container = container.to_a if Hash === container
+
+    options_for_select = container.inject([]) do |options, element|
+      text, value = option_text_and_value(element)
+      selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
+      options << %(<option title="#{html_escape(text.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute}>#{html_escape(text.to_s)}</option>)
+    end
+
+    options_for_select.join("\n")
+  end
+
 protected
   def self.next_id_number
     if defined? @@id_num
@@ -0,0 +1,51 @@
+module ForumHelper
+
+  def cms_label_for_new_children
+    _('New discussion topic')
+  end
+
+  def cms_label_for_edit
+    _('Configure forum')
+  end
+
+  def list_forum_posts(articles)
+    pagination = will_paginate(articles, {
+      :param_name => 'npage',
+      :prev_label => _('&laquo; Newer posts'),
+      :next_label => _('Older posts &raquo;')
+    })
+    content = [content_tag('tr',
+                           content_tag('th', _('Discussion topic')) +
+                           content_tag('th', _('Posts')) +
+                           content_tag('th', _('Last post'))
+                          )
+              ]
+    artic_len = articles.length
+    articles.each_with_index{ |art,i|
+      css_add = [ 'position-'+(i+1).to_s() ]
+      position = (i%2 == 0) ? 'odd-post' : 'even-post'
+      css_add << 'first' if i == 0
+      css_add << 'last'  if i == (artic_len-1)
+      css_add << 'not-published' if !art.published?
+      css_add << position
+      content << content_tag('tr',
+                             content_tag('td', link_to(art.title, art.url)) +
+                             content_tag('td', link_to(art.comments.count, art.url.merge(:anchor => 'comments_list'))) +
+                             content_tag('td', last_topic_update(art)),
+                             :class => 'forum-post ' + css_add.join(' '),
+                             :id => "post-#{art.id}"
+                            )
+    }
+    content_tag('table', content) + (pagination or '')
+  end
+
+  def last_topic_update(article)
+    info = article.info_from_last_update
+    if info[:author_url]
+      time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+    else
+      time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + info[:author_name]
+    end
+  end
+
+end
 module FriendsHelper
  
-  def link_to_import(text, options = {})
-    options.merge!({:action => 'invite', :import => 1, :wizard => true})
-    link_to text, options
-  end
-
-  def pagination_links(collection, options={})
-    options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
-    will_paginate(collection, options)
-  end
-
 end
 module ManageProductsHelper
+
+  def remote_function_to_update_categories_selection(container_id, options = {})
+    remote_function({
+      :update => container_id,
+      :url => { :action => "categories_for_selection" },
+      :loading => "loading('hierarchy_navigation', '#{ _('loading…') }'); loading('#{container_id}', '&nbsp;')",
+      :complete => "loading_done('hierarchy_navigation'); loading_done('#{container_id}')"
+    }.merge(options))
+  end
+
+  def hierarchy_category_item(category, make_links, title = nil)
+    title ||= category.name
+    if make_links
+      link_to(title, '#',
+        :title => title,
+        :onclick => remote_function_to_update_categories_selection("categories_container_level#{ category.level + 1 }",
+          :with => "'category_id=#{ category.id }'"
+        )
+      )
+    else
+      title
+    end
+  end
+
+  def hierarchy_category_navigation(current_category, options = {})
+    hierarchy = []
+    if current_category
+      count_chars = 0
+      unless options[:hide_current_category]
+        hierarchy << current_category.name
+        count_chars += current_category.name.length
+      end
+      ancestors = current_category.ancestors
+      toplevel = ancestors.pop
+      if toplevel
+        count_chars += toplevel.name.length
+      end
+      ancestors.each do |category|
+        if count_chars > 55
+          hierarchy << hierarchy_category_item(category, options[:make_links], '( … )')
+          break
+        else
+          hierarchy << hierarchy_category_item(category, options[:make_links])
+        end
+        count_chars += category.name.length
+      end
+      if toplevel
+        hierarchy << hierarchy_category_item(toplevel, options[:make_links])
+      end
+    end
+    hierarchy.reverse.join(options[:separator] || ' &rarr; ')
+  end
+
+  def options_for_select_categories(categories, selected = nil)
+    categories.sort_by{|cat| cat.name.transliterate}.map do |category|
+      selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')
+      "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{truncate(category.name, 33) + (category.leaf? ? '': ' &raquo;')}</option>"
+    end.join("\n")
+  end
+
+  def build_selects_for_ancestors(ancestors, current_category)
+    current_ancestor = ancestors.shift
+    if current_ancestor.nil?
+      select_for_new_category(current_category.children, current_category.level + 1)
+    else
+      content_tag('div',
+        select_tag('category_id',
+          options_for_select_categories(current_ancestor.siblings + [current_ancestor], current_ancestor),
+          :size => 10,
+          :onchange => remote_function_to_update_categories_selection("categories_container_level#{ current_ancestor.level + 1 }", :with => "'category_id=' + this.value")
+        ) +
+        build_selects_for_ancestors(ancestors, current_category),
+        :class => 'categories_container',
+        :id => "categories_container_level#{ current_ancestor.level }"
+      )
+    end
+  end
+
+  def selects_for_all_ancestors(current_category)
+    build_selects_for_ancestors(current_category.ancestors.reverse + [current_category], current_category)
+  end
+
+  def select_for_new_category(categories, level)
+    content_tag('div',
+      render(:partial => 'categories_for_selection', :locals => { :categories => categories, :level => level }),
+      :class => 'categories_container',
+      :id => "categories_container_level#{ level }"
+    )
+  end
+
+  def categories_container(categories_selection_html, hierarchy_html = '')
+    hidden_field_tag('selected_category_id') +
+    content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
+    content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
+  end
+
+  def select_for_categories(categories, level = 0)
+    if categories.empty?
+      content_tag('div', '', :id => 'no_subcategories')
+    else
+      select_tag('category_id',
+        options_for_select_categories(categories),
+        :size => 10,
+        :onchange => remote_function_to_update_categories_selection("categories_container_level#{ level + 1 }", :with => "'category_id=' + this.value")
+      ) +
+      content_tag('div', '', :class => 'categories_container', :id => "categories_container_level#{ level + 1 }")
+    end
+  end
+
+  def edit_link(label, url, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    link_to(label, url, html_options)
+  end
+
+  def edit_product_link_to_remote(product, field, label, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    options = html_options.merge(:id => 'link-edit-product-' + field)
+    options[:class] = options[:class] ? options[:class] + ' link-to-remote' : 'link-to-remote'
+
+    link_to_remote(label,
+                   {:update => "product-#{field}",
+                   :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
+                   :method => :get,
+                   :loading => "loading_for_button('#link-edit-product-#{field}')"},
+                   options)
+  end
+
+  def edit_button(type, label, url, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    button(type, label, url, html_options)
+  end
+
+  def edit_product_button_to_remote(product, field, label, html_options = {})
+    the_class = 'button with-text icon-edit'
+    if html_options.has_key?(:class)
+     the_class << ' ' << html_options[:class]
+    end
+    edit_product_link_to_remote(product, field, label, html_options.merge(:class => the_class))
+  end
+
+  def edit_ui_button(label, url, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    ui_button(label, url, html_options)
+  end
+
+  def edit_product_ui_button_to_remote(product, field, label, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    id = 'edit-product-remote-button-ui-' + field
+    options = html_options.merge(:id => id)
+
+    ui_button_to_remote(label,
+                   {:update => "product-#{field}",
+                   :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
+                   :complete => "$('edit-product-button-ui-#{field}').hide()",
+                   :method => :get,
+                   :loading => "loading_for_button('##{id}')"},
+                   options)
+  end
+
+  def cancel_edit_product_link(product, field, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    button_to_function(:cancel, _('Cancel'), nil, html_options) do |page|
+      page.replace_html "product-#{field}", :partial => "display_#{field}", :locals => {:product => product}
+    end
+  end
+
+  def edit_product_category_link(product, html_options = {})
+    return '' unless (user && user.has_permission?('manage_products', profile))
+    options = html_options.merge(:id => 'link-edit-product-category')
+    link_to(_('Change category'), { :action => 'edit_category', :id => product.id}, options)
+  end
+
+  def display_value(product)
+    price = product.price
+    return '' if price.blank? || price.zero?
+    discount = product.discount
+    if discount.blank? || discount.zero?
+      result = display_price(_('Price: '), price)
+    else
+      result = display_price_with_discount(price, product.price_with_discount)
+    end
+    content_tag('span', content_tag('span', result, :class => 'product-price'), :class => "#{product.available? ? '' : 'un'}available-product")
+  end
+
+  def display_availability(product)
+    if !product.available?
+      ui_highlight(_('Product not available!'))
+    end
+  end
+
+  def display_price(label, price)
+    content_tag('span', label, :class => 'field-name') +
+    content_tag('span', float_to_currency(price), :class => 'field-value')
+  end
+
+  def display_price_with_discount(price, price_with_discount)
+    original_value = content_tag('span', display_price(_('List price: '), price), :class => 'list-price')
+    discount_value = content_tag('span', display_price(_('On sale: '), price_with_discount), :class => 'on-sale-price')
+    original_value + tag('br') + discount_value
+  end
+
+  def display_qualifiers(product)
+    data = ''
+    product.product_qualifiers.each do |pq|
+      certified_by = ''
+      certifier = pq.certifier
+      if certifier
+        certifier_name = certifier.link.blank? ? certifier.name : link_to(certifier.name, certifier.link)
+        certified_by = _('certified by %s') % certifier_name
+      else
+        certified_by = _('(Self declared)')
+      end
+      data << content_tag('li', "✔ #{pq.qualifier.name} #{certified_by}", :class => 'product-qualifiers-item')
+    end
+    content_tag('ul', data, :id => 'product-qualifiers')
+  end
+
+  def qualifiers_for_select
+    [[_('Select...'), nil]] + environment.qualifiers.map{ |c| [c.name, c.id] }
+  end
+  def certifiers_for_select(qualifier)
+    [[_('Self declared'), nil]] + qualifier.certifiers.map{ |c| [c.name, c.id] }
+  end
+  def select_qualifiers(product, selected = nil)
+    select_tag('selected_qualifier', options_for_select(qualifiers_for_select, selected),
+      :onchange => remote_function(
+        :url => {:action => 'certifiers_for_selection'},
+        :with => "'id=' + value + '&certifier_area=' + jQuery(this).parent().next().attr('id')",
+        :before => "small_loading(jQuery(this).parent().next().attr('id'), '&nbsp;')"
+      ),
+      :id => nil
+    )
+  end
+  def select_certifiers(qualifier, product = nil)
+    if qualifier
+      selected = product ? product.product_qualifiers.find_by_qualifier_id(qualifier.id).certifier_id : nil
+      select_tag("product[qualifiers_list][#{qualifier.id}]", options_for_select(certifiers_for_select(qualifier), selected))
+    else
+      select_tag("product[qualifiers_list][nil]")
+    end
+  end
+
+  def select_unit(object)
+    selected = object.unit.nil? ? '' : object.unit
+    select(object.class.name.downcase, 'unit', Product::UNITS.map{|unit| [_(unit[0]), unit[0]]}, {:selected => selected, :include_blank => _('Select the unit')})
+  end
+
+  def input_icon(input)
+    if input.is_from_solidarity_economy?
+      hint = _('Product from solidarity economy')
+      image_tag("/images/solidarity-economy.png", :class => 'solidatiry-economy-icon', :alt => hint, :title => hint)
+    end
+  end
+
+  def display_price_by(unit)
+    selected_unit = content_tag('span', unit, :class => 'selected-unit')
+    content_tag('span', _('by') + ' ' + selected_unit, :class => 'price-by-unit')
+  end
+
+  def label_amount_used(input)
+    product_unit = input.product.unit
+    if product_unit.blank?
+       _('Amount used in this product or service')
+    else
+       _('Amount used by %s of this product or service') % _(product_unit)
+    end
+  end
+
+  def display_unit(input)
+    input_amount_used = content_tag('span', input.formatted_amount, :class => 'input-amount-used')
+    return input_amount_used if input.unit.blank?
+    units = Product::UNITS.find {|unit| unit[0] == input.unit}
+    n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', units[0], :class => 'input-unit'), :plural_unit => content_tag('span', units[1], :class => 'input-unit') }
+  end
 end
@@ -15,9 +15,12 @@ module ProfileHelper
     end
   end
  
-  def pagination_links(collection, options={})
-    options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
-    will_paginate(collection, options)
-  end
+  def render_tabs(tabs)
+    titles = tabs.inject(''){ |result, tab| result << content_tag(:li, link_to(tab[:title], '#'+tab[:id]), :class => 'tab') }
+    contents = tabs.inject(''){ |result, tab| result << content_tag(:div, tab[:content], :id => tab[:id]) }
  
+    content_tag :div, :class => 'ui-tabs' do
+      content_tag(:ul, titles) + contents
+    end
+  end
 end
@@ -98,11 +98,6 @@ module SearchHelper
         ), :class => 'profile-info')
   end
  
-  def pagination_links(collection, options={})
-    options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
-    will_paginate(collection, options)
-  end
-
   def product_categories_menu(asset, product_category, object_ids = nil)
     cats = ProductCategory.menu_categories(@product_category, environment)
     cats += cats.select { |c| c.children_count > 0 }.map(&:children).flatten
@@ -0,0 +1,11 @@
+class ActionTrackerNotification < ActiveRecord::Base
+
+  belongs_to :profile
+  belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
+
+  validates_presence_of :profile_id, :action_tracker_id
+  validates_uniqueness_of :action_tracker_id, :scope => :profile_id
+
+end
+
+ActionTracker::Record.has_many :action_tracker_notifications, :class_name => 'ActionTrackerNotification', :foreign_key => 'action_tracker_id', :dependent => :destroy
 class AddFriend < Task
  
-  acts_as_having_settings :group_for_person, :group_for_friend, :field => :data
+  settings_items :group_for_person, :group_for_friend
  
   validates_presence_of :requestor_id, :target_id
  
   validates_uniqueness_of :target_id, :scope => [ :requestor_id ]
  
- validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
+  validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
  
   alias :person :requestor
   alias :person= :requestor=
@@ -15,21 +15,37 @@ class AddFriend &lt; Task
   alias :friend= :target=
  
   def perform
-    requestor.add_friend(target, group_for_person)
     target.add_friend(requestor, group_for_friend)
-  end
-
-  def description
-    _('%s wants to be your friend.') % requestor.name
+    requestor.add_friend(target, group_for_person)
   end
  
   def permission
     :manage_friends
   end
  
+  def target_notification_description
+    _('%{requestor} wants to be your friend.') % {:requestor => requestor.name}
+  end
+
   def target_notification_message
-    description + "\n\n" +
+    target_notification_description + "\n\n" +
     _('You need to login to %{system} in order to accept %{requestor} as your friend.') % { :system => target.environment.name, :requestor => requestor.name }
   end
  
+  def title
+    _("New friend")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to be your friend.') }
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
 end
@@ -8,23 +8,39 @@ class AddMember &lt; Task
   alias :organization :target
   alias :organization= :target=
  
-  acts_as_having_settings :roles, :field => :data
+  settings_items :roles
  
   def perform
     self.roles ||= [Profile::Roles.member(organization.environment.id).id]
     target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
   end
  
-  def description
-    _('%s wants to be a member of "%s".') % [requestor.name, organization.name]
+  def title
+    _("New member")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to be a member of this community.')}
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
  
   def permission
     :manage_memberships
   end
  
+  def target_notification_description
+    _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name}
+  end
+
   def target_notification_message
-    description + "\n\n" +
+    target_notification_description + "\n\n" +
     _('You will need login to %{system} in order to accept or reject %{requestor} as a member of %{organization}.') % { :system => target.environment.name, :requestor => requestor.name, :organization => organization.name }
   end
  
 class ApproveArticle < Task
-  serialize :data, Hash
-
   validates_presence_of :requestor_id, :target_id
  
-  def description
-    _('%{author} wants to publish "%{article}" on %{community}') % { :author => requestor.name, :article => article_title, :community => target.name }
-  end
-
   def article_title
     article ? article.title : _('(The original text was removed)')
   end
  
-  def data
-    self[:data] ||= {} 
-  end
-
   def article
     Article.find_by_id data[:article_id]
   end
@@ -24,53 +14,97 @@ class ApproveArticle &lt; Task
   end
  
   def name
-    data[:name]
+    data[:name].blank? ? (article ? article.name : _("Article removed.")) : data[:name]
   end
  
   def name= value
     data[:name] = value
   end
  
-  def closing_statment
-    data[:closing_statment]
+  settings_items :closing_statment, :article_parent_id, :highlighted
+
+  def article_parent
+    Article.find_by_id article_parent_id.to_i
   end
-  
-  def closing_statment= value
-    data[:closing_statment] = value
+
+  def article_parent= value
+    self.article_parent_id = value.id
   end
  
-  def article_parent_id= value
-    data[:parent_id] = value
+  def abstract= value
+    data[:abstract] = value
   end
  
-  def article_parent_id
-    data[:parent_id]
+  def abstract
+    data[:abstract].blank? ? (article ? article.abstract : '') : data[:abstract]
   end
  
-  def article_parent
-    Article.find_by_id article_parent_id.to_i
+  def body= value
+    data[:body] = value
   end
  
-  def article_parent= value
-    self.article_parent_id = value.id
+  def body
+    data[:body].blank? ? (article ? article.body : "") : data[:body]
   end
  
-  def highlighted= value
-    data[:highlighted] = value
+  def perform
+     article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
   end
  
-  def highlighted
-    data[:highlighted]
+  def title
+    _("New article")
   end
  
-  def perform
-    PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted)
+  def icon
+    result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => name}
+    result.merge({:url => article.url}) if article
+    return result
+  end
+
+  def linked_subject
+    {:text => name, :url => article.url} if article
+  end
+
+  def information
+    if article
+      {:message => _('%{requestor} wants to publish the article: %{linked_subject}.')}
+    else
+      {:message => _("The article was removed.")}
+    end
+  end
+
+  def accept_details
+    true
+  end
+
+  def default_decision
+    if article
+      'skip'
+    else
+      'reject'
+    end
+  end
+
+  def accept_disabled?
+    article.blank?
+  end
+
+  def target_notification_description
+    _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name}
   end
  
   def target_notification_message
     return nil if target.organization? && !target.moderated_articles?
-    description + "\n\n" +
+    target_notification_description + "\n\n" +
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
  
+  def task_finished_message
+    if !closing_statment.blank?
+      _("Your request for publishing the article \"%{article}\" was approved. Here is the comment left by the admin who approved your article:\n\n%{comment} ") % {:article => name, :comment => closing_statment}
+    else
+      _('Your request for publishing the article "%{article}" was approved.') % {:article => name}
+    end
+  end
+
 end
+require 'hpricot'
+
 class Article < ActiveRecord::Base
  
+  track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
+  track_actions :update_article, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && (a.body_changed? || a.name_changed?) }, :custom_target => :action_tracker_target
+  track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_target => :action_tracker_target
+
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
  
@@ -19,14 +25,25 @@ class Article &lt; ActiveRecord::Base
   acts_as_having_settings :field => :setting
  
   settings_items :display_hits, :type => :boolean, :default => true
+  settings_items :author_name, :type => :string, :default => ""
  
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
  
+  has_many :translations, :class_name => 'Article', :foreign_key => :translation_of_id
+  belongs_to :translation_of, :class_name => 'Article', :foreign_key => :translation_of_id
+  before_destroy :rotate_translations
+
   before_create do |article|
     article.published_at = article.created_at if article.published_at.nil?
+    if article.reference_article && !article.parent
+      parent = article.reference_article.parent
+      if parent && parent.blog? && article.profile.has_blog?
+        article.parent = article.profile.blog
+      end
+    end
   end
  
-  xss_terminate :only => [ :name ], :on => 'validation'
+  xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
  
   named_scope :in_category, lambda { |category|
     {:include => 'categories', :conditions => { 'categories.id' => category.id }}
@@ -38,20 +55,17 @@ class Article &lt; ActiveRecord::Base
     ]
   }}
  
-  def self.first_day_of_month(date)
-    date ||= Date.today
-    Date.new(date.year, date.month, 1)
-  end
-
-  def self.last_day_of_month(date)
-    date ||= Date.today
-    date >>= 1
-    Date.new(date.year, date.month, 1) - 1.day
-  end
-
   URL_FORMAT = /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\Z/ix
  
   validates_format_of :external_link, :with => URL_FORMAT, :if => lambda { |article| !article.external_link.blank? }
+  validate :known_language
+  validate :used_translation
+  validate :native_translation_must_have_language
+  validate :translation_must_have_language
+
+  def is_trackable?
+    self.published? && self.notifiable? && self.advertise?
+  end
  
   def external_link=(link)
     if !link.blank? && link !~ /^[a-z]+:\/\//i
@@ -60,6 +74,9 @@ class Article &lt; ActiveRecord::Base
     self[:external_link] = link
   end
  
+  def action_tracker_target
+    self.profile
+  end
  
   def self.human_attribute_name(attrib)
     case attrib.to_sym
@@ -120,9 +137,9 @@ class Article &lt; ActiveRecord::Base
  
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
-  def self.top_level_for(profile)
-    self.find(:all, :conditions => [ 'parent_id is null and profile_id = ?', profile.id ])
-  end
+  named_scope :top_level_for, lambda { |profile|
+    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
+  }
  
   # retrieves the latest +limit+ articles, sorted from the most recent to the
   # oldest.
@@ -182,7 +199,7 @@ class Article &lt; ActiveRecord::Base
   # to return their specific icons.
   #
   # FIXME use mime_type and generate this name dinamically
-  def icon_name
+  def self.icon_name(article = nil)
     'text-html'
   end
  
@@ -206,10 +223,24 @@ class Article &lt; ActiveRecord::Base
     name
   end
  
+  include ActionView::Helpers::TextHelper
+  def short_title
+    truncate self.title, 15, '...'
+  end
+
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
  
+  def info_from_last_update
+    last_comment = comments.last
+    if last_comment
+      {:date => last_comment.created_at, :author_name => last_comment.author_name, :author_url => last_comment.author_url}
+    else
+      {:date => updated_at, :author_name => author.name, :author_url => author.url}
+    end
+  end
+
   def url
     @url ||= self.profile.url.merge(:page => path.split('/'))
   end
@@ -230,6 +261,73 @@ class Article &lt; ActiveRecord::Base
     false
   end
  
+  def forum?
+    false
+  end
+
+  def has_posts?
+    false
+  end
+
+  named_scope :native_translations, :conditions => { :translation_of_id => nil }
+
+  def translatable?
+    false
+  end
+
+  def native_translation
+    self.translation_of.nil? ? self : self.translation_of
+  end
+
+  def possible_translations
+    possibilities = Noosfero.locales.keys - self.native_translation.translations(:select => :language).map(&:language) - [self.native_translation.language]
+    possibilities << self.language unless self.language_changed?
+    possibilities
+  end
+
+  def known_language
+    unless self.language.blank?
+      errors.add(:language, N_('Language not supported by Noosfero')) unless Noosfero.locales.key?(self.language)
+    end
+  end
+
+  def used_translation
+    unless self.language.blank? or self.translation_of.nil?
+      errors.add(:language, N_('Language is already used')) unless self.possible_translations.include?(self.language)
+    end
+  end
+
+  def translation_must_have_language
+    unless self.translation_of.nil?
+      errors.add(:language, N_('Language must be choosen')) if self.language.blank?
+    end
+  end
+
+  def native_translation_must_have_language
+    unless self.translation_of.nil?
+      errors.add_to_base(N_('A language must be choosen for the native article')) if self.translation_of.language.blank?
+    end
+  end
+
+  def rotate_translations
+    unless self.translations.empty?
+      rotate = self.translations
+      root = rotate.shift
+      root.update_attribute(:translation_of_id, nil)
+      root.translations = rotate
+    end
+  end
+
+  def get_translation_to(locale)
+    if self.language.nil? || self.language == locale
+      self
+    elsif self.native_translation.language == locale
+      self.native_translation
+    else
+      self.native_translation.translations.first(:conditions => { :language => locale }) || self
+    end
+  end
+
   def published?
     if self.published
       if self.parent && !self.parent.published?
@@ -241,22 +339,33 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
-  named_scope :published, :conditions => { :published => true  }
-  named_scope :folders, :conditions => { :type => ['Folder', 'Blog']  }
+  named_scope :published, :conditions => { :published => true }
+  named_scope :folders, :conditions => { :type => ['Folder', 'Blog', 'Forum', 'Gallery'] }
+  named_scope :galleries, :conditions => { :type => 'Gallery' }
+  named_scope :images, :conditions => { :is_image => true }
+
+  def self.display_filter(user, profile)
+    return {:conditions => ['published = ?', true]} if !user
+    {:conditions => ["  articles.published = ? OR
+                        articles.last_changed_by_id = ? OR
+                        articles.profile_id = ? OR
+                        ?",
+                        true, user.id, user.id, user.has_permission?(:view_private_content, profile)] }
+  end
  
   def display_unpublished_article_to?(user)
-    self.author == user || allow_view_private_content?(user) || user == self.profile ||
-    user.is_admin?(self.profile.environment) || user.is_admin?(self.profile)
+    user == author || allow_view_private_content?(user) || user == profile ||
+    user.is_admin?(profile.environment) || user.is_admin?(profile)
   end
  
-  def display_to?(user)
-    if self.published?
-      self.profile.display_info_to?(user)
+  def display_to?(user = nil)
+    if published?
+      profile.display_info_to?(user)
     else
-      if user.nil?
+      if !user
         false
       else
-        self.display_unpublished_article_to?(user)
+        display_unpublished_article_to?(user)
       end
     end
   end
@@ -286,12 +395,18 @@ class Article &lt; ActiveRecord::Base
   end
  
  
-  def copy(options)
+  def copy(options = {})
     attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
     attrs.merge!(options)
     self.class.create(attrs)
   end
  
+  def copy!(options = {})
+    attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
+    attrs.merge!(options)
+    self.class.create!(attrs)
+  end
+
   ATTRIBUTES_NOT_COPIED = [
     :id,
     :profile_id,
@@ -329,13 +444,28 @@ class Article &lt; ActiveRecord::Base
     false
   end
  
-  def display_as_gallery?
+  def event?
+    false
+  end
+
+  def gallery?
+    false
+  end
+
+  def tiny_mce?
     false
   end
  
   def author
-    last_changed_by ||
-      profile
+    if reference_article
+      reference_article.author
+    else
+      last_changed_by || profile
+    end
+  end
+
+  def author_name
+    setting[:author_name].blank? ? author.name : setting[:author_name]
   end
  
   alias :active_record_cache_key :cache_key
@@ -348,8 +478,16 @@ class Article &lt; ActiveRecord::Base
   end
  
   def first_paragraph
-    to_html =~ /(.*<\/p>)/
-    $1 || ''
+    paragraphs = Hpricot(to_html).search('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
+
+  def lead
+    abstract.blank? ? first_paragraph : abstract
+  end
+
+  def short_lead
+    truncate sanitize_html(self.lead), 170, '...'
   end
  
   def creator
@@ -357,6 +495,10 @@ class Article &lt; ActiveRecord::Base
     creator_id && Profile.find(creator_id)
   end
  
+  def notifiable?
+    false
+  end
+
   private
  
   def sanitize_tag_list
@@ -368,4 +510,9 @@ class Article &lt; ActiveRecord::Base
     tag_name.gsub(/[<>]/, '')
   end
  
+  def sanitize_html(text)
+    sanitizer = HTML::FullSanitizer.new
+    sanitizer.sanitize(text)
+  end
+
 end
@@ -19,12 +19,22 @@ class Block &lt; ActiveRecord::Base
   # may contain the following keys:
   #
   # * <tt>:article</tt>: the article being viewed currently
+  # * <tt>:language</tt>: in which language the block will be displayed
   def visible?(context = nil)
     if display == 'never'
       return false
     end
-    if context && context[:article] && display == 'home_page_only'
-      return context[:article] == owner.home_page
+    if context
+      if language != 'all' && language != context[:locale]
+        return false
+      end
+      if display == 'home_page_only'
+        if context[:article]
+          return context[:article] == owner.home_page
+        else
+          return context[:request_path] == '/'
+        end
+      end
     end
     true
   end
@@ -37,6 +47,11 @@ class Block &lt; ActiveRecord::Base
   #   homepage of its owner.
   settings_items :display, :type => :string, :default => 'always'
  
+  # The block can be configured to be displayed in all languages or in just one language. It can assume any locale of the environment:
+  #
+  # * <tt>'all'</tt>: the block is always displayed
+  settings_items :language, :type => :string, :default => 'all'
+
   # returns the description of the block, used when the user sees a list of
   # blocks to choose one to include in the design.
   #
 class Blog < Folder
  
-  has_many :posts, :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC'
-
-  attr_accessor :feed_attrs
-
-  after_create do |blog|
-    blog.children << RssFeed.new(:name => 'feed', :profile => blog.profile)
-    blog.feed = blog.feed_attrs
-  end
-
-  settings_items :posts_per_page, :type => :integer, :default => 5
+  acts_as_having_posts
  
   def self.short_description
     _('Blog')
@@ -35,21 +26,6 @@ class Blog &lt; Folder
     true
   end
  
-  def feed
-    self.children.find(:first, :conditions => {:type => 'RssFeed'})
-  end
-
-  def feed=(attrs)
-    if attrs
-      if self.feed
-        self.feed.update_attributes(attrs)
-      else
-        self.feed_attrs = attrs
-      end
-    end
-    self.feed
-  end
-
   has_one :external_feed, :foreign_key => 'blog_id', :dependent => :destroy
  
   attr_accessor :external_feed_data
@@ -78,17 +54,15 @@ class Blog &lt; Folder
     end
   end
  
-  def name=(value)
-    self.set_name(value)
-    if self.slug.blank?
-      self.slug = self.name.to_slug
-    else
-      self.slug = self.slug.to_slug
-    end
+  def self.icon_name(article = nil)
+    'blog'
   end
  
   settings_items :visualization_format, :type => :string, :default => 'full'
   validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format
  
+  settings_items :display_posts_in_current_language, :type => :boolean, :default => true
+
+  alias :display_posts_in_current_language? :display_posts_in_current_language
  
 end
@@ -24,7 +24,7 @@ class BlogArchivesBlock &lt; Block
     owner_blog = self.blog
     return nil unless owner_blog
     results = ''
-    owner_blog.posts.group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
+    owner_blog.posts.native_translations.group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
       results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
       results << "<ul class='#{year}-archive'>"
       results_by_year.group_by{|i| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do |month, results_by_month|
@@ -0,0 +1,38 @@
+class CategoriesBlock < Block
+
+  CATEGORY_TYPES = {
+    _('Generic category') => nil,
+    _('Region') => 'Region',
+    _('Product') => 'ProductCategory'
+  }
+
+  settings_items :category_types, :type => Array, :default => []
+
+  def self.description
+    _("Categories Menu")
+  end
+
+  def default_title
+    _("Categories Menu")
+  end
+
+  def help
+    _('This block presents the categories like a web site menu.')
+  end
+
+  def available_category_types
+    CATEGORY_TYPES
+  end
+
+  def selected_categories
+    Category.top_level_for(self.owner).from_types(self.category_types)
+  end
+
+  def content
+    block = self
+    lambda do
+      render :file => 'blocks/categories', :locals => { :block => block }
+    end
+  end
+
+end
@@ -9,9 +9,9 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.')
  
   # Finds all top level categories for a given environment. 
-  def self.top_level_for(environment)
-    self.find(:all, :conditions => ['parent_id is null and environment_id = ?', environment.id ])
-  end
+  named_scope :top_level_for, lambda { |environment|
+    {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
+  }
  
   acts_as_filesystem
  
@@ -30,6 +30,12 @@ class Category &lt; ActiveRecord::Base
  
   acts_as_having_image
  
+  named_scope :from_types, lambda { |types|
+    types.select{ |t| t.blank? }.empty? ?
+      { :conditions => { :type => types } } :
+      { :conditions => [ "type IN (?) OR type IS NULL", types.reject{ |t| t.blank? } ] }
+  }
+
   def recent_articles(limit = 10)
     self.articles.recent(limit)
   end
@@ -58,4 +64,9 @@ class Category &lt; ActiveRecord::Base
     results
   end
  
+  def is_leaf_displayable_in_menu?
+    return false if self.display_in_menu == false
+    self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
+  end
+
 end
@@ -0,0 +1,14 @@
+class Certifier < ActiveRecord::Base
+
+  belongs_to :environment
+
+  has_many :qualifier_certifiers
+  has_many :qualifiers, :through => :qualifier_certifiers
+
+  validates_presence_of :environment_id
+  validates_presence_of :name
+
+  def link
+    self[:link] || ''
+  end
+end
 class ChangePassword < Task
  
-  serialize :data, Hash
-  def data
-    self[:data] ||= {}
-  end
-
   attr_accessor :login, :email, :password, :password_confirmation, :environment_id
  
   def self.human_attribute_name(attrib)
@@ -45,7 +40,7 @@ class ChangePassword &lt; Task
   end
  
   before_validation_on_create do |change_password|
-    change_password.requestor = Person.find_by_identifier(change_password.login)
+    change_password.requestor = Person.find_by_identifier_and_environment_id(change_password.login, change_password.environment_id)
   end
  
   ###################################################
@@ -56,9 +51,16 @@ class ChangePassword &lt; Task
   validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED }
   validates_confirmation_of :password, :if => lambda { |change| change.status != Task::Status::CANCELLED }
  
-  def initialize(*args)
-    super(*args)
-    self[:data] = {}
+  def title
+    _("Change password")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to change its password.')}
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
  
   def perform
@@ -87,8 +89,8 @@ class ChangePassword &lt; Task
     end
   end
  
-  def description
-    _('Password change request')
+  def environment
+    self.requestor.environment
   end
  
 end
 class Comment < ActiveRecord::Base
-  
+
+  track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
+
   validates_presence_of :title, :body
   belongs_to :article, :counter_cache => true
   belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
+  has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
+  belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
  
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
@@ -19,6 +23,10 @@ class Comment &lt; ActiveRecord::Base
  
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
  
+  def action_tracker_target
+    self.article.profile
+  end
+
   def author_name
     if author
       author.short_name
@@ -35,16 +43,20 @@ class Comment &lt; ActiveRecord::Base
     author ? author.url : email
   end
  
+  def author_url
+    author ? author.url : nil
+  end
+
   def url
     article.view_url.merge(:anchor => anchor)
   end
  
   def message
-   author_id ? _('(removed user)') : ('<br />' + _('(unauthenticated user)'))
+    author_id ? _('(removed user)') : _('(unauthenticated user)')
   end
  
   def removed_user_image
-    '/images/icons-app/user_icon_size-minor.png'
+    '/images/icons-app/person-minor.png'
   end
  
   def anchor
@@ -62,18 +74,34 @@ class Comment &lt; ActiveRecord::Base
   end
  
   after_create do |comment|
-    if comment.article.notify_comments?
+    if comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
       Comment::Notifier.deliver_mail(comment)
     end
   end
  
+  def replies
+    @replies || children
+  end
+
+  def replies=(comments_list)
+    @replies = comments_list
+  end
+
+  def self.as_thread
+    result = {}
+    root = []
+    all.each do |c|
+      c.replies = []
+      result[c.id] ||= c
+      c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c
+    end
+    root
+  end
+
   class Notifier < ActionMailer::Base
     def mail(comment)
       profile = comment.article.profile
-      email = profile.notification_emails
-      return unless email
-      recipients email
-
+      recipients profile.notification_emails
       from "#{profile.environment.name} <#{profile.environment.contact_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
@@ -81,6 +109,8 @@ class Comment &lt; ActiveRecord::Base
         :sender_link => comment.author_link,
         :article_title => comment.article.name,
         :comment_url => comment.url,
+        :comment_title => comment.title,
+        :comment_body => comment.body,
         :environment => profile.environment.name,
         :url => profile.environment.top_url
     end
@@ -8,10 +8,6 @@ class CommunitiesBlock &lt; ProfileListBlock
     n__('{#} community', '{#} communities', profile_count)
   end
  
-  def profile_image_link_method
-    :community_image_link
-  end
-
   def help
     __('This block displays the communities in which the user is a member.')
   end
@@ -25,35 +21,15 @@ class CommunitiesBlock &lt; ProfileListBlock
       end
     when Environment
       lambda do
-        link_to s_('communities|View all'), :controller => 'search', :action => 'assets', :asset => 'communities'
+        link_to s_('communities|View all'), :controller => 'browse', :action => 'communities'
       end
     else
       ''
     end
   end
  
-  def profile_count
-    if owner.kind_of?(Environment)
-      owner.communities.count(:conditions => { :visible => true })
-    else
-      owner.communities(:visible => true).count
-    end
-  end
-
-  def profile_finder
-    @profile_finder ||= CommunitiesBlock::Finder.new(self)
-  end
-
-  class Finder < ProfileListBlock::Finder
-    def ids
-      # FIXME when owner is an environment (i.e. listing communities globally
-      # this can become SLOW)
-      if block.owner.kind_of?(Environment)
-        block.owner.communities.all(:conditions => {:visible => true}, :limit => block.limit, :order => 'random()').map(&:id)
-      else
-        block.owner.communities(:visible => true).map(&:id)
-      end
-    end
+  def profiles
+    owner.communities
   end
  
 end
@@ -67,4 +67,12 @@ class Community &lt; Organization
   def blocks_to_expire_cache
     [MembersBlock]
   end
+
+  def each_member(offset=0)
+    while member = self.members.first(:order => :id, :offset => offset)
+      yield member
+      offset = offset + 1
+    end
+  end
+
 end
@@ -1,9 +0,0 @@
-class Consumption < ActiveRecord::Base
-  belongs_to :profile
-  belongs_to :product_category
-
-  validates_uniqueness_of :product_category_id, :scope => :profile_id
-
-  xss_terminate :only => [ :aditional_specifications ], :on => 'validation'
-
-end
@@ -0,0 +1,27 @@
+class ContactList < ActiveRecord::Base
+
+  serialize :list, Array
+
+  def list
+    self[:list] || []
+  end
+
+  def data
+    if self.fetched
+      { "fetched" => true, "contact_list" => self.id, "error" => self.error_fetching }
+    else
+      {}
+    end
+  end
+
+  def register_auth_error
+    msg = _('There was an error while authenticating. Did you enter correct login and password?')
+    self.update_attributes(:fetched => true, :error_fetching => msg)
+  end
+
+  def register_error
+    msg = _('There was an error while looking for your contact list. Please, try again')
+    self.update_attributes(:fetched => true, :error_fetching => msg)
+  end
+
+end
@@ -6,25 +6,11 @@ class CreateCommunity &lt; Task
   alias :environment :target
   alias :environment= :target=
  
-  serialize :data, Hash
-  attr_protected :data
-  def data
-    self[:data] ||= Hash.new
-  end
-
   acts_as_having_image
  
   DATA_FIELDS = Community.fields + ['name', 'closed']
-
   DATA_FIELDS.each do |field|
-    # getter
-    define_method(field) do
-      self.data[field.to_sym]
-    end
-    # setter
-    define_method("#{field}=") do |value|
-      self.data[field.to_sym] = value
-    end
+    settings_items field.to_sym
   end
  
   def validate
@@ -48,16 +34,30 @@ class CreateCommunity &lt; Task
     community.add_admin(self.requestor)
   end
  
-  def description
-    _('%s wants to create community %s.') % [requestor.name, self.name]
+  def title
+    _("New community")
+  end
+
+  def icon
+    src = image ? image.public_filename(:minor) : '/images/icons-app/community-minor.png'
+    {:type => :defined_image, :src => src, :name => name}
+  end
+
+  def subject
+    name
   end
  
-  def closing_statement
-    data[:closing_statement]
+  def information
+    if description.blank?
+      { :message => _('%{requestor} wants to create community %{subject} with no description.') }
+    else
+      { :message => _('%{requestor} wants to create community %{subject} with this description:<p><em>%{description}</em></p>'),
+        :variables => {:description => description} }
+    end
   end
  
-  def closing_statement= value
-    data[:closing_statement] = value
+  def reject_details
+    true
   end
  
   # tells if this request was rejected
@@ -70,8 +70,11 @@ class CreateCommunity &lt; Task
     self.status == Task::Status::FINISHED
   end
  
+  def target_notification_description
+    _('%{requestor} wants to create community %{subject}') % {:requestor => requestor.name, :subject => subject}
+  end
+
   def target_notification_message
-    description + "\n\n" +
     _("User \"%{user}\" just requested to create community %{community}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.requestor.name, :community => self.name }
   end
  
@@ -82,7 +85,7 @@ class CreateCommunity &lt; Task
   end
  
   def task_cancelled_message
-    _("Your request for registering community %{community} at %{environment} was not approved by the environment administrator. The following explanation was given: \n\n%{explanation}") % { :community => self.name, :environment => self.environment, :explanation => self.closing_statement }
+    _("Your request for registering community %{community} at %{environment} was not approved by the environment administrator. The following explanation was given: \n\n%{explanation}") % { :community => self.name, :environment => self.environment, :explanation => self.reject_explanation }
   end
  
   def task_finished_message
@@ -11,23 +11,9 @@ class CreateEnterprise &lt; Task
   N_('Economic activity')
   N_('Management information')
  
-  DATA_FIELDS = Enterprise.fields + %w[name identifier region_id reject_explanation]
-
-  serialize :data, Hash
-  attr_protected :data
-  def data
-    self[:data] ||= Hash.new
-  end
-
+  DATA_FIELDS = Enterprise.fields + %w[name identifier region_id]
   DATA_FIELDS.each do |field|
-    # getter
-    define_method(field) do
-      self.data[field.to_sym]
-    end
-    # setter
-    define_method("#{field}=") do |value|
-      self.data[field.to_sym] = value
-    end
+    settings_items field.to_sym
   end
  
   # checks for virtual attributes 
@@ -48,7 +34,6 @@ class CreateEnterprise &lt; Task
  
   # check for explanation when rejecting
   validates_presence_of :reject_explanation, :if => (lambda { |record| record.status == Task::Status::CANCELLED } )
-
   xss_terminate :only => [ :acronym, :address, :contact_person, :contact_phone, :economic_activity, :legal_form, :management_information, :name ], :on => 'validation'
  
   def validate
@@ -59,7 +44,7 @@ class CreateEnterprise &lt; Task
       end
     end
  
-    if self.identifier && Profile.exists?(:identifier => self.identifier)
+    if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier)
       self.errors.add(:identifier, '%{fn} is already being as identifier by another enterprise, organization or person.')
     end
   end
@@ -91,7 +76,7 @@ class CreateEnterprise &lt; Task
   end
  
   def environment
-    region ? region.environment : self.requestor ? self.requestor.environment : Environment.default
+    requestor.environment
   end
  
   def available_regions
@@ -153,8 +138,24 @@ class CreateEnterprise &lt; Task
     enterprise.add_admin(enterprise.user.person)
   end
  
-  def description
-    _('Enterprise registration: "%s"') % self.name
+  def title
+    _("Enterprise registration")
+  end
+
+  def icon
+    {:type => :defined_image, :src => '/images/icons-app/enterprise-minor.png', :name => name}
+  end
+
+  def subject
+    name
+  end
+
+  def information
+    {:message => _('%{requestor} wants to create enterprise %{subject}.')}
+  end
+
+  def reject_details
+    true
   end
  
   def task_created_message
@@ -164,18 +165,18 @@ class CreateEnterprise &lt; Task
   end
  
   def task_finished_message
-    _('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
+    __('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
   end
  
   def task_cancelled_message
-    _("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
+    __("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
   end
  
   def target_notification_message
     msg = ""
-    msg << _("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
+    msg << __("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
     msg << "\n"
-    msg << _("The data provided by the enterprise was the following:\n") << "\n"
+    msg << __("The data provided by the enterprise was the following:\n") << "\n"
  
  
     msg << (_("Name: %s") % self.name) << "\n"
@@ -185,16 +186,20 @@ class CreateEnterprise &lt; Task
     msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?
     msg << (_("Economic activity: %s") % self.economic_activity) << "\n"
  
-    msg << _("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
+    msg << __("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
  
     msg << (_("Contact phone: %s") % self.contact_phone) << "\n"
     msg << (_("Contact person: %s") % self.contact_person) << "\n"
  
-    msg << _('CreateEnterprise|Identifier')
+    msg << __('CreateEnterprise|Identifier')
  
     msg
   end
  
+  def target_notification_description
+    _('%{requestor} wants to create enterprise %{subject}.') % {:requestor => requestor.name, :subject => subject}
+  end
+
   def permission
     :validate_enterprise
   end
 class DisabledEnterpriseMessageBlock < Block
  
   def self.description
-    _('"Disabled enterprise" message')
+    __('"Disabled enterprise" message')
   end
  
   def help
-    _('Shows a message for disabled enterprises.')
+    __('Shows a message for disabled enterprises.')
   end
  
   def default_title
@@ -11,8 +11,20 @@ class EmailActivation &lt; Task
     end
   end
  
-  def description
-    _("'%{user} wants to activate email '%{email}'") % { :user => person.name, :email => person.email_addresses.join(', ') }
+  def title
+    _("Email activation")
+  end
+
+  def subject
+    person.email_addresses.join(', ')
+  end
+
+  def information
+    {:message => _("%{requestor} wants to activate the following email: %{subject}.")}
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
  
   def perform
@@ -4,7 +4,8 @@ class Enterprise &lt; Organization
  
   N_('Enterprise')
  
-  has_many :products, :dependent => :destroy
+  has_many :products, :dependent => :destroy, :order => 'name ASC'
+  has_many :inputs, :through => :products
  
   extra_data_for_index :product_categories
  
@@ -51,6 +52,10 @@ class Enterprise &lt; Organization
     environment ? environment.active_enterprise_fields : []
   end
  
+  def highlighted_products_with_image(options = {})
+    Product.find(:all, {:conditions => {:highlighted => true}, :joins => :image}.merge(options))
+  end
+
   def required_fields
     environment ? environment.required_enterprise_fields : []
   end
@@ -117,17 +122,28 @@ class Enterprise &lt; Organization
   end
  
   def default_set_of_blocks
+    links = [
+      {:name => _("Enterprises's profile"), :address => '/profile/{profile}', :icon => 'ok'},
+      {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
+      {:name => _('Products'), :address => '/catalog/{profile}', :icon => 'new'},
+    ]
     blocks = [
-      [MainBlock],
-      [ProfileInfoBlock, MembersBlock],
-      [RecentDocumentsBlock]
+      [MainBlock.new],
+      [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
+      []
     ]
     if !environment.enabled?('disable_products_for_enterprises')
-      blocks[2].unshift ProductsBlock
+      blocks[2].unshift ProductsBlock.new
     end
     blocks
   end
  
+  def default_set_of_articles
+    [
+      Blog.new(:name => _('Blog')),
+    ]
+  end
+
   before_create do |enterprise|
     if enterprise.environment.enabled?('enterprises_are_disabled_when_created')
       enterprise.enabled = false
@@ -149,10 +165,4 @@ class Enterprise &lt; Organization
     enable_contact_us
   end
  
-  protected
-
-  def default_homepage(attrs)
-    EnterpriseHomepage.new(attrs)
-  end
-
 end
@@ -2,7 +2,6 @@ class EnterpriseActivation &lt; Task
  
   class RequestorRequired < Exception; end
  
-  acts_as_having_settings :field => :data
   settings_items :enterprise_id, :integer
  
   validates_presence_of :enterprise_id
@@ -20,4 +19,20 @@ class EnterpriseActivation &lt; Task
     self.enterprise.enable(requestor)
   end
  
+  def title
+    _("Enterprise activation")
+  end
+
+  def linked_subject
+    {:text => target.name, :url => target.public_profile_url}
+  end
+
+  def information
+    {:message => _('%{requestor} wants to activate enterprise %{linked_subject}.')}
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
 end
 class EnterpriseHomepage < Article
  
   def self.short_description
-    _('Enterprise homepage.')
+    __('Enterprise homepage.')
   end
  
   def self.description
@@ -28,29 +28,8 @@ class EnterprisesBlock &lt; ProfileListBlock
     end
   end
  
-  def profile_count
-    if owner.kind_of?(Environment)
-      owner.enterprises.count(:conditions => { :visible => true })
-    else
-      owner.enterprises(:visible => true).count
-    end
-
-  end
-
-  def profile_finder
-    @profile_finder ||= EnterprisesBlock::Finder.new(self)
-  end
-
-  class Finder < ProfileListBlock::Finder
-    def ids
-      # FIXME when owner is an environment (i.e. listing enterprises globally
-      # this can become SLOW)
-      if block.owner.kind_of?(Environment)
-        block.owner.enterprises.all(:conditions => {:visible => true}, :limit => block.limit, :order => 'random()').map(&:id)
-      else
-        block.owner.enterprises.select(&:visible).map(&:id)
-      end
-    end
+  def profiles
+    owner.enterprises
   end
  
 end
@@ -3,6 +3,8 @@
 # domains.
 class Environment < ActiveRecord::Base
  
+  has_many :users
+
   self.partial_updates = false
  
   has_many :tasks, :dependent => :destroy, :as => 'target'
@@ -14,6 +16,7 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_categories' => N_('Manage environment categories'),
     'manage_environment_roles' => N_('Manage environment roles'),
     'manage_environment_validators' => N_('Manage environment validators'),
+    'manage_environment_users' => N_('Manage environment users'),
   }
  
   module Roles
@@ -42,9 +45,7 @@ class Environment &lt; ActiveRecord::Base
       :name => N_('Member'),
       :environment => self,
       :permissions => [
-        'edit_profile',
-        'post_content',
-        'manage_products'
+        'invite_members',
       ]
     )
     # moderators for enterprises, communities etc
@@ -67,7 +68,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def admins
-    self.members_by_role(Environment::Roles.admin(self.id))
+    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id])
   end
  
   # returns the available features for a Environment, in the form of a
@@ -80,7 +81,7 @@ class Environment &lt; ActiveRecord::Base
       'disable_asset_communities' => __('Disable search for communities'),
       'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
-      'disable_products_for_enterprises' => _('Disable products for enterprises'),
+      'disable_products_for_enterprises' => __('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
       'disable_cms' => _('Disable CMS'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
@@ -89,14 +90,12 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
-      'enterprise_registration' => _('Enterprise registration'),
-      'join_community_popup' => _('Ask users to join a group/community with a popup'),
+      'enterprise_registration' => __('Enterprise registration'),
  
-      'enterprise_activation' => _('Enable activation of enterprises'),
+      'enterprise_activation' => __('Enable activation of enterprises'),
       'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
-      'display_wizard_signup' => _('Display wizard signup'),
       'use_portal_community' => _('Use the portal as news source for front page'),
       'user_themes' => _('Allow users to create their own themes'),
       'search_in_home' => _("Display search form in home page"),
@@ -107,7 +106,10 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
+      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
+      'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
+      'xmpp_chat' => _('XMPP/Jabber based chat'),
+      'show_zoom_button_on_article_images' => _('Show a zoom link on all article images')
     }
   end
  
@@ -131,7 +133,8 @@ class Environment &lt; ActiveRecord::Base
     env.boxes[1].blocks << RecentDocumentsBlock.new
  
     # "right" area
-    env.boxes[2].blocks << ProfileListBlock.new
+    env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
+    env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
   end
  
   # One Environment can be reached by many domains
@@ -147,10 +150,16 @@ class Environment &lt; ActiveRecord::Base
   has_many :categories
   has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
  
+  has_many :product_categories, :conditions => { :type => 'ProductCategory'}
   has_many :regions
  
   has_many :roles
  
+  has_many :qualifiers
+  has_many :certifiers
+
+  has_many :mailings, :class_name => 'EnvironmentMailing', :foreign_key => :source_id, :as => 'source'
+
   acts_as_accessible
  
   def superior_intances
@@ -198,16 +207,21 @@ class Environment &lt; ActiveRecord::Base
   settings_items :location, :type => String
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
-  settings_items :description, :type => String
-  settings_items :category_types, :type => Array, :default => ['Category']
+  settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
   settings_items :enable_ssl
-  settings_items :theme, :type => String, :default => 'default'
-  settings_items :icon_theme, :type => String, :default => 'default'
   settings_items :local_docs, :type => Array, :default => []
   settings_items :news_amount_by_folder, :type => Integer, :default => 4
   settings_items :help_message_to_add_enterprise, :type => String, :default => ''
   settings_items :tip_message_enterprise_activation_question, :type => String, :default => ''
  
+  settings_items :currency_unit, :type => String, :default => '$'
+  settings_items :currency_separator, :type => String, :default => '.'
+  settings_items :currency_delimiter, :type => String, :default => ','
+
+  settings_items :trusted_sites_for_iframe, :type => Array, :default => ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org']
+
+  settings_items :enabled_plugins, :type => Array, :default => []
+
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
@@ -241,6 +255,29 @@ class Environment &lt; ActiveRecord::Base
     end
   end
  
+  def enabled_features
+    features = self.class.available_features
+    features.delete_if{ |k, v| !self.enabled?(k) }
+  end
+
+  before_create :enable_default_features
+  def enable_default_features
+    %w(
+      disable_asset_products
+      disable_gender_icon
+      disable_products_for_enterprises
+      disable_select_city_for_contact
+      enterprise_registration
+      media_panel
+      organizations_are_moderated_by_default
+      show_balloon_with_profile_links_when_clicked
+      use_portal_community
+      wysiwyg_editor_for_environment_home
+    ).each do |feature|
+      enable(feature)
+    end
+  end
+
   # returns <tt>true</tt> if this Environment has terms of use to be
   # accepted by users before registration.
   def has_terms_of_use?
@@ -457,6 +494,10 @@ class Environment &lt; ActiveRecord::Base
  
   xss_terminate :only => [ :message_for_disabled_enterprise ], :with => 'white_list', :on => 'validation'
  
+  validates_presence_of :theme
+
+  include WhiteListFilter
+  filter_iframes :message_for_disabled_enterprise, :whitelist => lambda { trusted_sites_for_iframe }
  
   # #################################################
   # Business logic in general
@@ -525,7 +566,29 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def themes=(values)
-    settings[:themes] = values.map(&:id)
+    settings[:themes] = values
+  end
+
+  def add_themes(values)
+    if settings[:themes].nil?
+      self.themes = values
+    else
+      settings[:themes] += values
+    end
+  end
+
+  before_create do |env|
+    env.settings[:themes] ||= %w[
+      aluminium
+      butter
+      chameleon
+      chocolate
+      noosfero
+      orange
+      plum
+      scarletred
+      skyblue
+    ]
   end
  
   def community_template
@@ -589,7 +652,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def portal_folders
-    (settings[:portal_folders] || []).map{|fid| portal_community.articles.find(fid) }
+    (settings[:portal_folders] || []).map{|fid| portal_community.articles.find(:first, :conditions => { :id => fid }) }.compact
   end
  
   def portal_folders=(folders)
@@ -628,4 +691,17 @@ class Environment &lt; ActiveRecord::Base
     end
   end
  
+  def highlighted_products_with_image(options = {})
+    Product.find(:all, {:conditions => {:highlighted => true, :enterprise_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
+  end
+
+  settings_items :home_cache_in_minutes, :type => :integer, :default => 5
+  settings_items :general_cache_in_minutes, :type => :integer, :default => 15
+  settings_items :profile_cache_in_minutes, :type => :integer, :default => 15
+
+  def image_galleries
+    portal_community ? portal_community.image_galleries : []
+  end
+
 end
+
@@ -0,0 +1,25 @@
+class EnvironmentMailing < Mailing
+
+  def recipients(offset=0, limit=100)
+   source.people.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+  end
+
+  def each_recipient
+    offset = 0
+    limit = 100
+    while !(people = recipients(offset, limit)).empty?
+      people.each do |person|
+          yield person
+      end
+      offset = offset + limit
+    end
+  end
+
+  def signature_message
+    _('Sent by %s.') % source.name
+  end
+
+  def url
+    source.top_url
+  end
+end
@@ -17,11 +17,12 @@ class EnvironmentStatisticsBlock &lt; Block
     enterprises = owner.enterprises.visible.count
     communities = owner.communities.visible.count
  
-    info = [
-      n_('One user', '%{num} users', users) % { :num => users },
-      n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
-      n__('One community', '%{num} communities', communities) % { :num => communities },
-    ]
+    info = []
+    info << (n_('One user', '%{num} users', users) % { :num => users })
+    unless owner.enabled?('disable_asset_enterprises')
+      info << (n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
+    end
+    info << (n__('One community', '%{num} communities', communities) % { :num => communities })
  
     block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
   end
 class Event < Article
  
-  acts_as_having_settings :field => :body
-
-  settings_items :description, :type => :string
-  settings_items :link, :type => :string
   settings_items :address, :type => :string
  
+  def link=(value)
+    self.setting[:link] = maybe_add_http(value)
+  end
+
+  def link
+    maybe_add_http(self.setting[:link])
+  end
+
   xss_terminate :only => [ :link ], :on => 'validation'
-  xss_terminate :only => [ :description, :link, :address ], :with => 'white_list', :on => 'validation'
+  xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'
+
+  def initialize(*args)
+    super(*args)
+    self.start_date ||= Date.today
+  end
  
   validates_presence_of :title, :start_date
  
@@ -21,6 +30,9 @@ class Event &lt; Article
     {:conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}]}
   }
  
+  include WhiteListFilter
+  filter_iframes :body, :link, :address, :whitelist => lambda { profile && profile.environment && profile.environment.trusted_sites_for_iframe }
+
   def self.description
     _('A calendar event')
   end
@@ -29,7 +41,7 @@ class Event &lt; Article
     _('Event')
   end
  
-  def icon_name
+  def self.icon_name(article = nil)
     'event'
   end
  
@@ -88,26 +100,27 @@ class Event &lt; Article
         }
       }
  
-      if self.description
+      if self.body
         html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description') 
       end
     }
  
-    if self.description
-      result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.description)
+    if self.body
+      result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
     end
  
     result
   end
  
-  def link=(value)
-    self.body[:link] = maybe_add_http(value)
+  def event?
+    true
   end
  
-  def link
-    maybe_add_http(self.body[:link])
+  def tiny_mce?
+    true
   end
  
+  include Noosfero::TranslatableContent
   include MaybeAddHttp
  
 end
@@ -9,7 +9,7 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
   end
  
   def self.description
-    __('Favorite enterprises')
+    __('Favorite Enterprises')
   end
  
   def footer
@@ -20,18 +20,8 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
     end
   end
  
-  def profile_count
-    owner.favorite_enterprises.count
-  end
-
-  def profile_finder
-    @profile_finder ||= FavoriteEnterprisesBlock::Finder.new(self)
-  end
-
-  class Finder < ProfileListBlock::Finder
-    def ids
-      block.owner.favorite_enterprises.map(&:id)
-    end
+  def profiles
+    owner.favorite_enterprises
   end
  
 end
@@ -0,0 +1,35 @@
+class FeaturedProductsBlock < Block
+
+  settings_items :product_ids, :type => Array, :default => []
+  settings_items :groups_of, :type => :integer, :default => 3
+  settings_items :speed, :type => :integer, :default => 1000
+  settings_items :reflect, :type => :boolean, :default => true
+
+  before_save do |block|
+    if block.owner.kind_of?(Environment) && block.product_ids.blank?
+      seed = block.owner.products.count
+      block.product_ids = block.owner.highlighted_products_with_image(:offset => (rand(seed) % (seed - block.groups_of * 3)), :limit => block.groups_of * 3).map(&:id)
+    end
+    block.groups_of = block.groups_of.to_i
+  end
+
+  def self.description
+    _('Featured Products')
+  end
+
+  def products
+    Product.find(self.product_ids) || []
+  end
+
+  def products_for_selection
+    self.owner.highlighted_products_with_image
+  end
+
+  def content
+    block = self
+    lambda do
+      render :file => 'blocks/featured_products', :locals => { :block => block }
+    end
+  end
+
+end
@@ -12,7 +12,7 @@ class FeedReaderBlock &lt; Block
   def address=(new_address)
     old_address = address
     orig_set_address(new_address)
-    self.enabled = (old_address.blank? && !new_address.blank?) || (new_address && new_address != old_address) || false
+    self.enabled = (new_address && new_address != old_address) || (new_address && self.enabled) || false
   end
  
   settings_items :limit, :type => :integer
@@ -2,19 +2,10 @@ class Folder &lt; Article
  
   acts_as_having_settings :field => :setting
  
-  settings_items :view_as, :type => :string, :default => 'folder'
-
   xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
  
-  def self.select_views
-    [[_('Folder'), 'folder'], [_('Image gallery'), 'image_gallery']]
-  end
-
-  def self.views
-    select_views.map(&:last)
-  end
-
-  validates_inclusion_of :view_as, :in => self.views
+  include WhiteListFilter
+  filter_iframes :body, :whitelist => lambda { profile && profile.environment && profile.environment.trusted_sites_for_iframe }
  
   def self.short_description
     _('Folder')
@@ -24,37 +15,22 @@ class Folder &lt; Article
     _('A folder, inside which you can put other articles.')
   end
  
-  def icon_name
+  def self.icon_name(article = nil)
     'folder'
   end
  
-
+  include ActionView::Helpers::TagHelper
   def to_html(options = {})
-    send(view_as)
-  end
-
-  def folder
     folder = self
     lambda do
       render :file => 'content_viewer/folder', :locals => { :folder => folder }
     end
   end
  
-  def image_gallery
-    article = self
-    lambda do
-      render :file => 'content_viewer/image_gallery', :locals => {:article => article}
-    end
-  end
-
   def folder?
     true
   end
  
-  def display_as_gallery?
-    view_as == 'image_gallery'
-  end
-
   def can_display_hits?
     false
   end
@@ -70,7 +46,5 @@ class Folder &lt; Article
   has_many :images, :class_name => 'Article',
                     :foreign_key => 'parent_id',
                     :order => 'articles.type, articles.name',
-                    :include => :reference_article,
-                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type = 'Folder' or (articles.type = 'PublishedArticle' and reference_articles_articles.type = 'UploadedFile' and reference_articles_articles.content_type in (?))", UploadedFile.content_types, UploadedFile.content_types]
-
+                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
 end
@@ -0,0 +1,27 @@
+class Forum < Folder
+
+  acts_as_having_posts :order => 'updated_at DESC'
+
+  def self.short_description
+    _('Forum')
+  end
+
+  def self.description
+    _('An internet forum, also called message board, where discussions can be held.')
+  end
+
+  include ActionView::Helpers::TagHelper
+  def to_html(options = {})
+    lambda do
+      render :file => 'content_viewer/forum_page'
+    end
+  end
+
+  def forum?
+    true
+  end
+
+  def self.icon_name(article = nil)
+    'forum'
+  end
+end
@@ -19,18 +19,8 @@ class FriendsBlock &lt; ProfileListBlock
     end
   end
  
-  class FriendsBlock::Finder < ProfileListBlock::Finder
-    def ids
-      self.block.owner.friend_ids
-    end
-  end
-
-  def profile_finder
-    @profile_finder ||= FriendsBlock::Finder.new(self)
-  end
-
-  def profile_count
-    owner.friends.visible.count
+  def profiles
+    owner.friends
   end
  
 end
...	...	@@ -1,28 +0,0 @@
1		-.gitignore
2		-vendor/rails
3		-doc/api
4		-doc/plugins
5		-tmp
6		-config/database.yml
7		-config/session.secret
8		-config/mail.yml
9		-config/ferret_server.yml
10		-config/mongrel_cluster.yml
11		-index
12		-locale
13		-log
14		-public/articles
15		-public/images/0000
16		-public/thumbnails
17		-public/user_themes
18		-public/designs/themes/default
19		-public/javascripts/cache*.js
20		-public/stylesheets/cache*.css
21		-db/development.db
22		-db/production.db
23		-db/test.db
24		-doc/noosfero/*.xhtml
25		-doc/noosfero//.xhtml
26		-tags
27		-pkg
28		-*~
1	1	Antonio Terceiro <terceiro@colivre.coop.br> <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
2	2	Antonio Terceiro <terceiro@colivre.coop.br> <terceiro@softwarelivre.org>
3	3	Aurelio A. Heckert <aurelio@colivre.coop.br> <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
	4	+Aurelio A. Heckert <aurelio@colivre.coop.br> <aurelio@colivre.coop.br>
	5	+Aurelio A. Heckert <aurelio@colivre.coop.br> <aurium@gmail.com>
	6	+Caio SBA <caiosba@gmail.com> <caiosba@safernet.org.br>
4	7	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <DanielaFeitosa@3f533792-8f58-4932-b0fe-aaf55b0a4547>
5	8	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <danielafeitosa@colivre.coop.br>
6	9	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <daniela@sede.colivre.coop.br>
7	10	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <dani@lindinha.(none)>
	11	+Daniel Cunha <daniel@colivre.coop.br> <daniel.ccunha@gmail.com>
	12	+Grazieno Pellegrino <grazieno@gmail.com> <GrazienoPellegrino@3f533792-8f58-4932-b0fe-aaf55b0a4547>
8	13	Joenio Costa <joenio@colivre.coop.br> <JoenioCosta@3f533792-8f58-4932-b0fe-aaf55b0a4547>
9	14	Joenio Costa <joenio@colivre.coop.br> <joenio@perl.org.br>
10		-Grazieno Pellegrino <grazieno@gmail.com> <GrazienoPellegrino@3f533792-8f58-4932-b0fe-aaf55b0a4547>
11	15	Leandro Nunes dos Santos <leandronunes@gmail.com> <LeandroNunes@3f533792-8f58-4932-b0fe-aaf55b0a4547>
12	16	Moises Machado <moises@colivre.coop.br> <MoisesMachado@3f533792-8f58-4932-b0fe-aaf55b0a4547>
13	17	Valessio Brito <valessio@gmail.com> <ValessioBrito@3f533792-8f58-4932-b0fe-aaf55b0a4547>
...	...
...	...	@@ -8,13 +8,18 @@ Developers
8	8
9	9	Antonio Terceiro <terceiro@colivre.coop.br>
10	10	Aurelio A. Heckert <aurelio@colivre.coop.br>
	11	+Bráulio Bhavamitra <brauliobo@gmail.com>
	12	+Caio SBA <caiosba@gmail.com>
11	13	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
	14	+Daniel Cunha <daniel@colivre.coop.br>
12	15	Fernanda Lopes <nanda.listas+psl@gmail.com>
13	16	Grazieno Pellegrino <grazieno@gmail.com>
14	17	Italo Valcy <italo@dcc.ufba.br>
15	18	Joenio Costa <joenio@colivre.coop.br>
16	19	Josef Spillner <josef.spillner@tu-dresden.de>
	20	+Keilla Menezes <keilla@colivre.coop.br>
17	21	Leandro Nunes dos Santos <leandronunes@gmail.com>
	22	+LinguÁgil 2010 <linguagil.bahia@gmail.com>
18	23	Martín Olivera <molivera@solar.org.ar>
19	24	Moises Machado <moises@colivre.coop.br>
20	25	Nanda Lopes <nanda.listas+psl@gmail.com>
...	...	@@ -22,6 +27,7 @@ Raphaël Rousseau <raph@r4f.org>
22	27	Raquel Lira <raquel.lira@gmail.com>
23	28	Rodrigo Souto <rodrigo@colivre.coop.br>
24	29	Ronny Kursawe <kursawe.ronny@googlemail.com>
	30	+Samuel R. C. Vale <srcvale@holoscopio.com>
25	31	Valessio Brito <valessio@gmail.com>
26	32	Yann Lugrin <yann.lugrin@liquid-concept.ch>
27	33
...	...
...	...	@@ -61,3 +61,26 @@ The above command makes the server available at http://localhost:9999/
61	61
62	62	The sample-data data scripts creates one administrator user with login "ze" and
63	63	password "test".
	64	+
	65	+Note that some operations, like generating image thumbnails, sending e-mails,
	66	+etc, are done in background in the context of a service independent from the
	67	+Rails application server. To have those tasks performed in a development
	68	+environment, you must run the delayed_job server like this:
	69	+
	70	+ ./script/delayed_job run
	71	+
	72	+This will block your terminal. To stop the delayed_job server, hit Control-C.
	73	+
	74	+== Enabling exceptions notification
	75	+
	76	+By default, exception notifications are disabled in development environment. If
	77	+you want to enable it then you need to change some files:
	78	+
	79	+1) Add in config/environments/development.rb:
	80	+ config.action_controller.consider_all_requests_local = false
	81	+
	82	+2) Add in app/controller/application.rb:
	83	+ local_addresses.clear
	84	+
	85	+3) Add in config/noosfero.yml at development section:
	86	+ exception_recipients: [admin@example.com]
...	...
...	...	@@ -0,0 +1,255 @@
	1	+== XMPP/Chat Client Setup
	2	+
	3	+To configure XMPP/BOSH in Noosfero you need:
	4	+
	5	+* REST Client - http://github.com/archiloque/rest-client
	6	+* SystemTimer - http://ph7spot.com/musings/system-timer
	7	+* Pidgin data files - http://www.pidgin.im/
	8	+
	9	+If you use Debian Lenny:
	10	+
	11	+# apt-get install librestclient-ruby (from backports)
	12	+# apt-get install pidgin-data
	13	+# apt-get install ruby1.8-dev
	14	+# gem install SystemTimer
	15	+
	16	+Take a look at util/chat directory to see samples of config file to configure a
	17	+XMPP/BOSH server with ejabberd, postgresql and apache2.
	18	+
	19	+== XMPP/Chat Server Setup
	20	+
	21	+This is a step-by-step guide to get a XMPP service working, in a Debian system.
	22	+
	23	+1. Install the required packages
	24	+
	25	+# apt-get -t lenny-backports install ejabberd
	26	+# apt-get install odbc-postgresql
	27	+
	28	+2. Ejabberd configuration
	29	+
	30	+All the following changes must be done in config file:
	31	+
	32	+ /etc/ejabberd/ejabberd.cfg
	33	+
	34	+ 2.1. Set the default admin user
	35	+
	36	+{ acl, admin, { user, "john", "www.example.com" } }.
	37	+{ acl, admin, { user, "bart", "www.example.com" } }.
	38	+
	39	+ 2.2. Set the default host
	40	+
	41	+{ hosts, [ "www.example.com" ] }.
	42	+
	43	+ 2.3. Http-Bind activation
	44	+
	45	+{ 5280, ejabberd_http, [
	46	+ http_bind,
	47	+ web_admin
	48	+ ]
	49	+}
	50	+
	51	+(...)
	52	+
	53	+{ modules, [
	54	+ {mod_http_bind, []},
	55	+ ...
	56	+] }.
	57	+
	58	+Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client
	59	+needs non-anonymous room, then we need to change default params of creation
	60	+rooms in ejabberd to create non-anonymous rooms.
	61	+
	62	+In non-anonymous rooms the jabber service sends the new occupant's full JID to
	63	+all occupants in the room[1].
	64	+
	65	+Add option "{default_room_options, [{anonymous, false}]}" to
	66	+/etc/ejabberd/ejabberd.cfg in mod_muc session. See below:
	67	+
	68	+{ mod_muc, [
	69	+ %%{host, "conference.@HOST@"},
	70	+ {access, muc},
	71	+ {access_create, muc},
	72	+ {access_persistent, muc},
	73	+ {access_admin, muc_admin},
	74	+ {max_users, 500},
	75	+ {default_room_options, [{anonymous, false}]}
	76	+]},
	77	+
	78	+[1] - http://xmpp.org/extensions/xep-0045.html#enter-nonanon
	79	+
	80	+
	81	+ 2.4. Authentication method
	82	+
	83	+To use Postgresql through ODBC, the following modifications must be done:
	84	+
	85	+ * Disable the default method:
	86	+
	87	+{auth_method, internal}.
	88	+
	89	+ * Enable autheticantion through ODBC:
	90	+
	91	+{auth_method, odbc}.
	92	+
	93	+ * Set database server name
	94	+
	95	+{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.
	96	+
	97	+
	98	+ 2.5. Increase the shaper traffic limit
	99	+
	100	+{ shaper, normal, { maxrate, 10000000 } }.
	101	+
	102	+
	103	+ 2.6. Disable unused modules
	104	+
	105	+Unused modules can be disabled, for example:
	106	+
	107	+ * s2s
	108	+ * web_admin
	109	+ * mod_pubsub
	110	+ * mod_irc
	111	+ * mod_offine
	112	+ * mod_admin_extra
	113	+ * mod_register
	114	+
	115	+
	116	+ 2.7. Enable ODBC modules
	117	+
	118	+ * mod_privacy -> mod_privacy_odbc
	119	+ * mod_private -> mod_private_odbc
	120	+ * mod_roster -> mod_roster_odbc
	121	+
	122	+3. Configuring Postgresql
	123	+
	124	+Login as noosfero user, and execute:
	125	+
	126	+ $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
	127	+
	128	+Where 'noosfero' may need to be replace by the name of the database used for
	129	+Noosfero.
	130	+
	131	+This will create a new schema inside the noosfero database, called 'ejabberd'.
	132	+
	133	+Note 'noosfero' user should have permission to create Postgresql schemas. Also,
	134	+there should be at least one domain with 'is_default = true' in 'domains'
	135	+table, otherwise people couldn't see your friends online.
	136	+
	137	+
	138	+4. ODBC configuration
	139	+
	140	+The following files must be created:
	141	+
	142	+ * /etc/odbc.ini
	143	+
	144	+[PostgreSQLEjabberdNoosfero]
	145	+Description = PostgreSQL Noosfero ejabberd database
	146	+Driver = PostgreSQL Unicode
	147	+Trace = No
	148	+TraceFile = /tmp/psqlodbc.log
	149	+Database = noosfero
	150	+Servername = localhost
	151	+UserName = <DBUSER>
	152	+Password = <DBPASS>
	153	+Port =
	154	+ReadOnly = No
	155	+RowVersioning = No
	156	+ShowSystemTables = No
	157	+ShowOidColumn = No
	158	+FakeOidIndex = No
	159	+ConnSettings = SET search_path TO ejabberd
	160	+
	161	+ * /etc/odbcinst.ini
	162	+
	163	+[PostgreSQL Unicode]
	164	+Description = PostgreSQL ODBC driver (Unicode version)
	165	+Driver = /usr/lib/odbc/psqlodbcw.so
	166	+Setup = /usr/lib/odbc/libodbcpsqlS.so
	167	+Debug = 0
	168	+CommLog = 1
	169	+UsageCount = 3
	170	+
	171	+ * testing all:
	172	+
	173	+# isql 'PostgreSQLEjabberdNoosfero' DBUSER
	174	+
	175	+
	176	+5. Enabling kernel polling and SMP in /etc/default/ejabberd
	177	+
	178	+POLL=true
	179	+SMP=auto
	180	+
	181	+
	182	+6. Increase the file descriptors limit for user ejabberd
	183	+
	184	+ 6.1. Uncomment this line in file /etc/pam.d/su:
	185	+
	186	+session required pam_limits.so
	187	+
	188	+
	189	+ 6.2. Add this lines to file /etc/security/limits.conf:
	190	+
	191	+ejabberd hard nofile 65536
	192	+ejabberd soft nofile 65536
	193	+
	194	+Now, test the configuration:
	195	+
	196	+# cat /proc/<EJABBERD_BEAM_PROCESS_PID>/limits
	197	+
	198	+
	199	+7. Apache Configuration
	200	+
	201	+Apache server must be configurated as follow:
	202	+
	203	+ * /etc/apache2/sites-enabled/noosfero
	204	+
	205	+RewriteEngine On
	206	+Include /usr/share/noosfero/util/chat/apache/xmpp.conf
	207	+
	208	+ * /etc/apache2/apache2.conf:
	209	+
	210	+<IfModule mpm_worker_module>
	211	+ StartServers 8
	212	+ MinSpareThreads 25
	213	+ MaxSpareThreads 75
	214	+ ThreadLimit 128
	215	+ ThreadsPerChild 128
	216	+ MaxClients 2048
	217	+ MaxRequestsPerChild 0
	218	+</IfModule>
	219	+
	220	+Note: module proxy_http must be enabled:
	221	+
	222	+# a2enmod proxy_http
	223	+
	224	+
	225	+8. DNS configuration
	226	+
	227	+ * /etc/bind/db.colivre:
	228	+
	229	+_xmpp-client._tcp SRV 5 100 5222 master
	230	+(...)
	231	+conference CNAME master
	232	+_xmpp-client._tcp.conference SRV 5 100 5222 master
	233	+
	234	+
	235	+9. Testing this Setup
	236	+
	237	+Adjust shell limits to proceed with some benchmarks and load tests:
	238	+
	239	+# ulimit −s 256
	240	+# ulimit −n 8192
	241	+# echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
	242	+
	243	+To measure the bandwidth between server and client:
	244	+
	245	+ * at server side:
	246	+
	247	+# iperf −s
	248	+
	249	+ * at client side:
	250	+
	251	+# iperf −c server_ip
	252	+
	253	+For heavy load tests, clone and use this software:
	254	+
	255	+git clone http://git.holoscopio.com/git/metal/tester.git
...	...
...	...	@@ -0,0 +1,67 @@
	1	+= Setting up Varnish for your Noosfero site
	2	+
	3	+Varnish is a HTTP caching server, and using it together with Noosfero is highly
	4	+recommended. See http://www.varnish-cache.org/ for more information on Varnish.
	5	+
	6	+Varnish can be set up to use with Noosfero with the following steps:
	7	+
	8	+1) setup Noosfero with apache according to the INSTALL file.
	9	+
	10	+2) install Varnish
	11	+
	12	+ # apt-get install varnish
	13	+
	14	+Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
	15	+should, unless Debian already released Squeeze by now), make sure you install
	16	+varnish from the lenny-backports suite.
	17	+
	18	+3) Enable varnish logging:
	19	+
	20	+3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
	21	+
	22	+VARNISHNCSA_ENABLED=1
	23	+
	24	+The varnish log will be written to /var/log/varnish/varnishncsa.log in an
	25	+apache-compatible format. You should change your statistics generation software
	26	+(e.g. awstats) to use that instead of apache logs.
	27	+
	28	+3b) Restart Varnish Logging service
	29	+
	30	+ # invoke-rc.d varnishncsa start
	31	+
	32	+4) Change Apache to listen on port 8080 instead of 80
	33	+
	34	+4a) Edit /etc/apache2/ports.conf, and:
	35	+
	36	+ * change 'Listen 80' to 'Listen 127.0.0.1:8080'
	37	+ * change 'NameVirtualHost :80' to 'NameVirtualHost :8080'
	38	+
	39	+4b) Edit /etc/apache2/sites-enabled/, and change '<VirtualHost :80>' to '<VirtualHost *:8080>'
	40	+
	41	+4c) Restart apache
	42	+
	43	+ # invoke-rc.d apache2 restart
	44	+
	45	+5) Change Varnish to listen on port 80
	46	+
	47	+5a) Edit /etc/default/varnish and change '-a :6081' to '-a :80'
	48	+
	49	+5b) Restart Varnish
	50	+
	51	+ # invoke-rc.d varnish restart
	52	+
	53	+6) Configure varnish to store separate caches for each language
	54	+
	55	+6a) Add the following line to your /etc/varnish/default.vcl file (assuming
	56	+Noosfero is installed in /var/lib/noosfero):
	57	+
	58	+ include "/var/lib/noosfero/etc/noosfero/varnish-accept-language.vcl";
	59	+
	60	+6b) Restart Varnish
	61	+
	62	+ # invoke-rc.d varnish restart
	63	+
	64	+Thanks to Cosimo Streppone for varnish-accept-language. See
	65	+http://github.com/cosimo/varnish-accept-language for more information.
	66	+
	67	+ -- Antonio Terceiro <terceiro@colivre.coop.br> Sat, 04 Sep 2010 17:29:27 -0300
...	...
...	...	@@ -1,101 +0,0 @@
1		-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
2		-
3		-require 'rake'
4		-require 'rake/testtask'
5		-require 'rake/rdoctask'
6		-require 'rake/packagetask'
7		-require 'noosfero'
8		-
9		-Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do \|p\|
10		- p.need_tar_gz = true
11		-
12		- # cleaning temporary files
13		- FileUtils.rm_rf('tmp')
14		- FileUtils.mkdir_p('tmp/cache')
15		- FileUtils.mkdir_p('tmp/sessions')
16		- FileUtils.mkdir_p('tmp/sockets')
17		-
18		- # application files
19		- p.package_files.include('app/*/.{rb,rhtml,rjs,rxml,erb}')
20		- p.package_files.include('config/*/.{rb,sqlite3}')
21		- p.package_files.include('config/ferret_server.yml.dist')
22		- p.package_files.include('db/migrate/*.rb')
23		- p.package_files.include('db/schema.rb')
24		- p.package_files.include('doc/README_FOR_APP')
25		- p.package_files.include('lib/*/.{rake,rb}')
26		- p.package_files.include('Rakefile')
27		- p.package_files.include('Rakefile.pkg')
28		-
29		- # translation files
30		- p.package_files.include('po//.po')
31		- p.package_files.include('po/noosfero.pot')
32		-
33		- # templates
34		- p.package_files.include('public/designs/templates/*/')
35		-
36		- # icon sets
37		- p.package_files.include('public/designs/icons/tango/*/')
38		- p.package_files.exclude('public/designs/icons/tango/Tango')
39		- p.package_files.exclude('public/designs/icons/default')
40		-
41		- # themes
42		- p.package_files.include('public/designs/themes/noosfero/*/')
43		- p.package_files.include('public/designs/themes/base/*/')
44		- p.package_files.exclude('public/designs/themes/default')
45		-
46		- # static files
47		- p.package_files.include('public/dispatch.*')
48		- p.package_files.include('public/favicon.ico')
49		- p.package_files.include('public/*.html')
50		- p.package_files.include('public/*.html.erb')
51		- p.package_files.include('public/images/*/')
52		- p.package_files.include('public/javascripts/*/')
53		- p.package_files.include('public/robots.txt')
54		- p.package_files.include('public/stylesheets/*/')
55		-
56		- # top-level docs
57		- p.package_files.include('README')
58		- p.package_files.include('COPYING')
59		- p.package_files.include('COPYRIGHT')
60		- p.package_files.include('INSTALL')
61		- p.package_files.include('HACKING')
62		-
63		- # scripts
64		- p.package_files.include('script/*/')
65		-
66		- # test files
67		- p.package_files.include('test/*/.{rb,yml}')
68		- p.package_files.include('test/fixtures/files/*')
69		- p.package_files.include('features/*/')
70		- p.package_files.include('config/cucumber.yml')
71		-
72		- # empty directories that must exist
73		- p.package_files.include('tmp/cache')
74		- p.package_files.include('tmp/sessions')
75		- p.package_files.include('tmp/sockets')
76		- p.package_files.include('log')
77		-
78		- # symbolic links
79		- p.package_files.include('app/views/profile_design/*')
80		- p.package_files.include('app/views/environment_design/*')
81		-
82		- # util
83		- p.package_files.include('util/*/')
84		-
85		- # external resources
86		- p.package_files.include('vendor/*/')
87		- p.package_files.exclude('vendor/rails')
88		-
89		- # online documentation
90		- p.package_files.include('doc/noosfero/*/')
91		-
92		- # do not install locally generated files
93		- p.package_files.exclude('coverage/*/')
94		- p.package_files.exclude('public/images/[0-9][0-9][0-9][0-9]/*/')
95		-
96		-end
97		-
98		-task :default => :package
99		-task :clean => :clobber_package
100		-
101		-# vim: ft=ruby
...	...	@@ -1,49 +0,0 @@
1		-0 - All modified code have the tag UPGRADE on it.
2		-
3		-1 - I Changed acts_as_versioned plugin code to the new one:
4		-
5		- http://github.com/technoweenie/acts_as_versioned/tree/master
6		-
7		-2 - I removed the 'build_person' calls after create the user on UserTest
8		-
9		-3 - The settings_items method generated a lot of bugs. Theses bugs are explained here:
10		- Solution 1: http://casperfabricius.com/site/2008/06/12/serialize-doesnt-play-nice-with-rails-21-partial-updates/
11		- Solution 2: http://www.kalzumeus.com/2008/06/28/rails-fails-to-update-serialized-columns-on-save/
12		-
13		-The problem is how rails is working with ActiveRecord. The serialization data was not save on database.
14		-
15		-I add this code
16		-
17		- send(self.class.settings_field.to_s + '_will_change!')
18		-
19		-on lib/acts_as_having_settings
20		-
21		-I used the solution 1.
22		-
23		-I choose solution number 2 for Environment model. I think it is more clear in this situation.
24		-I put the code:
25		-
26		- self.partial_updates = false
27		-
28		-on Environment model.
29		-
30		-
31		-4 - acts_as_searchable -> find_by_contents
32		-
33		-I solved an incompatibility between paginate and geokit with an work around like this the one explained on the link:
34		-
35		- http://groups.google.com/group/will_paginate/browse_thread/thread/1bbb1f0c5810f1c1
36		-
37		-5 - The test of this method 'theme_include' of application helper was not passing.
38		-
39		-I changed the tests
40		- - "should 'render theme footer' do"
41		- - " should 'ignore unexisting theme footer' do"
42		-
43		- to make the test usefull
44		-
45		-
46		-6 - I changed the way as the product is created on ManageProducts controller. I removed the line:
47		- @product.build_image unless @product.image
48		-
49		-because the image was never saved. It don't have valid values to be saved.
...	...	@@ -40,7 +40,7 @@ class AdminPanelController < AdminController
40	40	end
41	41	redirect_to :action => 'set_portal_folders'
42	42	else
43		- flash[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
	43	+ session[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
44	44	end
45	45	end
46	46	end
...	...	@@ -54,7 +54,7 @@ class AdminPanelController < AdminController
54	54	folders = params[:folders].map{\|fid\| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} if params[:folders]
55	55	env.portal_folders = folders
56	56	if env.save
57		- flash[:notice] = _('Saved the portal folders')
	57	+ session[:notice] = _('Saved the portal folders')
58	58	redirect_to :action => 'set_portal_news_amount'
59	59	end
60	60	end
...	...	@@ -63,7 +63,7 @@ class AdminPanelController < AdminController
63	63	def set_portal_news_amount
64	64	if request.post?
65	65	if @environment.update_attributes(params[:environment])
66		- flash[:notice] = _('Saved the number of news on folders')
	66	+ session[:notice] = _('Saved the number of news on folders')
67	67	redirect_to :action => 'index'
68	68	end
69	69	end
...	...
...	...	@@ -5,9 +5,9 @@ class CategoriesController < AdminController
5	5	helper :categories
6	6
7	7	def index
8		- # WORKAROUND: restricting the category trees to display. Region and
9		- # ProductCategory have VERY LARGE trees.
10	8	@categories = environment.categories.find(:all, :conditions => "parent_id is null AND type is null")
	9	+ @regions = environment.regions.find(:all, :conditions => {:parent_id => nil})
	10	+ @product_categories = environment.product_categories.find(:all, :conditions => {:parent_id => nil})
11	11	end
12	12
13	13	ALLOWED_TYPES = CategoriesHelper::TYPES.map {\|item\| item[1] }
...	...