Merge branch 'master' into feature_cyrillic

Josef Spillner
2 parents 9a9bb082 86514f9d
Showing 828 changed files with 79866 additions and 47407 deletions Show diff stats
AUTHORS
Gemfile
Gemfile.lock
HACKING
HACKING.rails235
INSTALL
INSTALL.awstats
app/controllers/admin/role_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/admin_controller.rb
app/controllers/application.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/my_profile_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/browse_controller.rb
app/controllers/public/catalog_controller.rb
@@ -6,25 +6,42 @@ noosfero, that&#39;s not a problem).
 Developers
 ==========
+Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
+Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
 Caio SBA <caio@colivre.coop.br>
+Carlos Morais <carlos88morais@gmail.com>
+Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
+Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Cunha <daniel@colivre.coop.br>
+Diego Araújo <diegoamc90@gmail.com>
+Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Italo Valcy <italo@dcc.ufba.br>
+João da Silva <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
+João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
 Keilla Menezes <keilla@colivre.coop.br>
+Larissa Reis <larissa@colivre.coop.br>
+Larissa Reis <reiss.larissa@gmail.com>
 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>
+Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
+Paulo Meirelles <paulo@softwarelivre.org>
 Rafael Gomes <rafaelgomes@techfree.com.br>
+Rafael Martins <rmmartins@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
@@ -41,3 +58,6 @@ Raphael Rousseau &lt;raph@r4f.org&gt;
 Théo Bondolfi <move@cooperation.net>
 Vicente Aguiar <vicenteaguiar@colivre.coop.br>
