Merge branch 'master' into AI3279-block_store

Leandro Santos
2 parents 0d7ce656 e6855182
Showing 412 changed files with 8486 additions and 14531 deletions Show diff stats
.ackrc
AUTHORS
Gemfile
Gemfile.lock
INSTALL.chat.md
INSTALL.https.md
INSTALL.varnish.md
Rakefile
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
@@ -0,0 +1,3 @@
+--ignore-dir=log
+--ignore-dir=tmp
+--ignore-dir=pkg
@@ -170,6 +170,7 @@ João M. M. Silva + Renan Teruo &lt;jaodsilv@linux.ime.usp.br&gt;
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
 Junior Silva <junior@bajor.localhost.localdomain>
+Junior Silva <junior@sedeantigo.colivre.coop.br>
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Junior Silva <juniorsilva@colivre.coop.br>
@@ -15,6 +15,8 @@ gem &#39;thin&#39;
 gem 'hpricot'
 gem 'nokogiri'
 gem 'rake', :require => false
+gem 'rest-client'
+gem 'exception_notification'
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
@@ -30,7 +32,6 @@ group :test do
 end
 group :cucumber do
-  gem 'rake'
   gem 'cucumber-rails', :require => false
   gem 'capybara'
   gem 'cucumber'
@@ -61,7 +61,10 @@ GEM
     database_cleaner (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.11)
+    eventmachine (0.12.10)
+    exception_notification (4.0.1)
+      actionmailer (>= 3.0.4)
+      activesupport (>= 3.0.4)
     fast_gettext (0.6.8)
     ffi (1.0.11)
     gherkin (2.4.21)
@@ -111,6 +114,8 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.9.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rmagick (2.13.1)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
@@ -165,6 +170,7 @@ DEPENDENCIES
   daemons
   dalli
   database_cleaner
+  exception_notification
   fast_gettext
   hpricot
   mocha
@@ -175,6 +181,7 @@ DEPENDENCIES
   rails
   rails_autolink
   rake
+  rest-client
   rmagick
   rspec
   rspec-rails
-XMPP/Chat Client Setup
-======================
+XMPP/Chat Setup
+===============
-To configure XMPP/BOSH in Noosfero you need:
+The samples of config file to configure a XMPP/BOSH server with ejabberd,
+postgresql and apache2 can be found at util/chat directory.
-* REST Client - http://github.com/archiloque/rest-client
-* SystemTimer - http://ph7spot.com/musings/system-timer
-* Pidgin data files - http://www.pidgin.im/
+This setup supposes that you are using Noosfero installed via Debian package
+in a production environment.
-If you use Debian 6.0 (squeeze):
-
-    # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
-    # gem install SystemTimer
-
-The samples of config file to configure a XMPP/BOSH server with ejabberd, postgresql and apache2 can be found at util/chat directory.
-
-XMPP/Chat Server Setup
-======================
+Steps
+=====
 This is a step-by-step guide to get a XMPP service working, in a Debian system.
 ## 1. Install the required packages
-    # apt-get install ejabberd odbc-postgresql
+    # apt-get install ejabberd odbc-postgresql librestclient-ruby pidgin-data ruby1.8-dev
+    # gem install SystemTimer
 ## 2. Ejabberd configuration
-All the following changes must be done in config file: `/etc/ejabberd/ejabberd.cfg`
-
-### 2.1. Set the default admin user
-
-    { acl, admin, { user, "john", "www.example.com" } }.
-    { acl, admin, { user, "bart", "www.example.com" } }.
-
-### 2.2. Set the default host
-
-    { hosts, [ "www.example.com" ] }.
-
-### 2.3. Http-Bind activation
-
-    { 5280, ejabberd_http, [
-          http_bind,
-          web_admin
-       ]
-    }
-
-    (...)
-
-    { modules, [
-       {mod_http_bind, []},
-       ...
-    ] }.
-
-Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client needs non-anonymous room, then we need to change default params of creation rooms in ejabberd to create non-anonymous rooms.
-
-In non-anonymous rooms the jabber service sends the new occupant's full JID to all occupants in the room [[1]].
+    # cp /usr/share/noosfero/util/chat/ejabberd.cfg /etc/ejabberd/
-Add option "`{default_room_options, [{anonymous, false}]}`" to `/etc/ejabberd/ejabberd.cfg` in mod_muc session. See below:
+Edit the /etc/ejabberd/ejabberd.cfg file and set your domain on the first 2 lines.
-    { mod_muc, [
-       %%{host, "conference.@HOST@"},
-       {access, muc},
-       {access_create, muc},
-       {access_persistent, muc},
-       {access_admin, muc_admin},
-       {max_users, 500},
-       {default_room_options, [{anonymous, false}]}
-    ]},
-
-[1]: http://xmpp.org/extensions/xep-0045.html#enter-nonanon
-
-
-### 2.4. Authentication method
-
-To use Postgresql through ODBC, the following modifications must be done:
-
- * Disable the default method:
-   `{auth_method, internal}.`
-
- * Enable autheticantion through ODBC:
-   `{auth_method, odbc}.`
+## 3. Configuring Postgresql
- * Set database server name
-   `{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.`
+Give permission to noosfero user create new roles, login as
+postgres user and execute:
+    $ psql
+    postgres=# GRANT CREATE ON DATABASE noosfero TO noosfero;
-### 2.5. Increase the shaper traffic limit
+Change the postgresql authentication method to md5 instead of ident,
+add the following line to the file /etc/postgresql/8.4/main/pg_hba.conf:
-    { shaper, normal, { maxrate, 10000000 } }.
+   # Noosfero user
+   local   noosfero    noosfero                          md5
+(add this line before the following line)
-### 2.6. Disable unused modules
+   # "local" is for Unix domain socket connections only
+   local   all         all                               ident
-Unused modules can be disabled, for example:
+Restart postgresql server:
- * s2s
- * web_admin
- * mod_pubsub
- * mod_irc
- * mod_offline
- * mod_admin_extra
- * mod_register
+    # service postgresql restart
+Login as noosfero user, and execute:
-### 2.7. Enable ODBC modules
+    $ psql -U noosfero -W noosfero < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql
- * mod_privacy -> mod_privacy_odbc
- * mod_private -> mod_private_odbc
- * mod_roster  -> mod_roster_odbc
+(see database password in the /etc/noosfero/database.yml file)
-## 3. Configuring Postgresql
+This will create a new schema inside the noosfero database, called `ejabberd`.
-Login as noosfero user, and execute:
+Note that there should be at least one domain with `is_default = true` in
+`domains` table, otherwise people won't be able to see their friends online.
-    $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
+## 4. ODBC configuration
-Where `noosfero` may need to be replace by the name of the database used for Noosfero.
+Create the following files:
-This will create a new schema inside the noosfero database, called `ejabberd`.
+    # cp /usr/share/noosfero/util/chat/odbc.ini /etc/
+    # cp /usr/share/noosfero/util/chat/odbcinst.ini /etc/
-Note `noosfero` user should have permission to create Postgresql schemas. Also, there should be at least one domain with `is_default = true` in `domains` table, otherwise people won't be able to see their friends online.
+Edit the odbc.ini file and set the password for the database user, see
+the file /etc/noosfero/database.yml to get the password.
-## 4. ODBC configuration
+Adjust premissions:
-The following files must be created:
-
-`/etc/odbc.ini`:
-
-    [PostgreSQLEjabberdNoosfero]
-    Description      = PostgreSQL Noosfero ejabberd database
-    Driver           = PostgreSQL Unicode
-    Trace            = No
-    TraceFile        = /tmp/psqlodbc.log
-    Database         = noosfero
-    Servername       = localhost
-    UserName         = <DBUSER>
-    Password         = <DBPASS>
-    Port             =
-    ReadOnly         = No
-    RowVersioning    = No
-    ShowSystemTables = No
-    ShowOidColumn    = No
-    FakeOidIndex     = No
-    ConnSettings     = SET search_path TO ejabberd
-
-`/etc/odbcinst.ini`:
-
-    [PostgreSQL Unicode]
-    Description = PostgreSQL ODBC driver (Unicode version)
-    Driver      = /usr/lib/odbc/psqlodbcw.so
-    Setup       = /usr/lib/odbc/libodbcpsqlS.so
-    Debug       = 0
-    CommLog     = 1
-    UsageCount  = 3
+    # chmod 640 /etc/odbc.ini
+    # chown ejabberd /etc/odbc.ini
 ## 4.1 testing all:
@@ -159,7 +78,6 @@ The following files must be created:
 If the configuration was done right, the message "Connected!" will be displayed.
-
 ## 5. Enabling kernel polling and SMP in `/etc/default/ejabberd`
     POLL=true
@@ -205,32 +123,45 @@ Note: module proxy_http must be enabled:
     # a2enmod proxy_http
-## 8. DNS configuration
+Restart services:
-For this point, we assume you are using BIND as your DNS server. You need to add the following entries to the DNS zone file corresponding to the domain of your noosfero site:
+    # service ejabberd restart
+    # service noosfero restart
+    # service apache2 restart
-    _xmpp-client._tcp   SRV   5 100 5222 master
-    conference   CNAME master
-    _xmpp-client._tcp.conference   SRV   5 100 5222 master
+## 8. Test Apache Configuration
-If you are running a DNS server other than BIND, you will have to figure out how to create equivalente rules for your zone file. Patches to this documentation are welcome.
+Open in your browser the address:
-## 9. Testing this Setup
+    http://<yout domain>/http-bind
-Adjust shell limits to proceed with some benchmarks and load tests: 
+You should see a page with a message like that:
-    # ulimit −s 256
-    # ulimit −n 8192
-    # echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
+   ejabberd mod_http_bind
+   An implementation of XMPP over BOSH (XEP-0206)
+   This web page is only informative. To use HTTP-Bind you need a Jabber/XMPP
+   client that supports it.
-To measure the bandwidth between server and client:
+## 9. Test chat session
- * at server side:
-   `# iperf −s`
+Open Noosfero console and execute:
- * at client side:
-   `# iperf −c server_ip`
+>> environment = Environment.default
+>> user = Person['guest']
+>> password = user.user.crypted_password
+>> login = user.jid
+>> RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind", :wait => 30, :hold => 1, :window => 5
-For heavy load tests, clone and use this software:
+If you have luck, should see something like that:
-    $ git clone http://git.holoscopio.com/git/metal/tester.git
+Ruby-BOSH - SEND
+<body window="5" rid="60265" xmlns="http://jabber.org/protocol/httpbind" xmlns:xmpp="urn:xmpp:xbosh" to="vagrant-debian-squeeze.vagrantup.com" wait="30" xmpp:version="1.0" hold="1"/>
+Ruby-BOSH - SEND
+<body rid="60266" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><auth mechanism="PLAIN" xmlns="urn:ietf:params:xml:ns:xmpp-sasl">Z3Vlc3RAdmFncmFudC1kZWJpYW4tc3F1ZWV6ZS52YWdyYW50dXAuY29tAGd1ZXN0ADEzZTFhYWVlYjRhYjZlMTA0MmRkNWI1YWY0MzM4MjA1OGJiOWZmNzk=</auth></body>
+Ruby-BOSH - SEND
+<body xmpp:restart="true" rid="60267" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"/>
+Ruby-BOSH - SEND
+<body rid="60268" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><iq type="set" xmlns="jabber:client" id="bind_29330"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>bosh_9631</resource></bind></iq></body>
+Ruby-BOSH - SEND
+<body rid="60269" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><iq type="set" xmlns="jabber:client" id="sess_21557"><session xmlns="urn:ietf:params:xml:ns:xmpp-session"/></iq></body>
+=> ["guest@vagrant-debian-squeeze.vagrantup.com", "24cdfc43646a2af1059a7060b677c2e11b26f34f", 60270]
@@ -0,0 +1,115 @@
+Setup Noosfero to use HTTPS
+===========================
+
+This document assumes that you have a fully and clean Noosfero
+installation as explained at the `INSTALL.md` file.
+
+SSL certificate
++++++++++++++++
+
+You should get a valid SSL certificate, but if you want to test
+your setup before, you could generate a self-signed certificate
+as below:
+
+    # mkdir /etc/noosfero/ssl
+    # cd /etc/noosfero/ssl
+	  # openssl genrsa 1024 > noosfero.key
+    # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
+    # cat noosfero.key noosfero.cert > noosfero.pem
+
+There are two ways of using SSL with Noosfero: 1) If you are not using
+Varnish; and 2) If you are using Varnish.
+
+1) If you are are not using Varnish
++++++++++++++++++++++++++++++++++++
+
+Simply do a redirect in apache to force all connections with SSL:
+
+  <VirtualHost *:8080>
+    ServerName test.stoa.usp.br
+   
+    Redirect / https://example.com/
+  </VirtualHost>
+
+And set a vhost to receive then:
+
+  <VirtualHost *:443>
+    ServerName example.com
+   
+    SSLEngine On
+    SSLCertificateFile    /etc/ssl/certs/cert.pem
+    SSLCertificateKeyFile /etc/ssl/private/cert.key
+   
+    Include /etc/noosfero/apache/virtualhost.conf
+  </VirtualHost>
+
+Be aware that if you had configured varnish, the requests won't reach
+it with this configuration.
+
+2) If you are using Varnish
++++++++++++++++++++++++++++
+
+Varnish isn't able to communicate with the SSL protocol, so we will
+need some one who do this and Pound[1] can do the job. In order to
+install it in Debian based systems:
+
+  $ sudo apt-get install pound
+
+Set Varnish to listen in other port than 80:
+
+/etc/defaults/varnish
+---------------------
+
+  DAEMON_OPTS="-a localhost:6081 \
+               -T localhost:6082 \ 
+               -f /etc/varnish/default.vcl \ 
+               -S /etc/varnish/secret \ 
+               -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
+
+Configure Pound:
+
+    # cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
+
+Edit /etc/pound.cfg and set the IP and domain of your server.
+
+Configure Pound to start at system initialization:
+
+/etc/default/pound
+------------------
+
+  startup=1
+
+Set Apache to only listen to localhost:
+
+/etc/apache2/ports.conf
+-----------------------
+
+  Listen 127.0.0.1:8080
+
+Restart the services:
+
+  $ sudo service apache2 restart
+  $ sudo service varnish restart
+
+Start pound:
+
+  $ sudo service pound start
+
+[1] http://www.apsis.ch/pound
+
+Noosfero XMPP chat
+++++++++++++++++++
+
+If you want to use chat over HTTPS, then you should add the domain
+and IP of your server in the /etc/hosts file, example:
+
+/etc/hosts
+----------
+
+  192.168.1.86	mydomain.example.com
+
+Also, it's recomended that you remove lines above from the file
+`/etc/apache2/sites-enabled/noosfero`:
+
+    RewriteEngine On
+    Include /usr/share/noosfero/util/chat/apache/xmpp.conf
@@ -24,10 +24,6 @@ Install the RPAF apache module (or skip this step if not using apache):
 3b) Edit `/etc/apache2/sites-enabled/*`, and change `<VirtualHost *:80>` to `<VirtualHost *:8080>`