+Arts
+===================================
+Nara Oliveira <narananet@gmail.com>
@@ -0,0 +1,19 @@
+source :rubygems
+gem 'cucumber', '0.4.0'
+gem 'webrat', '0.5.1'
+gem 'rspec', '1.2.9'
+gem 'rspec-rails', '1.2.9'
+gem 'Selenium', '>= 1.1.14'
+gem 'selenium-client', '>= 1.2.17'
+gem 'database_cleaner'
+gem 'exception_notification', '1.0.20090728'
+gem 'system_timer'
+
+def program(name)
+  unless system("which #{name} > /dev/null")
+    puts "W: Program #{name} is needed, but was not found in your PATH"
+  end
+end
+
+program 'java'
+program 'firefox'
@@ -0,0 +1,44 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    Selenium (1.1.14)
+    builder (3.0.0)
+    cucumber (0.4.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      polyglot (>= 0.2.9)
+      term-ansicolor (>= 1.0.3)
+      treetop (>= 1.4.2)
+    database_cleaner (0.7.0)
+    diff-lcs (1.1.3)
+    exception_notification (1.0.20090728)
+    nokogiri (1.5.0)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rspec (1.2.9)
+    rspec-rails (1.2.9)
+      rack (>= 1.0.0)
+      rspec (>= 1.2.9)
+    selenium-client (1.2.18)
+    system_timer (1.2.4)
+    term-ansicolor (1.0.7)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    webrat (0.5.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  Selenium (>= 1.1.14)
+  cucumber (= 0.4.0)
+  database_cleaner
+  exception_notification (= 1.0.20090728)
+  rspec (= 1.2.9)
+  rspec-rails (= 1.2.9)
+  selenium-client (>= 1.2.17)
+  system_timer
+  webrat (= 0.5.1)
@@ -13,7 +13,7 @@ After installing the requirements listed in INSTALL, you need to install some
 packages be able to run Noosfero tests. On Debian GNU/Linux and Debian-based
 systems, you install them with the following command:
- # apt-get install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb
+ # apt-get install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev
 On other systems, they may or may not be available through your regular package
 management system. Below are the links to their homepages.
@@ -24,6 +24,8 @@ management system. Below are the links to their homepages.
 * Imagemagick: http://wwwimagemagick.org/
 * po4a: http://po4a.alioth.debian.org/
 * xvfb: http://packages.debian.org/lenny/xvfb
+* Libxml2: http://xmlsoft.org/
+* Libxslt: http://xmlsoft.org/xslt
 == Boostraping a development/test environment
@@ -46,6 +48,9 @@ commands and make sure you understand what you are doing):
  rake makemo
  # create some test data:
  ./script/sample-data
+ # install latest requirements for running tests
+ RAILS_ENV=cucumber rake gems:install
+ RAILS_ENV=test rake gems:install
  # run the automated test suite to make sure your environment is sane:
  rake test
@@ -0,0 +1,14 @@
+This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
+development.
+
+Install dependencies:
+
+gem install rails -v 2.3.5
+gem install ferret
+gem install i18n
+gem install will_paginate -v 2.3.12
+gem install cucumber
+
+Creating initial environment:
+
+rake db:schema:load
@@ -13,7 +13,7 @@ You need to install some packages Noosfero depends on.  On Debian GNU/Linux or
 Debian-based systems, all of these packages are available through the Debian
 archive. You can install them with the following command:
- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-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
+ # 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 thin 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.
@@ -31,7 +31,7 @@ management system. Below are the links to their homepages.
 * iso-codes: http://pkg-isocodes.alioth.debian.org/
 * feedparser: http://packages.debian.org/sid/libfeedparser-ruby
 * Daemons - http://daemons.rubyforge.org/
-* Mongrel: http://mongrel.rubyforge.org/
+* Thin: http://code.macournoyer.com/thin/
 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
 * Hpricot: http://hpricot.com/
@@ -118,13 +118,13 @@ $ 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:
+Create the thin configuration file:
-$ mongrel_rails cluster::configure
+$ thin -C config/thin.yml config
-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.
+Edit config/thin.yml to suit your needs. Make sure your apache
+configuration matches the thin cluster configuration, specially in respect
+to the ports and numbers of thin 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
@@ -237,6 +237,10 @@ Create the database structure:
 $ RAILS_ENV=production rake db:schema:load
+Compile the translations:
+
+$ RAILS_ENV=production rake noosfero:translations:compile
+
 Now we have to create some initial data. To create your default environment
 (the first one), run the command below:
@@ -258,10 +262,6 @@ $ RAILS_ENV=production ./script/runner &quot;User.create(:login =&gt; &#39;adminuser&#39;, :emai
 (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
@@ -316,7 +316,7 @@ In other systems the way by which you enable apache modules may be different.
 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
+We are assuming that you are running two thin 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.
@@ -0,0 +1,78 @@
+= AWStats setup for Noosfero
+
+AWStats is a free powerful and featureful tool that generates advanced web,
+streaming, ftp or mail server statistics, graphically.
+
+See http://awstats.sourceforge.net/
+
+This guide supposes that the Noosfero server is running GNU/Linux Debian Squeeze.
+
+1. Install AWStats
+
+# apt-get install awstats libgeo-ip-perl geoip-database
+
+2. Basic setup
+
+Create AWStats config file:
+
+ * /etc/awstats/awstats.<domain>.conf
+
+Include "/etc/awstats/awstats.conf"
+Include "/etc/noosfero/awstats-noosfero.conf"
+SiteDomain="<domain>"
+HostAliases="<domain-aliases>"
+
+<domain> should be the domain used in your Noosfero server (eg.:
+softwarelivre.org) and the <domain-aliases> should be a list with all aliases
+that you configured in apache (eg.: www.softwarelivre.org
+www2.softwarelivre.org etc).
+
+This setup is considering that the Noosfero server is running varnish (see
+INSTALL.varnish) and varnishncsa-vhost [1].
+
+[1] http://gitorious.org/varnisnncsa-vhost
+
+3. Running AWStats for the first time
+
+Run awstats by hand via command line:
+
+# /usr/lib/cgi-bin/awstats.pl -config=<domain>
+
+You should see something as below as output of this command:
+
+# /usr/lib/cgi-bin/awstats.pl -config=softwarelivre.org
+Create/Update database for config "/etc/awstats/awstats.softwarelivre.org.conf" by AWStats version 6.7 (build 1.892)
+From data in log file "/var/log/varnish/varnishncsa-vhost.log"...
+Phase 1 : First bypass old records, searching new record...
+Searching new records from beginning of log file...
+Phase 2 : Now process new records (Flush history on disk after 20000 hosts)...
+Jumped lines in file: 0
+Parsed lines in file: 452
+ Found 0 dropped records,
+ Found 0 corrupted records,
+ Found 0 old records,
+ Found 452 new qualified records.
+
+4. Setup frontend
+
+You should create a new subdomain to have access to the AWStats, usually
+something like tools.<domain> (eg.: tools.softwarelivre.org). Don't include
+this subdomain in HostAliases in the AWStats neither in SiteAlias in the
+Apache.
+
+# cp /usr/share/doc/awstats/examples/apache.conf /etc/apache2/conf.d/awstats.conf
+# invoke-rc.d apache2 restart
+
+ps.: Don't forget to change the port /etc/apache/sites-enabled/000-default to
+8080.
+
+Try: http://tools.<domain>/cgi-bin/awstats.pl?config=<domain>
+(eg.: http://tools.softwarelivre.org/cgi-bin/awstats.pl?config=softwarelivre.org).
+
+5. Schedule AWStats in crontab
+
+ * /etc/cron.d/awstats
+
+0,10,20,30,40,50 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.<domain>.conf -a -r /var/log/apache/access.log ] && /usr/lib/cgi-bin/awstats.pl -config=<domain> -update >/dev/null
+
+Done, check the AWStats frontend after one or two days to see if everything is working properly.
@@ -5,6 +5,20 @@ class RoleController &lt; AdminController
     @roles = environment.roles.find(:all)
   end
+  def new
+    @role = Role.new
+  end
+
+  def create
+    @role = Role.new :name => params[:role][:name], :permissions => params[:role][:permissions], :environment => environment
+    if @role.save
+      redirect_to :action => 'show', :id => @role
+    else
+      session[:notice] = _('Failed to create role')
+      render :action => 'new'
+    end
+  end
+
   def show
     @role = environment.roles.find(params[:id])
   end
@@ -3,10 +3,10 @@ class UsersController &lt; AdminController
   protect 'manage_environment_users', :environment
   def index
-    @users = environment.users
     respond_to do |format|
       format.html
       format.xml do
+        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
         render :xml => @users.to_xml(
           :skip_types => true,
           :only => %w[email login created_at updated_at],
@@ -14,6 +14,7 @@ class UsersController &lt; AdminController
         )
       end
       format.csv do
+        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
         render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
       end
     end
 class AdminController < ApplicationController
-  require_ssl
   before_filter :login_required
 end
-# his is the application's main controller. Features defined here are
-# available in all controllers.
-class ApplicationController < ActionController::Base
-
-  before_filter :change_pg_schema
-
-  include ApplicationHelper
-  layout :get_layout
-  def get_layout
-    theme_option(:layout) || 'application'
-  end
-
-  filter_parameter_logging :password
-
-  def log_processing
-    super
-    return unless ENV['RAILS_ENV'] == 'production'
-    if logger && logger.info?
-      logger.info("  HTTP Referer: #{request.referer}")
-      logger.info("  User Agent: #{request.user_agent}")
-      logger.info("  Accept-Language: #{request.headers['HTTP_ACCEPT_LANGUAGE']}")
-    end
-  end
-
-  helper :document
-  helper :language
-
-  def self.no_design_blocks
-    @no_design_blocks = true
-  end
-  def self.uses_design_blocks?
-    !@no_design_blocks
-  end
-  def uses_design_blocks?
-    !@no_design_blocks && self.class.uses_design_blocks?
-  end
-
-  # Be sure to include AuthenticationSystem in Application Controller instead
-  include AuthenticatedSystem
-  include PermissionCheck
-
-  def self.require_ssl(*options)
-    before_filter :check_ssl, *options
-  end
-  def check_ssl
-    return true if (request.ssl? || ENV['RAILS_ENV'] == 'development')
-    redirect_to_ssl
-  end
-  def redirect_to_ssl
-    if environment.enable_ssl
-      redirect_to(params.merge(:protocol => 'https://', :host => ssl_hostname))
-      true
-    else
-      false
-    end
-  end
-
-  def self.refuse_ssl(*options)
-    before_filter :avoid_ssl, *options
-  end
-  def avoid_ssl
-    if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
-      true
-    else
-      redirect_to(params.merge(:protocol => 'http://'))
-      false
-    end
-  end
-
-  before_filter :set_locale
-  def set_locale
-    FastGettext.available_locales = Noosfero.available_locales
-    FastGettext.default_locale = Noosfero.default_locale
-    FastGettext.set_locale(params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
-    if params[:lang]
-      session[:lang] = params[:lang]
-    end
-  end
-
-  include NeedsProfile
-
-  before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
-  attr_reader :environment
-
-  before_filter :load_terminology
-
-  # declares that the given <tt>actions</tt> cannot be accessed by other HTTP
-  # method besides POST.
-  def self.post_only(actions, redirect = { :action => 'index'})
-    verify :method => :post, :only => actions, :redirect_to => redirect
-  end
-
-  helper_method :current_person, :current_person
-
-  def change_pg_schema
-    if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
-      Noosfero::MultiTenancy.db_by_host = request.host
-    end
-  end
-
-  protected
-
-  def boxes_editor?
-    false
-  end
-
-  def content_editor?
-    false
-  end
-
-  def user
-    current_user.person if logged_in?
-  end
-  
-  alias :current_person :user
-
-  # TODO: move this logic somewhere else (Domain class?)
-  def detect_stuff_by_domain
-    @domain = Domain.find_by_name(request.host)
-    if @domain.nil?
-      @environment = Environment.default
-    else
-      @environment = @domain.environment
-      @profile = @domain.profile
-    end
-  end
-
-  def init_noosfero_plugins
-    @plugins = Noosfero::Plugin::Manager.new(self)
-    @plugins.enabled_plugins.map(&:class).each do |plugin|
-      prepend_view_path(plugin.view_path)
-    end
-    init_noosfero_plugins_controller_filters
-  end
-
-  # This is a generic method that initialize any possible filter defined by a
-  # plugin to the current controller being initialized.
-  def init_noosfero_plugins_controller_filters
-    @plugins.enabled_plugins.each do |plugin|
-      plugin.send(self.class.name.underscore + '_filters').each do |plugin_filter|
-        self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
-        self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
-      end
-    end
-  end
-
-  def load_terminology
-    # cache terminology for performance
-    @@terminology_cache ||= {}
-    @@terminology_cache[environment.id] ||= environment.terminology
-    Noosfero.terminology = @@terminology_cache[environment.id]
-  end
-
-  def render_not_found(path = nil)
-    @no_design_blocks = true
-    @path ||= request.path
-    render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
-  end
-  alias :render_404 :render_not_found
-
-  def render_access_denied(message = nil, title = nil)
-    @no_design_blocks = true
-    @message = message
-    @title = title
-    render :template => 'shared/access_denied.rhtml', :status => 403
-  end
-
-  def load_category
-    unless params[:category_path].blank?
-      path = params[:category_path].join('/')
-      @category = environment.categories.find_by_path(path)
-      if @category.nil?
-        render_not_found(path)
-      end
-    end
-  end
-
-end
+require 'application_controller'
@@ -0,0 +1,155 @@
+class ApplicationController < ActionController::Base
+
+  before_filter :change_pg_schema
+
+  include ApplicationHelper
+  layout :get_layout
+  def get_layout
+    prepend_view_path('public/' + theme_path)
+    theme_option(:layout) || 'application'
+  end
+
+  filter_parameter_logging :password
+
+  def log_processing
+    super
+    return unless ENV['RAILS_ENV'] == 'production'
+    if logger && logger.info?
+      logger.info("  HTTP Referer: #{request.referer}")
+      logger.info("  User Agent: #{request.user_agent}")
+      logger.info("  Accept-Language: #{request.headers['HTTP_ACCEPT_LANGUAGE']}")
+    end
+  end
+
+  helper :document
+  helper :language
+
+  def self.no_design_blocks
+    @no_design_blocks = true
+  end
+  def self.uses_design_blocks?
+    !@no_design_blocks
+  end
+  def uses_design_blocks?
+    !@no_design_blocks && self.class.uses_design_blocks?
+  end
+
+  # Be sure to include AuthenticationSystem in Application Controller instead
+  include AuthenticatedSystem
+  include PermissionCheck
+
+  before_filter :set_locale
+  def set_locale
+    FastGettext.available_locales = Noosfero.available_locales
+    FastGettext.default_locale = Noosfero.default_locale
+    I18n.locale = FastGettext.locale = (params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
+    if params[:lang]
+      session[:lang] = params[:lang]
+    end
+  end
+
+  include NeedsProfile
+
+  before_filter :detect_stuff_by_domain
+  before_filter :init_noosfero_plugins
+  attr_reader :environment
+
+  before_filter :load_terminology
+
+  # declares that the given <tt>actions</tt> cannot be accessed by other HTTP
+  # method besides POST.
+  def self.post_only(actions, redirect = { :action => 'index'})
+    verify :method => :post, :only => actions, :redirect_to => redirect
+  end
+
+  helper_method :current_person, :current_person
+
+  protected
+
+  def change_pg_schema
+    if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
+      Noosfero::MultiTenancy.db_by_host = request.host
+    end
+  end
+
+  def boxes_editor?
+    false
+  end
+
+  def content_editor?
+    false
+  end
+
+
+  def user
+    current_user.person if logged_in?
+  end
+  
+  alias :current_person :user
+
+  # TODO: move this logic somewhere else (Domain class?)
+  def detect_stuff_by_domain
+    @domain = Domain.find_by_name(request.host)
+    if @domain.nil?
+      @environment = Environment.default
+      if @environment.nil? && Rails.env.development?
+        # This should only happen in development ...
+        @environment = Environment.create!(:name => "Noosfero", :is_default => true)
+      end
+    else
+      @environment = @domain.environment
+      @profile = @domain.profile
+    end
+  end
+
+  def init_noosfero_plugins
+    @plugins = Noosfero::Plugin::Manager.new(self)
+    @plugins.each do |plugin|
+      prepend_view_path(plugin.class.view_path)
+    end
+    init_noosfero_plugins_controller_filters
+  end
+
+  # This is a generic method that initialize any possible filter defined by a
+  # plugin to the current controller being initialized.
+  def init_noosfero_plugins_controller_filters
+    @plugins.each do |plugin|
+      plugin.send(self.class.name.underscore + '_filters').each do |plugin_filter|
+        self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
+        self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
+      end
+    end
+  end
+
+  def load_terminology
+    # cache terminology for performance
+    @@terminology_cache ||= {}
+    @@terminology_cache[environment.id] ||= environment.terminology
+    Noosfero.terminology = @@terminology_cache[environment.id]
+  end
+
+  def render_not_found(path = nil)
+    @no_design_blocks = true
+    @path ||= request.path
+    render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
+  end
+  alias :render_404 :render_not_found
+
+  def render_access_denied(message = nil, title = nil)
+    @no_design_blocks = true
+    @message = message
+    @title = title
+    render :template => 'shared/access_denied.rhtml', :status => 403
+  end
+
+  def load_category
+    unless params[:category_path].blank?
+      path = params[:category_path].join('/')
+      @category = environment.categories.find_by_path(path)
+      if @category.nil?
+        render_not_found(path)
+      end
+    end
+  end
+
+end
@@ -82,7 +82,6 @@ class BoxOrganizerController &lt; ApplicationController
   def save
     @block = boxes_holder.blocks.find(params[:id])
     @block.update_attributes(params[:block])
-    expire_timeout_fragment(@block.cache_key)
     redirect_to :action => 'index'
   end
@@ -93,7 +92,6 @@ class BoxOrganizerController &lt; ApplicationController
   def remove
     @block = Block.find(params[:id])
     if @block.destroy
-      expire_timeout_fragment(@block.cache_key)
       redirect_to :action => 'index'
     else
       session[:notice] = _('Failed to remove block')
@@ -23,15 +23,6 @@ class CmsController &lt; MyProfileController
     profile.articles.find(c.params[:id]).allow_post_content?(user)
   end
-  alias :check_ssl_orig :check_ssl
-  # Redefines the SSL checking to avoid requiring SSL when creating the "New
-  # publication" button on article's public view.
-  def check_ssl
-    if ((params[:action] == 'new') && (!request.xhr?)) || (params[:action] != 'new')
-      check_ssl_orig
-    end
-  end
-
   def boxes_holder
     profile
   end
@@ -59,7 +50,7 @@ class CmsController &lt; MyProfileController
   end
   def special_article_types
-    [Folder, Blog, UploadedFile, Forum, Gallery, RssFeed]
+    [Folder, Blog, UploadedFile, Forum, Gallery, RssFeed] + @plugins.dispatch(:content_types)
   end
   def view
@@ -206,6 +197,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     if request.post?
       @article.destroy
+      session[:notice] = _("\"#{@article.name}\" was removed.")
       redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
     end
   end
@@ -319,10 +311,6 @@ class CmsController &lt; MyProfileController
     end
   end
-  def maybe_ssl(url)
-    [url, url.sub('https:', 'http:')]
-  end
-
   def valid_article_type?(type)
     (available_article_types + special_article_types).map {|item| item.name}.include?(type)
   end
@@ -365,7 +353,7 @@ class CmsController &lt; MyProfileController
       }
     end.to_json
   end
-  
+
   def content_editor?
     true
   end
@@ -111,6 +111,36 @@ class ManageProductsController &lt; ApplicationController
     end
   end
+  def manage_product_details
+    @product = @profile.products.find(params[:id])
+    if request.post?
+      @product.update_price_details(params[:price_details]) if params[:price_details]
+      render :partial => 'display_price_details'
+    else
+      render :partial => 'manage_product_details'
+    end
+  end
+
+  def remove_price_detail
+    @product = @profile.products.find(params[:product])
+    @price_detail = @product.price_details.find(params[:id])
+    @product = @price_detail.product
+    if request.post?
+      @price_detail.destroy
+      render :nothing => true
+    end
+  end
+
+  def display_price_composition_bar
+    @product = @profile.products.find(params[:id])
+    render :partial => 'price_composition_bar'
+  end
+
+  def display_inputs_cost
+    @product = @profile.products.find(params[:id])
+    render :inline => "<%= float_to_currency(@product.inputs_cost) %>"
+  end
+
   def destroy
     @product = @profile.products.find(params[:id])
     if @product.destroy
@@ -167,4 +197,18 @@ class ManageProductsController &lt; ApplicationController
     end
   end
+  def create_production_cost
+    cost = @profile.production_costs.create(:name => params[:id])
+    if cost.valid?
+      cost.save
+      render :text => {:name => cost.name,
+                       :id => cost.id,
+                       :ok => true
+                      }.to_json
+    else
+      render :text => {:ok => false,
+                       :error_msg => _(cost.errors['name']) % {:fn => _('Name')}
+                      }.to_json
+    end
+  end
 end
@@ -33,12 +33,14 @@ class TasksController &lt; MyProfileController
       end
     end
+    url = { :action => 'index' }
     if failed.blank?
       session[:notice] = _("All decisions were applied successfully.")
     else
       session[:notice] = _("Some decisions couldn't be applied.")
+      url[:failed] = failed
     end
-    redirect_to params.merge!(:action => 'index', :failed => failed)
+    redirect_to url
   end
   def new
@@ -2,7 +2,6 @@ class MyProfileController &lt; ApplicationController
   needs_profile
-  require_ssl
   before_filter :login_required
@@ -2,8 +2,6 @@ class AccountController &lt; ApplicationController
   no_design_blocks
-  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]
@@ -60,6 +58,10 @@ class AccountController &lt; ApplicationController
   def signup
     @invitation_code = params[:invitation_code]
     begin
+      if params[:user]
+        params[:user].delete(:password_confirmation_clear)
+        params[:user].delete(:password_clear)
+      end
       @user = User.new(params[:user])
       @user.terms_of_use = environment.terms_of_use
       @user.environment = environment
@@ -91,7 +93,6 @@ class AccountController &lt; ApplicationController
     if logged_in?
       self.current_user.forget_me
     end
-    cookies.delete :auth_token
     reset_session
     session[:notice] = _("You have been logged out.")
     redirect_to :controller => 'home', :action => 'index'
@@ -209,16 +210,26 @@ class AccountController &lt; ApplicationController
     @identifier = params[:identifier]
     valid = Person.is_available?(@identifier, environment)
     if valid
-      @status = _('Available!')
+      @status = _('This login name is available')
       @status_class = 'available'
     else
-      @status = _('Unavailable!')
+      @status = _('This login name is unavailable')
       @status_class = 'unavailable'
     end
-    @url = environment.top_url + '/' + @identifier
     render :partial => 'identifier_status'
   end
+  def check_email
+    if User.find_by_email_and_environment_id(params[:address], environment.id).nil?
+      @status = _('This e-mail address is available')
+      @status_class = 'available'
+    else
+      @status = _('This e-mail address is taken')
+      @status_class = 'unavailable'
+    end
+    render :partial => 'email_status'
+  end
+
   def user_data
     user_data =
       if logged_in?
@@ -231,7 +242,7 @@ class AccountController &lt; ApplicationController
       session[:notice] = nil # consume the notice
     end
-    @plugins.enabled_plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
+    @plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
@@ -6,6 +6,8 @@ class BrowseController &lt; PublicController
     more_recent
     more_active
     more_popular
+    more_comments
+    more_views
   )
   def per_page
@@ -36,6 +38,18 @@ class BrowseController &lt; PublicController
     @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
+  def contents
+    @filter = filter
+    @title = self.filter_description(params[:action] + '_' + @filter )
+
+    @results = @environment.articles.published.text_articles.send(@filter)
+
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
+    end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
+  end
+
   protected
   def filter
@@ -54,6 +68,9 @@ class BrowseController &lt; PublicController
       'communities_more_recent' => _('More recent communities'),  
       'communities_more_active' => _('More active communities'),  
       'communities_more_popular' => _('More popular communities'),
+      'contents_more_recent' => _('More recent contents'),
+      'contents_more_views' => _('Most viewed contents'),
+      'contents_more_comments' => _('Most commented contents'),
     }[str] || str
   end
@@ -4,10 +4,11 @@ class CatalogController &lt; PublicController
   before_filter :check_enterprise_and_environment
   def index
-    @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
+    @products = @profile.products.paginate(:order => 'name asc', :per_page => 9, :page => params[:page])
   end
   protected
+
   def check_enterprise_and_environment
     unless @profile.kind_of?(Enterprise) && !@profile.environment.enabled?('disable_products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
@@ -31,14 +31,6 @@ class ContentViewerController &lt; ApplicationController
       end
     end
-    if !@page.public? && !request.ssl?
-      return if redirect_to_ssl
-    end
-
-    if @page.public?
-      return unless avoid_ssl
-    end
-
     if !@page.display_to?(user)
       if profile.display_info_to?(user) || !profile.visible?
         message = _('You are not allowed to view this content. You can contact the owner of this profile to request access then.')
@@ -54,7 +46,7 @@ class ContentViewerController &lt; ApplicationController
       return
     end
-    redirect_to_translation
+    redirect_to_translation if @page.profile.redirect_l10n
     # At this point the page will be showed
     @page.hit
@@ -119,7 +111,11 @@ class ContentViewerController &lt; ApplicationController
   def add_comment
     @comment.author = user if logged_in?
     @comment.article = @page
-    if (logged_in? || @comment.reply_of_id || verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
+    @comment.ip_address = request.remote_ip
+    plugins_filter_comment(@comment)
+    return if @comment.rejected?
+    if (pass_without_comment_captcha? || verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
+      plugins_comment_saved(@comment)
       @page.touch
       @comment = nil # clear the comment form
       redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
@@ -128,6 +124,23 @@ class ContentViewerController &lt; ApplicationController
     end
   end
+  def plugins_filter_comment(comment)
+    @plugins.each do |plugin|
+      plugin.filter_comment(comment)
+    end
+  end
+
+  def plugins_comment_saved(comment)
+    @plugins.each do |plugin|
+      plugin.comment_saved(comment)
+    end
+  end
+
+  def pass_without_comment_captcha?
+    logged_in? && !environment.enabled?('captcha_for_logged_users')
+  end
+  helper_method :pass_without_comment_captcha?
+
   def remove_comment
     @comment = @page.comments.find(params[:remove_comment])
     if (user == @comment.author || user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
 class EnterpriseRegistrationController < ApplicationController
-  require_ssl
   before_filter :login_required
@@ -14,4 +14,8 @@ class HomeController &lt; PublicController
     end
   end
+  def terms
+    @no_design_blocks = true
+  end
+
 end
@@ -23,7 +23,7 @@ class ProfileController &lt; PublicController
   def tags
     @tags_cache_key = "tags_profile_#{profile.id.to_s}"
-    if is_cache_expired?(@tags_cache_key, true)
+    if is_cache_expired?(@tags_cache_key)
       @tags = profile.article_tags
     end
   end
@@ -31,7 +31,7 @@ class ProfileController &lt; PublicController
   def content_tagged
     @tag = params[:id]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"
-    if is_cache_expired?(@tag_cache_key, true)
+    if is_cache_expired?(@tag_cache_key)
       @tagged = profile.find_tagged_with(@tag).paginate(:per_page => 20, :page => params[:npage])
     end
   end
@@ -211,7 +211,8 @@ class ProfileController &lt; PublicController
   def remove_activity
     begin
-      activity = current_person.tracked_actions.find(params[:activity_id])
+      raise if !can_edit_profile
+      activity = ActionTracker::Record.find(params[:activity_id])
       activity.destroy
       render :text => _('Activity successfully removed.')
     rescue
@@ -219,6 +220,17 @@ class ProfileController &lt; PublicController
     end
   end
+  def remove_notification
+    begin
+      raise if !can_edit_profile
+      notification = ActionTrackerNotification.find(:first, :conditions => {:profile_id => profile.id, :action_tracker_id => params[:activity_id]})
+      notification.destroy
+      render :text => _('Notification successfully removed.')
+    rescue
+      render :text => _('You could not remove this notification.')
+    end
+  end
+
   def profile_info
     begin
       @block = profile.blocks.find(params[:block_id])
@@ -320,4 +332,8 @@ class ProfileController &lt; PublicController
     20
   end
+  def can_edit_profile
+    @can_edit_profile ||= user && user.has_permission?('edit_profile', profile)
+  end
+  helper_method :can_edit_profile
 end
@@ -207,7 +207,7 @@ class SearchController &lt; PublicController
   def tags
     @tags_cache_key = "tags_env_#{environment.id.to_s}"
-    if is_cache_expired?(@tags_cache_key, true)
+    if is_cache_expired?(@tags_cache_key)
       @tags = environment.tag_counts
     end
   end
@@ -215,7 +215,7 @@ class SearchController &lt; PublicController
   def 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)
+    if is_cache_expired?(@tag_cache_key)
       @tagged = environment.articles.find_tagged_with(@tag).paginate(:per_page => 10, :page => params[:npage])
     end
   end
 class PublicController < ApplicationController
-  refuse_ssl
 end
 module AccountHelper
+  def validation_classes
+    'available unavailable valid invalid checking'
+  end
+
+  def checking_message(key)
+    case key
+    when :url
+      _('Checking availability of login name...')
+    when :email
+      _('Checking if e-mail address is already taken...')
+    end
+  end
 end
+require 'redcloth'
+
 # Methods added to this helper will be available to all templates in the
 # application.
 module ApplicationHelper
@@ -95,7 +97,7 @@ module ApplicationHelper
     text = content_tag('div', button + content_tag('div', content_tag('div', content) + close_button, :class => 'help_message', :id => help_id, :style => 'display: none;'), :class => 'help_box')
     unless block.nil?
-      concat(text, block.binding)
+      concat(text)
     end
     text
@@ -256,7 +258,7 @@ module ApplicationHelper
   end
   def button_bar(options = {}, &block)
-    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)), block.binding)
+    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)))
   end
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
@@ -538,7 +540,7 @@ module ApplicationHelper
           {_('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'}},
+          {_('Leave community') => {: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)
@@ -587,19 +589,20 @@ module ApplicationHelper
   def gravatar_url_for(email, options = {})
     # Ta dando erro de roteamento
-    url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
+    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
+    url_for( { :gravatar_id => Digest::MD5.hexdigest(email.to_s),
                :host => 'www.gravatar.com',
                :protocol => 'http://',
                :only_path => false,
                :controller => 'avatar.php',
-               :d => NOOSFERO_CONF['gravatar'] ? NOOSFERO_CONF['gravatar'] : nil
+               :d => default
              }.merge(options) )
   end
   def str_gravatar_url_for(email, options = {})
-    default = NOOSFERO_CONF['gravatar'] ? NOOSFERO_CONF['gravatar'] : nil
+    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
     url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
-           Digest::MD5.hexdigest(email)
+           Digest::MD5.hexdigest(email.to_s)
     {
       :only_path => false,
       :d => default
@@ -609,6 +612,10 @@ module ApplicationHelper
     url
   end
+  def gravatar_profile_url(email)
+    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+  end
+
   attr_reader :environment
   def select_categories(object_name, title=nil, title_size=4)
     return nil if environment.enabled?(:disable_categories)
@@ -753,7 +760,7 @@ module ApplicationHelper
   # Should be on the forms_helper file but when its there the translation of labels doesn't work
   class NoosferoFormBuilder < ActionView::Helpers::FormBuilder
-  extend ActionView::Helpers::TagHelper
+    extend ActionView::Helpers::TagHelper
     def self.output_field(text, field_html, field_id = nil)
       # try to guess an id if none given
@@ -775,7 +782,7 @@ module ApplicationHelper
     (field_helpers - %w(hidden_field)).each do |selector|
       src = <<-END_SRC
         def #{selector}(field, *args, &proc)
-          text = object.class.human_attribute_name(field.to_s)
+          text = object.class.respond_to?(:human_attribute_name) && object.class.human_attribute_name(field.to_s) || field.to_s.humanize
           NoosferoFormBuilder::output_field(text, super)
         end
       END_SRC
@@ -877,7 +884,7 @@ module ApplicationHelper
     end
     if block
-      concat(result, block.binding)
+      concat(result)
     end
     result
@@ -909,18 +916,11 @@ module ApplicationHelper
   def login_url
     options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
-    if environment.enable_ssl && (ENV['RAILS_ENV'] != 'development')
-      options.merge!(:protocol => 'https://', :host => ssl_hostname)
-    end
     url_for(options)
   end
-  def ssl_hostname
-    environment.default_hostname
-  end
-
   def base_url
-    environment.top_url(request.ssl?)
+    environment.top_url
   end
   def helper_for_article(article)
@@ -985,7 +985,7 @@ module ApplicationHelper
       'thickbox',
       'lightbox',
       'colorpicker',
-      colorbox_stylesheet_path,
+      'colorbox',
       pngfix_stylesheet_path,
     ] +
     tokeninput_stylesheets
@@ -1000,10 +1000,6 @@ module ApplicationHelper
     'iepngfix/iepngfix.css'
   end
-  def colorbox_stylesheet_path
-    'colorbox/colorbox.css'
-  end
-
   def tokeninput_stylesheets
     ['token-input', 'token-input-facebook', 'token-input-mac']
   end
@@ -1024,7 +1020,7 @@ module ApplicationHelper
     options.merge!(:page => params[:npage])
     content = article.to_html(options)
     content = content.kind_of?(Proc) ? self.instance_eval(&content) : content
-    @plugins && @plugins.enabled_plugins.each do |plugin|
+    @plugins && @plugins.each do |plugin|
       content = plugin.parse_content(content)
     end
     content
@@ -1134,15 +1130,26 @@ module ApplicationHelper
     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 browse_contents_menu
+     links = [
+       {s_('contents|More Comments') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_comments'})}},
+       {s_('contents|More Views') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_views'})}},
+       {s_('contents|More Recent') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_recent'})}}
+     ]
+
+    link_to(content_tag(:span, _('Contents'), :class => 'icon-blog'), {:controller => "browse", :action => 'contents'}, :id => 'submenu-contents') +
+    link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+  end
+
   def pagination_links(collection, options={})
-    options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
+    options = {:previous_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")
+      file = File.join(@controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
       if File.exists?(file)
         result << render(:file => file, :use_full_path => false)
       end
@@ -1166,7 +1173,7 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
@@ -1226,7 +1233,7 @@ module ApplicationHelper
     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)
+    concat(content_tag('div', wrapper + tag('br', :style => 'clear: both;'), { :class => 'comment-balloon ' + classes.to_s }.merge(options)))
   end
   def display_source_info(page)
@@ -1247,25 +1254,27 @@ module ApplicationHelper
     task.information[:message] % values
   end
+  def add_zoom_to_article_images
+    add_zoom_to_images if environment.enabled?(:show_zoom_button_on_article_images)
+  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($) {
-        $(window).load( 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();
+    stylesheet_link_tag('fancybox') +
+    javascript_include_tag('jquery.fancybox-1.3.4.pack') +
+    javascript_tag("jQuery(function($) {
+      $(window).load( 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>');
+          }
         });
-      });" % _('Zoom in'))
-    end
+        $('.zoomify-image').fancybox();
+      });
+    });" % _('Zoom in'))
   end
   def render_dialog_error_messages(instance_name)
@@ -1303,4 +1312,29 @@ module ApplicationHelper
       ) + content_tag('span', ' | ', :class => 'comment-footer comment-footer-hide')
     end
   end
+
+  def cache_timeout(key, timeout, &block)
+    cache(key, { :expires_in => timeout }, &block)
+  end
+
+  def is_cache_expired?(key)
+    !cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller))
+  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
+
+  def delete_article_message(article)
+    if article.folder?
+      _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
+    else
+      _("Are you sure that you want to remove the item \"#{article.name}\"?")
+    end
+  end
 end
@@ -17,7 +17,7 @@ module BlogHelper
   def list_posts(articles, format = 'full')
     pagination = will_paginate(articles, {
       :param_name => 'npage',
-      :prev_label => _('&laquo; Newer posts'),
+      :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;')
     })
     content = []
@@ -81,8 +81,8 @@ module BoxesHelper
     box_decorator == DontMoveBlocks
   end
-  def display_block_content(block, main_content = nil)
-    content = block.main? ? wrap_main_content(main_content) : block.content
+  def display_block_content(block, person, main_content = nil)
+    content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
     result = extract_block_content(content)
     footer_content = extract_block_content(block.footer)
     unless footer_content.blank?