-3c) Restart apache
-
-    # invoke-rc.d apache2 restart
-
 4) Varnish configuration
 4a) Edit `/etc/default/varnish`
@@ -44,10 +40,6 @@ On manual installations, change `/etc/noosfero/*` to `{Rails.root}/etc/noosfero/
 **NOTE**: it is very important that the `*.vcl` files are included in that order, i.e. *first* include `varnish-noosfero.vcl`, and *after* `noosfero-accept-language.cvl`.
-4c) Restart Varnish
-
-    # invoke-rc.d varnish restart
-
 5) Enable varnish logging:
 5a) Edit `/etc/default/varnishncsa` and uncomment the line that contains:
@@ -56,8 +48,10 @@ On manual installations, change `/etc/noosfero/*` to `{Rails.root}/etc/noosfero/
 The varnish log will be written to `/var/log/varnish/varnishncsa.log` in an apache-compatible format. You should change your statistics generation software (e.g. awstats) to use that instead of apache logs.
-5b) Restart Varnish Logging service
+Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
-    # invoke-rc.d varnishncsa restart
+6) Restart services
-Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
+    # service apache2 restart
+    # service varnish restart
+    # service varnishncsa restart
 #!/usr/bin/env rake
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
@@ -143,6 +143,7 @@ class CmsController &lt; MyProfileController
     end
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
     @article.created_by = user
@@ -188,7 +189,18 @@ class CmsController &lt; MyProfileController
     end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
-        @uploaded_files << UploadedFile.create({:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user}, :without_protection => true) unless file == ''
+        unless file == ''
+          @uploaded_files << UploadedFile.create(
+            {
+              :uploaded_data => file,
+              :profile => profile,
+              :parent => @parent,
+              :last_changed_by => user,
+              :author => user,
+            },
+            :without_protection => true
+          )
+        end
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
@@ -232,7 +244,7 @@ class CmsController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
   end
   def publish
@@ -248,12 +260,15 @@ class CmsController &lt; MyProfileController
     end.compact unless params[:marked_groups].nil?
     if request.post?
       @failed = {}
+      if @marked_groups.empty?
+        return session[:notice] = _("Select some group to publish your article")
+      end
       @marked_groups.each do |item|
         task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
         begin
           task.finish unless item[:group].moderated_articles?
         rescue Exception => ex
-           @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
+          @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
         end
       end
       if @failed.blank?
@@ -11,7 +11,7 @@ class FriendsController &lt; MyProfileController
   def remove
     @friend = profile.friends.find(params[:id])
     if request.post? && params[:confirmation]
-      profile.remove_friend(@friend)
+      Friendship.remove_friendship(profile, @friend)
       redirect_to :action => 'index'
     end
   end
@@ -7,9 +7,9 @@ class MembershipsController &lt; MyProfileController
       ra = profile.role_assignments.find_by_role_id(role.id)
       ra.present? && ra.resource_type == 'Profile'
     end
-    @filter = params[:filter_type].blank? ? nil : params[:filter_type]
+    @filter = params[:filter_type].to_i
     begin
-      @memberships = @filter.nil? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
+      @memberships = @filter.zero? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
     rescue ActiveRecord::RecordNotFound
       @memberships = []
     end
@@ -54,7 +54,7 @@ class ProfileEditorController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
   end
   def header_footer
@@ -2,7 +2,7 @@ class AccountController &lt; ApplicationController
   no_design_blocks
-  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
+  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise, :change_password]
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
@@ -11,7 +11,7 @@ class CatalogController &lt; PublicController
   protected
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
+    unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -31,8 +31,8 @@ class ContentViewerController &lt; ApplicationController
     if request.post? && @page.forum?
       process_forum_terms_of_use(user, params[:terms_accepted])
-    elsif is_a_forum_topic?(@page)
-      redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
+    elsif is_a_forum_topic?(@page) && !@page.parent.agrees_with_terms?(user)
+      redirect_to @page.parent.url
       return
     end
@@ -74,7 +74,7 @@ class ContentViewerController &lt; ApplicationController
   end
   def versions_diff
-    path = params[:page].join('/')
+    path = params[:page]
     @page = profile.articles.find_by_path(path)
     @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
   end
@@ -216,6 +216,8 @@ class ContentViewerController &lt; ApplicationController
     if @page.has_posts?
       posts = get_posts(params[:year], params[:month])
+      posts = posts.includes(:parent, {:profile => [:domains, :environment]}, :author)
+
       #FIXME Need to run this before the pagination because this version of
       #      will_paginate returns a will_paginate collection instead of a
       #      relation.
@@ -51,7 +51,7 @@ class ProfileController &lt; PublicController
   def communities
     if is_cache_expired?(profile.communities_cache_key(params))
-      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count)
     end
   end
@@ -202,7 +202,8 @@ class ProfileController &lt; PublicController
   end
   def more_comments
-    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile}
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity]}.merge(profile_filter))
     comments_count = activity.comments.count
     comment_page = (params[:comment_page] || 1).to_i
     comments_per_page = 5
@@ -312,13 +312,13 @@ module ApplicationHelper
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
-  def view_for_profile_actions(klass)
-    raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
-
-    name = klass.name.underscore
-    return "blocks/profile_info_actions/" + name + '.html.erb' if File.exists?(Rails.root.join('app', 'views', 'blocks', 'profile_info_actions', name + '.html.erb'))
-
-    view_for_profile_actions(klass.superclass)
+  def render_profile_actions klass
+    name = klass.to_s.underscore
+    begin
+      render "blocks/profile_info_actions/#{name}"
+    rescue ActionView::MissingTemplate
+      render_profile_actions klass.superclass
+    end
   end
   def user
@@ -671,7 +671,7 @@ module ApplicationHelper
   def theme_javascript_ng
     script = File.join(theme_path, 'theme.js')
-    if File.join(Rails.root, 'public', script)
+    if File.exists?(File.join(Rails.root, 'public', script))
       javascript_include_tag script
     else
       nil
@@ -1095,7 +1095,7 @@ module ApplicationHelper
     result
   end
-  def manage_link(list, kind)
+  def manage_link(list, kind, title)
     if list.present?
       link_to_all = nil
       if list.count > 5
@@ -1108,19 +1108,19 @@ module ApplicationHelper
       if link_to_all
         link << link_to_all
       end
-      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s, :title => title}
     end
   end
   def manage_enterprises
     return '' unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
-    manage_link(user.enterprises, :enterprises).to_s
+    manage_link(user.enterprises, :enterprises, _('My enterprises')).to_s
   end
   def manage_communities
     return '' unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
     administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
-    manage_link(administered_communities, :communities).to_s
+    manage_link(administered_communities, :communities, _('My communities')).to_s
   end
   def admin_link
@@ -1223,22 +1223,9 @@ module ApplicationHelper
   end
   def add_zoom_to_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();
-      });
-    });" % _('Zoom in'))
+    stylesheet_link_tag('jquery.fancybox') +
+    javascript_include_tag('jquery.fancybox.pack') +
+    javascript_tag("apply_zoom_to_images(#{_('Zoom in').to_json})")
   end
   def render_dialog_error_messages(instance_name)
@@ -1373,7 +1360,7 @@ module ApplicationHelper
       @message = _("The content here is available to %s's friends only.") % profile.short_name
     else
       @action = :join
-      @message = _('The contents in this community is available to members only.')
+      @message = _('The contents in this profile is available to members only.')
     end
     @no_design_blocks = true
   end
@@ -6,19 +6,20 @@ module BlockHelper
     content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
-  def highlights_block_config_image_fields(block, image={})
+  def highlights_block_config_image_fields(block, image={}, row_number=nil)
     "
-    <tr class=\"image-data-line\">
+    <tr class=\"image-data-line\" data-row-number='#{row_number}'>
       <td>
         #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
       </td>
       <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
       <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
-    </tr><tr class=\"image-title\">
+    </tr><tr class=\"image-title\" data-row-number='#{row_number}'>
       <td colspan=\"3\"><label>#{
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
+      <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>
     </tr>
     "
   end
@@ -17,13 +17,13 @@ module BlogHelper
     _('Configure blog')
   end
-  def list_posts(articles, format = 'full')
+  def list_posts(articles, format = 'full', paginate = true)
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
       :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
-    }) if articles.present?
+    }) if articles.present? && paginate
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
@@ -45,9 +45,9 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
+    title = article_title(article, :no_comments => no_comments)
     html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
-
-    article_title(article, :no_comments => no_comments) + html
+    title + html
   end
   def display_full_format(article)
@@ -10,7 +10,7 @@ module ContentViewerHelper
   end
   def number_of_comments(article)
-    display_number_of_comments(article.comments.without_spam.count)
+    display_number_of_comments(article.comments_count - article.spam_comments_count)
   end
   def article_title(article, args = {})
@@ -26,7 +26,7 @@ module ContentViewerHelper
       end
       title << content_tag('span',
         content_tag('span', show_date(article.published_at), :class => 'date') +
-        content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +
+        content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
       )
@@ -5,15 +5,17 @@ module FolderHelper
   include ShortFilename
   include ArticleHelper
-  def list_articles(articles, recursive = false)
-    if !articles.blank?
-      articles = articles.paginate(
+  def list_contents(configure={})
+    configure[:recursive] ||= false
+    configure[:list_type] ||= :folder
+    if !configure[:contents].blank?
+      configure[:contents] = configure[:contents].paginate(
         :order => "updated_at DESC",
         :per_page => 10,
         :page => params[:npage]
       )
-      render :file => 'shared/articles_list', :locals => {:articles => articles, :recursive => recursive}
+      render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
     end
@@ -23,21 +25,33 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  def display_article_in_listing(article, recursive = false, level = 0)
-    article = FilePresenter.for article
-    article_link = if article.image?
-         link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
+  def display_content_in_listing(configure={})
+    recursive = configure[:recursive] || false
+    list_type = configure[:list_type] || :folder
+    level = configure[:level] || 0
+    content = FilePresenter.for configure[:content]
+    content_link = if content.image?
+         link_to('&nbsp;' * (level * 4) +
+           image_tag(icon_for_article(content)) + short_filename(content.name),
+           content.url.merge(:view => true)
+         )
        else
-         link_to('&nbsp;' * (level * 4) + short_filename(article.name), article.url.merge(:view => true), :class => icon_for_article(article))
+         link_to('&nbsp;' * (level * 4) +
+           short_filename(content.name),
+           content.url.merge(:view => true), :class => icon_for_article(content)
+         )
        end
     result = content_tag(
       'tr',
-      content_tag('td', article_link )+
-      content_tag('td', show_date(article.updated_at), :class => 'last-update'),
-      :class => 'sitemap-item'
+      content_tag('td', content_link ) +
+      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
+      :class => "#{list_type}-item"
     )
     if recursive
-      result + article.children.map {|item| display_article_in_listing(item, recursive, level + 1) }.join('')
+      result + content.children.map {|item|
+        display_content_in_listing :content=>item, :recursive=>recursive,
+                                   :list_type=>list_type, :level=>level+1
+      }.join("\n")
     else
       result
     end
@@ -2,7 +2,7 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
-  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link
+  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link, :image_builder
   acts_as_having_image
@@ -40,6 +40,12 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
+  before_create do |article|
+    if article.author
+      article.author_name = article.author.name
+    end
+  end
+
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -48,6 +54,7 @@ class Article &lt; ActiveRecord::Base
   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 :author, :class_name => 'Person'
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
@@ -456,10 +463,10 @@ class Article &lt; ActiveRecord::Base
     ['TextArticle', 'TextileArticle', 'TinyMceArticle']
   end
-  scope :published, :conditions => { :published => true }
-  scope :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
-  scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.folder_types]}}
-  scope :galleries, :conditions => { :type => 'Gallery' }
+  scope :published, :conditions => ['articles.published = ?', true]
+  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
+  scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
+  scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
   scope :images, :conditions => { :is_image => true }
   scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
   scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
@@ -469,7 +476,7 @@ class Article &lt; ActiveRecord::Base
   scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
-    return {:conditions => ['published = ?', true]} if !user
+    return {:conditions => ['articles.published = ?', true]} if !user
     {:conditions => ["  articles.published = ? OR
                         articles.last_changed_by_id = ? OR
                         articles.profile_id = ? OR
@@ -496,6 +503,7 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_post_content?(user = nil)
+    return true if allow_edit_topic?(user)
     user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == author))
   end
@@ -515,9 +523,14 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_edit?(user)
+    return true if allow_edit_topic?(user)
     allow_post_content?(user) || user && allow_members_to_edit && user.is_member_of?(profile)
   end
+  def allow_edit_topic?(user)
+    self.belongs_to_forum? && (user == author) && user.present? && user.is_member_of?(profile)
+  end
+
   def moderate_comments?
     moderate_comments == true
   end
@@ -632,35 +645,36 @@ class Article &lt; ActiveRecord::Base
     can_display_versions? && display_versions
   end
-  def author(version_number = nil)
-    if version_number
-      version = self.versions.find_by_version(version_number)
-      author_id = version.last_changed_by_id if version
-    else
-      author_id = self.created_by_id
-    end
+  def get_version(version_number = nil)
+    version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest
+  end
-    environment.people.find_by_id(author_id)
+  def author_by_version(version_number = nil)
+    version_number ? profile.environment.people.find_by_id(get_version(version_number).author_id) : author
   end
   def author_name(version_number = nil)
-    person = author(version_number)
-    person ? person.name : (setting[:author_name] || _('Unknown'))
+    person = author_by_version(version_number)
+    if version_number
+      person ? person.name : _('Unknown')
+    else
+      person ? person.name : (setting[:author_name] || _('Unknown'))
+    end
   end
   def author_url(version_number = nil)
-    person = author(version_number)
+    person = author_by_version(version_number)
     person ? person.url : nil
   end
   def author_id(version_number = nil)
-    person = author(version_number)
+    person = author_by_version(version_number)
     person ? person.id : nil
   end
   def version_license(version_number = nil)
     return license if version_number.nil?
-    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
+    profile.environment.licenses.find_by_id(get_version(version_number).license_id)
   end
   alias :active_record_cache_key :cache_key
@@ -22,6 +22,10 @@ class Block &lt; ActiveRecord::Base
     false
   end
+  def get_limit
+    [0,limit].max
+  end
+
   def embed_code
     me = self
     proc do
@@ -109,14 +109,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
   include Spammable
+  include CacheCounterHelper
   def after_spam!
     SpammerLogger.log(ip_address, self)
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+    update_cache_counter(:spam_comments_count, source, 1) if source.kind_of?(Article)
   end
   def after_ham!
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+    update_cache_counter(:spam_comments_count, source, -1) if source.kind_of?(Article)
   end
   def verify_and_notify
@@ -2,7 +2,7 @@ require &#39;noosfero/multi_tenancy&#39;
 class Domain < ActiveRecord::Base
-  attr_accessible :name, :owner
+  attr_accessible :name, :owner, :is_default
   # relationships
   ###############
@@ -25,7 +25,10 @@ class Enterprise &lt; Organization
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
   settings_items :organization_website, :historic_and_current_context, :activities_short_description
+
   settings_items :products_per_catalog_page, :type => :integer, :default => 6
+  alias_method :products_per_catalog_page_before_type_cast, :products_per_catalog_page
+  validates_numericality_of :products_per_catalog_page, :allow_nil => true, :greater_than => 0
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -286,7 +286,7 @@ class Environment &lt; ActiveRecord::Base
     www.youtube.com
   ] + ('a' .. 'z').map{|i| "#{i}.yimg.com"}
-  settings_items :enabled_plugins, :type => Array, :default => []
+  settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
   settings_items :search_hints, :type => Hash, :default => {}
 class FeaturedProductsBlock < Block
+  attr_accessible :product_ids, :groups_of, :speed, :reflect
+
   settings_items :product_ids, :type => Array, :default => []
   settings_items :groups_of, :type => :integer, :default => 3
   settings_items :speed, :type => :integer, :default => 1000
@@ -15,4 +15,9 @@ class Friendship &lt; ActiveRecord::Base
     Friendship.update_cache_counter(:friends_count, friendship.person, -1)
     Friendship.update_cache_counter(:friends_count, friendship.friend, -1)
   end
+
+  def self.remove_friendship(person1, person2)
+    person1.remove_friend(person2)
+    person2.remove_friend(person1)
+  end
 end
 class HighlightsBlock < Block
-  attr_accessible :images
+  attr_accessible :images, :interval, :shuffle, :navigation
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
 class LocationBlock < Block
+  attr_accessible :zoom, :map_type
+
   settings_items :zoom, :type => :integer, :default => 4
   settings_items :map_type, :type => :string, :default => 'roadmap'
@@ -82,7 +82,7 @@ class PersonNotifier
       @url = @profile.environment.top_url
       mail(
         content_type: "text/html",
-        from: "#{@profile.environment.name} <#{@profile.environment.contact_email}>",
+        from: "#{@profile.environment.name} <#{@profile.environment.noreply_email}>",
         to: @profile.email,
         subject: _("[%s] Network Activity") % [@profile.environment.name]
       )
@@ -11,7 +11,7 @@ class Product &lt; ActiveRecord::Base
   SEARCH_DISPLAYS = %w[map full]
-  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers
+  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs
   def self.default_search_display
     'full'
@@ -17,7 +17,7 @@ class ProductCategoriesBlock &lt; Block
     profile = owner
     proc do
       if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level().order(:name)
+        categories = ProductCategory.on_level(nil).order(:name)
         if @categories and @categories.length == 0
           notice = _('There are no sub-categories for %s') % @category.name
         end
@@ -33,7 +33,7 @@ class ProductCategoriesBlock &lt; Block
     end
   end
-  DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')
+  DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
   def display
     settings[:display].nil? ? 'catalog_only' : super
@@ -49,17 +49,10 @@ class ProductsBlock &lt; Block
   def products(reload = false)
     if product_ids.blank?
-      products_list = owner.products(reload)
-      result = []
-      [4, products_list.size].min.times do
-        p = products_list.sample
-        result << p
-        products_list -= [p]
-      end
-      result
+      owner.products.order('RANDOM()').limit([4,owner.products.count].min)
     else
-      product_ids.map {|item| owner.products.find(item) }
-    end
+      owner.products.where(:id => product_ids)
+    end.compact
   end
 end
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
 class ProfileListBlock < Block
-  attr_accessible :limit, :prioritize_profiles_with_image
+  attr_accessible :prioritize_profiles_with_image
   settings_items :limit, :type => :integer, :default => 6
   settings_items :prioritize_profiles_with_image, :type => :boolean, :default => true
@@ -18,13 +18,13 @@ class ProfileListBlock &lt; Block
     result = nil
     visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = visible_profiles.all(:limit => limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
-    elsif profiles.visible.with_image.count >= limit
-      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = visible_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
+    elsif profiles.visible.with_image.count >= get_limit
+      result = visible_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     else
-      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     end
-    result.slice(0..limit-1)
+    result.slice(0..get_limit-1)
   end
   def profile_count
@@ -33,7 +33,7 @@ class RecentDocumentsBlock &lt; Block
   end
   def docs
-    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
+    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.get_limit, {}, false)
   end
   def self.expire_on
 class RssFeed < Article
-  attr_accessible :limit, :enabled, :language, :include
+  attr_accessible :limit, :enabled, :language, :include, :feed_item_description
   def self.type_name
     _('RssFeed')
@@ -6,6 +6,8 @@ class SlideshowBlock &lt; Block
   settings_items :navigation, :type => 'boolean', :default => false
   settings_items :image_size, :type => 'string', :default => 'thumb'
+  attr_accessible :gallery_id, :image_size, :interval, :shuffle, :navigation
+
   def self.description
     _('Slideshow')
   end
@@ -5,7 +5,7 @@ require &#39;user_activation_job&#39;
 # Rails generator.
 class User < ActiveRecord::Base
-  attr_accessible :login, :email, :password, :password_confirmation
+  attr_accessible :login, :email, :password, :password_confirmation, :activated_at
   N_('Password')
   N_('Password confirmation')
@@ -11,4 +11,9 @@ class FilePresenter::Image &lt; FilePresenter
   def short_description
     _('Image (%s)') % content_type.split('/')[1].upcase
   end
+
+  #Overwriting method from FilePresenter to allow download of images
+  def download?(view = nil)
+    view.blank? || view == 'false'
+  end
 end
@@ -136,8 +136,6 @@
 <script type="text/javascript">
 jQuery(function($) {
-  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
-
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
     $(this).bind('blur', function() {
       if ($(this).val() == '') {
 <%= block_title(title) %>
-<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
+<%= render_profile_actions owner.class %>
 <ul>
   <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
@@ -11,5 +11,5 @@
 </ul>
 <div class="my-network-actions">
-  <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
+  <%= render 'blocks/profile_info_actions/' + owner.class.name.underscore %>
 </div>
@@ -23,6 +23,6 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(block.owner.class) %>
+  <%= render_profile_actions block.owner.class %>
 </div>
 </div><!-- end class="vcard" -->
@@ -40,7 +40,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(block.owner.class) %>
+  <%= render_profile_actions block.owner.class %>
 </div>
 </div><!-- end class="vcard" -->
@@ -0,0 +1,20 @@
+<ul>
+  <li>
+    <%= render "blocks/profile_info_actions/join_leave_community" %>
+  </li>
+  <% if logged_in? %>
+    <% if profile.enable_contact? %>
+      <li>
+      <%= link_to content_tag('span', _('Send an e-mail')),
+        { :profile => profile.identifier,
+          :controller => 'contact',
+          :action => 'new' },
+        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
+      </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+
+    <%= render_environment_features(:profile_actions) %>
+  <% end %>
+</ul>
@@ -0,0 +1,12 @@
+<ul>
+  <%if logged_in? %>
+    <%if !user.favorite_enterprises.include?(profile) %>
+      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
+    <% end %>
+  <% end %>
+  <% if profile.enable_contact? %>
+    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
+  <% end %>
+
+  <li><%= report_abuse(profile, :button) %></li>
+</ul>
@@ -0,0 +1,16 @@
+<ul>
+  <%if logged_in? && (user != profile) %>
+
+    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
+      <li>
+      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      </li>
+    <% end %>
+
+    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
+      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+  <% end %>
+</ul>
@@ -1,20 +0,0 @@
-<ul>
-  <li>
-    <%= render "blocks/profile_info_actions/join_leave_community" %>
-  </li>
-  <% if logged_in? %>
-    <% if profile.enable_contact? %>
-      <li>
-      <%= link_to content_tag('span', _('Send an e-mail')),
-        { :profile => profile.identifier,
-          :controller => 'contact',
-          :action => 'new' },
-        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
-      </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-
-    <%= render_environment_features(:profile_actions) %>
-  <% end %>
-</ul>
@@ -1,12 +0,0 @@
-<ul>
-  <%if logged_in? %>
-    <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
-    <% end %>
-  <% end %>
-  <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
-  <% end %>
-
-  <li><%= report_abuse(profile, :button) %></li>
-</ul>
@@ -1,16 +0,0 @@
-<ul>
-  <%if logged_in? && (user != profile) %>
-
-    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
-      <li>
-      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
-      </li>
-    <% end %>
-
-    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
-      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-  <% end %>
-</ul>
+<%= javascript_include_tag "highlight_block" %>
+
 <strong><%= _('Highlights') %></strong>
 <table class="noborder"><tbody id="highlights-data-table">
   <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
-  <% for image in @block.images do %>
-    <%= highlights_block_config_image_fields @block, image %>
+  <% @block.images.each_with_index do |image, index| %>
+    <%= highlights_block_config_image_fields @block, image, index %>
   <% end %>
 </tbody></table>
-<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
-  page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
-end %>
+<table class="hidden highlight-table-row">
+  <tbody>
+    <%= highlights_block_config_image_fields(@block) %>
+  </tbody>
+</table>
+
+<%= link_to(_('New highlight'), '#', :class => 'button icon-add with-text new-highlight-button')%>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
@@ -25,7 +25,9 @@
   <div id='article-full-path'>
     <strong><%= _('Current folder: ') %></strong>
     <%= link_to profile.identifier, :action => 'index' %>
-    <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %>
+    <% @article.hierarchy.each do |item| %>
+      <%= " / " + ((item == @article) ? item.name.html_safe : link_to(item.slug, :id => item.id).html_safe) %>
+    <% end %>
   </div>
 <% end %>
@@ -31,7 +31,7 @@ function check_captcha(button, confirm_action) {
   return true;
   <% else %>
   jQuery('#recaptcha-container').show();
-  jQuery.colorbox({ inline : true, href : '#recaptcha-container', maxWidth : '600px', maxHeight : '300px' });
+  jQuery.colorbox({ html: jQuery('#recaptcha-container').html(), maxWidth : '600px', maxHeight : '300px' });
   jQuery('#confirm-captcha').unbind('click');
   jQuery('#confirm-captcha').bind('click', function() {
     jQuery.colorbox.close();
@@ -1,19 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
-
-<%= word_wrap(_('Title: %s') % @comment_title) %>
-
-<%= _("Comment:") %>
--------------------------------------------------------------------------------
-<%= word_wrap(@comment_body) %>
--------------------------------------------------------------------------------
-
-<%= _('Access the address below to view this comment:') %>
-<%= url_for @comment_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,19 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Access the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
 <div class="article-versions">
-  <%= button(:back, _('Go back to latest version'), {:action => 'view_page'}) %>
+  <%= button(:back, _('Go back to latest version'), @page.url) %>
 </div>
 <%= article_title(@page, :no_link => true) %>
 <p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
-<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}, :method => 'get') do %>
+<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path}, :method => 'get') do %>
   <ul id="article-versions">
     <% @versions.each do |v| %>
       <li>
@@ -9,13 +9,15 @@
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
+  <% paginate = true %>
   <%=
    posts = @posts
    format = blog.visualization_format
    if inside_block
      posts = blog.posts.paginate(:page=>1, :per_page=>inside_block.posts_per_page)
      format = inside_block.visualization_format
+     paginate = false
    end
-   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format))
+   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format, paginate))
   %>
 </div>
@@ -8,5 +8,5 @@
 <% if folder.children.empty? %>
   <em><%= _('(empty folder)') %></em>
 <% else %>
-  <%= list_articles(folder.children) %>
+  <%= list_contents(:contents=>folder.children) %>
 <% end %>
@@ -23,7 +23,6 @@
   <p id="no-current-version">
     <%= _('This is not the latest version of this content.') %>
   </p>
-</div>
   <% version_license = @page.version_license(@version) %>
   <%# This seemingly doubled verification exists because the article-sub-header
@@ -40,8 +40,6 @@
   </div>
 <% end %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -80,8 +78,8 @@
     </h3>
   <% end %>
-  <% if @page.accept_comments? && @comments.present? && @comments.count > 1 %>
-    <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
+  <% if @comments.present? && @comments.count > 1 %>
+    <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") if @page.accept_comments? %>
     <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %>
     <%= javascript_include_tag "comment_order.js" %>
@@ -90,12 +88,14 @@
         <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
       <% end %>
     </div>
+  <% end %>
-    <ul class="article-comments-list">
+  <ul class="article-comments-list">
+    <% if @comments.present? %>
       <%= render :partial => 'comment/comment', :collection => @comments %>
       <%= pagination_links @comments, :param_name => 'comment_page' %>
-    </ul>
-  <% end %>
+    <% end %>
+  </ul>
   <% if @page.accept_comments? %>
     <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
@@ -8,11 +8,12 @@
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
-<% type_collection = [[nil, _('All')]] %>
+<% type_collection = [[0, _('All')]] %>
 <% type_collection += @roles.sort_by {|role| role.id}.map{|r| ["#{r.id}", r.name]} %>
+<%= javascript_include_tag "memberships_filter.js" %>
 <p>
-  <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+  <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :id => 'memberships_filter')%>
 </p>
 <% if @memberships.empty? %>
@@ -1,25 +0,0 @@
-<%= _("Dear %s") % @person.name %>,
-
-<%= _("You have %d pending task(s).") % @tasks.size %>
-
-<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
-
-<%= _("Click in address below to process task(s):") %>
-
-<%= @url_for_pending_tasks %>
-<% @organizations_with_pending_tasks.each do |organization| %>
-<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
-<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
-
-<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
-
-<%= _("Click in address below to process task(s):") %>
-
-<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
-<% end %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1,25 @@
+<%= _("Dear %s") % @person.name %>,
+
+<%= _("You have %d pending task(s).") % @tasks.size %>
+
+<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
+
+<%= _("Click in address below to process task(s):") %>
+
+<%= @url_for_pending_tasks %>
+<% @organizations_with_pending_tasks.each do |organization| %>
+<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
+<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
+
+<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
+
+<%= _("Click in address below to process task(s):") %>
+
+<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
+<% end %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <h1><%= h profile.name %></h1>
 <% if @action %>
@@ -19,7 +17,7 @@
   <table class='profile'>
     <tr>
       <td colspan='2'>
-        <% plugins_tabs = @plugins.dispatch(:profile_tabs).map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_exec(&tab[:content]), :start => tab[:title]} }%>
+        <% plugins_tabs = @plugins.dispatch(:profile_tabs).map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_exec(&tab[:content]), :start => tab[:start]} }%>
         <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
 <h1><%= _("%s: site map") % profile.name %></h1>
-<%= list_articles(available_articles(@articles, user), false) %>
+<%= list_contents :contents=>available_articles(@articles, user), :list_type=>:sitemap %>
@@ -24,7 +24,7 @@
   <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
-  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
+  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') if user.is_admin?(environment) || (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))  %>
   <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
@@ -1,16 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
-
--------------------------------------------------------------------------------
-<%= word_wrap(@scrap_content) %>
--------------------------------------------------------------------------------
-
-<%= _('View this scrap on the wall') %>:
-<%= url_for @wall_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,16 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
+
+-------------------------------------------------------------------------------
+<%= word_wrap(@scrap_content) %>
+-------------------------------------------------------------------------------
+
+<%= _('View this scrap on the wall') %>:
+<%= url_for @wall_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -1,10 +0,0 @@
-<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
-  <div id='profile-disabled'>
-    <%= environment.message_for_disabled_enterprise %>
-    <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
-      <div class='unlock-button'>
-        <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
 <div id=<%= "manage-#{kind}" %> class="manage-groups">
-  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % _(kind) %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + title %></strong></a>
   <ul class="simplemenu-submenu">
     <% link.each do |link| %>
       <li class="simplemenu-item"><%= link %></li>
@@ -1,14 +0,0 @@
-<table>
-
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
-  <% articles.each do |article| %>
-    <% if article.display_to?(user) %>
-      <%= display_article_in_listing(article, recursive, 0) %>
-    <% end %>
-  <% end %>
-</table>
-
-<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
@@ -0,0 +1,13 @@
+<table class="<%= list_type %>-content">
+  <tr>
+    <th><%= _('Title') %></th>
+    <th><%= _('Last update') %></th>
+  </tr>
+  <% contents.each do |content| %>
+    <% if content.display_to?(user) %>
+      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
+    <% end %>
+  <% end %>
+</table>
+
+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
 <%
   content = render :partial => 'shared/select_categories',
-      :locals => {:object_name => 'article', :multiple => true}, :layout => false
+      :locals => {:object_name => object_name, :multiple => true}, :layout => false
 %>
 jQuery('#select-categories').html('<%= j(content) %>');
@@ -1 +0,0 @@
-<%= @message %>
 \ No newline at end of file
@@ -0,0 +1 @@
+<%= @message %>
 \ No newline at end of file
@@ -1,10 +0,0 @@
-<%= _('Hello %s,') % @target %>
-
-<%= word_wrap(@message) %>
-
-<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
-<%= @tasks_url %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1,10 @@
+<%= _('Hello %s,') % @target %>
+
+<%= word_wrap(@message) %>
+
+<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
+<%= @tasks_url %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -0,0 +1 @@
+task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
 \ No newline at end of file
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1 @@
+task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,9 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -1,12 +0,0 @@
-<%= _('Hello %s,') % @name  %>
-
-<%= _('Your email %s was just activated.') % [@email] %>
-
-<%= _('You can access your e-mail from anywhere, using the following address:') %>
-<%= @webmail %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1,12 @@
+<%= _('Hello %s,') % @name  %>
+
+<%= _('Your email %s was just activated.') % [@email] %>
+
+<%= _('You can access your e-mail from anywhere, using the following address:') %>
+<%= @webmail %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -0,0 +1,3 @@
+Plugins in this directory are enabled by default, and cannot be disabled at the
+system level. Each environment admistrator can still disable it in the web UI,
+though.
@@ -0,0 +1 @@
+../plugins/people_block
 \ No newline at end of file
 # Load the rails application
 require File.expand_path('../application', __FILE__)
+#FIXME Necessary hack to avoid the need of downgrading rubygems on rails 2.3.5
+# http://stackoverflow.com/questions/5564251/uninitialized-constant-activesupportdependenciesmutex
+require 'thread'
+
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 #ENV['RAILS_ENV'] ||= 'production'
 unless NOOSFERO_CONF['exception_recipients'].blank?
-  require 'noosfero.rb'
-  require 'exception_notification.rb'
-  ExceptionNotifier.sender_address = "noreply@#{Noosfero.default_hostname}"
-  ExceptionNotifier.email_prefix = "[Noosfero ERROR] "
-  ExceptionNotifier.exception_recipients = NOOSFERO_CONF['exception_recipients']
-  ActionController::Base.send :include, ExceptionNotifiable
+  Noosfero::Application.config.middleware.use ExceptionNotification::Rack,
+    :email => {
+      :sender_address => "noreply@#{Noosfero.default_hostname}",
+      :email_prefix => "[Noosfero ERROR] ",
+      :exception_recipients => NOOSFERO_CONF['exception_recipients']
+    }
 end
@@ -1 +0,0 @@
-../../plugins/people_block
 \ No newline at end of file
@@ -131,7 +131,7 @@ Noosfero::Application.routes.draw do
   match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # match requests for profiles that don't have a custom domain
@@ -0,0 +1,17 @@
+class IndexFilteredFieldsOnTask < ActiveRecord::Migration
+  def self.up
+    add_index :tasks, :requestor_id
+    add_index :tasks, :target_id
+    add_index :tasks, :target_type
+    add_index :tasks, [:target_id, :target_type]
+    add_index :tasks, :status
+  end
+
+  def self.down
+    remove_index :tasks, :requestor_id
+    remove_index :tasks, :target_id
+    remove_index :tasks, :target_type
+    remove_index :tasks, [:target_id, :target_type]
+    remove_index :tasks, :status
+  end
+end
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+--ignore-dir=log
	2	+--ignore-dir=tmp
	3	+--ignore-dir=pkg
	@@ -61,7 +61,10 @@ GEM		@@ -61,7 +61,10 @@ GEM
61	database_cleaner (1.2.0)	61	database_cleaner (1.2.0)
62	diff-lcs (1.1.3)	62	diff-lcs (1.1.3)
63	erubis (2.7.0)	63	erubis (2.7.0)
64	- eventmachine (0.12.11)	64	+ eventmachine (0.12.10)
		65	+ exception_notification (4.0.1)
		66	+ actionmailer (>= 3.0.4)
		67	+ activesupport (>= 3.0.4)
65	fast_gettext (0.6.8)	68	fast_gettext (0.6.8)
66	ffi (1.0.11)	69	ffi (1.0.11)
67	gherkin (2.4.21)	70	gherkin (2.4.21)
	@@ -111,6 +114,8 @@ GEM		@@ -111,6 +114,8 @@ GEM
111	thor (>= 0.14.6, < 2.0)	114	thor (>= 0.14.6, < 2.0)
112	rake (0.9.2.2)	115	rake (0.9.2.2)
113	rdoc (3.9.4)	116	rdoc (3.9.4)
		117	+ rest-client (1.6.7)
		118	+ mime-types (>= 1.16)
114	rmagick (2.13.1)	119	rmagick (2.13.1)
115	rspec (2.10.0)	120	rspec (2.10.0)
116	rspec-core (~> 2.10.0)	121	rspec-core (~> 2.10.0)
	@@ -165,6 +170,7 @@ DEPENDENCIES		@@ -165,6 +170,7 @@ DEPENDENCIES
165	daemons	170	daemons
166	dalli	171	dalli
167	database_cleaner	172	database_cleaner
		173	+ exception_notification
168	fast_gettext	174	fast_gettext
169	hpricot	175	hpricot
170	mocha	176	mocha
	@@ -175,6 +181,7 @@ DEPENDENCIES		@@ -175,6 +181,7 @@ DEPENDENCIES
175	rails	181	rails
176	rails_autolink	182	rails_autolink
177	rake	183	rake
		184	+ rest-client
178	rmagick	185	rmagick
179	rspec	186	rspec
180	rspec-rails	187	rspec-rails
@@ -0,0 +1,115 @@		@@ -0,0 +1,115 @@
	1	+Setup Noosfero to use HTTPS
	2	+===========================
	3	+
	4	+This document assumes that you have a fully and clean Noosfero
	5	+installation as explained at the `INSTALL.md` file.
	6	+
	7	+SSL certificate
	8	++++++++++++++++
	9	+
	10	+You should get a valid SSL certificate, but if you want to test
	11	+your setup before, you could generate a self-signed certificate
	12	+as below:
	13	+
	14	+ # mkdir /etc/noosfero/ssl
	15	+ # cd /etc/noosfero/ssl
	16	+ # openssl genrsa 1024 > noosfero.key
	17	+ # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
	18	+ # cat noosfero.key noosfero.cert > noosfero.pem
	19	+
	20	+There are two ways of using SSL with Noosfero: 1) If you are not using
	21	+Varnish; and 2) If you are using Varnish.
	22	+
	23	+1) If you are are not using Varnish
	24	++++++++++++++++++++++++++++++++++++
	25	+
	26	+Simply do a redirect in apache to force all connections with SSL:
	27	+
	28	+ <VirtualHost *:8080>
	29	+ ServerName test.stoa.usp.br
	30	+
	31	+ Redirect / https://example.com/
	32	+ </VirtualHost>
	33	+
	34	+And set a vhost to receive then:
	35	+
	36	+ <VirtualHost *:443>
	37	+ ServerName example.com
	38	+
	39	+ SSLEngine On
	40	+ SSLCertificateFile /etc/ssl/certs/cert.pem
	41	+ SSLCertificateKeyFile /etc/ssl/private/cert.key
	42	+
	43	+ Include /etc/noosfero/apache/virtualhost.conf
	44	+ </VirtualHost>
	45	+
	46	+Be aware that if you had configured varnish, the requests won't reach
	47	+it with this configuration.
	48	+
	49	+2) If you are using Varnish
	50	++++++++++++++++++++++++++++
	51	+
	52	+Varnish isn't able to communicate with the SSL protocol, so we will
	53	+need some one who do this and Pound[1] can do the job. In order to
	54	+install it in Debian based systems:
	55	+
	56	+ $ sudo apt-get install pound
	57	+
	58	+Set Varnish to listen in other port than 80:
	59	+
	60	+/etc/defaults/varnish
	61	+---------------------
	62	+
	63	+ DAEMON_OPTS="-a localhost:6081 \
	64	+ -T localhost:6082 \
	65	+ -f /etc/varnish/default.vcl \
	66	+ -S /etc/varnish/secret \
	67	+ -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
	68	+
	69	+Configure Pound:
	70	+
	71	+ # cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
	72	+
	73	+Edit /etc/pound.cfg and set the IP and domain of your server.
	74	+
	75	+Configure Pound to start at system initialization:
	76	+
	77	+/etc/default/pound
	78	+------------------
	79	+
	80	+ startup=1
	81	+
	82	+Set Apache to only listen to localhost:
	83	+
	84	+/etc/apache2/ports.conf
	85	+-----------------------
	86	+
	87	+ Listen 127.0.0.1:8080
	88	+
	89	+Restart the services:
	90	+
	91	+ $ sudo service apache2 restart
	92	+ $ sudo service varnish restart
	93	+
	94	+Start pound:
	95	+
	96	+ $ sudo service pound start
	97	+
	98	+[1] http://www.apsis.ch/pound
	99	+
	100	+Noosfero XMPP chat
	101	+++++++++++++++++++
	102	+
	103	+If you want to use chat over HTTPS, then you should add the domain
	104	+and IP of your server in the /etc/hosts file, example:
	105	+
	106	+/etc/hosts
	107	+----------
	108	+
	109	+ 192.168.1.86 mydomain.example.com
	110	+
	111	+Also, it's recomended that you remove lines above from the file
	112	+`/etc/apache2/sites-enabled/noosfero`:
	113	+
	114	+ RewriteEngine On
	115	+ Include /usr/share/noosfero/util/chat/apache/xmpp.conf
1	#!/usr/bin/env rake	1	#!/usr/bin/env rake
		2	+
2	# Add your own tasks in files placed in lib/tasks ending in .rake,	3	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.	4	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4		5
	@@ -11,7 +11,7 @@ class FriendsController < MyProfileController		@@ -11,7 +11,7 @@ class FriendsController < MyProfileController
11	def remove	11	def remove
12	@friend = profile.friends.find(params[:id])	12	@friend = profile.friends.find(params[:id])
13	if request.post? && params[:confirmation]	13	if request.post? && params[:confirmation]
14	- profile.remove_friend(@friend)	14	+ Friendship.remove_friendship(profile, @friend)
15	redirect_to :action => 'index'	15	redirect_to :action => 'index'
16	end	16	end
17	end	17	end
	@@ -7,9 +7,9 @@ class MembershipsController < MyProfileController		@@ -7,9 +7,9 @@ class MembershipsController < MyProfileController
7	ra = profile.role_assignments.find_by_role_id(role.id)	7	ra = profile.role_assignments.find_by_role_id(role.id)
8	ra.present? && ra.resource_type == 'Profile'	8	ra.present? && ra.resource_type == 'Profile'
9	end	9	end
10	- @filter = params[:filter_type].blank? ? nil : params[:filter_type]	10	+ @filter = params[:filter_type].to_i
11	begin	11	begin
12	- @memberships = @filter.nil? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))	12	+ @memberships = @filter.zero? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
13	rescue ActiveRecord::RecordNotFound	13	rescue ActiveRecord::RecordNotFound
14	@memberships = []	14	@memberships = []
15	end	15	end
	@@ -54,7 +54,7 @@ class ProfileEditorController < MyProfileController		@@ -54,7 +54,7 @@ class ProfileEditorController < MyProfileController
54	@current_category = Category.find(params[:category_id])	54	@current_category = Category.find(params[:category_id])
55	@categories = @current_category.children	55	@categories = @current_category.children
56	end	56	end
57	- render :template => 'shared/update_categories', :locals => { :category => @current_category }	57	+ render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
58	end	58	end
59		59
60	def header_footer	60	def header_footer
	@@ -2,7 +2,7 @@ class AccountController < ApplicationController		@@ -2,7 +2,7 @@ class AccountController < ApplicationController
2		2
3	no_design_blocks	3	no_design_blocks
4		4
5	- before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]	5	+ before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise, :change_password]
6	before_filter :redirect_if_logged_in, :only => [:login, :signup]	6	before_filter :redirect_if_logged_in, :only => [:login, :signup]
7	before_filter :protect_from_bots, :only => :signup	7	before_filter :protect_from_bots, :only => :signup
8		8
	@@ -11,7 +11,7 @@ class CatalogController < PublicController		@@ -11,7 +11,7 @@ class CatalogController < PublicController
11	protected	11	protected
12		12
13	def check_enterprise_and_environment	13	def check_enterprise_and_environment
14	- unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')	14	+ unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'	15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
16	end	16	end
17	end	17	end
	@@ -10,7 +10,7 @@ module ContentViewerHelper		@@ -10,7 +10,7 @@ module ContentViewerHelper
10	end	10	end
11		11
12	def number_of_comments(article)	12	def number_of_comments(article)
13	- display_number_of_comments(article.comments.without_spam.count)	13	+ display_number_of_comments(article.comments_count - article.spam_comments_count)
14	end	14	end
15		15
16	def article_title(article, args = {})	16	def article_title(article, args = {})
	@@ -26,7 +26,7 @@ module ContentViewerHelper		@@ -26,7 +26,7 @@ module ContentViewerHelper
26	end	26	end
27	title << content_tag('span',	27	title << content_tag('span',
28	content_tag('span', show_date(article.published_at), :class => 'date') +	28	content_tag('span', show_date(article.published_at), :class => 'date') +
29	- content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +	29	+ content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	30	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	31	:class => 'created-at'
32	)	32	)