@@ -99,7 +99,7 @@ module BoxesHelper
     unless block.visible?
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
-    @controller.send(:content_editor?) || @plugins.enabled_plugins.each do |plugin|
+    @controller.send(:content_editor?) || @plugins.each do |plugin|
       result = plugin.parse_content(result)
     end
     box_decorator.block_target(block.box, block) +
 module CatalogHelper
-include DisplayHelper
-include ManageProductsHelper
+  include DisplayHelper
+  include ManageProductsHelper
-  def display_products_list(profile, products)
-    data = ''
-    extra_content = []
-    extra_content_list = []
-    products.each { |product|
-      extra_content = @plugins.map(:catalog_item_extras, product).collect { |content| instance_eval(&content) } if @plugins
-      extra_content_list = @plugins.map(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } if @plugins
-      data << content_tag('li',
-        link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:portrait) ) +
-        content_tag('h3', link_to_product(product)) +
-        content_tag('ul',
-          (product.price ? content_tag('li', _('Price: %s') % ( "%.2f" % product.price), :class => 'product_price') : '') +
-          content_tag('li', product_category_name(profile, product.product_category), :class => 'product_category') +
-          extra_content_list.map { |content| content_tag('li', content)}.join("\n")
-        ) +
-        (product.description ? content_tag('div',
-                                           txt2html(product.description),
-                                           :class => 'description') : tag('br',
-                                           :style => 'clear:both')) +
-        extra_content.join("\n"),
-        :class => 'product')
-    }
-    content_tag('h1', _('Products/Services')) + content_tag('ul', data, :id => 'product_list')
-  end
-
-  private
-
-  def product_category_name(profile, product_category)
-    if profile.enabled?
-      link_to_product_category(product_category)
-    else
-      product_category ? product_category.full_name(' &rarr; ') : _('Uncategorized product')
-    end
-  end
 end
@@ -16,7 +16,7 @@ module CmsHelper
   end
   def pagination_links(collection, options={})
-    options = {:prev_label => '&laquo; ', :next_label => ' &raquo;', :page_links => false}.merge(options)
+    options = {:previous_label => '&laquo; ', :next_label => ' &raquo;', :page_links => false}.merge(options)
     will_paginate(collection, options)
   end
@@ -49,12 +49,6 @@ module CmsHelper
   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
+    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
   end
 end
@@ -55,7 +55,7 @@ module ContentViewerHelper
     "http://www.facebook.com/sharer.php?s=100&p[title]=%{title}&p[summary]=%{summary}&p[url]=%{url}&p[images][0]=%{image}" % {
       :title => CGI.escape(article.title),
       :url => CGI.escape(url_for(article.url)),
-      :summary => CGI.escape(truncate(strip_tags(article.body.to_s), 300)),
+      :summary => CGI.escape(truncate(strip_tags(article.body.to_s), :length => 300)),
       :image => CGI.escape(article.body_images_paths.first.to_s)
     }
   end
@@ -42,11 +42,11 @@ module DatesHelper
     end
   end
-  def show_period(date1, date2 = nil)
+  def show_period(date1, date2 = nil, use_numbers = false)
     if (date1 == date2) || (date2.nil?)
-      show_date(date1)
+      show_date(date1, use_numbers)
     else
-      _('from %{date1} to %{date2}') % {:date1 => show_date(date1), :date2 => show_date(date2)}
+      _('from %{date1} to %{date2}') % {:date1 => show_date(date1, use_numbers), :date2 => show_date(date2, use_numbers)}
     end
   end
@@ -8,6 +8,20 @@ module DisplayHelper
             opts
   end
+  def image_link_to_product(product, opts={})
+    return _('No product') unless product
+    target = product_path(product)
+    link_to image_tag(product.default_image(:big), :alt => product.name),
+            target,
+            opts
+  end
+
+  def price_span(price, options = {})
+    content_tag 'span',
+      number_to_currency(price, :unit => environment.currency_unit, :delimiter => environment.currency_delimiter, :separator => environment.currency_separator),
+      options
+  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
@@ -14,9 +14,9 @@ module FormsHelper
   def labelled_check_box( human_name, name, value = "1", checked = false, options = {} )
     options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
-    check_box_tag( name, value, checked, options ) +
-      content_tag( 'label', human_name, :for => options[:id] ) +
-      hidden_field_tag(name, '0')
+    hidden_field_tag(name, '0') +
+      check_box_tag( name, value, checked, options ) +
+      content_tag( 'label', human_name, :for => options[:id] )
   end
   def labelled_text_field( human_name, name, value=nil, options={} )
@@ -11,7 +11,7 @@ module ForumHelper
   def list_forum_posts(articles)
     pagination = will_paginate(articles, {
       :param_name => 'npage',
-      :prev_label => _('&laquo; Newer posts'),
+      :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;')
     })
     content = [content_tag('tr',
@@ -55,7 +55,7 @@ module ManageProductsHelper
   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>"
+      "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{truncate(category.name, :length => 33) + (category.leaf? ? '': ' &raquo;')}</option>"
     end.join("\n")
   end
@@ -271,4 +271,23 @@ module ManageProductsHelper
     return input_amount_used if input.unit.blank?
     n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', input.unit.singular, :class => 'input-unit'), :plural_unit => content_tag('span', input.unit.plural, :class => 'input-unit') }
   end
+
+  def select_production_cost(product,selected=nil)
+    url = url_for( :controller => 'manage_products', :action => 'create_production_cost' )
+    prompt_msg = _('Insert the name of the new cost:')
+    error_msg = _('Something went wrong. Please, try again')
+    select_tag('price_details[][production_cost_id]',
+               '<option value="" disabled="disabled">' + _('Select...') + '</option>' +
+               options_for_select(product.available_production_costs.map {|item| [truncate(item.name, 10, '...'), item.id]} + [[_('Other cost'), '']], selected),
+               {:class => 'production-cost-selection',
+                :onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})
+  end
+
+  def price_composition_progressbar_text(product, args = {})
+    currency = environment.currency_unit
+    production_cost = args[:production_cost_value] || product.formatted_value(:total_production_cost)
+    product_price = args[:product_price] || product.formatted_value(:price)
+
+    _("%{currency} %{production_cost} of %{currency} %{product_price}") % {:currency => currency, :production_cost => content_tag('span', production_cost, :class => 'production_cost'), :product_price => content_tag('span', product_price, :class => 'product_price')}
+  end
 end
@@ -137,8 +137,8 @@ module ProfileEditorHelper
       content_tag(
         'div',
         capture(&block) + '<br style="clear:left;"/>&nbsp;',
-        :class => 'control-panel'),
-      block.binding)
+        :class => 'control-panel')
+    )
   end
   def control_panel_button(title, icon, url)
@@ -15,12 +15,4 @@ module ProfileHelper
     end
   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
@@ -4,9 +4,7 @@ module SweeperHelper
     ActionController::Base.new().expire_fragment(*args)
   end
-  def expire_timeout_fragment(*args)
-    ActionController::Base.new().expire_timeout_fragment(*args)
-  end
+  alias :expire_timeout_fragment :expire_fragment
   def expire_friends(profile)
     # public friends page
@@ -22,7 +20,7 @@ module SweeperHelper
     # friends blocks
     blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_communities(profile)
@@ -34,13 +32,13 @@ module SweeperHelper
     # communities block
     blocks = profile.blocks.select{|b| b.kind_of?(CommunitiesBlock)}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_enterprises(profile)
     # enterprises and favorite enterprises blocks
     blocks = profile.blocks.select {|b| [EnterprisesBlock, FavoriteEnterprisesBlock].any?{|klass| b.kind_of?(klass)} }
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_profile_index(profile)
@@ -50,7 +50,7 @@ module TagsHelper
       style = ""+
         "font-size: #{ (v * delta).round + min_size }px;"+
         "top: #{ -(delta/2) - (v * (delta/2)).round }px;"
-      destination = url.kind_of?(Hash) ? url_for(url.merge(tagname_option => tag)) : (url.to_s + tag)
+      destination = url.merge(tagname_option => tag)
       if options[:show_count]
         display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""
@@ -11,7 +11,9 @@ class AddMember &lt; Task
   settings_items :roles
   def perform
-    self.roles ||= [Profile::Roles.member(organization.environment.id).id]
+    if !self.roles or (self.roles.uniq.compact.length == 1 and self.roles.uniq.compact.first.to_i.zero?)
+      self.roles = [Profile::Roles.member(organization.environment.id).id]
+    end
     target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
   end
@@ -13,7 +13,7 @@ class Article &lt; ActiveRecord::Base
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
-  validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('<!-- %{fn} -->The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
+  validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
@@ -34,7 +34,7 @@ class Article &lt; ActiveRecord::Base
   before_destroy :rotate_translations
   before_create do |article|
-    article.published_at = article.created_at if article.published_at.nil?
+    article.published_at ||= Time.now
     if article.reference_article && !article.parent
       parent = article.reference_article.parent
       if parent && parent.blog? && article.profile.has_blog?
@@ -233,7 +233,7 @@ class Article &lt; ActiveRecord::Base
   include ActionView::Helpers::TextHelper
   def short_title
-    truncate self.title, 15, '...'
+    truncate self.title, :length => 15, :omission => '...'
   end
   def belongs_to_blog?
@@ -355,11 +355,20 @@ class Article &lt; ActiveRecord::Base
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
+  def self.text_article_types
+    ['TextArticle', 'TextileArticle', 'TinyMceArticle']
+  end
+
   named_scope :published, :conditions => { :published => true }
   named_scope :folders, :conditions => { :type => folder_types}
   named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
+  named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+
+  named_scope :more_comments, :order => "comments_count DESC"
+  named_scope :more_views, :order => "hits DESC"
+  named_scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
     return {:conditions => ['published = ?', true]} if !user
@@ -487,8 +496,8 @@ class Article &lt; ActiveRecord::Base
   end
   alias :active_record_cache_key :cache_key
-  def cache_key(params = {}, the_profile = nil)
-    active_record_cache_key +
+  def cache_key(params = {}, the_profile = nil, language = 'en')
+    active_record_cache_key+'-'+language +
       (allow_post_content?(the_profile) ? "-owner" : '') +
       (params[:npage] ? "-npage-#{params[:npage]}" : '') +
       (params[:year] ? "-year-#{params[:year]}" : '') +
@@ -505,7 +514,7 @@ class Article &lt; ActiveRecord::Base
   end
   def short_lead
-    truncate sanitize_html(self.lead), 170, '...'
+    truncate sanitize_html(self.lead), :length => 170, :omission => '...'
   end
   def creator
@@ -528,6 +537,28 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def more_comments_label
+    amount = self.comments_count
+    {
+      0 => _('no comments'),
+      1 => _('one comment')
+    }[amount] || _("%s comments") % amount
+
+  end
+
+  def more_views_label
+    amount = self.hits
+    {
+      0 => _('no views'),
+      1 => _('one view')
+    }[amount] || _("%s views") % amount
+
+  end
+
+  def more_recent_label
+    _('Created at: ')
+  end
+
   private
   def sanitize_tag_list
@@ -8,7 +8,7 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
-  def content
+  def content(args={})
     block = self
     lambda do
       block_title(block.title) +
@@ -81,7 +81,7 @@ class Block &lt; ActiveRecord::Base
   # The method can also return <tt>nil</tt>, which means "no content".
   #
   # See BoxesHelper#extract_block_content for implementation details. 
-  def content
+  def content(args={})
     "This is block number %d" % self.id
   end
@@ -127,6 +127,11 @@ class Block &lt; ActiveRecord::Base
     true
   end
+  alias :active_record_cache_key :cache_key
+  def cache_key(language='en')
+    active_record_cache_key+'-'+language
+  end
+
   def timeout
     4.hours
   end
@@ -68,7 +68,7 @@ class Blog &lt; Folder
   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
+  settings_items :display_posts_in_current_language, :type => :boolean, :default => false
   alias :display_posts_in_current_language? :display_posts_in_current_language
@@ -20,11 +20,15 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
-  def content
+  def visible_posts(person)
+    blog.posts.native_translations.select {|post| post.display_to?(person)}
+  end
+
+  def content(args={})
     owner_blog = self.blog
     return nil unless owner_blog
     results = ''
-    owner_blog.posts.native_translations.group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
+    visible_posts(args[:person]).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|
@@ -28,7 +28,7 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/categories', :locals => { :block => block }
 class Category < ActiveRecord::Base
-  validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.')
+  validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
   validates_presence_of :name, :environment_id
-  validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.')
+  validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
   validates_inclusion_of :display_color, :in => [ 1, 2, 3, 4, nil ]
-  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.')
+  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.').fix_i18n
   # Finds all top level categories for a given environment. 
   named_scope :top_level_for, lambda { |environment|
@@ -30,10 +30,10 @@ class ChangePassword &lt; Task
     unless data.login.blank? || data.email.blank?
       user = User.find_by_login_and_environment_id(data.login, data.environment_id)
       if user.nil? 
-        data.errors.add(:login, _('%{fn} is not a valid username.'))
+        data.errors.add(:login, _('%{fn} is not a valid username.').fix_i18n)
       else
         if user.email != data.email
-          data.errors.add(:email, _('%{fn} is invalid.'))
+          data.errors.add(:email)
         end
       end
     end
@@ -2,7 +2,7 @@ class Comment &lt; 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
+  validates_presence_of :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
@@ -17,7 +17,7 @@ class Comment &lt; ActiveRecord::Base
   validates_presence_of :author_id, :if => (lambda { |rec| rec.name.blank? && rec.email.blank? })
   validates_each :name do |rec,attribute,value|
     if rec.author_id && (!rec.name.blank? || !rec.email.blank?)
-      rec.errors.add(:name, _('%{fn} can only be informed for unauthenticated authors'))
+      rec.errors.add(:name, _('%{fn} can only be informed for unauthenticated authors').fix_i18n)
     end
   end
@@ -126,4 +126,12 @@ class Comment &lt; ActiveRecord::Base
     end
   end
+  def rejected?
+    @rejected
+  end
+
+  def reject!
+    @rejected = true
+  end
+
 end
@@ -34,7 +34,7 @@ class Community &lt; Organization
     super
     self.required_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} can\'t be blank'))
+        self.errors.add_on_blank(field)
       end
     end
   end
@@ -16,7 +16,7 @@ class CreateCommunity &lt; Task
   def validate
     self.environment.required_community_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} can\'t be blank'))
+        self.errors.add_on_blank(field)
       end
     end
   end
@@ -40,12 +40,12 @@ class CreateEnterprise &lt; Task
     if self.region && self.target
       unless self.region.validators.include?(self.target) || self.target_type == "Environment"
-        self.errors.add(:target, '%{fn} is not a validator for the chosen region')
+        self.errors.add(:target, _('%{fn} is not a validator for the chosen region').fix_i18n)
       end
     end
     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.')
+      self.errors.add(:identifier, _('%{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
     end
   end
@@ -12,7 +12,7 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
-  def content
+  def content(args={})
     message = self.owner.environment.message_for_disabled_enterprise || ''
     lambda do
        render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
@@ -10,14 +10,14 @@ class Domain &lt; ActiveRecord::Base
   # <tt>name</tt> must be a sequence of word characters (a to z, plus 0 to 9,
   # plus '_'). Letters must be lowercase
-  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9), "_" and "-"')
+  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9), "_" and "-"').fix_i18n
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
   # * <tt>name</tt> must not start with 'www.'
   def validate
     if self.name =~ /^www\./
-      self.errors.add(:name, _('%{fn} must not start with www.'))
+      self.errors.add(:name, _('%{fn} must not start with www.').fix_i18n)
     end
   end
@@ -6,6 +6,7 @@ class Enterprise &lt; Organization
   has_many :products, :dependent => :destroy, :order => 'name ASC'
   has_many :inputs, :through => :products
+  has_many :production_costs, :as => :owner
   has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
@@ -45,7 +46,7 @@ class Enterprise &lt; Organization
     super
     self.required_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _("%{fn} can't be blank"))
+        self.errors.add_on_blank(field)
       end
     end
   end
@@ -75,7 +76,11 @@ class Enterprise &lt; Organization
   end
   after_save do |e|
-    e.products.each{ |p| p.enterprise_updated(e) }
+    e.delay.update_products_position
+  end
+
+  def update_products_position
+    products.each{ |p| p.enterprise_updated(self) }
   end
   def closed?
@@ -12,18 +12,13 @@ class EnterpriseHomepage &lt; Article
     profile.nil? ? _('Homepage') : profile.name
   end
-  # FIXME isn't this too much including just to be able to generate some HTML?
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionController::UrlWriter
-  include ActionView::Helpers::AssetTagHelper
-  include EnterpriseHomepageHelper
-  include CatalogHelper
-
-  def to_html(options ={})
-    products = self.profile.products
-    display_profile_info(self.profile) + content_tag('div', self.body || '') +
-    (self.profile.environment.enabled?('disable_products_for_enterprises') ? '' : display_products_list(self.profile, products))
+  def to_html(options = {})
+    enterprise_homepage = self
+    lambda do
+      extend EnterpriseHomepageHelper
+      @products = profile.products.paginate(:order => 'id asc', :per_page => 9, :page => 1)
+      render :partial => 'content_viewer/enterprise_homepage', :object => enterprise_homepage
+    end
   end
   def can_display_hits?
@@ -120,7 +120,8 @@ class Environment &lt; ActiveRecord::Base
       'enterprises_are_validated_when_created' => __('Enterprises are validated 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')
+      'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
+      'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
     }
   end
@@ -174,6 +175,7 @@ class Environment &lt; ActiveRecord::Base
   acts_as_accessible
   has_many :units, :order => 'position'
+  has_many :production_costs, :as => :owner
   def superior_intances
     [self, nil]
@@ -221,7 +223,6 @@ class Environment &lt; ActiveRecord::Base
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
   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 :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 => ''
@@ -562,8 +563,8 @@ class Environment &lt; ActiveRecord::Base
     domain
   end
-  def top_url(ssl = false)
-    protocol = (ssl ? 'https' : 'http')
+  def top_url
+    protocol = 'http'
     result = "#{protocol}://#{default_hostname}"
     if Noosfero.url_options.has_key?(:port)
       result << ':' << Noosfero.url_options[:port].to_s
@@ -53,7 +53,7 @@ class EnvironmentFinder
         # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
         @environment.send(asset).find_by_contents(query, ferret_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
       elsif product_category && asset == :enterprises
-        @environment.send(asset).find_by_contents(query, ferret_options, options.merge(:joins => 'inner join product_categorizations on (product_categorizations.product_id = products.id)', :include => 'products', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
+        @environment.send(asset).find_by_contents(query, ferret_options, options.merge(:joins => 'inner join products on products.enterprise_id = profiles.id inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
       else
         @environment.send(asset).find_by_contents(query, ferret_options, options)
       end
@@ -12,7 +12,7 @@ class EnvironmentStatisticsBlock &lt; Block
     _('This block presents some statistics about your environment.')
   end
-  def content
+  def content(args={})
     users = owner.people.visible.count
     enterprises = owner.enterprises.visible.count
     communities = owner.communities.visible.count
@@ -22,7 +22,7 @@ class Event &lt; Article
   validates_each :start_date do |event,field,value|
     if event.end_date && event.start_date && event.start_date > event.end_date
-      event.errors.add(:start_date, _('%{fn} cannot come before end date.'))
+      event.errors.add(:start_date, _('%{fn} cannot come before end date.').fix_i18n)
     end
   end
@@ -25,7 +25,7 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/featured_products', :locals => { :block => block }
@@ -13,6 +13,7 @@ class FeedReaderBlock &lt; Block
     old_address = address
     orig_set_address(new_address)
     self.enabled = (new_address && new_address != old_address) || (new_address && self.enabled) || false
+    self.fetched_at = nil
   end
   settings_items :limit, :type => :integer
@@ -71,12 +72,13 @@ class FeedReaderBlock &lt; Block
     self.feed_title = nil
     self.error_message = nil
   end
+
   def finish_fetch
     self.fetched_at = Time.now
     self.save!
   end
-  def content
+  def content(args={})
     block_title(title) + formatted_feed_content
   end
@@ -28,7 +28,7 @@ class HighlightsBlock &lt; Block
     shuffle ? block_images.shuffle : block_images
   end
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/highlights', :locals => { :block => block }
@@ -9,15 +9,15 @@ class Image &lt; ActiveRecord::Base
   has_attachment :content_type => :image, 
                  :storage => :file_system, 
                  :path_prefix => 'public/image_uploads',
-                 :resize_to => '320x200>',
+                 :resize_to => '800x600>',
                  :thumbnails => { :big      => '150x150',
                                   :thumb    => '100x100',
                                   :portrait => '64x64',
                                   :minor    => '50x50',
                                   :icon     => '20x20!' },
-                 :max_size => 500.kilobytes # remember to update validate message below
+                 :max_size => 5.megabytes # remember to update validate message below
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 500.0 KB")
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
   delay_attachment_fu_thumbnails
@@ -45,6 +45,18 @@ class Input &lt; ActiveRecord::Base
     %w[price_per_unit amount_used].each do |field|
       return true unless self.send(field).blank?
     end
-    return false
+    false
+  end
+
+  def has_all_price_details?
+    %w[price_per_unit unit amount_used].each do |field|
+      return false if self.send(field).blank?
+    end
+    true
+  end
+
+  def cost
+    return 0 if self.amount_used.blank? || self.price_per_unit.blank?
+    self.amount_used * self.price_per_unit
   end
 end
@@ -47,7 +47,7 @@ class LinkListBlock &lt; Block
     _('This block can be used to create a menu of links. You can add, remove and update the links as you wish.')
   end
-  def content
+  def content(args={})
     block_title(title) +
     content_tag('ul',
       links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}
@@ -11,7 +11,7 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
-  def content
+  def content(args={})
     profile = self.owner
     title = self.title
     if profile.lat
@@ -8,7 +8,7 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
-  def content
+  def content(args={})
     lambda do
       render :file => 'blocks/login_block'
     end
@@ -8,7 +8,7 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
-  def content
+  def content(args={})
     nil
   end
@@ -14,7 +14,7 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/my_network', :locals => {
@@ -157,4 +157,8 @@ class Organization &lt; Profile
     members_by_role(role).map { |member| {:id => member.id, :name => member.name} }.to_json
   end
+  def disable
+    self.visible = false
+    save!
+  end
 end
@@ -116,10 +116,17 @@ class Person &lt; Profile
   contact_phone
   contact_information
   description
+  image
   ]
   validates_multiparameter_assignments
+  validates_each :birth_date do |record,attr,value|
+    if value && value.year == 1
+      record.errors.add(attr)
+    end
+  end
+
   def self.fields
     FIELDS
   end
@@ -129,7 +136,7 @@ class Person &lt; Profile
     self.required_fields.each do |field|
       if self.send(field).blank?
         unless (field == 'custom_area_of_study' && self.area_of_study != 'Others') || (field == 'custom_formation' && self.formation != 'Others')
-          self.errors.add(field, _('%{fn} is mandatory'))
+          self.errors.add_on_blank(field)
         end
       end
     end
@@ -191,7 +198,7 @@ class Person &lt; Profile
   validates_each :email, :on => :update do |record,attr,value|
     if User.find(:first, :conditions => ['email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id])
-      record.errors.add(attr, _('%{fn} is already used by other user'))
+      record.errors.add(attr, _('%{fn} is already used by other user').fix_i18n)
     end
   end
@@ -403,7 +410,15 @@ class Person &lt; Profile
   end
   def control_panel_settings_button
-    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
+    {:title => _('Edit Profile'), :icon => 'edit-profile'}
+  end
+
+  def disable
+    self.visible = false
+    user.password = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{identifier}--")
+    user.password_confirmation = user.password
+    save!
+    user.save!
   end
   protected
@@ -0,0 +1,27 @@
+class PriceDetail < ActiveRecord::Base
+
+  belongs_to :product
+  validates_presence_of :product_id
+
+  belongs_to :production_cost
+  validates_presence_of :production_cost_id
+  validates_uniqueness_of :production_cost_id, :scope => :product_id
+
+  def price
+    self[:price] || 0
+  end
+
+  include FloatHelper
+  def price=(value)
+    if value.is_a?(String)
+      super(decimal_to_float(value))
+    else
+      super(value)
+    end
+  end
+
+  def formatted_value(value)
+    ("%.2f" % self[value]).to_s.gsub('.', product.enterprise.environment.currency_separator) if self[value]
+  end
+
+end
@@ -5,6 +5,8 @@ class Product &lt; ActiveRecord::Base
   has_many :product_qualifiers
   has_many :qualifiers, :through => :product_qualifiers
   has_many :inputs, :dependent => :destroy, :order => 'position'
+  has_many :price_details, :dependent => :destroy
+  has_many :production_costs, :through => :price_details
   validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
   validates_presence_of :product_category_id
@@ -101,12 +103,13 @@ class Product &lt; ActiveRecord::Base
     enterprise.public_profile
   end
-  def formatted_value(value)
-    ("%.2f" % self[value]).to_s.gsub('.', enterprise.environment.currency_separator) if self[value]
+  def formatted_value(method)
+    value = self[method] || self.send(method)
+    ("%.2f" % value).to_s.gsub('.', enterprise.environment.currency_separator) if value
   end
   def price_with_discount
-    price - discount if discount
+    discount ? (price - discount) : price
   end
   def price=(value)
@@ -125,6 +128,23 @@ class Product &lt; ActiveRecord::Base
     end
   end
+  # Note: will probably be completely overhauled for AI1413
+  def inputs_prices?
+    return false if self.inputs.count <= 0
+    self.inputs.each do |input|
+      return false if input.has_price_details? == false
+    end
+    true
+  end
+
+  def any_inputs_details?
+    return false if self.inputs.count <= 0
+    self.inputs.each do |input|
+      return true if input.has_all_price_details? == true
+    end
+    false
+  end
+
   def has_basic_info?
     %w[unit price discount].each do |field|
       return true if !self.send(field).blank?
@@ -153,4 +173,44 @@ class Product &lt; ActiveRecord::Base
     true
   end
+  def inputs_cost
+    return 0 if inputs.empty?
+    inputs.map(&:cost).inject { |sum,price| sum + price }
+  end
+
+  def total_production_cost
+    return inputs_cost if price_details.empty?
+    inputs_cost + price_details.map(&:price).inject { |sum,price| sum + price }
+  end
+
+  def price_described?
+    return false if price.blank? or price == 0
+    (price - total_production_cost).zero?
+  end
+
+  def update_price_details(price_details)
+    self.price_details.destroy_all
+    price_details.each do |price_detail|
+      self.price_details.create(price_detail)
+    end
+  end
+
+  def price_description_percentage
+    return 0 if price.blank? || price.zero?
+    total_production_cost * 100 / price
+  end
+
+  def available_production_costs
+    self.enterprise.environment.production_costs + self.enterprise.production_costs
+  end
+
+  include ActionController::UrlWriter
+  def price_composition_bar_display_url
+    url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_price_composition_bar', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
+  end
+
+  def inputs_cost_update_url
+    url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_inputs_cost', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
+  end
+
 end
@@ -0,0 +1,8 @@
+class ProductionCost < ActiveRecord::Base
+
+  belongs_to :owner, :polymorphic => true
+  validates_presence_of :owner
+  validates_presence_of :name
+  validates_length_of :name, :maximum => 30, :allow_blank => true
+  validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]
+end
@@ -16,7 +16,7 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
-  def content
+  def content(args={})
     block_title(title) +
     content_tag(
       'ul',
@@ -20,12 +20,16 @@ class Profile &lt; ActiveRecord::Base
       find_role('editor', env_id)
     end
     def self.organization_member_roles(env_id)
-      [admin(env_id), moderator(env_id), member(env_id)]
+      all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? }
     end
     def self.all_roles(env_id)
-      [admin(env_id), member(env_id), moderator(env_id), owner(env_id), editor(env_id)]
+      Role.all :conditions => { :environment_id => env_id }
+    end
+    def self.method_missing(m, *args, &block)
+      role = find_role(m, args[0])
+      return role unless role.nil?
+      super
     end
-
     private
     def self.find_role(name, env_id)
       ::Role.find_by_key_and_environment_id("profile_#{name}", env_id)
@@ -115,6 +119,7 @@ class Profile &lt; ActiveRecord::Base
   acts_as_having_settings :field => :data
+  settings_items :redirect_l10n, :type => :boolean, :default => false
   settings_items :public_content, :type => :boolean, :default => true
   settings_items :description
@@ -147,6 +152,7 @@ class Profile &lt; ActiveRecord::Base
   doc
   chat
   plugin
+  site
   ]
   belongs_to :user
@@ -609,7 +615,7 @@ private :generate_url, :url_options
   include ActionView::Helpers::TextHelper
   def short_name(chars = 40)
     if self[:nickname].blank?
-      truncate self.name, chars, '...'
+      truncate self.name, :length => chars, :omission => '...'
     else
       self[:nickname]
     end
@@ -806,15 +812,10 @@ private :generate_url, :url_options
   end
   def disable
-    self.visible = false
-    user.password = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{identifier}--")
-    user.password_confirmation = user.password
-    save!
-    user.save!
   end
   def control_panel_settings_button
-    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
+    {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
   def self.identification
@@ -10,7 +10,7 @@ class ProfileImageBlock &lt; Block
     _('This block presents the profile image')
   end
-  def content
+  def content(args={})
     block = self
     s = show_name
     lambda do
@@ -8,7 +8,7 @@ class ProfileInfoBlock &lt; Block
     _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
   end
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/profile_info', :locals => { :block => block }
@@ -37,7 +37,7 @@ class ProfileListBlock &lt; Block
     _('Clicking on the people or groups will take you to their home page.')
   end
-  def content
+  def content(args={})
     profiles = self.profile_list
     title = self.view_title
     nl = "\n"
@@ -4,7 +4,7 @@ class ProfileSearchBlock &lt; Block
     _('Display a form to search the profile')
   end
-  def content
+  def content(args={})
     title = self.title
     lambda do
       render :file => 'blocks/profile_search', :locals => { :title => title }
@@ -6,7 +6,7 @@ class RawHTMLBlock &lt; Block
   settings_items :html, :type => :text
-  def content
+  def content(args={})
     (title.blank? ? '' : block_title(title)) + html.to_s
   end
@@ -15,7 +15,7 @@ class RecentDocumentsBlock &lt; Block
   settings_items :limit, :type => :integer, :default => 5
   include ActionController::UrlWriter
-  def content
+  def content(args={})
     docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit)
     block_title(title) +
@@ -16,7 +16,7 @@ class SellersSearchBlock &lt; Block
     _('This block presents a search engine for products.')
   end
-  def content
+  def content(args={})
     title = self.title
     lambda do
       render :file => 'search/_sellers_form', :locals => { :title => title }
@@ -31,7 +31,7 @@ class SlideshowBlock &lt; Block
     gallery.images.reject {|item| item.folder?}
   end
-  def content
+  def content(args={})
     block = self
     if gallery
       images = block_images
@@ -19,7 +19,7 @@ class TagsBlock &lt; Block
        Try to add some tags to some articles and you'l see your tag cloud growing.")
   end
-  def content
+  def content(args={})
     tags = owner.article_tags
     return '' if tags.empty?
@@ -43,8 +43,11 @@ class Theme
     def approved_themes(owner)
       Dir.glob(File.join(system_themes_dir, '*')).select do |item|
-        config = YAML.load_file(File.join(item, 'theme.yml'))
-        (config['owner_type'] == owner.class.base_class.name) && (config['owner_id'] == owner.id) || config['public']
+        if File.exists?( File.join(item, 'theme.yml') )
+          config = YAML.load_file(File.join(item, 'theme.yml'))
+          (config['owner_type'] == owner.class.base_class.name) &&
+          (config['owner_id'] == owner.id) || config['public']
+        end
       end.map do |desc|
         new(File.basename(desc))
       end
@@ -50,7 +50,7 @@ class UploadedFile &lt; Article
     :thumbnail_class => Thumbnail,
     :max_size => 5.megabytes # remember to update validate message below
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB")
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
   delay_attachment_fu_thumbnails
@@ -100,7 +100,7 @@ class User &lt; ActiveRecord::Base
   before_save :encrypt_password
   validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
-  validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.')
+  validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
@@ -13,15 +13,11 @@ class ArticleSweeper &lt; ActiveRecord::Observer
 protected
   def expire_caches(article)
-    article.hierarchy.each do |a|
-      if a != article
-        a.touch
-      end
-    end
+    article.hierarchy.each { |a| a.touch if a != article }
     blocks = article.profile.blocks
     blocks += article.profile.environment.blocks if article.profile.environment
     blocks = blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
     env = article.profile.environment
     if env && (env.portal_community == article.profile)
       expire_fragment(env.portal_news_cache_key)
@@ -0,0 +1,28 @@
+class BlockSweeper < ActiveRecord::Observer
+
+  observe :block
+
+  class << self
+    include SweeperHelper
+
+    def cache_key_regex(block)
+      regex = '-[a-z]*$'
+      clean_ck = block.cache_key.gsub(/#{regex}/,'')
+      %r{#{clean_ck+regex}}
+    end
+
+    # Expire block's all languages cache
+    def expire_block(block)
+      expire_timeout_fragment(cache_key_regex(block))
+    end
+
+    def expire_blocks(blocks)
+      blocks.each { |block| expire_block(block) }
+    end
+  end
+
+  def after_save(block)
+    self.class.expire_block(block)
+  end
+
+end
@@ -35,7 +35,7 @@ protected
     end
     blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
 end
@@ -31,7 +31,7 @@ protected
   def expire_statistics_block_cache(profile)
     blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_blogs(profile)
@@ -25,7 +25,7 @@ protected
     profile.blocks_to_expire_cache.each { |block|
       blocks = profile.blocks.select{|b| b.kind_of?(block)}
-      blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+      BlockSweeper.expire_blocks(blocks)
     }
   end
@@ -0,0 +1,7 @@
+<div class='status-identifier'>
+  <p><span class='<%= @status_class %>'><%= @status %></span></p>
+  <script type="text/javascript">
+    jQuery('#user_email').removeClass('<%= validation_classes %>');
+    jQuery('#user_email').addClass('<%= @status_class %>');
+  </script>
+</div>
 <div class='status-identifier'>
-  <p><%= @url %> <span class='<%= @status_class %>'><%= @status %></span> </p>
+  <p><span class='<%= @status_class %>'><%= @status %></span></p>
+  <script type="text/javascript">
+    jQuery('#user_login').removeClass('<%= validation_classes %>');
+    jQuery('#user_login').addClass('<%= @status_class %>');
+  </script>
 </div>
 <%= error_messages_for :user, :person %>
-<% if ! defined? hidden_atention || ! hidden_atention %>
-<p/>
-<div class="atention">
-<%= _('Dear user, welcome to the %s network. To start your participation in this space, fill in the fields below. After this operation, your login and password will be registered, allowing you to create %s and %s in this environment.') % [environment.name, __('communities'), __('enterprises')] %>
-</div>
-<% end %>
-
-<% labelled_form_for :user, @user, :html => { :multipart => true } do |f| %>
+<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
 <%= hidden_field_tag :invitation_code, @invitation_code %>
-<%= required_fields_message %>
+<div id='signup-form-header'>
-<div id='signup-email'>
-  <%= required f.text_field(:email) %>
-  <%= content_tag(:small,_('This e-mail address will be used to contact you.')) %>
-</div>
+  <span id="signup-domain"><%= environment.default_hostname %>/</span>
+  <div id='signup-login'>
+    <div id='signup-login-field'>
+      <%= required f.text_field(:login, :onchange => 'this.value = convToValidLogin(this.value);', :rel => s_('signup|Login')) %>
+      <div id='url-check'><p>&nbsp;</p></div>
+    </div>
+    <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
+    <br style="clear: both;" />
+  </div>
+  <%= observe_field 'user_login',
+        :url => { :action => 'check_url' },
+        :with => 'identifier',
+        :update => 'url-check',
+        :loading => "jQuery('#user_login').removeClass('#{validation_classes}').addClass('checking');
+                     jQuery('#url-check').html('<p><span class=\"checking\">#{checking_message(:url)}</span></p>');",
+        :complete => "jQuery('#user_login').removeClass('checking')"
+  %>
-<%= required f.text_field(:login, :onchange => 'this.value = convToValidLogin( this.value )') %>
-<%= content_tag(:small,_('Insert your login')) %>
-<div id='url-check'></div>
+  <div id='signup-password'>
+    <%= required f.password_field(:password, :id => 'user_pw') %>
+    <%= f.text_field(:password_clear, :value => _('password')) %>
+    <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
+    <div id='fake-check'><p>&nbsp;</p></div>
+  </div>
+
+  <div id='signup-password-confirmation'>
+    <%= required f.password_field(:password_confirmation) %>
+    <%= f.text_field(:password_confirmation_clear, :value => _('password confirmation')) %>
+    <div id='password-check'><p>&nbsp;</p></div>
+  </div>
+
+  <div id='signup-email'>
+    <%= required f.text_field(:email, :rel => _('e-Mail')) %>
+    <%= content_tag(:small,_('This e-mail address will be used to contact you.')) %>
+    <div id='email-check'><p>&nbsp;</p></div>
+  </div>
+  <%= observe_field "user_email",
+        :url      => { :action => "check_email" },
+        :with     => "address",
+        :update   => "email-check",
+        :loading  => "jQuery('#user_email').removeClass('#{validation_classes}').addClass('checking');
+                      jQuery('#email-check').html('<p><span class=\"checking\">#{checking_message(:email)}</span></p>');",
+        :complete => "jQuery('#user_email').removeClass('checking')",
+        :before   => "if (!( jQuery('#user_email').valid() )) {
+                        jQuery('#user_email').removeClass('#{validation_classes}').addClass('unavailable');
+                        jQuery('#email-check').html('<p><span class=\"unavailable\">#{_('This e-mail address is not valid')}</span></p>');
+                        return false;
+                      }"
+  %>
-<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
+  <%= label :profile_data, :name %>
+  <%= required text_field(:profile_data, :name, :rel => _('Full name')) %>
-<div id='signup-password'>
-  <%= required f.password_field(:password) %>
-  <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.')) %>
 </div>
-<%= required f.password_field(:password_confirmation) %>
-<%= content_tag(:small,_('To confirm, repeat your password.')) %>
-
-<% labelled_fields_for :profile_data, @person do |f| %>
-  <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
-<% end %>
-
-<% unless @terms_of_use.blank? %>
-  <div id='terms-of-use-box' class='formfieldline'>
-    <%= _("By clicking on 'I accept the terms of use' below you are agreeing to the %s") %
-    link_to_function(_('Terms of use'), nil) do |page|
-      page['terms-of-use'].show
-    end %>
-
-    <div id='terms-of-use' style='display: none;'>
-      <%= @terms_of_use %>
-      <%= link_to_function(_('Hide'), nil) do |page|
-        page['terms-of-use'].hide
-      end %>
+<div id="signup-form-profile">
+
+  <% labelled_fields_for :profile_data, @person do |f| %>
+    <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
+  <% end %>
+
+  <% unless @terms_of_use.blank? %>
+    <div id='terms-of-use-box' class='formfieldline'>
+      <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
     </div>
-    <p><%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I accept the terms of use') : environment.terms_of_use_acceptance_text, 'user[terms_accepted]') %></p>
-  </div>
-<% end %>
-
-<% if params[:enterprise_code] %>
-  <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
-  <%= hidden_field_tag :answer, params[:answer] %>
-  <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
-  <%= hidden_field_tag :new_user, true %>
-<% end %>
-
-<% button_bar do %>
-  <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
-<% end %>
+  <% end %>
+
+  <% if params[:enterprise_code] %>
+    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+    <%= hidden_field_tag :answer, params[:answer] %>
+    <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
+    <%= hidden_field_tag :new_user, true %>
+  <% end %>
+</div>
+
+<p style="text-align: center">
+  <%= submit_button('save', _('Create my account')) %>
+</p>
+
 <% end -%>
+
+<script type="text/javascript">
+jQuery(function($) {
+  $('#signup-form input[type=text], #signup-form textarea').each(function() {
+    if ($(this).attr('rel')) var default_value = $(this).attr('rel').toLowerCase();
+    if ($(this).val() == '') $(this).val(default_value);
+    $(this).bind('focus', function() {
+      if ($(this).val() == default_value) $(this).val('');
+    });
+    $(this).bind('blur', function() {
+      if ($(this).val() == '') {
+        $(this).val(default_value);
+        $(this).removeClass('filled-in');
+      }
+      else $(this).addClass('filled-in');
+    });
+  });
+
+  $('#signup-form').bind('submit', function() {
+    $('#signup-form input[type=text], #signup-form textarea').each(function() {
+      if ($(this).attr('rel')) var default_value = $(this).attr('rel').toLowerCase();
+      if ($(this).val() == default_value) $(this).val('');
+    });
+    return true;
+  });
+
+  $('#user_password_clear, #user_password_confirmation_clear').show();
+  $('#user_password_clear, #user_password_confirmation_clear').unbind();
+  $('#user_pw, #user_password_confirmation').hide();
+  $('#user_password_clear').focus(function() {
+    $(this).hide();
+    $('#user_pw').show();
+    $('#user_pw').focus();
+  });
+  $('#user_pw').focus(function() {
+    $('#password-balloon').fadeIn('slow');
+  });
+  $('#user_pw').blur(function() {
+    if ($(this).val() == '') {
+      $('#user_password_clear').show();
+      $(this).hide();
+    }
+  });
+  $('#user_password_confirmation_clear').focus(function() {
+    $(this).hide();
+    $('#user_password_confirmation').show();
+    $('#user_password_confirmation').focus();
+  });
+  $('#user_password_confirmation, #user_pw').blur(function() {
+    if ($('#user_password_confirmation').val() == '') {
+      $('#user_password_confirmation_clear').show();
+      $('#user_password_confirmation').hide();
+    } else if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
+      $('#user_password_confirmation').addClass('passwords_match').removeClass('passwords_differ');
+      $('#user_pw').removeClass('invalid_input').addClass('valid_input');
+      $('#password-check').html("<p>&nbsp;</p>");
+    } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
+      $('#user_password_confirmation').removeClass('passwords_match').addClass('passwords_differ');
+      $('#user_pw').addClass('invalid_input').removeClass('valid_input');
+      $('#password-check').html("<p><span class='unavailable'><%= _('Passwords don\'t match') %></span></p>");
+    }
+    $('#password-balloon').fadeOut('slow');
+  });
+  $('#user_login').focus(function() {
+    $('#signup-balloon').fadeIn('slow');
+  });
+  $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
+  $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
+});
+</script>
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+source :rubygems
	2	+gem 'cucumber', '0.4.0'
	3	+gem 'webrat', '0.5.1'
	4	+gem 'rspec', '1.2.9'
	5	+gem 'rspec-rails', '1.2.9'
	6	+gem 'Selenium', '>= 1.1.14'
	7	+gem 'selenium-client', '>= 1.2.17'
	8	+gem 'database_cleaner'
	9	+gem 'exception_notification', '1.0.20090728'
	10	+gem 'system_timer'
	11	+
	12	+def program(name)
	13	+ unless system("which #{name} > /dev/null")
	14	+ puts "W: Program #{name} is needed, but was not found in your PATH"
	15	+ end
	16	+end
	17	+
	18	+program 'java'
	19	+program 'firefox'
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+GEM
	2	+ remote: http://rubygems.org/
	3	+ specs:
	4	+ Selenium (1.1.14)
	5	+ builder (3.0.0)
	6	+ cucumber (0.4.0)
	7	+ builder (>= 2.1.2)
	8	+ diff-lcs (>= 1.1.2)
	9	+ polyglot (>= 0.2.9)
	10	+ term-ansicolor (>= 1.0.3)
	11	+ treetop (>= 1.4.2)
	12	+ database_cleaner (0.7.0)
	13	+ diff-lcs (1.1.3)
	14	+ exception_notification (1.0.20090728)
	15	+ nokogiri (1.5.0)
	16	+ polyglot (0.3.3)
	17	+ rack (1.3.5)
	18	+ rspec (1.2.9)
	19	+ rspec-rails (1.2.9)
	20	+ rack (>= 1.0.0)
	21	+ rspec (>= 1.2.9)
	22	+ selenium-client (1.2.18)
	23	+ system_timer (1.2.4)
	24	+ term-ansicolor (1.0.7)
	25	+ treetop (1.4.10)
	26	+ polyglot
	27	+ polyglot (>= 0.3.1)
	28	+ webrat (0.5.1)
	29	+ nokogiri (>= 1.2.0)
	30	+ rack (>= 1.0)
	31	+
	32	+PLATFORMS
	33	+ ruby
	34	+
	35	+DEPENDENCIES
	36	+ Selenium (>= 1.1.14)
	37	+ cucumber (= 0.4.0)
	38	+ database_cleaner
	39	+ exception_notification (= 1.0.20090728)
	40	+ rspec (= 1.2.9)
	41	+ rspec-rails (= 1.2.9)
	42	+ selenium-client (>= 1.2.17)
	43	+ system_timer
	44	+ webrat (= 0.5.1)
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
	2	+development.
	3	+
	4	+Install dependencies:
	5	+
	6	+gem install rails -v 2.3.5
	7	+gem install ferret
	8	+gem install i18n
	9	+gem install will_paginate -v 2.3.12
	10	+gem install cucumber
	11	+
	12	+Creating initial environment:
	13	+
	14	+rake db:schema:load
@@ -0,0 +1,78 @@		@@ -0,0 +1,78 @@
	1	+= AWStats setup for Noosfero
	2	+
	3	+AWStats is a free powerful and featureful tool that generates advanced web,
	4	+streaming, ftp or mail server statistics, graphically.
	5	+
	6	+See http://awstats.sourceforge.net/
	7	+
	8	+This guide supposes that the Noosfero server is running GNU/Linux Debian Squeeze.
	9	+
	10	+1. Install AWStats
	11	+
	12	+# apt-get install awstats libgeo-ip-perl geoip-database
	13	+
	14	+2. Basic setup
	15	+
	16	+Create AWStats config file:
	17	+
	18	+ * /etc/awstats/awstats.<domain>.conf
	19	+
	20	+Include "/etc/awstats/awstats.conf"
	21	+Include "/etc/noosfero/awstats-noosfero.conf"
	22	+SiteDomain="<domain>"
	23	+HostAliases="<domain-aliases>"
	24	+
	25	+<domain> should be the domain used in your Noosfero server (eg.:
	26	+softwarelivre.org) and the <domain-aliases> should be a list with all aliases
	27	+that you configured in apache (eg.: www.softwarelivre.org
	28	+www2.softwarelivre.org etc).
	29	+
	30	+This setup is considering that the Noosfero server is running varnish (see
	31	+INSTALL.varnish) and varnishncsa-vhost [1].
	32	+
	33	+[1] http://gitorious.org/varnisnncsa-vhost
	34	+
	35	+3. Running AWStats for the first time
	36	+
	37	+Run awstats by hand via command line:
	38	+
	39	+# /usr/lib/cgi-bin/awstats.pl -config=<domain>
	40	+
	41	+You should see something as below as output of this command:
	42	+
	43	+# /usr/lib/cgi-bin/awstats.pl -config=softwarelivre.org
	44	+Create/Update database for config "/etc/awstats/awstats.softwarelivre.org.conf" by AWStats version 6.7 (build 1.892)
	45	+From data in log file "/var/log/varnish/varnishncsa-vhost.log"...
	46	+Phase 1 : First bypass old records, searching new record...
	47	+Searching new records from beginning of log file...
	48	+Phase 2 : Now process new records (Flush history on disk after 20000 hosts)...
	49	+Jumped lines in file: 0
	50	+Parsed lines in file: 452
	51	+ Found 0 dropped records,
	52	+ Found 0 corrupted records,
	53	+ Found 0 old records,
	54	+ Found 452 new qualified records.
	55	+
	56	+4. Setup frontend
	57	+
	58	+You should create a new subdomain to have access to the AWStats, usually
	59	+something like tools.<domain> (eg.: tools.softwarelivre.org). Don't include
	60	+this subdomain in HostAliases in the AWStats neither in SiteAlias in the
	61	+Apache.
	62	+
	63	+# cp /usr/share/doc/awstats/examples/apache.conf /etc/apache2/conf.d/awstats.conf
	64	+# invoke-rc.d apache2 restart
	65	+
	66	+ps.: Don't forget to change the port /etc/apache/sites-enabled/000-default to
	67	+8080.
	68	+
	69	+Try: http://tools.<domain>/cgi-bin/awstats.pl?config=<domain>
	70	+(eg.: http://tools.softwarelivre.org/cgi-bin/awstats.pl?config=softwarelivre.org).
	71	+
	72	+5. Schedule AWStats in crontab
	73	+
	74	+ * /etc/cron.d/awstats
	75	+
	76	+0,10,20,30,40,50 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.<domain>.conf -a -r /var/log/apache/access.log ] && /usr/lib/cgi-bin/awstats.pl -config=<domain> -update >/dev/null
	77	+
	78	+Done, check the AWStats frontend after one or two days to see if everything is working properly.
	@@ -5,6 +5,20 @@ class RoleController < AdminController		@@ -5,6 +5,20 @@ class RoleController < AdminController
5	@roles = environment.roles.find(:all)	5	@roles = environment.roles.find(:all)
6	end	6	end
7		7
		8	+ def new
		9	+ @role = Role.new
		10	+ end
		11	+
		12	+ def create
		13	+ @role = Role.new :name => params[:role][:name], :permissions => params[:role][:permissions], :environment => environment
		14	+ if @role.save
		15	+ redirect_to :action => 'show', :id => @role
		16	+ else
		17	+ session[:notice] = _('Failed to create role')
		18	+ render :action => 'new'
		19	+ end
		20	+ end
		21	+
8	def show	22	def show
9	@role = environment.roles.find(params[:id])	23	@role = environment.roles.find(params[:id])
10	end	24	end
1	class AdminController < ApplicationController	1	class AdminController < ApplicationController
2	- require_ssl
3	before_filter :login_required	2	before_filter :login_required
4	end	3	end
1	-# his is the application's main controller. Features defined here are
2	-# available in all controllers.
3	-class ApplicationController < ActionController::Base
4	-
5	- before_filter :change_pg_schema
6	-
7	- include ApplicationHelper
8	- layout :get_layout
9	- def get_layout
10	- theme_option(:layout) \|\| 'application'
11	- end
12	-
13	- filter_parameter_logging :password
14	-
15	- def log_processing
16	- super
17	- return unless ENV['RAILS_ENV'] == 'production'
18	- if logger && logger.info?
19	- logger.info(" HTTP Referer: #{request.referer}")
20	- logger.info(" User Agent: #{request.user_agent}")
21	- logger.info(" Accept-Language: #{request.headers['HTTP_ACCEPT_LANGUAGE']}")
22	- end
23	- end
24	-
25	- helper :document
26	- helper :language
27	-
28	- def self.no_design_blocks
29	- @no_design_blocks = true
30	- end
31	- def self.uses_design_blocks?
32	- !@no_design_blocks
33	- end
34	- def uses_design_blocks?
35	- !@no_design_blocks && self.class.uses_design_blocks?
36	- end
37	-
38	- # Be sure to include AuthenticationSystem in Application Controller instead
39	- include AuthenticatedSystem
40	- include PermissionCheck
41	-
42	- def self.require_ssl(*options)
43	- before_filter :check_ssl, *options
44	- end
45	- def check_ssl
46	- return true if (request.ssl? \|\| ENV['RAILS_ENV'] == 'development')
47	- redirect_to_ssl
48	- end
49	- def redirect_to_ssl
50	- if environment.enable_ssl
51	- redirect_to(params.merge(:protocol => 'https://', :host => ssl_hostname))
52	- true
53	- else
54	- false
55	- end
56	- end
57	-
58	- def self.refuse_ssl(*options)
59	- before_filter :avoid_ssl, *options
60	- end
61	- def avoid_ssl
62	- if (!request.ssl? \|\| ENV['RAILS_ENV'] == 'development')
63	- true
64	- else
65	- redirect_to(params.merge(:protocol => 'http://'))
66	- false
67	- end
68	- end
69	-
70	- before_filter :set_locale
71	- def set_locale
72	- FastGettext.available_locales = Noosfero.available_locales
73	- FastGettext.default_locale = Noosfero.default_locale
74	- FastGettext.set_locale(params[:lang] \|\| session[:lang] \|\| Noosfero.default_locale \|\| request.env['HTTP_ACCEPT_LANGUAGE'] \|\| 'en')
75	- if params[:lang]
76	- session[:lang] = params[:lang]
77	- end
78	- end
79	-
80	- include NeedsProfile
81	-
82	- before_filter :detect_stuff_by_domain
83	- before_filter :init_noosfero_plugins
84	- attr_reader :environment
85	-
86	- before_filter :load_terminology
87	-
88	- # declares that the given <tt>actions</tt> cannot be accessed by other HTTP
89	- # method besides POST.
90	- def self.post_only(actions, redirect = { :action => 'index'})
91	- verify :method => :post, :only => actions, :redirect_to => redirect
92	- end
93	-
94	- helper_method :current_person, :current_person
95	-
96	- def change_pg_schema
97	- if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
98	- Noosfero::MultiTenancy.db_by_host = request.host
99	- end
100	- end
101	-
102	- protected
103	-
104	- def boxes_editor?
105	- false
106	- end
107	-
108	- def content_editor?
109	- false
110	- end
111	-
112	- def user
113	- current_user.person if logged_in?
114	- end
115	-
116	- alias :current_person :user
117	-
118	- # TODO: move this logic somewhere else (Domain class?)
119	- def detect_stuff_by_domain
120	- @domain = Domain.find_by_name(request.host)
121	- if @domain.nil?
122	- @environment = Environment.default
123	- else
124	- @environment = @domain.environment
125	- @profile = @domain.profile
126	- end
127	- end
128	-
129	- def init_noosfero_plugins
130	- @plugins = Noosfero::Plugin::Manager.new(self)
131	- @plugins.enabled_plugins.map(&:class).each do \|plugin\|
132	- prepend_view_path(plugin.view_path)
133	- end
134	- init_noosfero_plugins_controller_filters
135	- end
136	-
137	- # This is a generic method that initialize any possible filter defined by a
138	- # plugin to the current controller being initialized.
139	- def init_noosfero_plugins_controller_filters
140	- @plugins.enabled_plugins.each do \|plugin\|
141	- plugin.send(self.class.name.underscore + '_filters').each do \|plugin_filter\|
142	- self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] \|\| {}))
143	- self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
144	- end
145	- end
146	- end
147	-
148	- def load_terminology
149	- # cache terminology for performance
150	- @@terminology_cache \|\|= {}
151	- @@terminology_cache[environment.id] \|\|= environment.terminology
152	- Noosfero.terminology = @@terminology_cache[environment.id]
153	- end
154	-
155	- def render_not_found(path = nil)
156	- @no_design_blocks = true
157	- @path \|\|= request.path
158	- render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
159	- end
160	- alias :render_404 :render_not_found
161	-
162	- def render_access_denied(message = nil, title = nil)
163	- @no_design_blocks = true
164	- @message = message
165	- @title = title
166	- render :template => 'shared/access_denied.rhtml', :status => 403
167	- end
168	-
169	- def load_category
170	- unless params[:category_path].blank?
171	- path = params[:category_path].join('/')
172	- @category = environment.categories.find_by_path(path)
173	- if @category.nil?
174	- render_not_found(path)
175	- end
176	- end
177	- end
178	-
179	-end	1	+require 'application_controller'
@@ -0,0 +1,155 @@		@@ -0,0 +1,155 @@
	1	+class ApplicationController < ActionController::Base
	2	+
	3	+ before_filter :change_pg_schema
	4	+
	5	+ include ApplicationHelper
	6	+ layout :get_layout
	7	+ def get_layout
	8	+ prepend_view_path('public/' + theme_path)
	9	+ theme_option(:layout) \|\| 'application'
	10	+ end
	11	+
	12	+ filter_parameter_logging :password
	13	+
	14	+ def log_processing
	15	+ super
	16	+ return unless ENV['RAILS_ENV'] == 'production'
	17	+ if logger && logger.info?
	18	+ logger.info(" HTTP Referer: #{request.referer}")
	19	+ logger.info(" User Agent: #{request.user_agent}")
	20	+ logger.info(" Accept-Language: #{request.headers['HTTP_ACCEPT_LANGUAGE']}")
	21	+ end
	22	+ end
	23	+
	24	+ helper :document
	25	+ helper :language
	26	+
	27	+ def self.no_design_blocks
	28	+ @no_design_blocks = true
	29	+ end
	30	+ def self.uses_design_blocks?
	31	+ !@no_design_blocks
	32	+ end
	33	+ def uses_design_blocks?
	34	+ !@no_design_blocks && self.class.uses_design_blocks?
	35	+ end
	36	+
	37	+ # Be sure to include AuthenticationSystem in Application Controller instead
	38	+ include AuthenticatedSystem
	39	+ include PermissionCheck
	40	+
	41	+ before_filter :set_locale
	42	+ def set_locale
	43	+ FastGettext.available_locales = Noosfero.available_locales
	44	+ FastGettext.default_locale = Noosfero.default_locale
	45	+ I18n.locale = FastGettext.locale = (params[:lang] \|\| session[:lang] \|\| Noosfero.default_locale \|\| request.env['HTTP_ACCEPT_LANGUAGE'] \|\| 'en')
	46	+ if params[:lang]
	47	+ session[:lang] = params[:lang]
	48	+ end
	49	+ end
	50	+
	51	+ include NeedsProfile
	52	+
	53	+ before_filter :detect_stuff_by_domain
	54	+ before_filter :init_noosfero_plugins
	55	+ attr_reader :environment
	56	+
	57	+ before_filter :load_terminology
	58	+
	59	+ # declares that the given <tt>actions</tt> cannot be accessed by other HTTP
	60	+ # method besides POST.
	61	+ def self.post_only(actions, redirect = { :action => 'index'})
	62	+ verify :method => :post, :only => actions, :redirect_to => redirect
	63	+ end
	64	+
	65	+ helper_method :current_person, :current_person
	66	+
	67	+ protected
	68	+
	69	+ def change_pg_schema
	70	+ if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
	71	+ Noosfero::MultiTenancy.db_by_host = request.host
	72	+ end
	73	+ end
	74	+
	75	+ def boxes_editor?
	76	+ false
	77	+ end
	78	+
	79	+ def content_editor?
	80	+ false
	81	+ end
	82	+
	83	+
	84	+ def user
	85	+ current_user.person if logged_in?
	86	+ end
	87	+
	88	+ alias :current_person :user
	89	+
	90	+ # TODO: move this logic somewhere else (Domain class?)
	91	+ def detect_stuff_by_domain
	92	+ @domain = Domain.find_by_name(request.host)
	93	+ if @domain.nil?
	94	+ @environment = Environment.default
	95	+ if @environment.nil? && Rails.env.development?
	96	+ # This should only happen in development ...
	97	+ @environment = Environment.create!(:name => "Noosfero", :is_default => true)
	98	+ end
	99	+ else
	100	+ @environment = @domain.environment
	101	+ @profile = @domain.profile
	102	+ end
	103	+ end
	104	+
	105	+ def init_noosfero_plugins
	106	+ @plugins = Noosfero::Plugin::Manager.new(self)
	107	+ @plugins.each do \|plugin\|
	108	+ prepend_view_path(plugin.class.view_path)
	109	+ end
	110	+ init_noosfero_plugins_controller_filters
	111	+ end
	112	+
	113	+ # This is a generic method that initialize any possible filter defined by a
	114	+ # plugin to the current controller being initialized.
	115	+ def init_noosfero_plugins_controller_filters
	116	+ @plugins.each do \|plugin\|
	117	+ plugin.send(self.class.name.underscore + '_filters').each do \|plugin_filter\|
	118	+ self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] \|\| {}))
	119	+ self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
	120	+ end
	121	+ end
	122	+ end
	123	+
	124	+ def load_terminology
	125	+ # cache terminology for performance
	126	+ @@terminology_cache \|\|= {}
	127	+ @@terminology_cache[environment.id] \|\|= environment.terminology
	128	+ Noosfero.terminology = @@terminology_cache[environment.id]
	129	+ end
	130	+
	131	+ def render_not_found(path = nil)
	132	+ @no_design_blocks = true
	133	+ @path \|\|= request.path
	134	+ render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
	135	+ end
	136	+ alias :render_404 :render_not_found
	137	+
	138	+ def render_access_denied(message = nil, title = nil)
	139	+ @no_design_blocks = true
	140	+ @message = message
	141	+ @title = title
	142	+ render :template => 'shared/access_denied.rhtml', :status => 403
	143	+ end
	144	+
	145	+ def load_category
	146	+ unless params[:category_path].blank?
	147	+ path = params[:category_path].join('/')
	148	+ @category = environment.categories.find_by_path(path)
	149	+ if @category.nil?
	150	+ render_not_found(path)
	151	+ end
	152	+ end
	153	+ end
	154	+
	155	+end
	@@ -111,6 +111,36 @@ class ManageProductsController < ApplicationController		@@ -111,6 +111,36 @@ class ManageProductsController < ApplicationController
111	end	111	end
112	end	112	end
113		113
		114	+ def manage_product_details
		115	+ @product = @profile.products.find(params[:id])
		116	+ if request.post?
		117	+ @product.update_price_details(params[:price_details]) if params[:price_details]
		118	+ render :partial => 'display_price_details'
		119	+ else
		120	+ render :partial => 'manage_product_details'
		121	+ end
		122	+ end
		123	+
		124	+ def remove_price_detail
		125	+ @product = @profile.products.find(params[:product])
		126	+ @price_detail = @product.price_details.find(params[:id])
		127	+ @product = @price_detail.product
		128	+ if request.post?
		129	+ @price_detail.destroy
		130	+ render :nothing => true
		131	+ end
		132	+ end
		133	+
		134	+ def display_price_composition_bar
		135	+ @product = @profile.products.find(params[:id])
		136	+ render :partial => 'price_composition_bar'
		137	+ end
		138	+
		139	+ def display_inputs_cost
		140	+ @product = @profile.products.find(params[:id])
		141	+ render :inline => "<%= float_to_currency(@product.inputs_cost) %>"
		142	+ end
		143	+
114	def destroy	144	def destroy
115	@product = @profile.products.find(params[:id])	145	@product = @profile.products.find(params[:id])
116	if @product.destroy	146	if @product.destroy
	@@ -167,4 +197,18 @@ class ManageProductsController < ApplicationController		@@ -167,4 +197,18 @@ class ManageProductsController < ApplicationController
167	end	197	end
168	end	198	end
169		199
		200	+ def create_production_cost
		201	+ cost = @profile.production_costs.create(:name => params[:id])
		202	+ if cost.valid?
		203	+ cost.save
		204	+ render :text => {:name => cost.name,
		205	+ :id => cost.id,
		206	+ :ok => true
		207	+ }.to_json
		208	+ else
		209	+ render :text => {:ok => false,
		210	+ :error_msg => _(cost.errors['name']) % {:fn => _('Name')}
		211	+ }.to_json
		212	+ end
		213	+ end
170	end	214	end
	@@ -2,7 +2,6 @@ class MyProfileController < ApplicationController		@@ -2,7 +2,6 @@ class MyProfileController < ApplicationController
2		2
3	needs_profile	3	needs_profile
4		4
5	- require_ssl
6		5
7	before_filter :login_required	6	before_filter :login_required
8		7