Merge branch 'master' into AI2928-categories

Joenio Costa
2 parents 894e8962 d0561132
Showing 547 changed files with 132026 additions and 116054 deletions Show diff stats
AUTHORS
AUTHORS.md
HACKING
HACKING.md
INSTALL
INSTALL.awstats
INSTALL.awstats.md
INSTALL.chat
INSTALL.chat.md
INSTALL.email
INSTALL.email.md
INSTALL.md
INSTALL.multitenancy
INSTALL.multitenancy.md
INSTALL.varnish
INSTALL.varnish.md
README
README.md
README.rails
README.rails.md
@@ -41,6 +41,7 @@ Alessandro Palmeira + Rafael Manzo &lt;alessandro.palmeira@gmail.com&gt;
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
+Arthur Del Esposte <arthurmde@yahoo.com.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
@@ -68,6 +69,7 @@ Caio Salgado + Renan Teruo &lt;caio.salgado@gmail.com&gt;
 Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio SBA <caio@colivre.coop.br>
+Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.com>
 Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
@@ -81,6 +83,7 @@ Daniel Alves + Diego Araújo + Guilherme Rojas &lt;guilhermehrojas@gmail.com&gt;
 Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
 Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
@@ -110,9 +113,12 @@ Diego + Jefferson &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diegoamc90@gmail.com>
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
+Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
+Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
+Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
@@ -149,18 +155,24 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
+Junior Silva <juniorsilva@colivre.coop.br>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
+Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
+Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
 Leandro Nunes dos Santos <leandronunes@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
+Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
+Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
@@ -195,8 +207,13 @@ Rodrigo Souto &lt;rodrigo@colivre.coop.br&gt;
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Valessio Brito <contato@valessiobrito.com.br>
+Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
 vfcosta <vfcosta@gmail.com>
+Victor Carvalho <victorhugodf.ac@gmail.com>
+Victor Costa <vfcosta@gmail.com>
+Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
 Vinicius Cubas Brand <viniciuscb@gmail.com>
 Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
@@ -0,0 +1,214 @@
+If you are not listed here, but should be, please write to the noosfero mailing list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev (this list requires subscription to post, but since you are an author of noosfero, that's not a problem).
+
+Developers
+==========
+
+Alan Freihof Tygel <alantygel@gmail.com>
+Alessandro Palmeira <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
+Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
+Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
+Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
+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>
+Braulio Bhavamitra <braulio@eita.org.br>
+Caio <caio.csalgado@gmail.com>
+Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
+Caio Formiga <caio.formiga@gmail.com>
+Caio, Pedro <caio.csalgado@gmail.com>
+Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
+Caio Salgado <caio.csalgado@gmail.com>
+Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
+Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
+Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
+Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
+Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
+Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
+Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
+Caio SBA <caio@colivre.coop.br>
+Carlos Morais <carlos88morais@gmail.com>
+Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
+Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
+Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
+Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
+Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
+Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
+Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Cunha <daniel@colivre.coop.br>
+diegoamc <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
+Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
+Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
+Diego Araújo <diegoamc90@gmail.com>
+Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
+Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
+Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
+Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Diego Araújo + João Machini <diegoamc90@gmail.com>
+Diego Araújo + João Machini <digoamc90@gmail.com>
+Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
+Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
+Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
+Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
+Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
+Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
+Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
+Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
+Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
+Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
+Diego + Jefferson <diegoamc90@gmail.com>
+Diego Martinez <diegoamc90@gmail.com>
+Diego Martinez <diego@diego-K55A.(none)>
+Diego + Renan <renanteruoc@gmail.com>
+Fernanda Lopes <nanda.listas+psl@gmail.com>
+Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
+Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
+Grazieno Pellegrino <grazieno@gmail.com>
+Isaac Canan <isaac@intelletto.com.br>
+Italo Valcy <italo@dcc.ufba.br>
+Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
+Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
+Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+João da Silva <jaodsilv@linux.ime.usp.br>
+João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Caio Salgado <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 + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
+Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
+Joenio Costa <joenio@colivre.coop.br>
+Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <juniorsilva1001@gmail.com>
+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
+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>
+Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
+LinguÁgil 2010 <linguagil.bahia@gmail.com>
+Lucas Melo <lucas@colivre.coop.br>
+Lucas Melo <lucaspradomelo@gmail.com>
+Luis David Aguilar Carlos <ludwig9003@gmail.com>
+Martín Olivera <molivera@solar.org.ar>
+Moises Machado <moises@colivre.coop.br>
+Naíla Alves <naila@colivre.coop.br>
+Nanda Lopes <nanda.listas+psl@gmail.com>
+Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
+Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
+Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
+Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
+Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
+Paulo Meirelles <paulo@softwarelivre.org>
+Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
+Rafael Gomes <rafaelgomes@techfree.com.br>
+Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
+Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
+Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
+Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
+Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
+Rafael Martins <rmmartins@gmail.com>
+Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
+Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
+Rafael Reggiani Manzo <rr.manzo@gmail.com>
+Raphaël Rousseau <raph@r4f.org>
+Raquel Lira <raquel.lira@gmail.com>
+Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
+Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
+Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
+Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
+Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
+Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
+Rodrigo Souto <diguliu@gmail.com>
+Rodrigo Souto <rodrigo@colivre.coop.br>
+Ronny Kursawe <kursawe.ronny@googlemail.com>
+root <root@debian.sdr.serpro>
+Samuel R. C. Vale <srcvale@holoscopio.com>
+Valessio Brito <valessio@gmail.com>
+vfcosta <vfcosta@gmail.com>
+Victor Costa <vfcosta@gmail.com>
+Vinicius Cubas Brand <viniciuscb@gmail.com>
+Visita <visita@debian.(none)>
+Yann Lugrin <yann.lugrin@liquid-concept.ch>
+
+Ideas, specifications and incentive
+===================================
+Daniel Tygel <dtygel@fbes.org.br>
+Guilherme Rocha <guilherme@gf7.com.br>
+Raphael Rousseau <raph@r4f.org>
+Théo Bondolfi <move@cooperation.net>
+Vicente Aguiar <vicenteaguiar@colivre.coop.br>
+
+Arts
+===================================
+Nara Oliveira <narananet@gmail.com>
@@ -1,63 +0,0 @@
-= Noosfero instructions for developers
-
-== A work about your the development platform
-
-These instructions are tested and known to work on Debian stable, which is the
-system that the Noosfero core developers use to work on Noosfero.
-
-If you want to use another OS, read "Instructions for other systems" below.
-
-== Instructions for Debian stable
-
-Download the source code:
-
-  $ git clone git://gitorious.org/noosfero/noosfero.git
-  $ cd noosfero
-
-Run the quick start script:
-
-  $ ./script/quick-start
-
-Now you can execute the development server with:
-
-  $ ./script/development
-
-You will be able to access Noosfero at http://localhost:3000/
-
-If you want to use a different port than 3000, pass `-p <PORT>` to
-./script/development
-
-== Instructions for other systems
-
-On other OS, you have 2 options:
-
-1) using a chroot or a VM with Debian stable (easier)
-
-Use a chroot (http://wiki.debian.org/Schroot) or a Virtual Machine (e.g. with
-VirtualBox) with a Debian stable system and follow the instructions above for
-Debian stable.
-
-2) Installing dependencies on other OS (harder)
-
-If you want to setup a development environment in another OS, you can create a
-file under script/install-dependencies/, called <OS>-<CODENAME>.sh, which
-installed the dependencies for your system. With this script in place,
-./script/quick-start will call it at the point of installing the required
-packages for Noosfero development.
-
-You can check script/install-dependencies/debian-squeeze.sh to have an idea of
-what kind of stuff that script has to do. 
-
-If you write such script for your own OS, *please* share it with us at the
-development mailing list so that we can include it in the official repository.
-This way other people using the same OS will have to put less effort to develop
-Noosfero.
-
-== Submitting your changes back
-
-For now please read:
-
-- Coding conventions
-  http://noosfero.org/Development/CodingConventions
-- Patch guidelines
-  http://noosfero.org/Development/PatchGuidelines
@@ -0,0 +1,56 @@
+Noosfero instructions for developers
+====================================
+
+A work about your the development platform
+------------------------------------------
+
+These instructions are tested and known to work on Debian stable, which is the system that the Noosfero core developers use to work on Noosfero.
+
+If you want to use another OS, read "Instructions for other systems" below.
+
+Instructions for Debian stable
+------------------------------
+
+Download the source code:
+
+    $ git clone https://gitlab.com/noosfero/noosfero.git
+    $ cd noosfero
+
+Run the quick start script:
+
+    $ ./script/quick-start
+
+Now you can execute the development server with:
+
+    $ ./script/development
+
+You will be able to access Noosfero at http://localhost:3000/
+
+If you want to use a different port than 3000, pass `-p <PORT>` to `./script/development`
+
+Instructions for other systems
+------------------------------
+
+On other OS, you have 2 options:
+
+### 1) using a chroot or a VM with Debian stable (easier)
+
+Use a chroot (http://wiki.debian.org/Schroot) or a Virtual Machine (e.g. with VirtualBox) with a Debian stable system and follow the instructions above for Debian stable.
+
+### 2) Installing dependencies on other OS (harder)
+
+If you want to setup a development environment in another OS, you can create a file under `./script/install-dependencies/`, called `<OS>-<CODENAME>.sh`, which installed the dependencies for your system. With this script in place, `./script/quick-start` will call it at the point of installing the required packages for Noosfero development.
+
+You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea of what kind of stuff that script has to do.
+
+If you write such script for your own OS, *please* share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
+
+Submitting your changes back
+----------------------------
+
+For now please read:
+
+- Coding conventions
+  http://noosfero.org/Development/CodingConventions
+- Patch guidelines
+  http://noosfero.org/Development/PatchGuidelines
@@ -1,417 +0,0 @@
-= Noosfero installation instructions from source for production environments
-
-The instructions below can be used for setting up a Noosfero production
-environment from the Noosfero sources.
-
-Before you start installing Noosfero manually, see the information about the
-Noosfero Debian package at http://noosfero.org/Development/DebianPackage. Using
-the Debian packages on a Debian stable system is the recommended method for
-installing production environments.
-
-If you want to setup a development environment instead of a production one,
-stop reading this file right now and read the file HACKING instead.
-
-For a complete installation guide, please see the following web page:
-http://noosfero.org/Development/HowToInstall
-
-If you have problems with the setup, please feel free to ask questions in the
-development mailing list.
-
-== Requirements
-
-DISCLAIMER: this installation procedure is tested with Debian stable, which is
-currently the only recommended operating system for production usage. It is
-possible that you can install it on other systems, and if you do so, please
-report it on one of the Noosfero mailing lists, and please send a patch
-updating these instructions.
-
-Noosfero is written in Ruby with the "Rails
-framework":http://www.rubyonrails.org, so the process of setting it up is
-pretty similar to other Rails applications.
-
-You need to install some packages Noosfero depends on.  On Debian GNU/Linux or
-Debian-based systems, all of these packages are available through the Debian
-archive. You can install them with the following command:
-
- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-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.
-
-* Ruby: http://www.ruby-lang.org/
-* Rake: http://rake.rubyforge.org/
-* po4a: http://po4a.alioth.debian.org/
-* Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
-* rcov: http://eigenclass.org/hiki/rcov
-* RMagick: http://rmagick.rubyforge.org/
-* RedCloth: http://redcloth.org/
-* will_paginate: http://github.com/mislav/will_paginate/wikis
-* iso-codes: http://pkg-isocodes.alioth.debian.org/
-* feedparser: http://packages.debian.org/sid/libfeedparser-ruby
-* Daemons - http://daemons.rubyforge.org/
-* Thin: http://code.macournoyer.com/thin/
-* tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
-* Hpricot: http://hpricot.com/
-
-If you manage to install Noosfero successfully on other systems than Debian,
-please feel free to contact the Noosfero development mailing with the
-instructions for doing so, and we'll include it here.
-
-As root user
-============
-
-Install memcached. On Debian:
-
-# apt-get install memcached
-
-Study whether you need to raise the ammount of memory it uses for caching,
-depending on the demand you expect for your site. If you are going to run a
-high-traffic site, you will want to raise the ammount of memory reserved for
-caching.
-
-It is recommended that you run noosfero with its own user account. To create
-such an account, please do the following:
-
-# adduser --system --group noosfero --shell /bin/sh --home /var/lib/noosfero
-
-(note that you can change the $HOME directory of the user if you wish, here we
-are using /var/lib/noosfero)
-
-The --system option will tell adduser to create a system user, i.e. this user
-will not have a password and cannot login to the system directly. To become
-this user, you have to use sudo:
-
-# sudo -u noosfero -i
-
-or
-
-# su - noosfero
-
-As noosfero user
-================
-
-downloading from git
---------------------
-
-Here we are cloning the noosfero repository from git. Note: you will need to
-install git before.
-
-$ git clone git://gitorious.org/noosfero/noosfero.git current
-$ cd current
-$ git checkout -b stable origin/stable
-
-downloading tarball
--------------------
-
-Note: replace 0.39.0 below from the latest stable version.
-
-$ wget http://noosfero.org/pub/Development/NoosferoVersion00x39x00/noosfero-0.39.0.tar.gz
-$ tar -zxvf noosfero-0.39.0.tar.gz
-$ ln -s noosfero-0.39.0 current
-$ cd current
-
-Create the thin configuration file:
-
-$ thin -C config/thin.yml -e production config
-
-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.3.5, which is the version in
-Debian Squeeze. If you have a Rails version newer than that, Noosfero will
-probably not work. You can install Rails 2.3.5 into your Noosfero installation
-with the following procedure:
-
-$ cd /var/lib/noosfero/current/vendor
-$ wget http://ftp.de.debian.org/debian/pool/main/r/rails/rails_2.3.5.orig.tar.gz
-$ tar xzf rails_2.3.5.orig.tar.gz
-$ ln -s rails-2.3.5 rails
-
-As root user
-============
-
-Setup Noosfero log and tmp directories:
-
-# cd /var/lib/noosfero/current
-# ./etc/init.d/noosfero setup
-
-Now it's time to setup the database. In this example we are using PostgreSQL,
-so if you are planning to use a different database this steps won't apply.
-
-# apt-get install postgresql libpgsql-ruby
-# su postgres -c 'createuser noosfero -S -d -R'
-
-By default Rails will try to connect on postgresql through 5432 port,
-you can check it on /etc/postgresql/8.4/main/postgresql.conf file.
-
-Restart postgresql:
-
-# invoke-rc.d postgresql restart
-
-Noosfero needs a functional e-mail setup to work: the local mail system should
-be able to deliver e-mail to the internet, either directly or through an
-external SMTP server. Please check the documentation at the INSTALL.email file.
-
-As noosfero user
-================
-
-Now create the databases:
-
-$ cd /var/lib/noosfero/current
-$ createdb noosfero_production
-$ createdb noosfero_development
-$ createdb noosfero_test
-
-The development and test databases are actually optional. If you are creating a
-stricly production server, you will probably not need them.
-
-Now we want to configure Noosfero for accessing the database we just created.
-To do that, you can 1) copy config/database.yml.pgsql to config/database.yml,
-or create config/database.yml from scratch with the following content:
-
-  production:
-    adapter: postgresql
-    encoding: unicode
-    database: noosfero_production
-    username: noosfero
-
-Now, to test the database access, you can fire the Rails database console:
-
-$ ./script/dbconsole production
-
-If it connects to your database, then everything is fine. If you got an error
-message, then you have to check your database configuration.
-
-Create the database structure:
-
-$ RAILS_ENV=production rake db:schema:load
-
-Compile the translations:
-
-$ RAILS_ENV=production rake noosfero:translations:compile
-
-Now we must create some initial data. To create your default environment
-(the first one), run the command below:
-
-$ RAILS_ENV=production ./script/runner 'Environment.create!(:name => "My environment", :is_default => true)'
-
-(of course, replace "My environment" with your environment's name!)
-
-And now you have to add the domain name you will be using for your noosfero
-site to the list of domains of that default environment you just created:
-
-$ RAILS_ENV=production ./script/runner "Environment.default.domains << Domain.new(:name => 'your.domain.com')"
-
-(replace "your.domain.com" with your actual domain name)
-
-Add at least one user as admin of environment:
-
-$ RAILS_ENV=production ./script/runner "User.create(:login => 'adminuser', :email => 'admin@example.com', :password => 'admin', :password_confirmation => 'admin', :environment => Environment.default, :activated_at => Time.new)"
-
-(replace "adminuser", "admin@example.com", "admin" with the login, email
-and password of your environment administrator)
-
-To start the Noosfero application servers:
-
-$ ./script/production start
-
-At this point you have a functional Noosfero installation running, the only
-thing left is to configure your webserver as a reverse proxy to pass requests
-to them.
-
-
-==================
-Apache instalation
-==================
-
-# apt-get install apache2
-
-Apache configuration
---------------------
-
-First you have to enable the following some apache modules:
-
-  deflate
-  expires
-  proxy
-  proxy_balancer
-  proxy_http
-  rewrite
-
-On Debian GNU/Linux system, these modules can be enabled with the following
-command line, as root:
-
-# a2enmod deflate expires proxy proxy_balancer proxy_http rewrite
-
-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 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.
-
-Add a file called "mysite" (or whatever name you want to give to your noosfero
-site) to /etc/apache2/sites-available with the following content, and customize
-as needed (as usual, make sure you replace "your.domain.com" with you actual
-domain name, and "/var/lib/noosfero/current" with the directory where Noosfero
-is installed):
-
-  <VirtualHost *:80>
-    ServerName your.domain.com
-
-    DocumentRoot "/var/lib/noosfero/current/public"
-    <Directory "/var/lib/noosfero/current/public">
-      Options FollowSymLinks
-      AllowOverride None
-      Order Allow,Deny
-      Allow from all
-    </Directory>
-
-    RewriteEngine On
-
-    # Rewrite index to check for static index.html
-    RewriteRule ^/$ /index.html [QSA]
-
-    # Rewrite to check for Rails cached page
-    RewriteRule ^([^.]+)$ $1.html [QSA]
-
-    RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
-    RewriteRule ^.*$ balancer://noosfero%{REQUEST_URI} [P,QSA,L]
-
-    ErrorDocument 503 /503.html
-
-    ErrorLog /var/log/apache2/noosfero.log
-    LogLevel warn
-    CustomLog /var/log/apache2/noosfero.access.log combined
-
-    Include /var/lib/noosfero/current/etc/noosfero/apache/cache.conf
-
-  </VirtualHost>
-
-  <Proxy balancer://noosfero>
-    BalancerMember http://127.0.0.1:3000
-    BalancerMember http://127.0.0.1:3001
-    Order Allow,Deny
-    Allow from All
-  </Proxy>
-
-The cache.conf file included in the end of the <VirtualHost> section is
-important, since it will tell apache to pass expiration and cache headers to
-clients so that the site feels faster for users. Do we need to say that using
-that configuration is strongly recommended?
-
-Enable that site with (as root, replace "mysite" with the actual name you gave
-to your site configuration):
-
-# a2ensite mysite
-
-Now restart your apache server (as root):
-
-# invoke-rc.d apache2 restart
-
-
-Enabling exception notifications
-================================
-
-This is an optional step. You will need it only if you want to receive e-mail
-notifications when some exception occurs on Noosfero.
-
-First, install this version of the gem.
-Others versions may not be compatible with Noosfero:
-
-# gem install exception_notification -v 1.0.20090728
-
-You can configure the e-mails that will receive the notifications.
-Change the file config/noosfero.yml as the following example, replacing the
-e-mails by real ones:
-
-  production:
-    exception_recipients: [admin@example.com, you@example.com]
-
-
-============
-Maintainance
-============
-
-To ease the maintainance, install a symbolic link for the Noosfero startup
-script in your server and add it to the system initialization and shutdown
-sequences (as root):
-
-# ln -s /var/lib/noosfero/current/etc/init.d/noosfero /etc/init.d/noosfero
-# update-rc.d noosfero defaults
- Adding system startup for /etc/init.d/noosfero ...
-   /etc/rc0.d/K20noosfero -> ../init.d/noosfero
-   /etc/rc1.d/K20noosfero -> ../init.d/noosfero
-   /etc/rc6.d/K20noosfero -> ../init.d/noosfero
-   /etc/rc2.d/S20noosfero -> ../init.d/noosfero
-   /etc/rc3.d/S20noosfero -> ../init.d/noosfero
-   /etc/rc4.d/S20noosfero -> ../init.d/noosfero
-   /etc/rc5.d/S20noosfero -> ../init.d/noosfero
-
-Now to start Noosfero, you do as root:
-
-# invoke-rc.d noosfero start
-
-To stop Noosfero:
-
-# invoke-rc.d noosfero start
-
-To restart Noosfero:
-
-# invoke-rc.d noosfero restart
-
-Noosfero will be automatically started during system boot, and automatically
-stopped if the system shuts down for some reason (or during the shutdown part
-of a reboot).
-
-=============
-Rotating logs
-=============
-
-Noosfero provides an example logrotate configuation to rotate its logs. To use
-it, create a symbolic link in /etc/logrotate.d/:
-
-# cd /etc/logrotate.d/
-# ln -s /var/lib/noosfero/current/etc/logrotate.d/noosfero
-
-Note that the provided file assumes Noosfero logging is being done in
-/var/log/noosfero (which is the case if you followed the instructions above
-correctly). If the logs are stored elsewhere, it's recommended that you copy
-the file over to /etc/logrotate.d/ and modify it to point to your local log
-directly.
-
-=========
-Upgrading
-=========
-
-If you followed the steps in this document and installed Noosfero from the git
-repository, then upgrading is easy. First, you need to allow the noosfero user
-to restart the memcached server with sudo, by adding the following line in
-/etc/sudoers:
-
-noosfero ALL=NOPASSWD: /etc/init.d/memcached
-
-Then, to perform an upgrade, do the following as the noosfero user:
-
-$ cd /var/lib/noosfero/current
-$ ./script/git-upgrade
-
-The git-upgrade script will take care of everything for you. It will first stop
-the service, then fetch the current source code, upgrade database, compile
-translations, and then start the service again.
-
-Note 1: make sure your local git repository is following the "stable" branch,
-just like the instructions above. The "master" branch is not recommended for
-use in production environments.
-
-Note 2: always read the release notes before upgrading. Sometimes there will be
-steps that must be performed manually. If that is the case, you can invoke the
-git-upgrade script with the special parameter "--shell" that will give you a
-shell after the upgrade, which you can use to perform any manual steps
-required:
-
-$ ./script/git-upgrade --shell
@@ -1,78 +0,0 @@
-= 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.
@@ -0,0 +1,67 @@
+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](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.
@@ -1,258 +0,0 @@
-== XMPP/Chat Client Setup
-
-To configure XMPP/BOSH in Noosfero you need:
-
-* REST Client - http://github.com/archiloque/rest-client
-* SystemTimer - http://ph7spot.com/musings/system-timer
-* Pidgin data files - http://www.pidgin.im/
-
-If you use Debian 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
-
-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
-
-2. Ejabberd configuration
-
-All the following changes must be done in config file:
-
- /etc/ejabberd/ejabberd.cfg
-
- 2.1. Set the default admin user
-
-{ acl, admin, { user, "john", "www.example.com" } }.
-{ acl, admin, { user, "bart", "www.example.com" } }.
-
- 2.2. Set the default host
-
-{ hosts, [ "www.example.com" ] }.
-
- 2.3. Http-Bind activation
-
-{ 5280, ejabberd_http, [
-      http_bind,
-      web_admin
-   ]
-}
-
-(...)
-
-{ modules, [
-   {mod_http_bind, []},
-   ...
-] }.
-
-Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client
-needs non-anonymous room, then we need to change default params of creation
-rooms in ejabberd to create non-anonymous rooms.
-
-In non-anonymous rooms the jabber service sends the new occupant's full JID to
-all occupants in the room[1].
-
-Add option "{default_room_options, [{anonymous, false}]}" to
-/etc/ejabberd/ejabberd.cfg in mod_muc session. See below:
-
-{ mod_muc, [
-   %%{host, "conference.@HOST@"},
-   {access, muc},
-   {access_create, muc},
-   {access_persistent, muc},
-   {access_admin, muc_admin},
-   {max_users, 500},
-   {default_room_options, [{anonymous, false}]}
-]},
-
-[1] - http://xmpp.org/extensions/xep-0045.html#enter-nonanon
-
-
- 2.4. Authentication method
-
-To use Postgresql through ODBC, the following modifications must be done:
-
- * Disable the default method:
-
-{auth_method, internal}.
-
- * Enable autheticantion through ODBC:
-
-{auth_method, odbc}.
-
- * Set database server name
-
-{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.
-
-
- 2.5. Increase the shaper traffic limit
-
-{ shaper, normal, { maxrate, 10000000 } }.
-
-
- 2.6. Disable unused modules
-
-Unused modules can be disabled, for example:
-
- * s2s
- * web_admin
- * mod_pubsub
- * mod_irc
- * mod_offline
- * mod_admin_extra
- * mod_register
-
-
- 2.7. Enable ODBC modules
-
- * mod_privacy -> mod_privacy_odbc
- * mod_private -> mod_private_odbc
- * mod_roster  -> mod_roster_odbc
-
-3. Configuring Postgresql
-
-Login as noosfero user, and execute:
-
-   $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
-
-Where 'noosfero' may need to be replace by the name of the database used for
-Noosfero.
-
-This will create a new schema inside the noosfero database, called 'ejabberd'.
-
-Note 'noosfero' user should have permission to create Postgresql schemas. Also,
-there should be at least one domain with 'is_default = true' in 'domains'
-table, otherwise people won't be able to see their friends online.
-
-
-4. ODBC configuration
-
-The following files must be created:
-
- * /etc/odbc.ini
-
-[PostgreSQLEjabberdNoosfero]
-Description      = PostgreSQL Noosfero ejabberd database
-Driver           = PostgreSQL Unicode
-Trace            = No
-TraceFile        = /tmp/psqlodbc.log
-Database         = noosfero
-Servername       = localhost
-UserName         = <DBUSER>
-Password         = <DBPASS>
-Port             =
-ReadOnly         = No
-RowVersioning    = No
-ShowSystemTables = No
-ShowOidColumn    = No
-FakeOidIndex     = No
-ConnSettings     = SET search_path TO ejabberd
-
- * /etc/odbcinst.ini
-
-[PostgreSQL Unicode]
-Description = PostgreSQL ODBC driver (Unicode version)
-Driver      = /usr/lib/odbc/psqlodbcw.so
-Setup       = /usr/lib/odbc/libodbcpsqlS.so
-Debug       = 0
-CommLog     = 1
-UsageCount  = 3
-
- 4.1 testing all:
-
-# isql 'PostgreSQLEjabberdNoosfero'
-
-If the configuration was done right, the message "Connected!"
-will be displayed.
-
-
-5. Enabling kernel polling and SMP in /etc/default/ejabberd
-
-POLL=true
-SMP=auto
-
-
-6. Increase the file descriptors limit for user ejabberd
-
- 6.1. Uncomment this line in file /etc/pam.d/su:
-
-session required pam_limits.so
-
-
- 6.2. Add this lines to file /etc/security/limits.conf:
-
-ejabberd       hard    nofile  65536
-ejabberd       soft    nofile  65536
-
-Now, test the configuration:
-
-# cat /proc/<EJABBERD_BEAM_PROCESS_PID>/limits
-
-
-7. Apache Configuration
-
-Apache server must be configurated as follow:
-
- * /etc/apache2/sites-enabled/noosfero
-
-RewriteEngine On
-Include /usr/share/noosfero/util/chat/apache/xmpp.conf
-
- * /etc/apache2/apache2.conf:
-
-<IfModule mpm_worker_module>
-   StartServers          8
-   MinSpareThreads       25
-   MaxSpareThreads       75
-   ThreadLimit           128
-   ThreadsPerChild       128
-   MaxClients            2048
-   MaxRequestsPerChild   0
-</IfModule>
-
-Note: module proxy_http must be enabled:
-
-# a2enmod proxy_http
-
-8. DNS configuration
-
-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:
-
-_xmpp-client._tcp   SRV   5 100 5222 master
-conference   CNAME master
-_xmpp-client._tcp.conference   SRV   5 100 5222 master
-
-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.
-
-9. Testing this Setup
-
-Adjust shell limits to proceed with some benchmarks and load tests: 
-
-# ulimit −s 256
-# ulimit −n 8192
-# echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
-
-To measure the bandwidth between server and client:
-
- * at server side:
-
-# iperf −s
-
- * at client side:
-
-# iperf −c server_ip
-
-For heavy load tests, clone and use this software:
-
-git clone http://git.holoscopio.com/git/metal/tester.git
@@ -0,0 +1,236 @@
+XMPP/Chat Client Setup
+======================
+
+To configure XMPP/BOSH in Noosfero you need:
+
+* REST Client - http://github.com/archiloque/rest-client
+* SystemTimer - http://ph7spot.com/musings/system-timer
+* Pidgin data files - http://www.pidgin.im/
+
+If you use Debian 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
+======================
+
+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
+
+## 2. Ejabberd configuration
+
+All the following changes must be done in config file: `/etc/ejabberd/ejabberd.cfg`
+
+### 2.1. Set the default admin user
+
+    { acl, admin, { user, "john", "www.example.com" } }.
+    { acl, admin, { user, "bart", "www.example.com" } }.
+
+### 2.2. Set the default host
+
+    { hosts, [ "www.example.com" ] }.
+
+### 2.3. Http-Bind activation
+
+    { 5280, ejabberd_http, [
+          http_bind,
+          web_admin
+       ]
+    }
+
+    (...)
+
+    { modules, [
+       {mod_http_bind, []},
+       ...
+    ] }.
+
+Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client needs non-anonymous room, then we need to change default params of creation rooms in ejabberd to create non-anonymous rooms.
+
+In non-anonymous rooms the jabber service sends the new occupant's full JID to all occupants in the room [[1]].
+
+Add option "`{default_room_options, [{anonymous, false}]}`" to `/etc/ejabberd/ejabberd.cfg` in mod_muc session. See below:
+
+    { mod_muc, [
+       %%{host, "conference.@HOST@"},
+       {access, muc},
+       {access_create, muc},
+       {access_persistent, muc},
+       {access_admin, muc_admin},
+       {max_users, 500},
+       {default_room_options, [{anonymous, false}]}
+    ]},
+
+[1]: http://xmpp.org/extensions/xep-0045.html#enter-nonanon
+
+
+### 2.4. Authentication method
+
+To use Postgresql through ODBC, the following modifications must be done:
+
+ * Disable the default method:
+   `{auth_method, internal}.`
+
+ * Enable autheticantion through ODBC:
+   `{auth_method, odbc}.`
+
+ * Set database server name
+   `{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.`
+
+
+### 2.5. Increase the shaper traffic limit
+
+    { shaper, normal, { maxrate, 10000000 } }.
+
+
+### 2.6. Disable unused modules
+
+Unused modules can be disabled, for example:
+
+ * s2s
+ * web_admin
+ * mod_pubsub
+ * mod_irc
+ * mod_offline
+ * mod_admin_extra
+ * mod_register
+
+
+### 2.7. Enable ODBC modules
+
+ * mod_privacy -> mod_privacy_odbc
+ * mod_private -> mod_private_odbc
+ * mod_roster  -> mod_roster_odbc
+
+## 3. Configuring Postgresql
+
+Login as noosfero user, and execute:
+
+    $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
+
+Where `noosfero` may need to be replace by the name of the database used for Noosfero.
+
+This will create a new schema inside the noosfero database, called `ejabberd`.
+
+Note `noosfero` user should have permission to create Postgresql schemas. Also, there should be at least one domain with `is_default = true` in `domains` table, otherwise people won't be able to see their friends online.
+
+## 4. ODBC configuration
+
+The following files must be created:
+
+`/etc/odbc.ini`:
+
+    [PostgreSQLEjabberdNoosfero]
+    Description      = PostgreSQL Noosfero ejabberd database
+    Driver           = PostgreSQL Unicode
+    Trace            = No
+    TraceFile        = /tmp/psqlodbc.log
+    Database         = noosfero
+    Servername       = localhost
+    UserName         = <DBUSER>
+    Password         = <DBPASS>
+    Port             =
+    ReadOnly         = No
+    RowVersioning    = No
+    ShowSystemTables = No
+    ShowOidColumn    = No
+    FakeOidIndex     = No
+    ConnSettings     = SET search_path TO ejabberd
+
+`/etc/odbcinst.ini`:
+
+    [PostgreSQL Unicode]
+    Description = PostgreSQL ODBC driver (Unicode version)
+    Driver      = /usr/lib/odbc/psqlodbcw.so
+    Setup       = /usr/lib/odbc/libodbcpsqlS.so
+    Debug       = 0
+    CommLog     = 1
+    UsageCount  = 3
+
+## 4.1 testing all:
+
+    # isql 'PostgreSQLEjabberdNoosfero'
+
+If the configuration was done right, the message "Connected!" will be displayed.
+
+
+## 5. Enabling kernel polling and SMP in `/etc/default/ejabberd`
+
+    POLL=true
+    SMP=auto
+
+## 6. Increase the file descriptors limit for user ejabberd
+
+### 6.1. Uncomment this line in file `/etc/pam.d/su`:
+
+    session required pam_limits.so
+
+### 6.2. Add this lines to file `/etc/security/limits.conf`:
+
+    ejabberd       hard    nofile  65536
+    ejabberd       soft    nofile  65536
+
+Now, test the configuration:
+
+    # cat /proc/<EJABBERD_BEAM_PROCESS_PID>/limits
+
+## 7. Apache Configuration
+
+Apache server must be configurated as follow:
+
+`/etc/apache2/sites-enabled/noosfero`:
+
+    RewriteEngine On
+    Include /usr/share/noosfero/util/chat/apache/xmpp.conf
+
+`/etc/apache2/apache2.conf`:
+
+    <IfModule mpm_worker_module>
+       StartServers          8
+       MinSpareThreads       25
+       MaxSpareThreads       75
+       ThreadLimit           128
+       ThreadsPerChild       128
+       MaxClients            2048
+       MaxRequestsPerChild   0
+    </IfModule>
+
+Note: module proxy_http must be enabled:
+
+    # a2enmod proxy_http
+
+## 8. DNS configuration
+
+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:
+
+    _xmpp-client._tcp   SRV   5 100 5222 master
+    conference   CNAME master
+    _xmpp-client._tcp.conference   SRV   5 100 5222 master
+
+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.
+
+## 9. Testing this Setup
+
+Adjust shell limits to proceed with some benchmarks and load tests: 
+
+    # ulimit −s 256
+    # ulimit −n 8192
+    # echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
+
+To measure the bandwidth between server and client:
+
+ * at server side:
+   `# iperf −s`
+
+ * at client side:
+   `# iperf −c server_ip`
+
+For heavy load tests, clone and use this software:
+
+    $ git clone http://git.holoscopio.com/git/metal/tester.git
@@ -1,43 +0,0 @@
-= Noosfero email setup
-
-If you know mail systems well, you just need to make sure that the local MTA,
-listening on localhost:25, is able to deliver e-mails to the internet. Any mail
-server will do it. You can stop reading now.
-
-If you are not an email specialist, then follow the instructions below. We
-suggest that you use the Postfix mail server, since it is easy to configure and
-very reliable. Just follow the instructions below.
-
-To install Postfix:
-
-# apt-get install postfix
-
-During the installation process, you will be asked a few questions. Your answer
-to them will vary in 2 cases:
-
-Case 1: you can send e-mails directly to the internet. This will be the case
-for most commercial private servers. Your answers should be:
-
-  General type of mail configuration: Internet site
-  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
-
-Case 2: you cannot, or don't want to, send e-mail directly to the internet.
-This happens for example if your server is not allowed to make outbound
-connections on port 25, or if you want to concentrate all your outbound mail
-through a single SMTP server. Your answers in this case should be:
-
-  General type of mail configuration: Internet with smarthost
-  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
-  SMTP relay host: smtp.yourprovider.com
-
-Note that smtp.yourprovider.com must allow your server to deliver e-mails
-through it. You should probably ask your servive provider about this.
-
-There is another possibility: if you are installing on a shared server, and
-don't have permission to configure the local MTA, you can instruct Noosfero to
-send e-mails directly through an external server. Please note that this should
-be your last option, since contacting an external SMTP server directly may slow
-down your Noosfero application server. To configure Noosfero to send e-mails
-through an external SMTP server, follow the instructions on
-http://noosfero.org/Development/SMTPMailSending
-
@@ -0,0 +1,28 @@
+Noosfero email setup
+====================
+
+If you know mail systems well, you just need to make sure that the local MTA, listening on localhost:25, is able to deliver e-mails to the internet. Any mail server will do it. You can stop reading now.
+
+If you are not an email specialist, then follow the instructions below. We suggest that you use the Postfix mail server, since it is easy to configure and very reliable. Just follow the instructions below.
+
+To install Postfix:
+
+    # apt-get install postfix
+
+During the installation process, you will be asked a few questions. Your answer to them will vary in 2 cases:
+
+**Case 1**: you can send e-mails directly to the internet. This will be the case for most commercial private servers. Your answers should be:
+
+ * General type of mail configuration: Internet site
+ * System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+
+**Case 2**: you cannot, or don't want to, send e-mail directly to the internet. This happens for example if your server is not allowed to make outbound connections on port 25, or if you want to concentrate all your outbound mail through a single SMTP server. Your answers in this case should be:
+
+ * General type of mail configuration: Internet with smarthost
+ * System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+ * SMTP relay host: smtp.yourprovider.com
+
+Note that smtp.yourprovider.com must allow your server to deliver e-mails through it. You should probably ask your servive provider about this.
+
+There is another possibility: if you are installing on a shared server, and don't have permission to configure the local MTA, you can instruct Noosfero to send e-mails directly through an external server. Please note that this should be your last option, since contacting an external SMTP server directly may slow down your Noosfero application server. To configure Noosfero to send e-mails through an external SMTP server, follow the instructions on http://noosfero.org/Development/SMTPMailSending
+
@@ -0,0 +1,334 @@
+Noosfero installation instructions from source for production environments
+==========================================================================
+
+The instructions below can be used for setting up a Noosfero production environment from the Noosfero sources.
+
+Before you start installing Noosfero manually, see the information about the Noosfero Debian package at http://noosfero.org/Development/DebianPackage. Using the Debian packages on a Debian stable system is the recommended method for installing production environments.
+
+If you want to setup a development environment instead of a production one, stop reading this file right now and read the file `HACKING.md` instead.
+
+For a complete installation guide, please see the following web page: http://noosfero.org/Development/HowToInstall
+
+If you have problems with the setup, please feel free to ask questions in the development mailing list.
+
+Requirements
+------------
+
+**DISCLAIMER**: this installation procedure is tested with Debian stable, which is currently the only recommended operating system for production usage. It is possible that you can install it on other systems, and if you do so, please report it on one of the Noosfero mailing lists, and please send a patch updating these instructions.
+
+Noosfero is written in Ruby with the "[Rails framework](http://www.rubyonrails.org)", so the process of setting it up is pretty similar to other Rails applications.
+
+You need to install some packages Noosfero depends on. On Debian GNU/Linux or Debian-based systems, all of these packages are available through the Debian archive. You can install them with the following command:
+
+    # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
+      libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
+      libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
+      tango-icon-theme
+
+On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages.
+
+* Ruby: http://www.ruby-lang.org
+* Rake: http://rake.rubyforge.org
+* po4a: http://po4a.alioth.debian.org
+* Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
+* rcov: http://eigenclass.org/hiki/rcov
+* RMagick: http://rmagick.rubyforge.org
+* RedCloth: http://redcloth.org
+* will_paginate: http://github.com/mislav/will_paginate/wikis
+* iso-codes: http://pkg-isocodes.alioth.debian.org
+* feedparser: http://packages.debian.org/sid/libfeedparser-ruby
+* Daemons - http://daemons.rubyforge.org
+* Thin: http://code.macournoyer.com/thin
+* tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
+* Hpricot: http://hpricot.com
+
+If you manage to install Noosfero successfully on other systems than Debian,
+please feel free to contact the Noosfero development mailing with the
+instructions for doing so, and we'll include it here.
+
+As root user
+============
+
+Install memcached. On Debian:
+
+    # apt-get install memcached
+
+Study whether you need to raise the ammount of memory it uses for caching, depending on the demand you expect for your site. If you are going to run a high-traffic site, you will want to raise the ammount of memory reserved for caching.
+
+It is recommended that you run noosfero with its own user account. To create such an account, please do the following:
+
+    # adduser --system --group noosfero --shell /bin/sh --home /var/lib/noosfero
+
+(note that you can change the `$HOME` directory of the user if you wish, here we are using `/var/lib/noosfero`)
+
+The `--system` option will tell adduser to create a system user, i.e. this user will not have a password and cannot login to the system directly. To become this user, you have to use sudo:
+
+    # sudo -u noosfero -i
+    or
+    # su - noosfero
+
+As noosfero user
+================
+
+downloading from git
+--------------------
+
+Here we are cloning the noosfero repository from git. Note: you will need to install git before.
+
+    $ git clone git://gitorious.org/noosfero/noosfero.git current
+    $ cd current
+    $ git checkout -b stable origin/stable
+
+downloading tarball
+-------------------
+
+Note: replace 0.39.0 below from the latest stable version.
+
+    $ wget http://noosfero.org/pub/Development/NoosferoVersion00x39x00/noosfero-0.39.0.tar.gz
+    $ tar -zxvf noosfero-0.39.0.tar.gz
+    $ ln -s noosfero-0.39.0 current
+    $ cd current
+
+Create the thin configuration file:
+
+    $ thin -C config/thin.yml -e production config
+
+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.3.5, which is the version in Debian Squeeze. If you have a Rails version newer than that, Noosfero will probably not work. You can install Rails 2.3.5 into your Noosfero installation with the following procedure:
+
+    $ cd /var/lib/noosfero/current/vendor
+    $ wget http://ftp.de.debian.org/debian/pool/main/r/rails/rails_2.3.5.orig.tar.gz
+    $ tar xzf rails_2.3.5.orig.tar.gz
+    $ ln -s rails-2.3.5 rails
+
+As root user
+============
+
+Setup Noosfero log and tmp directories:
+
+    # cd /var/lib/noosfero/current
+    # ./etc/init.d/noosfero setup
+
+Now it's time to setup the database. In this example we are using PostgreSQL, so if you are planning to use a different database this steps won't apply.
+
+    # apt-get install postgresql libpgsql-ruby
+    # su postgres -c 'createuser noosfero -S -d -R'
+
+By default Rails will try to connect on postgresql through 5432 port, you can check it on `/etc/postgresql/8.4/main/postgresql.conf` file.
+
+Restart postgresql:
+    # invoke-rc.d postgresql restart
+
+Noosfero needs a functional e-mail setup to work: the local mail system should be able to deliver e-mail to the internet, either directly or through an external SMTP server. Please check the documentation at the INSTALL.email file.
+
+As noosfero user
+================
+
+Now create the databases:
+
+    $ cd /var/lib/noosfero/current
+    $ createdb noosfero_production
+    $ createdb noosfero_development
+    $ createdb noosfero_test
+
+The development and test databases are actually optional. If you are creating a stricly production server, you will probably not need them.
+
+Now we want to configure Noosfero for accessing the database we just created. To do that, you can 1) copy `config/database.yml.pgsql` to `config/database.yml`, or create `config/database.yml` from scratch with the following content:
+
+    production:
+      adapter: postgresql
+      encoding: unicode
+      database: noosfero_production
+      username: noosfero
+
+Now, to test the database access, you can fire the Rails database console:
+
+    $ ./script/dbconsole production
+
+If it connects to your database, then everything is fine. If you got an error message, then you have to check your database configuration.
+
+Create the database structure:
+
+    $ RAILS_ENV=production rake db:schema:load
+
+Compile the translations:
+
+    $ RAILS_ENV=production rake noosfero:translations:compile
+
+Now we must create some initial data. To create your default environment (the first one), run the command below:
+
+    $ RAILS_ENV=production ./script/runner 'Environment.create!(:name => "My environment", :is_default => true)'
+
+(of course, replace "My environment" with your environment's name!)
+
+And now you have to add the domain name you will be using for your noosfero site to the list of domains of that default environment you just created:
+
+    $ RAILS_ENV=production ./script/runner "Environment.default.domains << Domain.new(:name => 'your.domain.com')"
+
+(replace "your.domain.com" with your actual domain name)
+
+Add at least one user as admin of environment:
+
+    $ RAILS_ENV=production ./script/runner "User.create(:login => 'adminuser', :email => 'admin@example.com', :password => 'admin', :password_confirmation => 'admin', :environment => Environment.default, :activated_at => Time.new)"
+
+(replace "adminuser", "admin@example.com", "admin" with the login, email and password of your environment administrator)
+
+To start the Noosfero application servers:
+
+    $ ./script/production start
+
+At this point you have a functional Noosfero installation running, the only thing left is to configure your webserver as a reverse proxy to pass requests to them.
+
+
+Apache instalation
+==================
+
+    # apt-get install apache2
+
+Apache configuration
+--------------------
+
+First you have to enable the following some apache modules:
+
+ * deflate
+ * expires
+ * proxy
+ * proxy_balancer
+ * proxy_http
+ * rewrite
+
+On Debian GNU/Linux system, these modules can be enabled with the following command line, as root:
+
+    # a2enmod deflate expires proxy proxy_balancer proxy_http rewrite
+
+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 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.
+
+Add a file called "mysite" (or whatever name you want to give to your noosfero site) to `/etc/apache2/sites-available` with the following content, and customize as needed (as usual, make sure you replace "your.domain.com" with you actual domain name, and "`/var/lib/noosfero/current`" with the directory where Noosfero is installed):
+
+    <VirtualHost *:80>
+      ServerName your.domain.com
+
+      DocumentRoot "/var/lib/noosfero/current/public"
+      <Directory "/var/lib/noosfero/current/public">
+        Options FollowSymLinks
+        AllowOverride None
+        Order Allow,Deny
+        Allow from all
+      </Directory>
+
+      RewriteEngine On
+
+      # Rewrite index to check for static index.html
+      RewriteRule ^/$ /index.html [QSA]
+
+      # Rewrite to check for Rails cached page
+      RewriteRule ^([^.]+)$ $1.html [QSA]
+
+      RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+      RewriteRule ^.*$ balancer://noosfero%{REQUEST_URI} [P,QSA,L]
+
+      ErrorDocument 503 /503.html
+
+      ErrorLog /var/log/apache2/noosfero.log
+      LogLevel warn
+      CustomLog /var/log/apache2/noosfero.access.log combined
+
+      Include /var/lib/noosfero/current/etc/noosfero/apache/cache.conf
+
+    </VirtualHost>
+
+    <Proxy balancer://noosfero>
+      BalancerMember http://127.0.0.1:3000
+      BalancerMember http://127.0.0.1:3001
+      Order Allow,Deny
+      Allow from All
+    </Proxy>
+
+The cache.conf file included in the end of the <VirtualHost> section is important, since it will tell apache to pass expiration and cache headers to clients so that the site feels faster for users. Do we need to say that using that configuration is strongly recommended?
+
+Enable that site with (as root, replace "mysite" with the actual name you gave to your site configuration):
+
+    # a2ensite mysite
+
+Now restart your apache server (as root):
+
+    # invoke-rc.d apache2 restart
+
+
+Enabling exception notifications
+================================
+
+This is an optional step. You will need it only if you want to receive e-mail notifications when some exception occurs on Noosfero.
+
+First, install this version of the gem. Others versions may not be compatible with Noosfero:
+
+    # gem install exception_notification -v 1.0.20090728
+
+You can configure the e-mails that will receive the notifications. Change the file config/noosfero.yml as the following example, replacing the e-mails by real ones:
+
+    production:
+      exception_recipients: [admin@example.com, you@example.com]
+
+
+Maintainance
+============
+
+To ease the maintainance, install a symbolic link for the Noosfero startup script in your server and add it to the system initialization and shutdown sequences (as root):
+
+    # ln -s /var/lib/noosfero/current/etc/init.d/noosfero /etc/init.d/noosfero
+    # update-rc.d noosfero defaults
+     Adding system startup for /etc/init.d/noosfero ...
+       /etc/rc0.d/K20noosfero -> ../init.d/noosfero
+       /etc/rc1.d/K20noosfero -> ../init.d/noosfero
+       /etc/rc6.d/K20noosfero -> ../init.d/noosfero
+       /etc/rc2.d/S20noosfero -> ../init.d/noosfero
+       /etc/rc3.d/S20noosfero -> ../init.d/noosfero
+       /etc/rc4.d/S20noosfero -> ../init.d/noosfero
+       /etc/rc5.d/S20noosfero -> ../init.d/noosfero
+
+Now to start Noosfero, you do as root:
+
+    # invoke-rc.d noosfero start
+
+To stop Noosfero:
+
+    # invoke-rc.d noosfero start
+
+To restart Noosfero:
+
+    # invoke-rc.d noosfero restart
+
+Noosfero will be automatically started during system boot, and automatically stopped if the system shuts down for some reason (or during the shutdown part of a reboot).
+
+Rotating logs
+=============
+
+Noosfero provides an example logrotate configuation to rotate its logs. To use it, create a symbolic link in `/etc/logrotate.d/`:
+
+    # cd /etc/logrotate.d/
+    # ln -s /var/lib/noosfero/current/etc/logrotate.d/noosfero
+
+Note that the provided file assumes Noosfero logging is being done in `/var/log/noosfero` (which is the case if you followed the instructions above correctly). If the logs are stored elsewhere, it's recommended that you copy the file over to `/etc/logrotate.d/` and modify it to point to your local log directly.
+
+Upgrading
+=========
+
+If you followed the steps in this document and installed Noosfero from the git repository, then upgrading is easy. First, you need to allow the noosfero user to restart the memcached server with sudo, by adding the following line in `/etc/sudoers`:
+
+    noosfero ALL=NOPASSWD: /etc/init.d/memcached
+
+Then, to perform an upgrade, do the following as the noosfero user:
+
+    $ cd /var/lib/noosfero/current
+    $ ./script/git-upgrade
+
+The `git-upgrade` script will take care of everything for you. It will first stop the service, then fetch the current source code, upgrade database, compile translations, and then start the service again.
+
+*Note 1*: make sure your local git repository is following the "stable" branch, just like the instructions above. The `master` branch is **not** recommended for use in production environments.
+
+*Note 2*: always read the release notes before upgrading. Sometimes there will be steps that must be performed manually. If that is the case, you can invoke the `git-upgrade` script with the special parameter `--shell` that will give you a shell after the upgrade, which you can use to perform any manual steps required:
+
+    $ ./script/git-upgrade --shell
@@ -1,163 +0,0 @@
-== Multitenancy support
-
-Multitenancy refers to a principle in software architecture where a
-single instance of the software runs on a server, serving multiple
-client organizations (tenants). Multitenancy is contrasted with a
-multi-instance architecture where separate software instances (or
-hardware systems) are set up for different client organizations. With
-a multitenant architecture, a software application is designed to
-virtually partition its data and configuration, and each client
-organization works with a customized virtual application instance.
-
-Today this feature is available only for PostgreSQL databases.
-
-This document assumes that you have a new fully PostgresSQL default Noosfero
-installation as explained at the INSTALL file.
-
-== Separated data
-
-The items below are separated for each hosted environment:
-
-* Uploaded files
-* Database
-* Solr index
-* ActiveRecord#cache_key
-* Feed updater
-* Delayed Job Workers
-
-== Database configuration file
-
-The file config/database.yml must follow a structure in order to
-achieve multitenancy support. In this example, we will set 3
-different environments: env1, env2 and env3.
-
-Each "hosted" environment must have an entry like this:
-
-env1_production:
-  adapter: postgresql
-  encoding: unicode
-  database: noosfero
-  schema_search_path: public
-  username: noosfero
-  domains:
-    - env1.com
-    - env1.org
-
-env2_production:
-  adapter: postgresql
-  encoding: unicode
-  database: noosfero
-  schema_search_path: env2
-  username: noosfero
-  domains:
-    - env2.com
-    - env2.org
-
-env3_production:
-  adapter: postgresql
-  encoding: unicode
-  database: noosfero
-  schema_search_path: env3
-  username: noosfero
-  domains:
-    - env3.com
-    - env3.net
-
-The "hosted" environments define, besides the schema_search_path, a
-list of domains that, when accessed, tells which database the
-application should use. Also, the environment name must end with
-'_hosting', where 'hosting' is the name of the hosting environment.
-
-You must also tell the application which is the default environment.
-
-production:
-  env1_production
-
-On the example above there are only three hosted environments, but it
-can be more than three. The schemas 'env2' and 'env3' must already
-exist in the same database of the hosting environment. As postgres
-user, you can create them typing:
-
-$ psql database_name -c "CREATE SCHEMA env2 AUTHORIZATION database_user"
-$ psql database_name -c "CREATE SCHEMA env3 AUTHORIZATION database_user"
-
-Replace database_name and database_user above with your stuff.
-
-So, yet on this same example, when a user accesses http://env2.com or
-http://env2.org, the Noosfero application running on production will
-turn the database schema to 'env2'. When the access is from domains
-http://env3.com or http://env3.net, the schema to be loaded will be
-'env3'.
-
-There is an example of this file in config/database.yml.multitenancy
-
-== Preparing the database
-
-Now create the environments:
-
-$ RAILS_ENV=production rake multitenancy:create
-
-This command above will create the hosted environment files equal to
-their hosting environment, here called 'production'.
-
-Run db:schema:load for each other environment:
-
-$ RAILS_ENV=env2_production rake db:schema:load
-$ RAILS_ENV=env3_production rake db:schema:load
-
-Then run the migrations for the hosting environment, and it will
-run for each of its hosted environments:
-
-RAILS_ENV=production rake db:migrate
-
-== Start Noosfero
-
-Run Noosfero init file as root:
-
-# invoke-rc.d noosfero start
-
-== Solr
-
-It's necessary to run only one instance of Solr. Don't worry
-about this, Noosfero initializer had already done this for you.
-
-== Feed updater & Delayed job
-
-Just for your information, a daemon of feed-updater and delayed_job
-must be running for each environment. Noosfero initializer do this,
-relax.
-
-== Uploaded files
-
-When running with PostgreSQL, Noosfero uploads stuff to a folder named
-the same way as the running schema. Inside the upload folder root, for
-example, will be public/image_uploads/env2 and public/image_uploads/env3.
-
-== Adding multitenancy support to an existing Noosfero environment
-
-If you already have a Noosfero environment, you can turn it multitenant
-by following the steps below in addition to the previous steps:
-
-1. Reindex your database
-
-Rebuild the Solr index by running the following task just
-for your hosting environment, do this as noosfero user:
-
-$ RAILS_ENV=production rake multitenancy:reindex
-
-2. Move the uploaded files to the right place
-
-Add a directory with the same name as your schema name (by default this
-name is 'public') in the root of each upload directory, for example,
-public/articles/0000 will be moved to public/articles/public/0000. Do this
-with the directories public/image_uploads, public/articles and public/thumbnails.
-
-3. Fix paths on activities
-
-The profile activities store static paths to the images, so it's necessary to fix
-these paths. You can do this easily by setting an alias on your webserver.
-On Apache you can add the three rules below, where 'public' is the schema name:
-
-  RewriteRule ^/articles(.+) /articles/public$1
-  RewriteRule ^/image_uploads(.+) /image_uploads/public$1
-  RewriteRule ^/thumbnails(.+) /thumbnails/public$1
@@ -0,0 +1,133 @@
+Multitenancy support
+====================
+
+Multitenancy refers to a principle in software architecture where a single instance of the software runs on a server, serving multiple client organizations (tenants). Multitenancy is contrasted with a multi-instance architecture where separate software instances (or hardware systems) are set up for different client organizations. With a multitenant architecture, a software application is designed to virtually partition its data and configuration, and each client organization works with a customized virtual application instance.
+
+Today this feature is available only for PostgreSQL databases.
+
+This document assumes that you have a new fully PostgresSQL default Noosfero installation as explained at the `INSTALL.md` file.
+
+Separated data
+--------------
+
+The items below are separated for each hosted environment:
+
+* Uploaded files
+* Database
+* Solr index
+* ActiveRecord#cache_key
+* Feed updater
+* Delayed Job Workers
+
+Database configuration file
+---------------------------
+
+The file config/database.yml must follow a structure in order to achieve multitenancy support. In this example, we will set 3 different environments: env1, env2 and env3.
+
+Each "hosted" environment must have an entry like this:
+
+    env1_production:
+      adapter: postgresql
+      encoding: unicode
+      database: noosfero
+      schema_search_path: public
+      username: noosfero
+      domains:
+        - env1.com
+        - env1.org
+
+    env2_production:
+      adapter: postgresql
+      encoding: unicode
+      database: noosfero
+      schema_search_path: env2
+      username: noosfero
+      domains:
+        - env2.com
+        - env2.org
+
+    env3_production:
+      adapter: postgresql
+      encoding: unicode
+      database: noosfero
+      schema_search_path: env3
+      username: noosfero
+      domains:
+        - env3.com
+        - env3.net
+
+The "hosted" environments define, besides the `schema_search_path`, a list of domains that, when accessed, tells which database the application should use. Also, the environment name must end with "`_<hosting>`", where `<hosting>` is the name of the hosting environment.
+
+You must also tell the application which is the default environment.
+
+    production:
+      env1_production
+
+On the example above there are only three hosted environments, but it can be more than three. The schemas `env2` and `env3` must already exist in the same database of the hosting environment. As postgres user, you can create them typing:
+
+    $ psql database_name -c "CREATE SCHEMA env2 AUTHORIZATION database_user"
+    $ psql database_name -c "CREATE SCHEMA env3 AUTHORIZATION database_user"
+
+Replace `database_name` and `database_user` above with your stuff.
+
+So, yet on this same example, when a user accesses http://env2.com or http://env2.org, the Noosfero application running on production will turn the database schema to `env2`. When the access is from domains http://env3.com or http://env3.net, the schema to be loaded will be `env3`.
+
+There is an example of this file in `config/database.yml.multitenancy`
+
+Preparing the database
+----------------------
+
+Now create the environments:
+
+    $ RAILS_ENV=production rake multitenancy:create
+
+This command above will create the hosted environment files equal to their hosting environment, here called 'production'.
+
+Run db:schema:load for each other environment:
+
+    $ RAILS_ENV=env2_production rake db:schema:load
+    $ RAILS_ENV=env3_production rake db:schema:load
+
+Then run the migrations for the hosting environment, and it will run for each of its hosted environments:
+
+    RAILS_ENV=production rake db:migrate
+
+Start Noosfero
+--------------
+
+Run Noosfero init file as root:
+
+    # invoke-rc.d noosfero start
+
+Feed updater & Delayed job
+--------------------------
+
+Just for your information, a daemon of `feed-updater` and `delayed_job` must be running for each environment. Noosfero initializer do this, relax.
+
+Uploaded files
+--------------
+
+When running with PostgreSQL, Noosfero uploads stuff to a folder named the same way as the running schema. Inside the upload folder root, for example, will be `public/image_uploads/env2` and `public/image_uploads/env3`.
+
+Adding multitenancy support to an existing Noosfero environment
+---------------------------------------------------------------
+
+If you already have a Noosfero environment, you can turn it multitenant by following the steps below in addition to the previous steps:
+
+### 1. Reindex your database
+
+Rebuild the Solr index by running the following task just for your hosting environment, do this as noosfero user:
+
+    $ RAILS_ENV=production rake multitenancy:reindex
+
+### 2. Move the uploaded files to the right place
+
+Add a directory with the same name as your schema name (by default this name is `public`) in the root of each upload directory, for example, `public/articles/0000` will be moved to `public/articles/public/0000`. Do this with the directories `public/image_uploads`, `public/articles` and `public/thumbnails`.
+
+### 3. Fix paths on activities
+
+The profile activities store static paths to the images, so it's necessary to fix these paths. You can do this easily by setting an alias on your webserver. On Apache you can add the three rules below, where 'public' is the schema name:
+
+    RewriteRule ^/articles(.+) /articles/public$1
+    RewriteRule ^/image_uploads(.+) /image_uploads/public$1
+    RewriteRule ^/thumbnails(.+) /thumbnails/public$1
@@ -1,71 +0,0 @@
-= Setting up Varnish for your Noosfero site
-
-Varnish is a HTTP caching server, and using it together with Noosfero is highly
-recommended. See http://www.varnish-cache.org/ for more information on Varnish.
-
-Varnish can be set up to use with Noosfero with the following steps:
-
-1) setup Noosfero with apache according to the INSTALL file. If you used the
-Debian package to install noosfero, you don't need to do anything about this.
-
-2) install Varnish
-
-  # apt-get install varnish
-
-Install the RPAF apache module (or skip this step if not using apache):
-
-  # apt-get install libapache2-mod-rpaf
-
-3) Change Apache to listen on port 8080 instead of 80
-
-3a) Edit /etc/apache2/ports.conf, and:
-
-  * change 'NameVirtualHost *:80' to 'NameVirtualHost *:8080'
-  * change 'Listen 80' to 'Listen 127.0.0.1:8080'
-
-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
-
-   * change the line that says "START=no" to say "START=yes"
-   * change '-a :6081' to '-a :80'
-
-4b) Edit /etc/varnish/default.vcl and add the following lines at the end:
-
-  include "/etc/noosfero/varnish-noosfero.vcl";
-  include "/etc/noosfero/varnish-accept-language.vcl";
-
-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:
-
-VARNISHNCSA_ENABLED=1
-
-The varnish log will be written to /var/log/varnish/varnishncsa.log in an
-apache-compatible format. You should change your statistics generation software
-(e.g. awstats) to use that instead of apache logs.
-
-5b) Restart Varnish Logging service
-
-  # invoke-rc.d varnishncsa restart
-
-Thanks to Cosimo Streppone for varnish-accept-language. See
-http://github.com/cosimo/varnish-accept-language for more information.
@@ -0,0 +1,63 @@
+Setting up Varnish for your Noosfero site
+=========================================
+
+Varnish is a HTTP caching server, and using it together with Noosfero is highly recommended. See http://www.varnish-cache.org/ for more information on Varnish.
+
+Varnish can be set up to use with Noosfero with the following steps:
+
+1) setup Noosfero with apache according to the `INSTALL.md` file. If you used the Debian package to install noosfero, you don't need to do anything about this.
+
+2) install Varnish
+
+    # apt-get install varnish
+
+Install the RPAF apache module (or skip this step if not using apache):
+
+    # apt-get install libapache2-mod-rpaf
+
+3) Change Apache to listen on port `8080` instead of `80`
+
+3a) Edit `/etc/apache2/ports.conf`, and:
+
+  * change `NameVirtualHost *:80` to `NameVirtualHost *:8080`
+  * change `Listen 80` to `Listen 127.0.0.1:8080`
+
+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`
+
+   * change the line that says `START=no` to say `START=yes`
+   * change `-a :6081` to `-a :80`
+
+4b) Edit `/etc/varnish/default.vcl` and add the following lines at the end:
+
+    include "/etc/noosfero/varnish-noosfero.vcl";
+    include "/etc/noosfero/varnish-accept-language.vcl";
+
+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:
+
+    VARNISHNCSA_ENABLED=1
+
+The varnish log will be written to `/var/log/varnish/varnishncsa.log` in an apache-compatible format. You should change your statistics generation software (e.g. awstats) to use that instead of apache logs.
+
+5b) Restart Varnish Logging service
+
+    # invoke-rc.d varnishncsa restart
+
+Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
@@ -1,33 +0,0 @@
-Noosfero - a web-based social platform
-======================================
-
-http://www.noosfero.org/
-
-Documentation
--------------
-
-The following documentation is available:
-
-File                  Purpose
-~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-INSTALL               install instructions
-INSTALL.awstats       install instructions - access statistics service
-INSTALL.chat          install instructions - chat service
-INSTALL.email         install instructions - email service
-INSTALL.multitenancy  install instructions - multiple sites
-INSTALL.varnish       install instructions - varnish HTTP caching (recommended)
-HACKING               development instruction
-RELEASING             instructions for doing releases
-doc/noosfero/*        user documentation (available through the app itself)
-
-
-Authors and copyright
----------------------
-
-Authorship and copyright information is available in the files listed below.
-
-File                  Purpose
-~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-AUTHORS               list of authors (updated at each release)
-COPYRIGHT             Copyright statement for the project
-COPYING               Full text of the project license
@@ -0,0 +1,33 @@
+Noosfero - a web-based social platform
+======================================
+
+http://www.noosfero.org
+
+Documentation
+-------------
+
+The following documentation is available:
+
+    File                     Purpose
+    -----------------------  --------------------------------------------------------
+    INSTALL.md               install instructions
+    INSTALL.awstats.md       install instructions - access statistics service
+    INSTALL.chat.md          install instructions - chat service
+    INSTALL.email.md         install instructions - email service
+    INSTALL.multitenancy.md  install instructions - multiple sites
+    INSTALL.varnish.md       install instructions - varnish HTTP caching (recommended)
+    HACKING.md               development instruction
+    RELEASING.md             instructions for doing releases
+    doc/noosfero/*           user documentation (available through the app itself)
+
+
+Authors and copyright
+---------------------
+
+Authorship and copyright information is available in the files listed below.
+
+    File                  Purpose
+    --------------------  -----------------------------------------
+    AUTHORS.md            list of authors (updated at each release)
+    COPYRIGHT             Copyright statement for the project
+    COPYING               Full text of the project license
@@ -1,183 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application and persistence framework that includes everything
-needed to create database-backed web-applications according to the
-Model-View-Control pattern of separation. This pattern splits the view (also
-called the presentation) into "dumb" templates that are primarily responsible
-for inserting pre-built data in between HTML tags. The model contains the
-"smart" domain objects (such as Account, Product, Person, Post) that holds all
-the business logic and knows how to persist themselves to a database. The
-controller handles the incoming requests (such as Save New Account, Update
-Product, Show Post) by manipulating the model and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in 
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails.  You can read more about Action Pack in 
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting started
-
-1. Start the web server: <tt>ruby script/server</tt> (run with --help for options)
-2. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!"
-3. Follow the guidelines to start developing your application
-
-
-== Web servers
-
-Rails uses the built-in web server in Ruby called WEBrick by default, so you don't
-have to install or configure anything to play around. 
-
-If you have lighttpd installed, though, it'll be used instead when running script/server.
-It's considerably faster than WEBrick and suited for production use, but requires additional
-installation and currently only works well on OS X/Unix (Windows users are encouraged
-to start with WEBrick). We recommend version 1.4.11 and higher. You can download it from
-http://www.lighttpd.net.
-
-If you want something that's halfway between WEBrick and lighttpd, we heartily recommend
-Mongrel. It's a Ruby-based web server with a C-component (so it requires compilation) that
-also works very well with Windows. See more at http://mongrel.rubyforge.org/.
-
-But of course its also possible to run Rails with the premiere open source web server Apache.
-To get decent performance, though, you'll need to install FastCGI. For Apache 1.3, you want
-to use mod_fastcgi. For Apache 2.0+, you want to use mod_fcgid.
-
-See http://wiki.rubyonrails.com/rails/pages/FastCGI for more information on FastCGI.
-
-== Example for Apache conf
-
-  <VirtualHost *:80>
-    ServerName rails
-    DocumentRoot /path/application/public/
-    ErrorLog /path/application/log/server.log
-  
-    <Directory /path/application/public/>
-      Options ExecCGI FollowSymLinks
-      AllowOverride all
-      Allow from all
-      Order allow,deny
-    </Directory>
-  </VirtualHost>
-
-NOTE: Be sure that CGIs can be executed in that directory as well. So ExecCGI
-should be on and ".cgi" should respond. All requests from 127.0.0.1 go
-through CGI, so no Apache restart is necessary for changes. All other requests
-go through FCGI (or mod_ruby), which requires a restart to show changes.
-
-
-== Debugging Rails
-
-Have "tail -f" commands running on both the server.log, production.log, and
-test.log files. Rails will automatically display debugging and runtime
-information to these files. Debugging info will also be shown in the browser
-on requests from 127.0.0.1.
-
-
-== Breakpoints
-
-Breakpoint support is available through the script/breakpointer client. This
-means that you can break out of execution at any point in the code, investigate
-and change the model, AND then resume execution! Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.find_all
-      breakpoint "Breaking out from the list"
-    end
-  end
-  
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the breakpointer window. Here you can do things like:
-
-Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>, 
-       #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
-  >> @posts.first.title = "hello from a breakpoint"
-  => "hello from a breakpoint"
-
-...and even better is that you can examine how your runtime objects actually work:
-
-  >> f = @posts.first 
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you press CTRL-D
-
-
-== Console
-
-You can interact with the domain model by starting the console through script/console. 
-Here you'll have all parts of the application configured, just like it is when the
-application is running. You can inspect domain models, change values, and save to the
-database. Starting the script without arguments will launch it in the development environment.
-Passing an argument will specify a different environment, like <tt>script/console production</tt>.
-
-To reload your controllers and models after launching the console run <tt>reload!</tt>
-
-
-
-== Description of contents
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/controllers
-  Holds controllers that should be named like weblog_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb.
-  Most models will descend from ActiveRecord::Base.
-  
-app/views
-  Holds the template files for the view that should be named like
-  weblog/index.rhtml for the WeblogController#index action. All views use eRuby
-  syntax. This directory can also be used to keep stylesheets, images, and so on
-  that can be symlinked to public.
-  
-app/helpers
-  Holds view helpers that should be named like weblog_helper.rb.
-
-app/apis
-  Holds API classes for web services.
-
-config
-  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
-
-components
-  Self-contained mini-applications that can bundle together controllers, models, and views.
-
-db
-  Contains the database schema in schema.rb.  db/migrate contains all
-  the sequence of Migrations for your schema.
-
-lib
-  Application specific libraries. Basically, any kind of custom code that doesn't
-  belong under controllers, models, or helpers. This directory is in the load path.
-    
-public
-  The directory available for the web server. Contains subdirectories for images, stylesheets,
-  and javascripts. Also contains the dispatchers and the default HTML files.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins subdirectory.
-  This directory is in the load path.
@@ -0,0 +1,138 @@
+Welcome to Rails
+================
+
+Rails is a web-application and persistence framework that includes everything needed to create database-backed web-applications according to the Model-View-Control pattern of separation. This pattern splits the view (also called the presentation) into "dumb" templates that are primarily responsible for inserting pre-built data in between HTML tags. The model contains the "smart" domain objects (such as Account, Product, Person, Post) that holds all the business logic and knows how to persist themselves to a database. The controller handles the incoming requests (such as Save New Account, Update Product, Show Post) by manipulating the model and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping layer entitled Active Record. This layer allows you to present the data from database rows as objects and embellish these data objects with business logic methods. You can read more about Active Record in `.../rails/activerecord/README.html`.
+
+The controller and view are handled by the Action Pack, which handles both layers by its two parts: Action View and Action Controller. These two layers are bundled in a single package due to their heavy interdependence. This is unlike the relationship between the Active Record and Action Pack that is much more separate. Each of these packages can be used independently outside of Rails. You can read more about Action Pack in `.../rails/actionpack/README.html`.
+
+
+Getting started
+---------------
+
+1. Start the web server: `ruby script/server` (run with `--help` for options)
+2. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!"
+3. Follow the guidelines to start developing your application
+
+Web servers
+-----------
+
+Rails uses the built-in web server in Ruby called WEBrick by default, so you don't have to install or configure anything to play around. 
+
+If you have lighttpd installed, though, it'll be used instead when running script/server. It's considerably faster than WEBrick and suited for production use, but requires additional installation and currently only works well on OS X/Unix (Windows users are encouraged to start with WEBrick). We recommend version 1.4.11 and higher. You can download it from http://www.lighttpd.net.
+
+If you want something that's halfway between WEBrick and lighttpd, we heartily recommend Mongrel. It's a Ruby-based web server with a C-component (so it requires compilation) that also works very well with Windows. See more at http://mongrel.rubyforge.org/.
+
+But of course its also possible to run Rails with the premiere open source web server Apache. To get decent performance, though, you'll need to install FastCGI. For Apache 1.3, you want to use mod_fastcgi. For Apache 2.0+, you want to use mod_fcgid.
+
+See http://wiki.rubyonrails.com/rails/pages/FastCGI for more information on FastCGI.
+
+Example for Apache conf
+-----------------------
+
+    <VirtualHost *:80>
+      ServerName rails
+      DocumentRoot /path/application/public/
+      ErrorLog /path/application/log/server.log
+    
+      <Directory /path/application/public/>
+        Options ExecCGI FollowSymLinks
+        AllowOverride all
+        Allow from all
+        Order allow,deny
+      </Directory>
+    </VirtualHost>
+
+NOTE: Be sure that CGIs can be executed in that directory as well. So ExecCGI should be on and ".cgi" should respond. All requests from 127.0.0.1 go through CGI, so no Apache restart is necessary for changes. All other requests go through FCGI (or mod_ruby), which requires a restart to show changes.
+
+Debugging Rails
+---------------
+
+Have "tail -f" commands running on both the server.log, production.log, and test.log files. Rails will automatically display debugging and runtime information to these files. Debugging info will also be shown in the browser on requests from 127.0.0.1.
+
+Breakpoints
+-----------
+
+Breakpoint support is available through the script/breakpointer client. This means that you can break out of execution at any point in the code, investigate and change the model, AND then resume execution! Example:
+
+    class WeblogController < ActionController::Base
+      def index
+        @posts = Post.find_all
+        breakpoint "Breaking out from the list"
+      end
+    end
+  
+So the controller will accept the action, run the first line, then present you with a IRB prompt in the breakpointer window. Here you can do things like:
+
+Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
+
+    >> @posts.inspect
+    => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>, 
+         #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
+    >> @posts.first.title = "hello from a breakpoint"
+    => "hello from a breakpoint"
+
+...and even better is that you can examine how your runtime objects actually work:
+
+    >> f = @posts.first 
+    => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+    >> f.
+    Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you press CTRL-D
+
+Console
+-------
+
+You can interact with the domain model by starting the console through script/console. Here you'll have all parts of the application configured, just like it is when the application is running. You can inspect domain models, change values, and save to the database. Starting the script without arguments will launch it in the development environment. Passing an argument will specify a different environment, like `script/console production`.
+
+To reload your controllers and models after launching the console run `reload!`
+
+Description of contents
+-----------------------
+
+* `app`
+  Holds all the code that's specific to this particular application.
+
+* `app/controllers`
+  Holds controllers that should be named like weblog_controller.rb for automated URL mapping. All controllers should descend from `ActionController::Base`.
+
+* `app/models`
+  Holds models that should be named like post.rb. Most models will descend from `ActiveRecord::Base`.
+  
+* `app/views`
+  Holds the template files for the view that should be named like `weblog/index.rhtml` for the `WeblogController#index` action. All views use eRuby syntax. This directory can also be used to keep stylesheets, images, and so on that can be symlinked to public.
+  
+* `app/helpers`
+  Holds view helpers that should be named like `weblog_helper.rb`.
+
+* `app/apis`
+  Holds API classes for web services.
+
+* `config`
+  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
+
+* `components`
+  Self-contained mini-applications that can bundle together controllers, models, and views.
+
+* `db`
+  Contains the database schema in `schema.rb`.
+
+* `db/migrate`
+  Contains all the sequence of Migrations for your schema.
+
+* `lib`
+  Application specific libraries. Basically, any kind of custom code that doesn't belong under controllers, models, or helpers. This directory is in the load path.
+    
+* `public`
+  The directory available for the web server. Contains subdirectories for images, stylesheets, and javascripts. Also contains the dispatchers and the default HTML files.
+
+* `script`
+  Helper scripts for automation and generation.
+
+* `test`
+  Unit and functional tests along with fixtures.
+
+* `vendor`
+  External libraries that the application depends on. Also includes the plugins subdirectory. This directory is in the load path.
@@ -1,40 +0,0 @@
-= Noosfero release tasks
-
-This file documents release-related activities.
-
-== Working with translations
-
-* Update translation files: <tt>rake updatepo</tt>. Then <tt>git commit</tt> them.
-* Send the PO files to the translators.
-* Get the PO files back from translators, put in po/ under the correct language
-  name (e.,g. po/pt_BR/) and <tt>git commit</tt>.
-* test translations: <tt>rake makemo</tt> and browse the application on the web.
-
-== Releasing noosfero
-
-Considering you are on a Debian GNU/Linux or Debian-based system
- # apt-get install devscripts debhelper
-
-To prepare a release of noosfero, you must follow the steps below:
-
-* Finish all requirements and bugs assigned to the to-be-released version
-* Make sure all tests pass
-* Write release notes at the version's wiki topic
-* Generate packages with <tt>rake noosfero:release[(stable|test)]</tt>. This task will:
-  * Update the version in lib/noosfero.rb and debian/changelog.
-  * Create the tarbal and the deb pkg under pkg/ directory.
-  * Create a git tag and push it.
-  * Upload the pkg to the configured repository (if configured) on ~/.dput.cf.
-* Test that the tarball and deb package are ok
-* Go to the version's wiki topic and edit it to reflect the new reality
-* Edit the topic WebPreferences and update DEBIAN_REPOSITORY_TOPICS setting
-* Attach the generated packages to that topic. Before attaching calculate the
-  sha1 of the package (with sha1sum and paste the SHA1 hash as comment in the
-  attachment form)
-* Download the attached and verify the MD5 hash
-* Update an eventual demonstration version that you run.
-* Write an announcement e-mail to the relevant mailing lists pointing to the
-  release notes, and maybe to the demonstration version.
-
-If you had any problem during these steps, you can do <tt>rake clobber_package</tt> to
-completely delete the generated packages and start the process again.
@@ -0,0 +1,39 @@
+Noosfero release tasks
+======================
+
+This file documents release-related activities.
+
+Working with translations
+-------------------------
+
+* Update translation files: `rake updatepo`. Then `git commit` them.
+* Send the PO files to the translators.
+* Get the PO files back from translators, put in `po/` under the correct language name (e.,g. `po/pt_BR/`) and `git commit`.
+* test translations: `rake makemo` and browse the application on the web.
+
+Releasing noosfero
+------------------
+
+Considering you are on a Debian GNU/Linux or Debian-based system
+
+    # apt-get install devscripts debhelper
+
+To prepare a release of noosfero, you must follow the steps below:
+
+* Finish all requirements and bugs assigned to the to-be-released version
+* Make sure all tests pass
+* Write release notes at the version's wiki topic
+* Generate packages with `rake noosfero:release[(stable|test)]`. This task will:
+  * Update the version in lib/noosfero.rb and debian/changelog.
+  * Create the tarbal and the deb pkg under pkg/ directory.
+  * Create a git tag and push it.
+  * Upload the pkg to the configured repository (if configured) on ~/.dput.cf.
+* Test that the tarball and deb package are ok
+* Go to the version's wiki topic and edit it to reflect the new reality
+* Edit the topic WebPreferences and update DEBIAN_REPOSITORY_TOPICS setting
+* Attach the generated packages to that topic. Before attaching calculate the sha1 of the package (with sha1sum and paste the SHA1 hash as comment in the attachment form)
+* Download the attached and verify the MD5 hash
+* Update an eventual demonstration version that you run.
+* Write an announcement e-mail to the relevant mailing lists pointing to the release notes, and maybe to the demonstration version.
+
+If you had any problem during these steps, you can do `rake clobber_package` to completely delete the generated packages and start the process again.
@@ -0,0 +1,11 @@
+class EnvironmentThemesController < ThemesController
+
+  protect 'edit_appearance', :environment
+  
+  no_design_blocks
+
+  def target
+    @target = environment
+  end
+
+end
@@ -2,7 +2,7 @@ class FeaturesController &lt; AdminController
   protect 'edit_environment_features', :environment
  
   def index
-    @features = Environment.available_features
+    @features = Environment.available_features.sort_by{|k,v|v}
   end
  
   post_only :update
@@ -4,12 +4,53 @@ class UsersController &lt; AdminController
  
   protect 'manage_environment_users', :environment
  
+  include UsersHelper
+
   def index
+    @filter = params[:filter] || 'all_users'
+    scope = environment.people.no_templates
+    if @filter == 'admin_users'
+      scope = scope.admins
+    elsif @filter == 'activated_users'
+      scope = scope.activated
+    elsif @filter == 'deactivated_users'
+      scope = scope.deactivated
+    end
+    scope = scope.order('name ASC')
+    @q = params[:q]
+    @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+  end
+
+  def set_admin_role
+    person = environment.people.find(params[:id])
+    environment.add_admin(person)
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def reset_admin_role
+    person = environment.people.find(params[:id])
+    environment.remove_admin(person)
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def activate
+    person = environment.people.find(params[:id])
+    person.user.activate
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def deactivate
+    person = environment.people.find(params[:id])
+    person.user.deactivate
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def download
     respond_to do |format|
       format.html
       format.xml do
-        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        send_data @users.to_xml(
+        users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
+        send_data users.to_xml(
             :skip_types => true,
             :only => %w[email login created_at updated_at],
             :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
@@ -45,4 +86,10 @@ class UsersController &lt; AdminController
     end
   end
  
+  private
+
+  def per_page
+    10
+  end
+
 end
@@ -2,7 +2,7 @@ class ApplicationController &lt; ActionController::Base
  
   before_filter :setup_multitenancy
   before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
+  before_filter :init_noosfero_plugins_controller_filters
   before_filter :allow_cross_domain_access
  
   def allow_cross_domain_access
@@ -21,8 +21,13 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    prepend_view_path('public/' + theme_path)
-    theme_option(:layout) || 'application'
+    return nil if request.format == :js
+    theme_layout = theme_option(:layout)
+    if theme_layout
+      theme_view_file('layouts/'+theme_layout) || theme_layout
+    else
+     'application'
+    end
   end
  
   filter_parameter_logging :password
@@ -122,22 +127,21 @@ class ApplicationController &lt; ActionController::Base
  
   include Noosfero::Plugin::HotSpot
  
-  def init_noosfero_plugins
-    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|
       filters = plugin.send(self.class.name.underscore + '_filters')
       filters = [filters] if !filters.kind_of?(Array)
+      controller_filters = self.class.filter_chain.map {|c| c.method }
       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])
+        filter_method = plugin.class.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]
+        unless controller_filters.include?(filter_method)
+          self.class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
+          self.class.send(:define_method, filter_method) do
+            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin.class)
+          end
+        end
       end
     end
   end
@@ -174,7 +178,7 @@ class ApplicationController &lt; ActionController::Base
   end
  
   def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
-    @plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
+    plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
     fallback_find_by_contents(asset, scope, query, paginate_options, options)
   end
  
@@ -70,7 +70,7 @@ class BoxOrganizerController &lt; ApplicationController
     else
       @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
       @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
-      @boxes = boxes_holder.boxes
+      @boxes = boxes_holder.boxes.with_position
       render :action => 'add_block', :layout => false
     end
   end
@@ -2,6 +2,8 @@ class CmsController &lt; MyProfileController
  
   protect 'edit_profile', :profile, :only => [:set_home_page]
  
+  include ArticleHelper
+
   def self.protect_if(*args)
     before_filter(*args) do |c|
       user, profile = c.send(:user), c.send(:profile)
@@ -64,20 +66,32 @@ class CmsController &lt; MyProfileController
   end
  
   def edit
+    @success_back_to = params[:success_back_to]
     @article = profile.articles.find(params[:id])
+    version = params[:version]
+    @article.revert_to(version) if version
+
     @parent_id = params[:parent_id]
     @type = params[:type] || @article.class.to_s
     translations if @article.translatable?
     continue = params[:continue]
  
+    @article.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i} unless params[:q].nil?
+
+    @tokenized_children = prepare_to_token_input(
+                            profile.members.includes(:articles_with_access).find_all{ |m|
+                              m.articles_with_access.include?(@article)
+                            }
+                          )
     refuse_blocks
     record_coming
     if request.post?
+      @article.image = nil if params[:remove_image] == 'true'
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
           if @article.content_type.nil? || @article.image?
-            redirect_to @article.view_url
+            success_redirect
           else
             redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
           end
@@ -89,6 +103,7 @@ class CmsController &lt; MyProfileController
   def new
     # FIXME this method should share some logic wirh edit !!!
  
+    @success_back_to = params[:success_back_to]
     # user must choose an article type first
  
     @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
@@ -129,11 +144,13 @@ class CmsController &lt; MyProfileController
  
     continue = params[:continue]
     if request.post?
+      @article.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i} unless params[:q].nil?
+
       if @article.save
         if continue
           redirect_to :action => 'edit', :id => @article
         else
-          redirect_to @article.view_url
+          success_redirect
         end
         return
       end
@@ -188,7 +205,7 @@ class CmsController &lt; MyProfileController
       @article.destroy
       session[:notice] = _("\"#{@article.name}\" was removed.")
       referer = ActionController::Routing::Routes.recognize_path URI.parse(request.referer).path rescue nil
-      if referer and referer[:controller] == 'cms'
+      if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
         redirect_to referer
       elsif @article.parent
         redirect_to @article.parent.url
@@ -289,6 +306,12 @@ class CmsController &lt; MyProfileController
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
  
+  def search_article_privacy_exceptions
+    arg = params[:q].downcase
+    result = profile.members.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input(result).to_json
+  end
+
   def media_upload
     files_uploaded = []
     parent = check_parent(params[:parent_id])
@@ -385,5 +408,12 @@ class CmsController &lt; MyProfileController
     true
   end
  
-end
+  def success_redirect
+    if !@success_back_to.blank?
+      redirect_to @success_back_to
+    else
+      redirect_to @article.view_url
+    end
+  end
  
+end
 class MembershipsController < MyProfileController
  
   protect 'manage_memberships', :profile
-  
+
   def index
-    @memberships = profile.memberships
+    @roles = environment.roles.select do |role|
+      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]
+    begin
+      @memberships = @filter.nil? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
+    rescue ActiveRecord::RecordNotFound
+      @memberships = []
+    end
   end
  
   def new_community
@@ -32,6 +32,7 @@ class ProfileDesignController &lt; BoxOrganizerController
     if profile.enterprise?
       blocks << DisabledEnterpriseMessageBlock
       blocks << HighlightsBlock
+      blocks << ProductCategoriesBlock
       blocks << FeaturedProductsBlock
       blocks << FansBlock
       blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
@@ -54,4 +55,10 @@ class ProfileDesignController &lt; BoxOrganizerController
     blocks
   end
  
+  def clone
+    block = Block.find(params[:id])
+    block.duplicate
+    redirect_to :action => 'index'
+  end
+
 end
@@ -2,7 +2,7 @@ class ProfileMembersController &lt; MyProfileController
   protect 'manage_memberships', :profile
  
   def index
-    @members = profile.members
+    @members = profile.members_by_name
     @member_role = environment.roles.find_by_name('member')
   end
  
@@ -0,0 +1,75 @@
+class ProfileThemesController < ThemesController
+
+  needs_profile
+
+  protect 'edit_appearance', :profile
+
+  no_design_blocks
+
+  def target
+    @target = profile
+  end
+
+  def new
+    if !request.xhr?
+      id = params[:name] ? params[:name].to_slug : 'my-theme'
+      t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
+      t.save
+      redirect_to :action => 'index'
+    else
+      render :action => 'new', :layout => false
+    end
+  end
+
+  def edit
+    @theme = profile.find_theme(params[:id])
+    @css_files = @theme.css_files
+    @image_files = @theme.image_files
+  end
+
+  def add_css
+    @theme = profile.find_theme(params[:id])
+    if request.xhr?
+      render :action => 'add_css', :layout => false
+    else
+      @theme.add_css(params[:css])
+      redirect_to :action => 'edit', :id => @theme.id
+    end
+  end
+
+  def css_editor
+    @theme = profile.find_theme(params[:id])
+    @css = params[:css]
+
+    @code = @theme.read_css(@css)
+    render :action => 'css_editor', :layout => false
+  end
+
+  post_only :update_css
+  def update_css
+    @theme = profile.find_theme(params[:id])
+    @theme.update_css(params[:css], params[:csscode])
+    redirect_to :action => 'edit', :id => @theme.id
+  end
+
+  def add_image
+    @theme = profile.find_theme(params[:id])
+    if request.xhr?
+      render :action => 'add_image', :layout => false
+    else
+      @theme.add_image(params[:image].original_filename, params[:image].read)
+      redirect_to :action => 'edit', :id => @theme.id
+    end
+  end
+
+  def start_test
+    session[:theme] = params[:id]
+    redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
+  end
+
+  def stop_test
+    session[:theme] = nil
+    redirect_to :action => 'index'
+  end
+
+end
@@ -1,91 +0,0 @@
-class ThemesController < MyProfileController
-
-  protect 'edit_appearance', :profile
-  no_design_blocks
-
-  def set
-    profile.update_theme(params[:id])
-    redirect_to :action => 'index'
-  end
-
-  def unset
-    profile.update_theme(nil)
-    redirect_to :action => 'index'
-  end
-
-  def index
-    @themes = profile.environment.themes + Theme.approved_themes(profile)
-    @current_theme = profile.theme
-
-    @layout_templates = LayoutTemplate.all
-    @current_template = profile.layout_template
-  end
-
-  def new
-    if !request.xhr?
-      id = params[:name] ? params[:name].to_slug : 'my-theme'
-      t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
-      t.save
-      redirect_to :action => 'index'
-    else
-      render :action => 'new', :layout => false
-    end
-  end
-
-  def edit
-    @theme = profile.find_theme(params[:id])
-    @css_files = @theme.css_files
-    @image_files = @theme.image_files
-  end
-
-  def add_css
-    @theme = profile.find_theme(params[:id])
-    if request.xhr?
-      render :action => 'add_css', :layout => false
-    else
-      @theme.add_css(params[:css])
-      redirect_to :action => 'edit', :id => @theme.id
-    end
-  end
-
-  def css_editor
-    @theme = profile.find_theme(params[:id])
-    @css = params[:css]
-
-    @code = @theme.read_css(@css)
-    render :action => 'css_editor', :layout => false
-  end
-
-  post_only :update_css
-  def update_css
-    @theme = profile.find_theme(params[:id])
-    @theme.update_css(params[:css], params[:csscode])
-    redirect_to :action => 'edit', :id => @theme.id
-  end
-
-  def add_image
-    @theme = profile.find_theme(params[:id])
-    if request.xhr?
-      render :action => 'add_image', :layout => false
-    else
-      @theme.add_image(params[:image].original_filename, params[:image].read)
-      redirect_to :action => 'edit', :id => @theme.id
-    end
-  end
-
-  def start_test
-    session[:theme] = params[:id]
-    redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
-  end
-
-  def stop_test
-    session[:theme] = nil
-    redirect_to :action => 'index'
-  end
-
-  def set_layout_template
-    profile.update_layout_template(params[:id])
-    redirect_to :action => 'index'
-  end
-
-end
@@ -141,22 +141,34 @@ class AccountController &lt; ApplicationController
     end
   end
  
-  # The user requests a password change. She forgot her old password.
-  #
-  # Posts back.
+  include ForgotPasswordHelper
+  helper :forgot_password
+
   def forgot_password
     if @plugins.dispatch(:allow_password_recovery).include?(false)
       redirect_back_or_default(:controller => 'home')
       session[:notice] = _("This environment doesn't allow password recovery.")
     end
-    @change_password = ChangePassword.new(params[:change_password])
+
+    @change_password = ChangePassword.new
  
     if request.post?
       begin
-        @change_password.save!
+        requestors = fetch_requestors(params[:value])
+        raise ActiveRecord::RecordNotFound if requestors.blank? || params[:value].blank?
+
+        requestors.each do |requestor|
+          ChangePassword.create!(:requestor => requestor)
+        end
         render :action => 'password_recovery_sent'
-      rescue ActiveRecord::RecordInvalid => e
-        nil # just pass and render at the end of the action
+      rescue ActiveRecord::RecordNotFound
+        if params[:value].blank?
+          @change_password.errors.add_to_base(_('Can not recover user password with blank value.'))
+        else
+          @change_password.errors.add_to_base(_('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]])
+        end
+      rescue ActiveRecord::RecordInvald
+        @change_password.errors.add_to_base(_('Could not perform password recovery for the user.'))
       end
     end
   end
@@ -262,7 +274,7 @@ class AccountController &lt; ApplicationController
   def user_data
     user_data =
       if logged_in?
-        current_user.data_hash
+        current_user.data_hash(gravatar_default)
       else
         { }
       end
 class CatalogController < PublicController
   needs_profile
-  no_design_blocks
  
   before_filter :check_enterprise_and_environment
  
@@ -71,7 +71,9 @@ class CommentController &lt; ApplicationController
       return
     end
  
-    @comment.save
+    if @comment.save
+      @plugins.dispatch(:process_extra_comment_params, [@comment,params])
+    end
  
     respond_to do |format|
       format.js do
@@ -113,6 +115,8 @@ class CommentController &lt; ApplicationController
  
   def update
     if @comment.update_attributes(params[:comment])
+      @plugins.dispatch(:process_extra_comment_params, [@comment,params])
+
       respond_to do |format|
         format.js do
           comment_to_render = @comment.comment_root
@@ -7,6 +7,7 @@ class ContentViewerController &lt; ApplicationController
  
   def view_page
     path = params[:page].join('/')
+    @version = params[:version].to_i
  
     if path.blank?
       @page = profile.home_page
@@ -25,31 +26,29 @@ class ContentViewerController &lt; ApplicationController
       end
     end
  
-    if !@page.nil? && !@page.display_to?(user)
-      if !profile.public?
-        private_profile_partial_parameters
-        render :template => 'profile/_private_profile.rhtml', :status => 403
-      else #if !profile.visible?
-        message = _('You are not allowed to view this content.')
-        message += ' ' + _('You can contact the owner of this profile to request access then.')
-        render_access_denied(message)
+    return unless allow_access_to_page(path)
+
+    if @version > 0
+      return render_access_denied unless @page.display_versions?
+      @versioned_article = @page.versions.find_by_version(@version)
+      if @versioned_article && @page.versions.latest.version != @versioned_article.version
+        render :template => 'content_viewer/versioned_article.rhtml'
+        return
       end
-      return
     end
  
-    # page not found, give error
-    if @page.nil?
-      render_not_found(@path)
-      return
-    end
+    redirect_to_translation if @page.profile.redirect_l10n
  
-    if request.xhr? && params[:toolbar]
-      render :partial => 'article_toolbar'
-      return
+    if request.post?
+      if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
+        @page.add_agreed_user(user)
+      end
+    elsif !@page.parent.nil? && @page.parent.forum?
+      unless @page.parent.agrees_with_terms?(user)
+        redirect_to @page.parent.url
+      end
     end
  
-    redirect_to_translation if @page.profile.redirect_l10n
-
     # At this point the page will be showed
     @page.hit
  
@@ -96,7 +95,7 @@ class ContentViewerController &lt; ApplicationController
     end
  
     if @page.folder? && @page.gallery?
-      @images = @page.images
+      @images = @page.images.select{ |a| a.display_to? user }
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
  
@@ -118,6 +117,15 @@ class ContentViewerController &lt; ApplicationController
     end
   end
  
+  def article_versions
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    return unless allow_access_to_page(path)
+
+    render_access_denied unless @page.display_versions?
+    @versions = @page.versions.paginate(:per_page => per_page, :page => params[:npage])
+  end
+
   protected
  
   def per_page
@@ -148,4 +156,22 @@ class ContentViewerController &lt; ApplicationController
   end
   helper_method :pass_without_comment_captcha?
  
+  def allow_access_to_page(path)
+    allowed = true
+    if @page.nil? # page not found, give error
+      render_not_found(path)
+      allowed = false
+    elsif !@page.display_to?(user)
+      if !profile.public?
+        private_profile_partial_parameters
+        render :template => 'profile/_private_profile.rhtml', :status => 403
+        allowed = false
+      else #if !profile.visible?
+        render_access_denied
+        allowed = false
+      end
+    end
+    allowed
+  end
+
 end
@@ -67,7 +67,7 @@ class ProfileController &lt; PublicController
  
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
     end
   end
  
@@ -0,0 +1,42 @@
+class ThemesController < ApplicationController
+
+  before_filter :login_required
+
+  no_design_blocks
+
+  # attr_reader :target
+
+  def target
+    @target
+  end
+
+  def index
+    @environment = environment
+    @themes = environment.themes + Theme.approved_themes(target)
+
+    @current_theme = target.theme
+
+    @layout_templates = LayoutTemplate.all
+    @current_template = target.layout_template
+  end
+
+  def set
+    target.update_theme(params[:id])
+    redirect_to :action => 'index'
+  end
+
+  def unset
+    if target.kind_of?(Environment)
+      target.update_theme('default')
+    else
+      target.update_theme(nil)
+    end
+    redirect_to :action => 'index'
+  end
+
+  def set_layout_template
+    target.update_layout_template(params[:id])
+    redirect_to :action => 'index'
+  end
+
+end
@@ -38,6 +38,12 @@ module ApplicationHelper
  
   include LayoutHelper
  
+  include Noosfero::Gravatar
+
+  include TokenHelper
+
+  include CatalogHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -366,7 +372,7 @@ module ApplicationHelper
   def current_theme
     @current_theme ||=
       begin
-        if (session[:theme])
+        if session[:theme]
           session[:theme]
         else
           # utility for developers: set the theme to 'random' in development mode and
@@ -375,7 +381,7 @@ module ApplicationHelper
           if ENV['RAILS_ENV'] == 'development' && environment.theme == 'random'
             @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
             @random_theme
-          elsif ENV['RAILS_ENV'] == 'development' && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
+          elsif ENV['RAILS_ENV'] == 'development' && respond_to?(:params) && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
             params[:theme]
           else
             if profile && !profile.theme.nil?
@@ -397,16 +403,24 @@ module ApplicationHelper
       end
   end
  
-  def theme_include(template)
+  def theme_view_file(template)
     ['.rhtml', '.html.erb'].each do |ext|
-      file = (RAILS_ROOT + '/public' + theme_path + '/' + template  + ext)
-      if File.exists?(file)
-        return render :file => file, :use_full_path => false
-      end
+      file = (RAILS_ROOT + '/public' + theme_path + '/' + template + ext)
+      return file if File.exists?(file)
     end
     nil
   end
  
+  def theme_include(template, options = {})
+    file = theme_view_file(template)
+    options.merge!({:file => file, :use_full_path => false})
+    if file
+      render options
+    else
+      nil
+    end
+  end
+
   def theme_favicon
     return '/designs/themes/' + current_theme + '/favicon.ico' if profile.nil? || profile.theme.nil?
     if File.exists?(File.join(RAILS_ROOT, 'public', theme_path, 'favicon.ico'))
@@ -589,33 +603,8 @@ module ApplicationHelper
       :class => 'vcard'), :class => 'common-profile-list-block')
   end
  
-  def gravatar_url_for(email, options = {})
-    # Ta dando erro de roteamento
-    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 => default
-             }.merge(options) )
-  end
-
-  def str_gravatar_url_for(email, options = {})
-    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
-           Digest::MD5.hexdigest(email.to_s)
-    {
-      :only_path => false,
-      :d => default
-    }.merge(options).each { |k,v|
-      url += ( '&%s=%s' % [ k,v ] )
-    }
-    url
-  end
-
-  def gravatar_profile_url(email)
-    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+  def gravatar_default
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
   end
  
   attr_reader :environment
@@ -909,7 +898,7 @@ module ApplicationHelper
     (@category ? " - #{@category.full_name}" : '')
   end
  
-  # DEPRECATED. Do not use this·
+  # DEPRECATED. Do not use this.
   def import_controller_stylesheets(options = {})
     stylesheet_import( "controller_"+ @controller.controller_name(), options )
   end
@@ -1127,12 +1116,12 @@ 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
  
-    (_("<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'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></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') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
     manage_communities.to_s +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -1284,10 +1273,6 @@ module ApplicationHelper
     content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
   end
  
-  def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
-    "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
-  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!")
@@ -1309,8 +1294,8 @@ module ApplicationHelper
     @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
   end
  
-  def template_options(klass, field_name)
-    templates = klass.templates(environment)
+  def template_options(kind, field_name)
+    templates = environment.send(kind).templates
     return '' if templates.count == 0
     return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
  
@@ -1328,50 +1313,6 @@ module ApplicationHelper
     )
   end
  
-  def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
-    options[:min_chars] ||= 3
-    options[:hint_text] ||= _("Type in a search term")
-    options[:no_results_text] ||= _("No results")
-    options[:searching_text] ||= _("Searching...")
-    options[:search_delay] ||= 1000
-    options[:prevent_duplicates] ||=  true
-    options[:backspace_delete_item] ||= false
-    options[:focus] ||= false
-    options[:avoid_enter] ||= true
-    options[:on_result] ||= 'null'
-    options[:on_add] ||= 'null'
-    options[:on_delete] ||= 'null'
-    options[:on_ready] ||= 'null'
-
-    result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
-    result += javascript_tag("jQuery('##{element_id}')
-      .tokenInput('#{url_for(search_action)}', {
-        minChars: #{options[:min_chars].to_json},
-        prePopulate: #{options[:pre_populate].to_json},
-        hintText: #{options[:hint_text].to_json},
-        noResultsText: #{options[:no_results_text].to_json},
-        searchingText: #{options[:searching_text].to_json},
-        searchDelay: #{options[:serach_delay].to_json},
-        preventDuplicates: #{options[:prevent_duplicates].to_json},
-        backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
-        queryParam: #{name.to_json},
-        tokenLimit: #{options[:token_limit].to_json},
-        onResult: #{options[:on_result]},
-        onAdd: #{options[:on_add]},
-        onDelete: #{options[:on_delete]},
-        onReady: #{options[:on_ready]},
-      });
-    ")
-    result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
-    if options[:avoid_enter]
-      result += javascript_tag("jQuery('#token-input-#{element_id}')
-                    .live('keydown', function(event){
-                    if(event.keyCode == '13') return false;
-                    });")
-    end
-    result
-  end
-
   def expirable_content_reference(content, action, text, url, options = {})
     reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
     options[:title] = reason
@@ -1432,4 +1373,8 @@ module ApplicationHelper
     content.nil? ? '' : content.id.to_s
   end
  
+  def display_article_versions(article, version = nil)
+    content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
+  end
+
 end
 module ArticleHelper
  
-  def custom_options_for_article(article)
+  include TokenHelper
+
+  def custom_options_for_article(article, tokenized_children)
     @article = article
-    content_tag('h4', _('Visibility')) +
-    content_tag('div',
-      content_tag('div',
-        radio_button(:article, :published, true) +
-          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
-           ) +
-      content_tag('div',
-        radio_button(:article, :published, false) +
-          content_tag('label', _('Private'), :for => 'article_published_false')
-       )
-     ) +
+
+    visibility_options(@article, tokenized_children) +
     content_tag('h4', _('Options')) +
     content_tag('div',
       (article.profile.has_members? ?
@@ -35,7 +28,7 @@ module ArticleHelper
         'div',
         check_box(:article, :notify_comments) +
         content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
-        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked") 
+        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
       ) +
  
       content_tag(
@@ -49,10 +42,40 @@ module ArticleHelper
         'div',
         check_box(:article, :display_hits) +
         content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
+      ) : '') +
+
+      (article.can_display_versions? ?
+      content_tag(
+        'div',
+        check_box(:article, :display_versions) +
+        content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
       ) : '')
+
     )
   end
  
+  def visibility_options(article, tokenized_children)
+    content_tag('h4', _('Visibility')) +
+    content_tag('div',
+      content_tag('div',
+        radio_button(:article, :published, true) +
+          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
+           ) +
+      content_tag('div',
+        radio_button(:article, :published, false) +
+          content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private")
+       ) +
+      (article.profile.community? ? content_tag('div',
+        content_tag('label', _('Fill in the search field to add the exception users to see this content'), :id => "text-input-search-exception-users") +
+        token_input_field_tag(:q, 'search-article-privacy-exceptions', {:action => 'search_article_privacy_exceptions'},
+          {:focus => false, :hint_text => _('Type in a search term for a user'), :pre_populate => tokenized_children})) :
+          ''))
+  end
+
+  def prepare_to_token_input(array)
+    array.map { |object| {:id => object.id, :name => object.name} }
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
 module BlogHelper
  
-  def custom_options_for_article(article)
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
     @article = article
     hidden_field_tag('article[published]', 1) +
-    hidden_field_tag('article[accept_comments]', 0)
+    hidden_field_tag('article[accept_comments]', 0) +
+    visibility_options(article,tokenized_children)
   end
  
   def cms_label_for_new_children
@@ -4,4 +4,10 @@ module BoxOrganizerHelper
     render :partial => 'icon_selector', :locals => { :icon => icon }
   end
  
-end
+  def extra_option_checkbox(option)
+    if [:human_name, :name, :value, :checked, :options].all? {|k| option.key? k}
+      labelled_check_box(option[:human_name], option[:name], option[:value], option[:checked], option[:options])
+    end
+  end
+
+end
 \ No newline at end of file
@@ -39,7 +39,7 @@ module BoxesHelper
   end
  
   def display_boxes(holder, main_content)
-    boxes = holder.boxes.first(holder.boxes_limit)
+    boxes = holder.boxes.with_position.first(holder.boxes_limit)
     content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
     content = main_content if (content.blank?)
  
@@ -65,7 +65,7 @@ module BoxesHelper
   end
  
   def display_box_content(box, main_content)
-    context = { :article => @page, :request_path => request.path, :locale => locale }
+    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
     box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
  
@@ -102,14 +102,16 @@ module BoxesHelper
  
     result = filter_html(result, block)
  
-    box_decorator.block_target(block.box, block) +
-      content_tag('div',
-       content_tag('div',
+    content_tag('div',
+      box_decorator.block_target(block.box, block) +
+        content_tag('div',
          content_tag('div',
-           result + footer_content + box_decorator.block_edit_buttons(block),
-           :class => 'block-inner-2'),
-         :class => 'block-inner-1'),
-       options) +
+           content_tag('div',
+             result + footer_content + box_decorator.block_edit_buttons(block),
+             :class => 'block-inner-2'),
+           :class => 'block-inner-1'),
+       options),
+    :class => 'block-outer') +
     box_decorator.block_handle(block)
   end
  
@@ -210,6 +212,7 @@ module BoxesHelper
  
     if !block.main?
       buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
+      buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })
     end
  
     if block.respond_to?(:help)
@@ -225,15 +228,11 @@ module BoxesHelper
  
   # DEPRECATED. Do not use this.
   def import_blocks_stylesheets(options = {})
-    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block_css_class_name(b)}.uniq
+    @blocks_css_files ||= current_blocks.map{|block|'blocks/' + block.class.name.to_css_class}.uniq
     stylesheet_import(@blocks_css_files, options)
   end
-
-  def block_css_class_name(block)
-    block.class.name.underscore.gsub('_', '-')
-  end
   def block_css_classes(block)
-    classes = block_css_class_name(block)
+    classes = block.class.name.to_css_class
     classes += ' invisible-block' if block.display == 'never'
     classes
   end
@@ -9,7 +9,11 @@ module CatalogHelper
       @categories = ProductCategory.on_level(params[:level]).order(:name)
     end
  
-    @products = profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => options[:page])
+    @products = profile.products.from_category(@category).paginate(
+      :order => 'available desc, highlighted desc, name asc',
+      :per_page => @profile.products_per_catalog_page,
+      :page => options[:page]
+    )
   end
  
   def breadcrumb(category)
@@ -20,20 +24,24 @@ module CatalogHelper
     content_tag('div', all_items.join(' &rarr; '), :id => 'breadcrumb')
   end
  
-  def category_link(category, sub = false)
+  def category_link(category)
     count = profile.products.from_category(category).count
     name = truncate(category.name, :length => 22 - count.to_s.size)
-    link_name = sub ? name : content_tag('strong', name)
-    link = link_to(link_name, {:controller => :catalog, :action => 'index', :level => category.id}, :title => category.name)
-    content_tag('li', "#{link} (#{count})") if count > 0
+    link = link_to(name, {:controller => 'catalog', :action => 'index', :level => category.id}, :title => category.name)
+    content_tag('div', "#{link} <span class=\"count\">#{count}</span>") if count > 0
   end
  
-  def category_sub_links(category)
+  def category_with_sub_list(category)
+    content_tag 'li', "#{category_link(category)}\n#{sub_category_list(category)}"
+  end
+
+  def sub_category_list(category)
     sub_categories = []
     category.children.order(:name).each do |sub_category|
-      sub_categories << category_link(sub_category, true)
+      cat_link = category_link sub_category
+      sub_categories << content_tag('li', cat_link) unless cat_link.nil?
     end
-    content_tag('ul', sub_categories) if sub_categories.size > 1
+    content_tag('ul', sub_categories) if sub_categories.size > 0
   end
  
 end
@@ -22,9 +22,9 @@ module CmsHelper
  
   attr_reader :environment
  
-  def options_for_article(article)
+  def options_for_article(article, tokenized_children=nil)
     article_helper = helper_for_article(article)
-    article_helper.custom_options_for_article(article)
+    article_helper.custom_options_for_article(article, tokenized_children)
   end
  
   def link_to_article(article)
@@ -25,7 +25,10 @@ module CommentHelper
   def comment_actions(comment)
     url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
     links = links_for_comment_actions(comment)
-    content_tag(:li, link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url), :class=> 'vcard') unless links.empty?
+    links_submenu = links.select{|link| link[:action_bar].blank?}
+    links_action_bar = links - links_submenu
+    links_submenu = links_submenu.collect {|link| link.slice(:link)}
+    render :partial => 'comment/comment_actions', :locals => {:links_submenu => links_submenu, :links_action_bar => links_action_bar, :url => url, :comment => comment}
   end
  
   private
 module FolderHelper
  
   include ShortFilename
+  include ArticleHelper
  
   def list_articles(articles, recursive = false)
     if !articles.blank?
@@ -60,19 +61,10 @@ module FolderHelper
     "icon-new icon-new%s" % klass.icon_name
   end
  
-  def custom_options_for_article(article)
+  def custom_options_for_article(article,tokenized_children)
     @article = article
-    content_tag('h4', _('Visibility')) +
-    content_tag('div',
-      content_tag('div',
-        radio_button(:article, :published, true) +
-          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
-           ) +
-      content_tag('div',
-        radio_button(:article, :published, false) +
-          content_tag('label', _('Private'), :for => 'article_published_false')
-       )
-     ) +
+
+    visibility_options(article,tokenized_children) +
     content_tag('div',
       hidden_field_tag('article[accept_comments]', 0)
     )
@@ -0,0 +1,43 @@
+module ForgotPasswordHelper
+  def plugins_options
+    @plugins.dispatch(:change_password_fields)
+  end
+
+  def user_fields
+    %w[login email] + plugins_options.select {|options| options[:model].to_sym == :user }.map { |options| options[:field].to_s }
+  end
+
+  def person_fields
+    %w[] + plugins_options.select {|options| options[:model].to_sym == :person }.map { |options| options[:field].to_s }
+  end
+
+  def fields
+    user_fields + person_fields
+  end
+
+  def fields_label
+    labels = [
+      _('Username'),
+      _('Email'),
+    ] + plugins_options.map { |options| options[:name] }
+
+    last = labels.pop
+    label = labels.join(', ')
+    "#{label} #{_('or')} #{last}"
+  end
+
+  def build_query(fields, value)
+    fields.map {|field| "#{field} = '#{value}'"}.join(' OR ')
+  end
+
+  def fetch_requestors(value)
+    requestors = []
+    person_query = build_query(person_fields, value)
+    user_query = build_query(user_fields, value)
+
+    requestors += Person.where(person_query).where(:environment_id => environment.id) if person_fields.present?
+    requestors += User.where(user_query).where(:environment_id => environment.id).map(&:person) if user_fields.present?
+    requestors
+  end
+
+end
@@ -16,14 +16,17 @@ module ProfileHelper
   end
  
   def display_contact(profile)
-    address = display_field(_('Address:'), profile, :address)
-    zip = display_field(_('ZIP code:'), profile, :zip_code)
-    phone = display_field(_('Contact phone:'), profile, :contact_phone)
-    email = display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }
-    if address.blank? && zip.blank? && phone.blank? && email.blank?
+    fields = []
+    fields << display_field(_('Address:'), profile, :address).html_safe
+    fields << display_field(_('ZIP code:'), profile, :zip_code).html_safe
+    fields << display_field(_('Contact phone:'), profile, :contact_phone).html_safe
+    fields << display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }.html_safe
+    fields << display_field(_('Personal website:'), profile, :personal_website).html_safe
+    fields << display_field(_('Jabber:'), profile, :jabber_id).html_safe
+    if fields.reject!(&:blank?).empty?
       ''
     else
-      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email
+      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + fields.join.html_safe
     end
   end
  
@@ -0,0 +1,51 @@
+module TokenHelper
+
+  def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
+    "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
+  end
+
+  def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
+    options[:min_chars] ||= 3
+    options[:hint_text] ||= _("Type in a search term")
+    options[:no_results_text] ||= _("No results")
+    options[:searching_text] ||= _("Searching...")
+    options[:search_delay] ||= 1000
+    options[:prevent_duplicates] ||=  true
+    options[:backspace_delete_item] ||= false
+    options[:focus] ||= false
+    options[:avoid_enter] ||= true
+    options[:on_result] ||= 'null'
+    options[:on_add] ||= 'null'
+    options[:on_delete] ||= 'null'
+    options[:on_ready] ||= 'null'
+
+    result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
+    result += javascript_tag("jQuery('##{element_id}')
+      .tokenInput('#{url_for(search_action)}', {
+        minChars: #{options[:min_chars].to_json},
+        prePopulate: #{options[:pre_populate].to_json},
+        hintText: #{options[:hint_text].to_json},
+        noResultsText: #{options[:no_results_text].to_json},
+        searchingText: #{options[:searching_text].to_json},
+        searchDelay: #{options[:serach_delay].to_json},
+        preventDuplicates: #{options[:prevent_duplicates].to_json},
+        backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
+        queryParam: #{name.to_json},
+        tokenLimit: #{options[:token_limit].to_json},
+        onResult: #{options[:on_result]},
+        onAdd: #{options[:on_add]},
+        onDelete: #{options[:on_delete]},
+        onReady: #{options[:on_ready]},
+      });
+    ")
+    result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
+    if options[:avoid_enter]
+      result += javascript_tag("jQuery('#token-input-#{element_id}')
+                    .live('keydown', function(event){
+                    if(event.keyCode == '13') return false;
+                    });")
+    end
+    result
+  end
+
+end
 \ No newline at end of file
@@ -0,0 +1,25 @@
+module UsersHelper
+
+  FILTER_TRANSLATION = {
+      'all_users' => _('All users'),
+      'admin_users' => _('Admin users'),
+      'activated_users' => _('Activated users'),
+      'deactivated_users' => _('Deativated users'),
+  }
+
+  def filter_selector(filter, float = 'right')
+    options = options_for_select(FILTER_TRANSLATION.map {|key, name| [name, key]}, :selected => filter)
+    url_params = url_for(params.merge(:filter => 'FILTER'))
+    onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
+    select_field = select_tag(:filter, options, :onchange => onchange)
+    content_tag('div',
+      content_tag('strong', _('Filter')) + ': ' + select_field,
+      :class => "environment-users-customize-search"
+    )
+  end
+
+  def filter_title(filter)
+    FILTER_TRANSLATION[filter]
+  end
+
+end
@@ -69,6 +69,7 @@ class Article &lt; ActiveRecord::Base
   settings_items :allow_members_to_edit, :type => :boolean, :default => false
   settings_items :moderate_comments, :type => :boolean, :default => false
   settings_items :followers, :type => Array, :default => []
+  has_and_belongs_to_many :article_privacy_exceptions, :class_name => 'Person', :join_table => 'article_privacy_exceptions'
  
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
  
@@ -157,7 +158,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def css_class_list
-    [self.class.name.underscore.dasherize]
+    [self.class.name.to_css_class]
   end
  
   def css_class_name
@@ -200,6 +201,7 @@ class Article &lt; ActiveRecord::Base
   acts_as_filesystem
  
   acts_as_versioned
+  self.non_versioned_columns << 'setting'
  
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
@@ -288,6 +290,11 @@ class Article &lt; ActiveRecord::Base
     'text-html'
   end
  
+  # TODO Migrate the class method icon_name to instance methods.
+  def icon_name
+    self.class.icon_name(self)
+  end
+
   def mime_type
     'text/html'
   end
@@ -350,22 +357,6 @@ class Article &lt; ActiveRecord::Base
     true
   end
  
-  def folder?
-    false
-  end
-
-  def blog?
-    false
-  end
-
-  def forum?
-    false
-  end
-
-  def uploaded_file?
-    false
-  end
-
   def has_posts?
     false
   end
@@ -459,11 +450,12 @@ class Article &lt; ActiveRecord::Base
   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 :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
+  named_scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.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 :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
  
   named_scope :more_popular, :order => 'hits DESC'
   named_scope :more_comments, :order => "comments_count DESC"
@@ -480,7 +472,8 @@ class Article &lt; ActiveRecord::Base
  
   def display_unpublished_article_to?(user)
     user == author || allow_view_private_content?(user) || user == profile ||
-    user.is_admin?(profile.environment) || user.is_admin?(profile)
+    user.is_admin?(profile.environment) || user.is_admin?(profile) ||
+    article_privacy_exceptions.include?(user)
   end
  
   def display_to?(user = nil)
@@ -596,17 +589,50 @@ class Article &lt; ActiveRecord::Base
     false
   end
  
-  def author
-    if versions.empty?
-      last_changed_by
-    else
-      author_id = versions.first.last_changed_by_id
+  def folder?
+    false
+  end
+
+  def blog?
+    false
+  end
+
+  def forum?
+    false
+  end
+
+  def uploaded_file?
+    false
+  end
+
+  settings_items :display_versions, :type => :boolean, :default => false
+
+  def can_display_versions?
+    false
+  end
+
+  def display_versions?
+    can_display_versions? && display_versions
+  end
+
+  def author(version_number = nil)
+    if version_number
+      version = versions.find_by_version(version_number)
+      author_id = version.last_changed_by_id if version
       Person.exists?(author_id) ? Person.find(author_id) : nil
+    else
+      if versions.empty?
+        last_changed_by
+      else
+        author_id = versions.first.last_changed_by_id
+        Person.exists?(author_id) ? Person.find(author_id) : nil
+      end
     end
   end
  
-  def author_name
-    author ? author.name : (setting[:author_name] || _('Unknown'))
+  def author_name(version_number = nil)
+    person = version_number ? author(version_number) : author
+    person ? person.name : (setting[:author_name] || _('Unknown'))
   end
  
   def author_url
@@ -617,13 +643,20 @@ class Article &lt; ActiveRecord::Base
     author ? author.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)
+  end
+
   alias :active_record_cache_key :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]}" : '') +
-      (params[:month] ? "-month-#{params[:month]}" : '')
+      (params[:month] ? "-month-#{params[:month]}" : '') +
+      (params[:version] ? "-version-#{params[:version]}" : '')
+
   end
  
   def first_paragraph
@@ -49,8 +49,8 @@ class ArticleBlock &lt; Block
   end
  
   def available_articles
-    return [] if self.box.nil? or self.box.owner.nil?
-    self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
+    return [] if self.owner.nil?
+    self.owner.kind_of?(Environment) ? self.owner.portal_community.articles : self.owner.articles
   end
  
   def posts_per_page
@@ -23,30 +23,41 @@ class Block &lt; ActiveRecord::Base
   # * <tt>:article</tt>: the article being viewed currently
   # * <tt>:language</tt>: in which language the block will be displayed
   def visible?(context = nil)
-    if display == 'never'
-      return false
-    end
+    return false if display == 'never'
+
     if context
-      if language != 'all' && language != context[:locale]
-        return false
-      end
-      if display == 'home_page_only'
-        if context[:article]
-          return context[:article] == owner.home_page
-        else
-          return context[:request_path] == '/'
-        end
-      elsif display == 'except_home_page'
-        if context[:article]
-          return context[:article] != owner.home_page
-        else
-          return context[:request_path] != '/' + owner.identifier
-        end
+      return false if language != 'all' && language != context[:locale]
+
+      begin
+        return self.send("display_#{display}", context)
+      rescue NoMethodError => exception
+        raise "Display '#{display}' is not a valid value."
       end
     end
+
+    true
+  end
+
+  def display_always(context)
     true
   end
  
+  def display_home_page_only(context)
+    if context[:article]
+      return context[:article] == owner.home_page
+    else
+      return context[:request_path] == '/'
+    end
+  end
+
+  def display_except_home_page(context)
+    if context[:article]
+      return context[:article] != owner.home_page
+    else
+      return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
+    end
+  end
+
   # The condition for displaying a block. It can assume the following values:
   #
   # * <tt>'always'</tt>: the block is always displayed
@@ -153,4 +164,29 @@ class Block &lt; ActiveRecord::Base
     }
   end
  
+  DISPLAY_OPTIONS = {
+    'always'           => __('In all pages'),
+    'home_page_only'   => __('Only in the homepage'),
+    'except_home_page' => __('In all pages, except in the homepage'),
+    'never'            => __('Don\'t display'),
+  }
+
+  def display_options
+    DISPLAY_OPTIONS.keys
+  end
+
+  def display_option_label(option)
+    DISPLAY_OPTIONS[option]
+  end
+
+  def duplicate
+    duplicated_block = self.clone
+    duplicated_block.display = 'never'
+    duplicated_block.created_at = nil
+    duplicated_block.updated_at = nil
+    duplicated_block.save!
+    duplicated_block.insert_at(self.position + 1)
+    duplicated_block
+  end
+
 end
@@ -6,7 +6,7 @@ class Blog &lt; Folder
   #FIXME This should be used until there is a migration to fix all blogs that
   # already have folders inside them
   def posts_with_no_folders
-    posts_without_no_folders.no_folders
+    posts_without_no_folders.no_folders(profile)
   end
   alias_method_chain :posts, :no_folders
  
@@ -3,12 +3,17 @@ class Box &lt; ActiveRecord::Base
   acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
   has_many :blocks, :dependent => :destroy, :order => 'position'
  
+  include Noosfero::Plugin::HotSpot
+
+  named_scope :with_position, :conditions => ['boxes.position > 0']
+
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
  
   def acceptable_blocks
-    to_css_class_name central?  ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
+    blocks_classes = central?  ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => [2, 3])
+    to_css_class_name(blocks_classes)
   end
  
   def central?
@@ -61,6 +66,7 @@ class Box &lt; ActiveRecord::Base
       MyNetworkBlock,
       PeopleBlock,
       ProductsBlock,
+      ProductCategoriesBlock,
       ProfileImageBlock,
       ProfileInfoBlock,
       ProfileSearchBlock,
@@ -74,8 +80,8 @@ class Box &lt; ActiveRecord::Base
  
   private
  
-  def to_css_class_name(blocks)
-    blocks.map{ |block| block.to_s.underscore.tr('_', '-') }
+  def to_css_class_name(blocks_classes)
+    blocks_classes.map{ |block_class| block_class.name.to_css_class }
   end
  
 end
 class ChangePassword < Task
  
-  attr_accessor :login, :email, :password, :password_confirmation, :environment_id
+  attr_accessor :password, :password_confirmation
  
   def self.human_attribute_name(attrib)
     case attrib.to_sym
-    when :login:
-      _('Username')
-    when :email
-      _('e-mail')
     when :password
       _('Password')
     when :password_confirmation
@@ -17,29 +13,7 @@ class ChangePassword &lt; Task
     end
   end
  
-  ###################################################
-  # validations for creating a ChangePassword task 
-  
-  validates_presence_of :login, :email, :environment_id, :on => :create, :message => _('must be filled in')
-
-  validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? })
-
-  validates_each :login, :on => :create do |data,attr,value|
-    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, _('is invalid or user does not exists.'))
-      else
-        if user.email != data.email
-          data.errors.add(:email, _('does not match the username you filled in'))
-        end
-      end
-    end
-  end
-
-  before_validation_on_create do |change_password|
-    change_password.requestor = Person.find_by_identifier_and_environment_id(change_password.login, change_password.environment_id)
-  end
+  validates_presence_of :requestor
  
   ###################################################
   # validations for updating a ChangePassword task 
@@ -49,6 +23,10 @@ class ChangePassword &lt; Task
   validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED }
   validates_confirmation_of :password, :if => lambda { |change| change.status != Task::Status::CANCELLED }
  
+  def environment
+    requestor.environment unless requestor.nil?
+  end
+
   def title
     _("Change password")
   end
@@ -87,12 +65,8 @@ class ChangePassword &lt; Task
     url = url_for(:host => hostname, :controller => 'account', :action => 'new_password', :code => code)
  
     lambda do
-      _("In order to change your password, please visit the following address:\n\n%s") % url 
+      _("In order to change your password, please visit the following address:\n\n%s\n\nIf you did not required any change to your password just desconsider this email.") % url
     end
   end
  
-  def environment
-    self.requestor.environment
-  end
-
 end
@@ -10,7 +10,7 @@ class Enterprise &lt; Organization
  
   N_('Enterprise')
  
-  has_many :products, :dependent => :destroy, :order => 'name ASC'
+  has_many :products, :foreign_key => :profile_id, :dependent => :destroy, :order => 'name ASC'
   has_many :inputs, :through => :products
   has_many :production_costs, :as => :owner
  
@@ -23,6 +23,7 @@ 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, :zip_code, :city, :state, :country
+  settings_items :products_per_catalog_page, :type => :integer, :default => 6
  
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -131,8 +132,11 @@ class Enterprise &lt; Organization
     ]
     blocks = [
       [MainBlock.new],
-      [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
-      []
+      [ ProfileImageBlock.new,
+        LinkListBlock.new(:links => links),
+        ProductCategoriesBlock.new
+      ],
+      [LocationBlock.new]
     ]
     if environment.enabled?('products_for_enterprises')
       blocks[2].unshift ProductsBlock.new
@@ -26,7 +26,8 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_users' => N_('Manage environment users'),
     'manage_environment_templates' => N_('Manage environment templates'),
     'manage_environment_licenses' => N_('Manage environment licenses'),
-    'manage_environment_trusted_sites' => N_('Manage environment trusted sites')
+    'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
+    'edit_appearance'      => N_('Edit appearance'),
   }
  
   module Roles
@@ -185,7 +186,7 @@ class Environment &lt; ActiveRecord::Base
   has_many :product_categories, :conditions => { :type => 'ProductCategory'}
   has_many :regions
  
-  has_many :roles
+  has_many :roles, :dependent => :destroy
  
   has_many :qualifiers
   has_many :certifiers
@@ -677,6 +678,16 @@ class Environment &lt; ActiveRecord::Base
     end
   end
  
+  def update_theme(theme)
+    self.theme = theme
+    self.save!
+  end
+
+  def update_layout_template(template)
+    self.layout_template = template
+    self.save!
+  end
+
   before_create do |env|
     env.settings[:themes] ||= %w[
       aluminium
@@ -692,7 +703,8 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def community_template
-    Community.find_by_id settings[:community_template_id]
+    template = Community.find_by_id settings[:community_template_id]
+    template if template && template.is_template
   end
  
   def community_template=(value)
@@ -700,7 +712,8 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def person_template
-    Person.find_by_id settings[:person_template_id]
+    template = Person.find_by_id settings[:person_template_id]
+    template if template && template.is_template
   end
  
   def person_template=(value)
@@ -708,7 +721,8 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def enterprise_template
-    Enterprise.find_by_id settings[:enterprise_template_id]
+    template = Enterprise.find_by_id settings[:enterprise_template_id]
+    template if template && template.is_template
   end
  
   def enterprise_template=(value)
@@ -716,7 +730,8 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def inactive_enterprise_template
-    Enterprise.find_by_id settings[:inactive_enterprise_template_id]
+    template = Enterprise.find_by_id settings[:inactive_enterprise_template_id]
+    template if template && template.is_template
   end
  
   def inactive_enterprise_template=(value)
@@ -798,7 +813,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true, :enterprise_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
+    Product.find(:all, {:conditions => {:highlighted => true, :profile_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
   end
  
   settings_items :home_cache_in_minutes, :type => :integer, :default => 5
@@ -3,6 +3,21 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
  
+  settings_items :terms_of_use, :type => :string, :default => ""
+  settings_items :has_terms_of_use, :type => :boolean, :default => false
+  has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
+
+  before_save do |forum|
+    if forum.has_terms_of_use
+      last_editor = forum.profile.environment.people.find_by_id(forum.last_changed_by_id)
+      if last_editor && !forum.users_with_agreement.exists?(last_editor)
+        forum.users_with_agreement << last_editor
+      end
+    else
+      forum.users_with_agreement.clear
+    end
+  end
+
   def self.type_name
     _('Forum')
   end
@@ -39,4 +54,16 @@ class Forum &lt; Folder
     paragraphs = Hpricot(body).search('p')
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
+
+  def add_agreed_user(user)
+    self.users_with_agreement << user
+    self.save
+  end
+
+  def agrees_with_terms?(user)
+    return true unless self.has_terms_of_use
+    return false unless user
+    self.users_with_agreement.exists? user
+  end
+
 end
@@ -63,7 +63,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
     )
   end
  
@@ -17,11 +17,15 @@ class MainBlock &lt; Block
   end
  
   def editable?
-    false
+    true
   end
  
   def cacheable?
-   false
+    false
+  end
+
+  def display_options
+    ['always', 'except_home_page']
   end
  
 end
 class MembersBlock < ProfileListBlock
+  settings_items :show_join_leave_button, :type => :boolean, :default => false
  
   def self.description
     _('Members')
@@ -14,8 +15,10 @@ class MembersBlock &lt; ProfileListBlock
  
   def footer
     profile = self.owner
+    s = show_join_leave_button
+
     lambda do
-      link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members'
+      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s}
     end
   end
  
@@ -23,4 +26,14 @@ class MembersBlock &lt; ProfileListBlock
     owner.members
   end
  
+  def extra_option
+    data = {
+      :human_name => _("Show join leave button"),
+      :name => 'block[show_join_leave_button]',
+      :value => true,
+      :checked => show_join_leave_button,
+      :options => {}
+    }
+  end
+
 end
@@ -43,9 +43,18 @@ class Person &lt; Profile
   alias_method_chain :has_permission?, :plugins
  
   def memberships
-    Profile.memberships_of(self)
+    scopes = []
+    plugins_scopes = plugins.dispatch_scopes(:person_memberships, self)
+    scopes = plugins_scopes unless plugins_scopes.first.blank?
+    scopes << Profile.memberships_of(self)
+    return scopes.first if scopes.size == 1
+    ScopeTool.union *scopes
   end
  
+   def memberships_by_role(role)
+     memberships.where('role_assignments.role_id = ?', role.id)
+   end
+
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
  
@@ -59,6 +68,9 @@ class Person &lt; Profile
  
   has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
  
+  has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
+  has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
+
   named_scope :more_popular,
       :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
       :group => Profile.qualified_column_names,
@@ -75,6 +87,10 @@ class Person &lt; Profile
   named_scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
   named_scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
  
+  named_scope :admins, :joins => [:role_assignments => :role], :conditions => ['roles.key = ?', 'environment_administrator' ]
+  named_scope :activated, :joins => :user, :conditions => ['users.activation_code IS NULL AND users.activated_at IS NOT NULL']
+  named_scope :deactivated, :joins => :user, :conditions => ['NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)']
+
   after_destroy do |person|
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
   end
@@ -129,32 +145,34 @@ class Person &lt; Profile
   end
  
   FIELDS = %w[
+  description
+  image
   preferred_domain
   nickname
   sex
-  address
-  zip_code
-  city
-  state
-  country
-  nationality
   birth_date
+  nationality
+  country
+  state
+  city
+  district
+  zip_code
+  address
+  address_reference
   cell_phone
   comercial_phone
+  personal_website
+  jabber_id
   schooling
+  formation
+  custom_formation
+  area_of_study
+  custom_area_of_study
   professional_activity
   organization
   organization_website
-  area_of_study
-  custom_area_of_study
-  formation
-  custom_formation
   contact_phone
   contact_information
-  description
-  image
-  district
-  address_reference
   ]
  
   validates_multiparameter_assignments
@@ -468,7 +486,7 @@ class Person &lt; Profile
   end
  
   def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' and action_tracker.verb != 'reply_scrap_on_self' ORDER BY updated_at DESC")
   end
  
   # by default, all fields are private
@@ -476,6 +494,13 @@ class Person &lt; Profile
     self.fields_privacy.nil? ? [] : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
   end
  
+  include Noosfero::Gravatar
+
+  def profile_custom_icon(gravatar_default=nil)
+    (self.image.present? && self.image.public_filename(:icon)) ||
+    gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
+  end
+
   protected
  
   def followed_by?(profile)
@@ -15,7 +15,11 @@ class Product &lt; ActiveRecord::Base
     'full'
   end
  
-  belongs_to :enterprise
+  belongs_to :enterprise, :foreign_key => :profile_id, :class_name => 'Profile'
+  belongs_to :profile
+  alias_method :enterprise=, :profile=
+  alias_method :enterprise, :profile
+
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
  
@@ -29,7 +33,10 @@ class Product &lt; ActiveRecord::Base
   has_many :qualifiers, :through => :product_qualifiers
   has_many :certifiers, :through => :product_qualifiers
  
-  validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
+  acts_as_having_settings :field => :data
+
+  validates_uniqueness_of :name, :scope => :profile_id, :allow_nil => true, :if => :validate_uniqueness_of_column_name?
+
   validates_presence_of :product_category_id
   validates_associated :product_category
  
@@ -234,4 +241,10 @@ class Product &lt; ActiveRecord::Base
  
   delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
  
+  protected
+
+  def validate_uniqueness_of_column_name?
+    true
+  end
+
 end
@@ -0,0 +1,50 @@
+class ProductCategoriesBlock < Block
+
+  def self.description
+    _('Product category menu')
+  end
+
+  # the title of the block. Probably will be overriden in subclasses.
+  def default_title
+    _('Catalog')
+  end
+
+  def help
+    _('Helps to filter the products catalog.')
+  end
+
+  def content(args={})
+    profile = owner
+    lambda do
+      if @categories.nil? or @categories.length == 0
+        categories = ProductCategory.on_level().order(:name)
+        if @categories and @categories.length == 0
+          notice = _('There are no sub-categories for %s') % @category.name
+        end
+      else
+        categories = @categories
+      end
+      render :file => 'blocks/product_categories',
+             :locals => {
+               :profile => profile,
+               :categories => categories,
+               :notice => notice
+             }
+    end
+  end
+
+  DISPLAY_OPTIONS['catalog_only'] = __('Only on the catalog')
+
+  def display
+    settings[:display].nil? ? 'catalog_only' : super
+  end
+
+  def display_catalog_only(context)
+    context[:params][:controller] == 'catalog'
+  end
+
+  def visible?(*args)
+    box.environment.enabled?('products_for_enterprises') ? super(*args) : false
+  end
+
+end
@@ -78,12 +78,18 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  named_scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } }
+  named_scope :templates, {:conditions => {:is_template => true}}
+  named_scope :no_templates, {:conditions => {:is_template => false}}
  
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
-    scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
+    return scopes.first if scopes.size == 1
+    ScopeTool.union *scopes
+  end
+
+  def members_by_name
+    members.order(:name)
   end
  
   def members_count
@@ -98,7 +104,6 @@ class Profile &lt; ActiveRecord::Base
     alias_method_chain :count, :distinct
   end
  
-
   def members_by_role(role)
     Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
   end
@@ -112,6 +117,7 @@ class Profile &lt; ActiveRecord::Base
   end
  
   named_scope :visible, :conditions => { :visible => true }
+  named_scope :public, :conditions => { :visible => true, :public_profile => true }
   # Subclasses must override these methods
   named_scope :more_popular
   named_scope :more_active
@@ -760,8 +766,20 @@ private :generate_url, :url_options
     !environment.enabled?('disable_contact_' + self.class.name.downcase)
   end
  
+  include Noosfero::Plugin::HotSpot
+  
+  def folder_types
+    types = Article.folder_types
+    plugins.dispatch(:content_types).each {|type|
+      if type < Folder
+        types << type.name
+      end
+    }
+    types
+  end
+
   def folders
-    articles.folders
+    articles.folders(self)
   end
  
   def image_galleries
@@ -844,8 +862,10 @@ private :generate_url, :url_options
     }[amount] || _("%s members") % amount
   end
  
-  def profile_custom_icon
-    self.image.public_filename(:icon) unless self.image.blank?
+  include Noosfero::Gravatar
+
+  def profile_custom_icon(gravatar_default=nil)
+    image.public_filename(:icon) if image.present?
   end
  
   def jid(options = {})
@@ -62,4 +62,8 @@ class ProfileListBlock &lt; Block
     title.gsub('{#}', profile_count.to_s)
   end
  
+  # override in subclasses! See MembersBlock for example
+  def extra_option
+    {}
+  end
 end
@@ -14,9 +14,11 @@ class Scrap &lt; ActiveRecord::Base
  
   named_scope :not_replies, :conditions => {:scrap_id => nil}
  
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target 
  
-  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
+  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
+
+  track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}
  
   after_create do |scrap|
     scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
@@ -25,6 +27,12 @@ class Scrap &lt; ActiveRecord::Base
  
   before_validation :strip_all_html_tags
  
+  def top_root
+    scrap = self
+    scrap = Scrap.find(scrap.scrap_id) while scrap.scrap_id
+    scrap
+  end
+
   def strip_all_html_tags
     sanitizer = HTML::WhiteListSanitizer.new
     self.content = sanitizer.sanitize(self.content, :tags => [])
@@ -17,4 +17,7 @@ class TextArticle &lt; Article
     end
   end
  
+  def can_display_versions?
+    true
+  end
 end
@@ -143,6 +143,21 @@ class User &lt; ActiveRecord::Base
     end
   end
  
+  # Deactivates the user in the database.
+  def deactivate
+    return false unless self.person
+    self.activated_at = nil
+    self.person.visible = false
+    begin
+      self.person.save! && self.save!
+    rescue Exception => exception
+      logger.error(exception.to_s)
+      false
+    else
+      true
+    end
+  end
+
   def activated?
     self.activation_code.nil? && !self.activated_at.nil?
   end
@@ -275,19 +290,21 @@ class User &lt; ActiveRecord::Base
     end
   end
  
-  def data_hash
+  def data_hash(gravatar_default = nil)
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
     self.person.friends.online.map do |person|
       friends_list[person.identifier] = {
-        'avatar' => person.profile_custom_icon,
+        'avatar' => person.profile_custom_icon(gravatar_default),
         'name' => person.short_name,
         'jid' => person.full_jid,
         'status' => person.user.chat_status,
       }
     end
+
     {
       'login' => self.login,
+      'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
       'since_year' => self.person.created_at.year,
@@ -101,7 +101,7 @@
  
   <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
  
-  <%= template_options(Person, 'profile_data') %>
+  <%= template_options(:people, 'profile_data') %>
  
   <% unless @terms_of_use.blank? %>
     <div id='terms-of-use-box' class='formfieldline'>
@@ -2,21 +2,13 @@
  
 <%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
  
-<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
-
-  <%= f.text_field :login,
-                   :onchange => 'this.value = convToValidUsername( this.value )' %>
-
-  <%= f.text_field :email %>
-
-  <%= f.hidden_field :environment_id, :value => environment.id %>
-
-<div>
-  <% button_bar do %>
-    <%= submit_button('send', _('Send instructions')) %>
-  <% end %>
-</div>
-<%= content_tag(:small,_('After clicking the button above, you will receive an email with a link to a page where you will be able to create a new password.')) %>
-
+<% form_tag do %>
+  <%= labelled_form_field fields_label, text_field_tag(:value) %>
+
+  <div>
+    <% button_bar do %>
+      <%= submit_button('send', _('Send instructions')) %>
+    <% end %>
+  </div>
+  <%= content_tag(:small,_('After clicking the button above, you will receive an email with a link to a page where you will be able to create a new password.')) %>
 <% end %>
-
@@ -6,6 +6,7 @@
   <tr><td><%= link_to _('Environment settings'), :action => 'site_info' %></td></tr>
   <tr><td><%= link_to _('Features'), :controller => 'features' %></td></tr>
   <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
+  <tr><td><%= link_to _('Appearance'), :controller =>'environment_themes' %></td></tr>
   <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
   <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
   <tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
@@ -3,7 +3,6 @@
   <div class='the-localization-map'>
     <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
   </div>
-</div>
 <% else %>
   <i><%= _('This profile has no geographical position registered.') %></i>
 <% end %>
@@ -0,0 +1,5 @@
+<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
+
+<% if show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
@@ -0,0 +1,9 @@
+<%= link_to _('Catalog start'), profile.catalog_url, :class=>'catalog-home-link' %>
+<ul class="catalog-categories-list">
+  <% categories.each do |category| %>
+    <%= category_with_sub_list(category) %>
+  <% end %>
+</ul>
+<% if notice %>
+  <div class="catalog-categories-notice"><%= notice %></div>
+<% end %>
@@ -14,11 +14,13 @@
   <p><%= h block.owner.short_name %></p>
 <% end %>
  
-<div style="text-align: center; font-size: 75%; clear: both" id="profile-admin-url-<%= block.id %>"></div>
-
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
+  <div class='admin-link'>
+    <%= link_to _('Control panel'), :controller => 'profile_editor' %>
+  </div>
+<% end %>
  
+<div class="profile-info-options">
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
+</div>
 </div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
@@ -14,13 +14,15 @@
   </div>
 </div>
  
-<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
+<ul class="profile-info-data">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
   <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
-  <li id="profile-admin-url-<%= block.id %>"></li>
+  <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
+    <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
+  <% end %>
   <% if profile.person? %>
     <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
   <% end %>
@@ -37,9 +39,8 @@
 </div>
 <% end %>
  
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+<div class="profile-info-options">
+  <%= render :file => view_for_profile_actions(@block.owner.class) %>
+</div>
  
 </div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
@@ -0,0 +1,29 @@
+<div class='join-leave-button'>
+  <% if logged_in? %>
+    <% if profile.members.include?(user) %>
+      <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+        :class => 'leave-community',
+        :title => _("Leave community"),
+        :style => 'position: relative;') %>
+      <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+        :class => 'join-community',
+        :title => _("Join community"),
+        :style => 'position: relative; display: none;') %>
+    <% else %>
+      <% unless profile.already_request_membership?(user) %>
+        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+          :class => 'leave-community',
+          :title => _("Leave community"),
+          :style => 'position: relative; display: none;') %>
+        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+          :class => 'join-community',
+          :title => _("Join community"),
+          :style => 'position: relative;') %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
+      :class => 'button with-text icon-add',
+      :title => _('Join this community') %>
+  <% end %>
+</div>
 <ul>
+  <li>
+    <%= render "blocks/profile_info_actions/join_leave_community" %>
+  </li>
   <% if logged_in? %>
-    <% if profile.members.include?(user) %>
-      <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
-          :class => 'leave-community',
-          :title => _("Leave community"),
-          :style => 'position: relative;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
-          :class => 'join-community',
-          :title => _("Join community"),
-          :style => 'position: relative; display: none;') %>
-      </li>
-    <% else %>
-      <% unless profile.already_request_membership?(user) %>
-        <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
-          :class => 'leave-community',
-          :title => _("Leave community"),
-          :style => 'position: relative; display: none;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
-          :class => 'join-community',
-          :title => _("Join community"),
-          :style => 'position: relative;') %>
-        </li>
-      <% end %>
-    <% end %>
-
     <% if profile.enable_contact? %>
       <li>
       <%= link_to content_tag('span', _('Send an e-mail')),
@@ -39,11 +16,5 @@
     <li><%= report_abuse(profile, :button) %></li>
  
     <%= render_environment_features(:profile_actions) %>
-  <% else %>
-    <li>
-    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
-      :class => 'button with-text icon-add',
-      :title => _('Join this community') %>
-    </li>
   <% end %>
 -</ul>
+</ul>
 \ No newline at end of file
 <div class="article-block-edition">
-<% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
+<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
   <p id="no_portal_community">
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <strong><%= _('Links') %></strong>
-<div id='edit-link-list-block' style='width:450px'>
+<div id='edit-link-list-block'>
 <table id='links' class='noborder'>
-  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th><th><%= _('Target') %></th></tr>
+  <tr>
+    <th><%= _('Icon') %></th>
+    <th><%= _('Name') %></th>
+    <th><%= _('Address') %></th>
+    <th><%= _('Title') %></th>
+    <th><%= _('Target') %></th>
+  </tr>
   <% for link in @block.links do %>
-    <tr>
-      <td>
-         <%= icon_selector(link['icon']) %>
-      </td>
-      <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
-      <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
-      <td>
-        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
-      </td>
-    </tr>
+  <tr>
+    <td><%= icon_selector(link['icon']) %></td>
+    <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
+    <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
+    <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
+    <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
+  </tr>
   <% end %>
 </table>
 </div>
@@ -22,8 +25,8 @@
       content_tag('td', icon_selector('ok')) +
       content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
       content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
-      content_tag('td', select_tag('block[links][][target]',
-options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
+      content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
+      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
@@ -2,5 +2,8 @@
   <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
   <%= check_box(:block, :prioritize_profiles_with_image) %>
   <label for="block_prioritize_profiles_with_image"><%= _('Prioritize profiles with image') %></label>
-</div>
  
+  <div>
+    <%= extra_option_checkbox(@block.extra_option) %>
+  </div>
+</div>
 \ No newline at end of file
 <div class="block-config-options <%= @block.class.name %>-options">
-  <h2 class="title"><%= _('Editing block') %></h2>
+  <h2 class="title"><%= _(@block.class.description) %></h2>
  
   <% form_tag(:action => 'save', :id => @block.id) do %>
  
@@ -9,17 +9,11 @@
  
     <%= labelled_form_field _('Display this block:'), '' %>
     <div style='margin-left: 10px'>
-      <%= radio_button(:block, :display, 'always') %>
-      <%= label_tag('block_display_always', _('In all pages')) %>
-      <br/>
-      <%= radio_button(:block, :display, 'home_page_only') %>
-      <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
-      <br/>
-      <%= radio_button(:block, :display, 'except_home_page') %>
-      <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
-      <br/>
-      <%= radio_button(:block, :display, 'never') %>
-      <%= label_tag('block_display_never', _("Don't display")) %>
+      <% @block.display_options.each do |option| %>
+        <%= radio_button(:block, :display, option) %>
+        <%= label_tag("block_display_#{option}", _(@block.display_option_label(option))) %>
+        <br/>
+      <% end %>
     </div>
  
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
 <% extra_content = [] %>
 <% extra_content_list = [] %>
  
-<h1><%= _('Products/Services') %></h1>
-
-<% if @categories %>
-  <%= breadcrumb(@category) if params[:level] %>
-
-  <div class='l-sidebar-left-bar'>
-    <ul>
-      <%= content_tag('li', link_to(_('Homepage'), profile.url), :class => 'catalog-categories-link') %>
-      <%= content_tag('li', link_to(_('Catalog start'), profile.catalog_url), :class => 'catalog-categories-link') %>
-      <% if @categories.present? %>
-        <% @categories.each do |category| %>
-          <%= category_link(category) %>
-          <%= category_sub_links(category) %>
-        <% end %>
-      <% elsif @category.present? %>
-        <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
-      <% else %>
-        <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
-      <% end %>
-    </ul>
+<div id="product-catalog">
+<% if !user.nil? && ( user.is_admin?(profile.environment) || user.is_admin?(profile) ) %>
+  <div class="product-catalog-ctrl">
+    <%= button :product, _('Manage Products/Services'), :controller => 'manage_products' %>
   </div>
 <% end %>
  
-<ul id="product-list" class="<%="l-sidebar-left-content" if @categories %>">
+<h1><%= _('Products/Services') %></h1>
+
+<%= breadcrumb(@category) if params[:level] %>
+
+<ul id="product-list">
   <% @products.each do |product| %>
     <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
     <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
@@ -132,10 +120,11 @@
       </ul>
     </li>
   <% end %>
-</ul>
+</ul><!-- end id="product-list" -->
  
 <%= pagination_links @products, :params => {:controller => :catalog, :action => :index, :profile => profile.identifier} %>
  
 <%= add_zoom_to_images %>
  
 <br style="clear:both"/>
+</div><!-- end id="product-catalog" -->
@@ -54,6 +54,15 @@
  
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10)) %>
  
+<% f.fields_for :image_builder, @article.image do |i| %>
+  <%= file_field_or_thumbnail(_('Cover image:'), @article.image, i)%>
+  <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+<% end %>
+
+<% unless @article.image.nil? %>
+  <%= labelled_check_box(_('Remove cover image'),'remove_image',true,false)%>
+<% end %>
+
 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %>
  
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -11,3 +11,9 @@
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
  
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>
+
+<%= labelled_form_field(_('Has terms of use:'), check_box(:article, :has_terms_of_use))%>
+
+<div id="text_area_terms_of_use">
+  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => 'mceEditor',:cols => 64, :rows => 10)) %>
+</div>
@@ -9,6 +9,8 @@
  
   <%= hidden_field_tag('back_to', @back_to) %>
  
+  <%= hidden_field_tag('success_back_to', @success_back_to) %>
+
   <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
  
   <% if environment.is_portal_community?(profile) %>
@@ -33,11 +35,12 @@
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
  
   <div id='edit-article-options'>
-    <%= options_for_article(@article) %>
+    <%= options_for_article(@article, @tokenized_children) %>
   </div>
  
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
+
     <% if @back_to %>
       <%= button :cancel, _('Cancel'), @back_to %>
     <% elsif @parent_id || @article.parent %>
@@ -45,6 +48,11 @@
     <% else %>
       <%= button :cancel, _('Cancel'), :action => 'index' %>
     <% end %>
+
+    <% unless @article.new_record? %>
+      <%= button :delete, _('Delete'), {:controller => :cms, :action => :destroy, :id => @article},
+        :method => :post, :confirm => delete_article_message(@article) %>
+    <% end %>
   <% end %>
 <% end %>
 </div>
@@ -54,3 +62,5 @@
 <% end %>
  
 <br style='clear: both'/>
+
+<%= javascript_include_tag "article.js" %>
@@ -13,11 +13,11 @@
   <% else %>
     <% url_image, status_class = comment.author_id ?
        [comment.removed_user_image, 'icon-user-removed'] :
-       [str_gravatar_url_for( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
+       [gravatar_profile_image_url( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
  
     <%= link_to(
           image_tag(url_image, :onerror=>'gravatarCommentFailback(this)',
-                   'data-gravatar'=>str_gravatar_url_for(comment.email, :size=>50)) +
+                   'data-gravatar'=>gravatar_profile_image_url(comment.email, :size=>50)) +
           content_tag('span', comment.author_name, :class => 'comment-info') +
           content_tag('span', comment.message,
                              :class => 'comment-user-status ' + status_class),
@@ -32,19 +32,7 @@
  
     <div class="comment-details">
       <div class="comment-header">
-        <ul>
-          <div class="comment-actions">
-            <%= comment_actions(comment) %>
-          </div>
-        </ul>
-      <% unless comment.spam? %>
-        <%= link_to_function '',
-          "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
-          :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
-          :id => 'comment-reply-to-' + comment.id.to_s,
-          :title => _('Reply')
-        %>
-      <% end %>
+        <%= comment_actions(comment) %>
       </div>
  
       <div class="comment-created-at">
@@ -55,6 +43,7 @@
         <p/>
         <%= txt2html comment.body %>
       </div>
+      <%= @plugins.dispatch(:comment_extra_contents, local_assigns).collect { |content| instance_eval(&content) }.join("") %>
     </div>
  
     <div class="comment_reply post_comment_box closed" id="comment_reply_to_<%= comment.id %>">
@@ -0,0 +1,22 @@
+<ul>
+  <% if !links_submenu.empty? %>
+    <div class="comment-actions">
+      <li class="vcard">
+        <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links_submenu.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
+      </li>
+    </div>
+  <% end %>
+</ul>
+<div class="comments-action-bar">
+  <% unless comment.spam? %>
+    <%= link_to_function '',
+      "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
+      :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
+      :id => 'comment-reply-to-' + comment.id.to_s,
+      :title => _('Reply')
+    %>
+  <% end %>
+  <% links_action_bar.collect do |link| %>
+    <%= link[:link] %>
+  <% end %>
+</div>
@@ -48,11 +48,19 @@
       <%= expirable_button @page, :suggest, content, url, options %>
     <% end %>
  
+    <% if @page.display_versions? %>
+      <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+    <% end %>
+
     <%= report_abuse(profile, :link, @page) %>
  
   </div>
   <div id="article-header">
+    <% if @page.blog? and !@page.image.nil? %>
+      <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
+    <% end %>
     <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_eval(&content) }.join("") %>
     <%= article_title(@page, :no_link => true) %>
     <%= article_translations(@page) %>
   </div>
@@ -0,0 +1,16 @@
+<%= 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>
+
+<ul class='article-versions'>
+  <% @versions.each do |v| %>
+    <li>
+      <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+      <%= @page.version == v.version ? _('(current)') : '' %>
+      <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
+      <div class='updated-on'><%= show_time(v.updated_at) %></div>
+    </li>
+  <% end %>
+</ul>
+
+<%= pagination_links @versions, :param_name => 'npage' %>
 <% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.forum? && @page.feed %>
+<% if @page.agrees_with_terms?(user) %>
  
-<div>
-  <div class='forum-description'>
-    <%= @page.body %>
+  <div>
+    <div class='forum-description'>
+      <%= @page.body %>
+    </div>
   </div>
-</div>
-<hr class="pre-posts"/>
-<div class="forum-posts">
-  <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
-</div>
+  <hr class="pre-posts"/>
+  <div class="forum-posts">
+    <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
+  </div>
+
+<% else %>
+
+  <p><%= @page.terms_of_use %></p>
+
+  <% form_tag @page.url.merge(:terms_accepted => true) do %>
+    <% button_bar do %>
+      <% if user %>
+        <%= submit_button :save, _("Accept")  %>
+      <% else %>
+        <%= button :save, _("Accept"),  login_url %>
+      <% end %>
+      <%= button :cancel, _("Cancel"), profile.url %>
+    <% end %>
+  <% end %>
+<% end %>
@@ -0,0 +1,43 @@
+<div id="article" class="<%= @page.css_class_name %>">
+
+  <div id="article-actions">
+    <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+      <% content = content_tag('span', _('Revert to this version')) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
+      <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
+    <% end %>
+  </div>
+
+  <div id="article-header">
+    <h1 class='title'><%= @versioned_article.name %></h1>
+    <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
+  </div>
+
+  <% version_license = @page.version_license(@version) %>
+  <%# This seemingly doubled verification exists because the article-sub-header
+      div must appear only if at least one content inside it will appeart.
+      Although we have only one content now, we might have others in the future.
+      So we're keeping it like that to avoid mistakes. %>
+  <% if version_license.present? %>
+    <div id='article-sub-header'>
+      <% if version_license.present? %>
+        <div id="article-license">
+          <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% cache(@page.cache_key(params, user, language)) do %>
+    <div class="<%="article-body article-body-" + @page.css_class_name %>">
+      <%= @versioned_article.body %>
+      <br style="clear:both" />
+    </div> <!-- end class="article-body" -->
+  <% end %>
+
+  <%= display_source_info(@page) %>
+
+</div><!-- end id="article" -->
+<%= add_zoom_to_article_images %>
@@ -14,11 +14,15 @@
     window.NO_COMMENT_YET = "<%= _('No comments yet') %>";
 </script>
  
-<div id="article-toolbar"></div>
+<% if @page.parent && !@page.parent.path.blank? %>
+  <div id="article-parent">
+    <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
+  </div>
+<% end %>
  
-<script type="text/javascript">
-  <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }) %>
-</script>
+<div id="article-toolbar">
+  <%= render :partial => 'article_toolbar' %>
+</div>
  
 <% if @page.display_hits? || @page.license.present? %>
   <div id='article-sub-header'>
@@ -36,19 +40,6 @@
   </div>
 <% end %>
  
-<% if !@page.tags.empty? %>
-  <div id="article-tags">
-    <%= _("This article's tags:") %>
-    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
-  </div>
-<% end %>
-
-<% if @page.parent && !@page.parent.path.blank? %>
-<div id="article-parent">
-  <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
-</div>
-<% end %>
-
 <%= render :partial => 'shared/disabled_enterprise' %>
  
 <% if NOOSFERO_CONF['addthis_enabled'] %>
@@ -84,6 +75,13 @@
 </div>
 <% end %>
  
+<% if !@page.tags.empty? %>
+  <div id="article-tags">
+    <%= _("This article's tags:") %>
+    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
+  </div>
+<% end %>
+
 <%= display_source_info(@page) %>
  
 <div class="comments" id="comments_list">
@@ -34,7 +34,7 @@
       <% end %>
     <% end %>
  
-    <%= template_options(Enterprise, 'create_enterprise')%>
+    <%= template_options(:enterprises, 'create_enterprise')%>
  
     <% button_bar do %>
       <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
@@ -0,0 +1,8 @@
+<%= render :partial => 'themes/select_template' %>
+<%= render :partial => 'themes/select_theme' %>
+
+<br style="clear:both" />
+
+<% button_bar do %>
+  <%= button(:back, _('Back'), :controller => 'admin_panel', :action => 'index') %>
+<% end %>
@@ -22,7 +22,7 @@
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
     </script>
   </head>
-  <body class="<%= body_classes %>">
+  <body class="<%= h body_classes %>">
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
  
     <%=
...	...	@@ -41,6 +41,7 @@ Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
41	41	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
42	42	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
43	43	Antonio Terceiro <terceiro@colivre.coop.br>
	44	+Arthur Del Esposte <arthurmde@yahoo.com.br>
44	45	Aurelio A. Heckert <aurelio@colivre.coop.br>
45	46	Braulio Bhavamitra <brauliobo@gmail.com>
46	47	Bráulio Bhavamitra <brauliobo@gmail.com>
...	...	@@ -68,6 +69,7 @@ Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
68	69	Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
69	70	Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
70	71	Caio SBA <caio@colivre.coop.br>
	72	+Carlos Andre de Souza <carlos.andre.souza@msn.com>
71	73	Carlos Morais <carlos88morais@gmail.com>
72	74	Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
73	75	Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
...	...	@@ -81,6 +83,7 @@ Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
81	83	Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
82	84	Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
83	85	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
	86	+Daniel Bucher <daniel.bucher88@gmail.com>
84	87	Daniel Cunha <daniel@colivre.coop.br>
85	88	diegoamc <diegoamc90@gmail.com>
86	89	Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
...	...	@@ -110,9 +113,12 @@ Diego + Jefferson <diegoamc90@gmail.com>
110	113	Diego Martinez <diegoamc90@gmail.com>
111	114	Diego Martinez <diego@diego-K55A.(none)>
112	115	Diego + Renan <renanteruoc@gmail.com>
	116	+Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
113	117	Fernanda Lopes <nanda.listas+psl@gmail.com>
114	118	Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
115	119	Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
	120	+Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
	121	+Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
116	122	Grazieno Pellegrino <grazieno@gmail.com>
117	123	Isaac Canan <isaac@intelletto.com.br>
118	124	Italo Valcy <italo@dcc.ufba.br>
...	...	@@ -149,18 +155,24 @@ João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
149	155	João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
150	156	Joenio Costa <joenio@colivre.coop.br>
151	157	Josef Spillner <josef.spillner@tu-dresden.de>
	158	+Junior Silva <juniorsilva1001@gmail.com>
152	159	Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
	160	+Junior Silva <juniorsilva@colivre.coop.br>
153	161	Keilla Menezes <keilla@colivre.coop.br>
154	162	Larissa Reis <larissa@colivre.coop.br>
155	163	Larissa Reis <reiss.larissa@gmail.com>
	164	+Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
	165	+Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
156	166	Leandro Nunes dos Santos <leandronunes@gmail.com>
157	167	Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
158	168	LinguÁgil 2010 <linguagil.bahia@gmail.com>
159	169	Lucas Melo <lucas@colivre.coop.br>
160	170	Lucas Melo <lucaspradomelo@gmail.com>
161	171	Luis David Aguilar Carlos <ludwig9003@gmail.com>
	172	+Marcos Ramos <ms.ramos@outlook.com>
162	173	Martín Olivera <molivera@solar.org.ar>
163	174	Moises Machado <moises@colivre.coop.br>
	175	+Naíla Alves <naila@colivre.coop.br>
164	176	Nanda Lopes <nanda.listas+psl@gmail.com>
165	177	Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
166	178	Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
...	...	@@ -195,8 +207,13 @@ Rodrigo Souto <rodrigo@colivre.coop.br>
195	207	Ronny Kursawe <kursawe.ronny@googlemail.com>
196	208	root <root@debian.sdr.serpro>
197	209	Samuel R. C. Vale <srcvale@holoscopio.com>
	210	+Valessio Brito <contato@valessiobrito.com.br>
	211	+Valessio Brito <contato@valessiobrito.info>
198	212	Valessio Brito <valessio@gmail.com>
199	213	vfcosta <vfcosta@gmail.com>
	214	+Victor Carvalho <victorhugodf.ac@gmail.com>
	215	+Victor Costa <vfcosta@gmail.com>
	216	+Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
200	217	Vinicius Cubas Brand <viniciuscb@gmail.com>
201	218	Visita <visita@debian.(none)>
202	219	Yann Lugrin <yann.lugrin@liquid-concept.ch>
...	...
...	...	@@ -0,0 +1,214 @@
	1	+If you are not listed here, but should be, please write to the noosfero mailing list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev (this list requires subscription to post, but since you are an author of noosfero, that's not a problem).
	2	+
	3	+Developers
	4	+==========
	5	+
	6	+Alan Freihof Tygel <alantygel@gmail.com>
	7	+Alessandro Palmeira <alessandro.palmeira@gmail.com>
	8	+Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
	9	+Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
	10	+Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
	11	+Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
	12	+Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
	13	+Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
	14	+Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
	15	+Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
	16	+Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
	17	+Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
	18	+Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
	19	+Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
	20	+Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
	21	+Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
	22	+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
	23	+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
	24	+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
	25	+Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	26	+Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
	27	+Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
	28	+Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
	29	+Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
	30	+Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
	31	+Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
	32	+Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
	33	+Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
	34	+Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
	35	+Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
	36	+Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
	37	+Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
	38	+Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
	39	+Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
	40	+Antonio Terceiro <terceiro@colivre.coop.br>
	41	+Aurelio A. Heckert <aurelio@colivre.coop.br>
	42	+Braulio Bhavamitra <brauliobo@gmail.com>
	43	+Bráulio Bhavamitra <brauliobo@gmail.com>
	44	+Braulio Bhavamitra <braulio@eita.org.br>
	45	+Caio <caio.csalgado@gmail.com>
	46	+Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
	47	+Caio Formiga <caio.formiga@gmail.com>
	48	+Caio, Pedro <caio.csalgado@gmail.com>
	49	+Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
	50	+Caio Salgado <caio.csalgado@gmail.com>
	51	+Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	52	+Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
	53	+Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
	54	+Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
	55	+Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
	56	+Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
	57	+Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
	58	+Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	59	+Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
	60	+Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
	61	+Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
	62	+Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
	63	+Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
	64	+Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
	65	+Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
	66	+Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
	67	+Caio SBA <caio@colivre.coop.br>
	68	+Carlos Morais <carlos88morais@gmail.com>
	69	+Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
	70	+Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
	71	+Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
	72	+Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
	73	+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
	74	+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
	75	+Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
	76	+Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
	77	+Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
	78	+Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
	79	+Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
	80	+Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
	81	+Daniel Cunha <daniel@colivre.coop.br>
	82	+diegoamc <diegoamc90@gmail.com>
	83	+Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
	84	+Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
	85	+Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
	86	+Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
	87	+Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
	88	+Diego Araújo <diegoamc90@gmail.com>
	89	+Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
	90	+Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
	91	+Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
	92	+Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
	93	+Diego Araújo + João Machini <diegoamc90@gmail.com>
	94	+Diego Araújo + João Machini <digoamc90@gmail.com>
	95	+Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	96	+Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
	97	+Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
	98	+Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
	99	+Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
	100	+Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	101	+Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
	102	+Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
	103	+Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
	104	+Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
	105	+Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
	106	+Diego + Jefferson <diegoamc90@gmail.com>
	107	+Diego Martinez <diegoamc90@gmail.com>
	108	+Diego Martinez <diego@diego-K55A.(none)>
	109	+Diego + Renan <renanteruoc@gmail.com>
	110	+Fernanda Lopes <nanda.listas+psl@gmail.com>
	111	+Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
	112	+Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
	113	+Grazieno Pellegrino <grazieno@gmail.com>
	114	+Isaac Canan <isaac@intelletto.com.br>
	115	+Italo Valcy <italo@dcc.ufba.br>
	116	+Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
	117	+Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
	118	+Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
	119	+João da Silva <jaodsilv@linux.ime.usp.br>
	120	+João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
	121	+João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
	122	+João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
	123	+Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	124	+João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	125	+João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
	126	+João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	127	+João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
	128	+João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
	129	+João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
	130	+João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
	131	+João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
	132	+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
	133	+Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
	134	+João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
	135	+João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
	136	+João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
	137	+João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
	138	+João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
	139	+João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
	140	+João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
	141	+João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
	142	+João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
	143	+Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
	144	+João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
	145	+João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
	146	+João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
	147	+Joenio Costa <joenio@colivre.coop.br>
	148	+Josef Spillner <josef.spillner@tu-dresden.de>
	149	+Junior Silva <juniorsilva1001@gmail.com>
	150	+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
	151	+Keilla Menezes <keilla@colivre.coop.br>
	152	+Larissa Reis <larissa@colivre.coop.br>
	153	+Larissa Reis <reiss.larissa@gmail.com>
	154	+Leandro Nunes dos Santos <leandronunes@gmail.com>
	155	+Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
	156	+LinguÁgil 2010 <linguagil.bahia@gmail.com>
	157	+Lucas Melo <lucas@colivre.coop.br>
	158	+Lucas Melo <lucaspradomelo@gmail.com>
	159	+Luis David Aguilar Carlos <ludwig9003@gmail.com>
	160	+Martín Olivera <molivera@solar.org.ar>
	161	+Moises Machado <moises@colivre.coop.br>
	162	+Naíla Alves <naila@colivre.coop.br>
	163	+Nanda Lopes <nanda.listas+psl@gmail.com>
	164	+Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
	165	+Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
	166	+Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
	167	+Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
	168	+Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
	169	+Paulo Meirelles <paulo@softwarelivre.org>
	170	+Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
	171	+Rafael Gomes <rafaelgomes@techfree.com.br>
	172	+Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
	173	+Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
	174	+Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
	175	+Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
	176	+Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
	177	+Rafael Martins <rmmartins@gmail.com>
	178	+Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
	179	+Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
	180	+Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
	181	+Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
	182	+Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
	183	+Rafael Reggiani Manzo <rr.manzo@gmail.com>
	184	+Raphaël Rousseau <raph@r4f.org>
	185	+Raquel Lira <raquel.lira@gmail.com>
	186	+Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
	187	+Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
	188	+Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
	189	+Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
	190	+Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
	191	+Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
	192	+Rodrigo Souto <diguliu@gmail.com>
	193	+Rodrigo Souto <rodrigo@colivre.coop.br>
	194	+Ronny Kursawe <kursawe.ronny@googlemail.com>
	195	+root <root@debian.sdr.serpro>
	196	+Samuel R. C. Vale <srcvale@holoscopio.com>
	197	+Valessio Brito <valessio@gmail.com>
	198	+vfcosta <vfcosta@gmail.com>
	199	+Victor Costa <vfcosta@gmail.com>
	200	+Vinicius Cubas Brand <viniciuscb@gmail.com>
	201	+Visita <visita@debian.(none)>
	202	+Yann Lugrin <yann.lugrin@liquid-concept.ch>
	203	+
	204	+Ideas, specifications and incentive
	205	+===================================
	206	+Daniel Tygel <dtygel@fbes.org.br>
	207	+Guilherme Rocha <guilherme@gf7.com.br>
	208	+Raphael Rousseau <raph@r4f.org>
	209	+Théo Bondolfi <move@cooperation.net>
	210	+Vicente Aguiar <vicenteaguiar@colivre.coop.br>
	211	+
	212	+Arts
	213	+===================================
	214	+Nara Oliveira <narananet@gmail.com>
...	...
...	...	@@ -1,63 +0,0 @@
1		-= Noosfero instructions for developers
2		-
3		-== A work about your the development platform
4		-
5		-These instructions are tested and known to work on Debian stable, which is the
6		-system that the Noosfero core developers use to work on Noosfero.
7		-
8		-If you want to use another OS, read "Instructions for other systems" below.
9		-
10		-== Instructions for Debian stable
11		-
12		-Download the source code:
13		-
14		- $ git clone git://gitorious.org/noosfero/noosfero.git
15		- $ cd noosfero
16		-
17		-Run the quick start script:
18		-
19		- $ ./script/quick-start
20		-
21		-Now you can execute the development server with:
22		-
23		- $ ./script/development
24		-
25		-You will be able to access Noosfero at http://localhost:3000/
26		-
27		-If you want to use a different port than 3000, pass `-p <PORT>` to
28		-./script/development
29		-
30		-== Instructions for other systems
31		-
32		-On other OS, you have 2 options:
33		-
34		-1) using a chroot or a VM with Debian stable (easier)
35		-
36		-Use a chroot (http://wiki.debian.org/Schroot) or a Virtual Machine (e.g. with
37		-VirtualBox) with a Debian stable system and follow the instructions above for
38		-Debian stable.
39		-
40		-2) Installing dependencies on other OS (harder)
41		-
42		-If you want to setup a development environment in another OS, you can create a
43		-file under script/install-dependencies/, called <OS>-<CODENAME>.sh, which
44		-installed the dependencies for your system. With this script in place,
45		-./script/quick-start will call it at the point of installing the required
46		-packages for Noosfero development.
47		-
48		-You can check script/install-dependencies/debian-squeeze.sh to have an idea of
49		-what kind of stuff that script has to do.
50		-
51		-If you write such script for your own OS, please share it with us at the
52		-development mailing list so that we can include it in the official repository.
53		-This way other people using the same OS will have to put less effort to develop
54		-Noosfero.
55		-
56		-== Submitting your changes back
57		-
58		-For now please read:
59		-
60		-- Coding conventions
61		- http://noosfero.org/Development/CodingConventions
62		-- Patch guidelines
63		- http://noosfero.org/Development/PatchGuidelines
...	...	@@ -0,0 +1,56 @@
	1	+Noosfero instructions for developers
	2	+====================================
	3	+
	4	+A work about your the development platform
	5	+------------------------------------------
	6	+
	7	+These instructions are tested and known to work on Debian stable, which is the system that the Noosfero core developers use to work on Noosfero.
	8	+
	9	+If you want to use another OS, read "Instructions for other systems" below.
	10	+
	11	+Instructions for Debian stable
	12	+------------------------------
	13	+
	14	+Download the source code:
	15	+
	16	+ $ git clone https://gitlab.com/noosfero/noosfero.git
	17	+ $ cd noosfero
	18	+
	19	+Run the quick start script:
	20	+
	21	+ $ ./script/quick-start
	22	+
	23	+Now you can execute the development server with:
	24	+
	25	+ $ ./script/development
	26	+
	27	+You will be able to access Noosfero at http://localhost:3000/
	28	+
	29	+If you want to use a different port than 3000, pass `-p <PORT>` to `./script/development`
	30	+
	31	+Instructions for other systems
	32	+------------------------------
	33	+
	34	+On other OS, you have 2 options:
	35	+
	36	+### 1) using a chroot or a VM with Debian stable (easier)
	37	+
	38	+Use a chroot (http://wiki.debian.org/Schroot) or a Virtual Machine (e.g. with VirtualBox) with a Debian stable system and follow the instructions above for Debian stable.
	39	+
	40	+### 2) Installing dependencies on other OS (harder)
	41	+
	42	+If you want to setup a development environment in another OS, you can create a file under `./script/install-dependencies/`, called `<OS>-<CODENAME>.sh`, which installed the dependencies for your system. With this script in place, `./script/quick-start` will call it at the point of installing the required packages for Noosfero development.
	43	+
	44	+You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea of what kind of stuff that script has to do.
	45	+
	46	+If you write such script for your own OS, please share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
	47	+
	48	+Submitting your changes back
	49	+----------------------------
	50	+
	51	+For now please read:
	52	+
	53	+- Coding conventions
	54	+ http://noosfero.org/Development/CodingConventions
	55	+- Patch guidelines
	56	+ http://noosfero.org/Development/PatchGuidelines
...	...
...	...	@@ -1,417 +0,0 @@
1		-= Noosfero installation instructions from source for production environments
2		-
3		-The instructions below can be used for setting up a Noosfero production
4		-environment from the Noosfero sources.
5		-
6		-Before you start installing Noosfero manually, see the information about the
7		-Noosfero Debian package at http://noosfero.org/Development/DebianPackage. Using
8		-the Debian packages on a Debian stable system is the recommended method for
9		-installing production environments.
10		-
11		-If you want to setup a development environment instead of a production one,
12		-stop reading this file right now and read the file HACKING instead.
13		-
14		-For a complete installation guide, please see the following web page:
15		-http://noosfero.org/Development/HowToInstall
16		-
17		-If you have problems with the setup, please feel free to ask questions in the
18		-development mailing list.
19		-
20		-== Requirements
21		-
22		-DISCLAIMER: this installation procedure is tested with Debian stable, which is
23		-currently the only recommended operating system for production usage. It is
24		-possible that you can install it on other systems, and if you do so, please
25		-report it on one of the Noosfero mailing lists, and please send a patch
26		-updating these instructions.
27		-
28		-Noosfero is written in Ruby with the "Rails
29		-framework":http://www.rubyonrails.org, so the process of setting it up is
30		-pretty similar to other Rails applications.
31		-
32		-You need to install some packages Noosfero depends on. On Debian GNU/Linux or
33		-Debian-based systems, all of these packages are available through the Debian
34		-archive. You can install them with the following command:
35		-
36		- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
37		-
38		-On other systems, they may or may not be available through your regular package
39		-management system. Below are the links to their homepages.
40		-
41		-* Ruby: http://www.ruby-lang.org/
42		-* Rake: http://rake.rubyforge.org/
43		-* po4a: http://po4a.alioth.debian.org/
44		-* Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
45		-* rcov: http://eigenclass.org/hiki/rcov
46		-* RMagick: http://rmagick.rubyforge.org/
47		-* RedCloth: http://redcloth.org/
48		-* will_paginate: http://github.com/mislav/will_paginate/wikis
49		-* iso-codes: http://pkg-isocodes.alioth.debian.org/
50		-* feedparser: http://packages.debian.org/sid/libfeedparser-ruby
51		-* Daemons - http://daemons.rubyforge.org/
52		-* Thin: http://code.macournoyer.com/thin/
53		-* tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
54		-* Hpricot: http://hpricot.com/
55		-
56		-If you manage to install Noosfero successfully on other systems than Debian,
57		-please feel free to contact the Noosfero development mailing with the
58		-instructions for doing so, and we'll include it here.
59		-
60		-As root user
61		-============
62		-
63		-Install memcached. On Debian:
64		-
65		-# apt-get install memcached
66		-
67		-Study whether you need to raise the ammount of memory it uses for caching,
68		-depending on the demand you expect for your site. If you are going to run a
69		-high-traffic site, you will want to raise the ammount of memory reserved for
70		-caching.
71		-
72		-It is recommended that you run noosfero with its own user account. To create
73		-such an account, please do the following:
74		-
75		-# adduser --system --group noosfero --shell /bin/sh --home /var/lib/noosfero
76		-
77		-(note that you can change the $HOME directory of the user if you wish, here we
78		-are using /var/lib/noosfero)
79		-
80		-The --system option will tell adduser to create a system user, i.e. this user
81		-will not have a password and cannot login to the system directly. To become
82		-this user, you have to use sudo:
83		-
84		-# sudo -u noosfero -i
85		-
86		-or
87		-
88		-# su - noosfero
89		-
90		-As noosfero user
91		-================
92		-
93		-downloading from git
94		---------------------
95		-
96		-Here we are cloning the noosfero repository from git. Note: you will need to
97		-install git before.
98		-
99		-$ git clone git://gitorious.org/noosfero/noosfero.git current
100		-$ cd current
101		-$ git checkout -b stable origin/stable
102		-
103		-downloading tarball
104		--------------------
105		-
106		-Note: replace 0.39.0 below from the latest stable version.
107		-
108		-$ wget http://noosfero.org/pub/Development/NoosferoVersion00x39x00/noosfero-0.39.0.tar.gz
109		-$ tar -zxvf noosfero-0.39.0.tar.gz
110		-$ ln -s noosfero-0.39.0 current
111		-$ cd current
112		-
113		-Create the thin configuration file:
114		-
115		-$ thin -C config/thin.yml -e production config
116		-
117		-Edit config/thin.yml to suit your needs. Make sure your apache
118		-configuration matches the thin cluster configuration, specially in respect
119		-to the ports and numbers of thin instances.
120		-
121		-Note: currently Noosfero only supports Rails 2.3.5, which is the version in
122		-Debian Squeeze. If you have a Rails version newer than that, Noosfero will
123		-probably not work. You can install Rails 2.3.5 into your Noosfero installation
124		-with the following procedure:
125		-
126		-$ cd /var/lib/noosfero/current/vendor
127		-$ wget http://ftp.de.debian.org/debian/pool/main/r/rails/rails_2.3.5.orig.tar.gz
128		-$ tar xzf rails_2.3.5.orig.tar.gz
129		-$ ln -s rails-2.3.5 rails
130		-
131		-As root user
132		-============
133		-
134		-Setup Noosfero log and tmp directories:
135		-
136		-# cd /var/lib/noosfero/current
137		-# ./etc/init.d/noosfero setup
138		-
139		-Now it's time to setup the database. In this example we are using PostgreSQL,
140		-so if you are planning to use a different database this steps won't apply.
141		-
142		-# apt-get install postgresql libpgsql-ruby
143		-# su postgres -c 'createuser noosfero -S -d -R'
144		-
145		-By default Rails will try to connect on postgresql through 5432 port,
146		-you can check it on /etc/postgresql/8.4/main/postgresql.conf file.
147		-
148		-Restart postgresql:
149		-
150		-# invoke-rc.d postgresql restart
151		-
152		-Noosfero needs a functional e-mail setup to work: the local mail system should
153		-be able to deliver e-mail to the internet, either directly or through an
154		-external SMTP server. Please check the documentation at the INSTALL.email file.
155		-
156		-As noosfero user
157		-================
158		-
159		-Now create the databases:
160		-
161		-$ cd /var/lib/noosfero/current
162		-$ createdb noosfero_production
163		-$ createdb noosfero_development
164		-$ createdb noosfero_test
165		-
166		-The development and test databases are actually optional. If you are creating a
167		-stricly production server, you will probably not need them.
168		-
169		-Now we want to configure Noosfero for accessing the database we just created.
170		-To do that, you can 1) copy config/database.yml.pgsql to config/database.yml,
171		-or create config/database.yml from scratch with the following content:
172		-
173		- production:
174		- adapter: postgresql
175		- encoding: unicode
176		- database: noosfero_production
177		- username: noosfero
178		-
179		-Now, to test the database access, you can fire the Rails database console:
180		-
181		-$ ./script/dbconsole production
182		-
183		-If it connects to your database, then everything is fine. If you got an error
184		-message, then you have to check your database configuration.
185		-
186		-Create the database structure:
187		-
188		-$ RAILS_ENV=production rake db:schema:load
189		-
190		-Compile the translations:
191		-
192		-$ RAILS_ENV=production rake noosfero:translations:compile
193		-
194		-Now we must create some initial data. To create your default environment
195		-(the first one), run the command below:
196		-
197		-$ RAILS_ENV=production ./script/runner 'Environment.create!(:name => "My environment", :is_default => true)'
198		-
199		-(of course, replace "My environment" with your environment's name!)
200		-
201		-And now you have to add the domain name you will be using for your noosfero
202		-site to the list of domains of that default environment you just created:
203		-
204		-$ RAILS_ENV=production ./script/runner "Environment.default.domains << Domain.new(:name => 'your.domain.com')"
205		-
206		-(replace "your.domain.com" with your actual domain name)
207		-
208		-Add at least one user as admin of environment:
209		-
210		-$ RAILS_ENV=production ./script/runner "User.create(:login => 'adminuser', :email => 'admin@example.com', :password => 'admin', :password_confirmation => 'admin', :environment => Environment.default, :activated_at => Time.new)"
211		-
212		-(replace "adminuser", "admin@example.com", "admin" with the login, email
213		-and password of your environment administrator)
214		-
215		-To start the Noosfero application servers:
216		-
217		-$ ./script/production start
218		-
219		-At this point you have a functional Noosfero installation running, the only
220		-thing left is to configure your webserver as a reverse proxy to pass requests
221		-to them.
222		-
223		-
224		-==================
225		-Apache instalation
226		-==================
227		-
228		-# apt-get install apache2
229		-
230		-Apache configuration
231		---------------------
232		-
233		-First you have to enable the following some apache modules:
234		-
235		- deflate
236		- expires
237		- proxy
238		- proxy_balancer
239		- proxy_http
240		- rewrite
241		-
242		-On Debian GNU/Linux system, these modules can be enabled with the following
243		-command line, as root:
244		-
245		-# a2enmod deflate expires proxy proxy_balancer proxy_http rewrite
246		-
247		-In other systems the way by which you enable apache modules may be different.
248		-
249		-Now with the Apache configuration. You can use the template below, replacing
250		-/var/lib/noosfero/current with the directory in which your noosfero
251		-installation is, your.domain.com with the domain name of your noosfero site.
252		-We are assuming that you are running two thin instances on ports 3000 and
253		-3001. If your setup is different you'll need to adjust <Proxy> section. If you
254		-don't understand something in the configuration, please refer to the apache
255		-documentation.
256		-
257		-Add a file called "mysite" (or whatever name you want to give to your noosfero
258		-site) to /etc/apache2/sites-available with the following content, and customize
259		-as needed (as usual, make sure you replace "your.domain.com" with you actual
260		-domain name, and "/var/lib/noosfero/current" with the directory where Noosfero
261		-is installed):
262		-
263		- <VirtualHost *:80>
264		- ServerName your.domain.com
265		-
266		- DocumentRoot "/var/lib/noosfero/current/public"
267		- <Directory "/var/lib/noosfero/current/public">
268		- Options FollowSymLinks
269		- AllowOverride None
270		- Order Allow,Deny
271		- Allow from all
272		- </Directory>
273		-
274		- RewriteEngine On
275		-
276		- # Rewrite index to check for static index.html
277		- RewriteRule ^/$ /index.html [QSA]
278		-
279		- # Rewrite to check for Rails cached page
280		- RewriteRule ^([^.]+)$ $1.html [QSA]
281		-
282		- RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
283		- RewriteRule ^.*$ balancer://noosfero%{REQUEST_URI} [P,QSA,L]
284		-
285		- ErrorDocument 503 /503.html
286		-
287		- ErrorLog /var/log/apache2/noosfero.log
288		- LogLevel warn
289		- CustomLog /var/log/apache2/noosfero.access.log combined
290		-
291		- Include /var/lib/noosfero/current/etc/noosfero/apache/cache.conf
292		-
293		- </VirtualHost>
294		-
295		- <Proxy balancer://noosfero>
296		- BalancerMember http://127.0.0.1:3000
297		- BalancerMember http://127.0.0.1:3001
298		- Order Allow,Deny
299		- Allow from All
300		- </Proxy>
301		-
302		-The cache.conf file included in the end of the <VirtualHost> section is
303		-important, since it will tell apache to pass expiration and cache headers to
304		-clients so that the site feels faster for users. Do we need to say that using
305		-that configuration is strongly recommended?
306		-
307		-Enable that site with (as root, replace "mysite" with the actual name you gave
308		-to your site configuration):
309		-
310		-# a2ensite mysite
311		-
312		-Now restart your apache server (as root):
313		-
314		-# invoke-rc.d apache2 restart
315		-
316		-
317		-Enabling exception notifications
318		-================================
319		-
320		-This is an optional step. You will need it only if you want to receive e-mail
321		-notifications when some exception occurs on Noosfero.
322		-
323		-First, install this version of the gem.
324		-Others versions may not be compatible with Noosfero:
325		-
326		-# gem install exception_notification -v 1.0.20090728
327		-
328		-You can configure the e-mails that will receive the notifications.
329		-Change the file config/noosfero.yml as the following example, replacing the
330		-e-mails by real ones:
331		-
332		- production:
333		- exception_recipients: [admin@example.com, you@example.com]
334		-
335		-
336		-============
337		-Maintainance
338		-============
339		-
340		-To ease the maintainance, install a symbolic link for the Noosfero startup
341		-script in your server and add it to the system initialization and shutdown
342		-sequences (as root):
343		-
344		-# ln -s /var/lib/noosfero/current/etc/init.d/noosfero /etc/init.d/noosfero
345		-# update-rc.d noosfero defaults
346		- Adding system startup for /etc/init.d/noosfero ...
347		- /etc/rc0.d/K20noosfero -> ../init.d/noosfero
348		- /etc/rc1.d/K20noosfero -> ../init.d/noosfero
349		- /etc/rc6.d/K20noosfero -> ../init.d/noosfero
350		- /etc/rc2.d/S20noosfero -> ../init.d/noosfero
351		- /etc/rc3.d/S20noosfero -> ../init.d/noosfero
352		- /etc/rc4.d/S20noosfero -> ../init.d/noosfero
353		- /etc/rc5.d/S20noosfero -> ../init.d/noosfero
354		-
355		-Now to start Noosfero, you do as root:
356		-
357		-# invoke-rc.d noosfero start
358		-
359		-To stop Noosfero:
360		-
361		-# invoke-rc.d noosfero start
362		-
363		-To restart Noosfero:
364		-
365		-# invoke-rc.d noosfero restart
366		-
367		-Noosfero will be automatically started during system boot, and automatically
368		-stopped if the system shuts down for some reason (or during the shutdown part
369		-of a reboot).
370		-
371		-=============
372		-Rotating logs
373		-=============
374		-
375		-Noosfero provides an example logrotate configuation to rotate its logs. To use
376		-it, create a symbolic link in /etc/logrotate.d/:
377		-
378		-# cd /etc/logrotate.d/
379		-# ln -s /var/lib/noosfero/current/etc/logrotate.d/noosfero
380		-
381		-Note that the provided file assumes Noosfero logging is being done in
382		-/var/log/noosfero (which is the case if you followed the instructions above
383		-correctly). If the logs are stored elsewhere, it's recommended that you copy
384		-the file over to /etc/logrotate.d/ and modify it to point to your local log
385		-directly.
386		-
387		-=========
388		-Upgrading
389		-=========
390		-
391		-If you followed the steps in this document and installed Noosfero from the git
392		-repository, then upgrading is easy. First, you need to allow the noosfero user
393		-to restart the memcached server with sudo, by adding the following line in
394		-/etc/sudoers:
395		-
396		-noosfero ALL=NOPASSWD: /etc/init.d/memcached
397		-
398		-Then, to perform an upgrade, do the following as the noosfero user:
399		-
400		-$ cd /var/lib/noosfero/current
401		-$ ./script/git-upgrade
402		-
403		-The git-upgrade script will take care of everything for you. It will first stop
404		-the service, then fetch the current source code, upgrade database, compile
405		-translations, and then start the service again.
406		-
407		-Note 1: make sure your local git repository is following the "stable" branch,
408		-just like the instructions above. The "master" branch is not recommended for
409		-use in production environments.
410		-
411		-Note 2: always read the release notes before upgrading. Sometimes there will be
412		-steps that must be performed manually. If that is the case, you can invoke the
413		-git-upgrade script with the special parameter "--shell" that will give you a
414		-shell after the upgrade, which you can use to perform any manual steps
415		-required:
416		-
417		-$ ./script/git-upgrade --shell
...	...	@@ -1,78 +0,0 @@
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.
...	...	@@ -0,0 +1,67 @@
	1	+AWStats setup for Noosfero
	2	+==========================
	3	+
	4	+AWStats is a free powerful and featureful tool that generates advanced web, 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	+`/etc/awstats/awstats.<domain>.conf`
	18	+
	19	+ Include "/etc/awstats/awstats.conf"
	20	+ Include "/etc/noosfero/awstats-noosfero.conf"
	21	+ SiteDomain="<domain>"
	22	+ HostAliases="<domain-aliases>"
	23	+
	24	+`<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).
	25	+
	26	+This setup is considering that the Noosfero server is running varnish (see `INSTALL.varnish`) and [varnishncsa-vhost](http://gitorious.org/varnisnncsa-vhost).
	27	+
	28	+### 3. Running AWStats for the first time
	29	+
	30	+Run awstats by hand via command line:
	31	+
	32	+ # /usr/lib/cgi-bin/awstats.pl -config=<domain>
	33	+
	34	+You should see something as below as output of this command:
	35	+
	36	+ # /usr/lib/cgi-bin/awstats.pl -config=softwarelivre.org
	37	+ Create/Update database for config "/etc/awstats/awstats.softwarelivre.org.conf" by AWStats version 6.7 (build 1.892)
	38	+ From data in log file "/var/log/varnish/varnishncsa-vhost.log"...
	39	+ Phase 1 : First bypass old records, searching new record...
	40	+ Searching new records from beginning of log file...
	41	+ Phase 2 : Now process new records (Flush history on disk after 20000 hosts)...
	42	+ Jumped lines in file: 0
	43	+ Parsed lines in file: 452
	44	+ Found 0 dropped records,
	45	+ Found 0 corrupted records,
	46	+ Found 0 old records,
	47	+ Found 452 new qualified records.
	48	+
	49	+### 4. Setup frontend
	50	+
	51	+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.
	52	+
	53	+ # cp /usr/share/doc/awstats/examples/apache.conf /etc/apache2/conf.d/awstats.conf
	54	+ # invoke-rc.d apache2 restart
	55	+
	56	+ps.: Don't forget to change the port `/etc/apache/sites-enabled/000-default` to `8080`.
	57	+
	58	+Try: `http://tools.<domain>/cgi-bin/awstats.pl?config=<domain>`
	59	+(eg.: `http://tools.softwarelivre.org/cgi-bin/awstats.pl?config=softwarelivre.org`).
	60	+
	61	+### 5. Schedule AWStats in crontab
	62	+
	63	+`/etc/cron.d/awstats`
	64	+
	65	+ 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
	66	+
	67	+Done, check the AWStats frontend after one or two days to see if everything is working properly.
...	...
...	...	@@ -1,258 +0,0 @@
1		-== XMPP/Chat Client Setup
2		-
3		-To configure XMPP/BOSH in Noosfero you need:
4		-
5		-* REST Client - http://github.com/archiloque/rest-client
6		-* SystemTimer - http://ph7spot.com/musings/system-timer
7		-* Pidgin data files - http://www.pidgin.im/
8		-
9		-If you use Debian 6.0 (squeeze):
10		-
11		-# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
12		-# gem install SystemTimer
13		-
14		-The samples of config file to configure a XMPP/BOSH server with
15		-ejabberd, postgresql and apache2 can be found at util/chat directory.
16		-
17		-== XMPP/Chat Server Setup
18		-
19		-This is a step-by-step guide to get a XMPP service working, in a Debian system.
20		-
21		-1. Install the required packages
22		-
23		-# apt-get install ejabberd odbc-postgresql
24		-
25		-2. Ejabberd configuration
26		-
27		-All the following changes must be done in config file:
28		-
29		- /etc/ejabberd/ejabberd.cfg
30		-
31		- 2.1. Set the default admin user
32		-
33		-{ acl, admin, { user, "john", "www.example.com" } }.
34		-{ acl, admin, { user, "bart", "www.example.com" } }.
35		-
36		- 2.2. Set the default host
37		-
38		-{ hosts, [ "www.example.com" ] }.
39		-
40		- 2.3. Http-Bind activation
41		-
42		-{ 5280, ejabberd_http, [
43		- http_bind,
44		- web_admin
45		- ]
46		-}
47		-
48		-(...)
49		-
50		-{ modules, [
51		- {mod_http_bind, []},
52		- ...
53		-] }.
54		-
55		-Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client
56		-needs non-anonymous room, then we need to change default params of creation
57		-rooms in ejabberd to create non-anonymous rooms.
58		-
59		-In non-anonymous rooms the jabber service sends the new occupant's full JID to
60		-all occupants in the room[1].
61		-
62		-Add option "{default_room_options, [{anonymous, false}]}" to
63		-/etc/ejabberd/ejabberd.cfg in mod_muc session. See below:
64		-
65		-{ mod_muc, [
66		- %%{host, "conference.@HOST@"},
67		- {access, muc},
68		- {access_create, muc},
69		- {access_persistent, muc},
70		- {access_admin, muc_admin},
71		- {max_users, 500},
72		- {default_room_options, [{anonymous, false}]}
73		-]},
74		-
75		-[1] - http://xmpp.org/extensions/xep-0045.html#enter-nonanon
76		-
77		-
78		- 2.4. Authentication method
79		-
80		-To use Postgresql through ODBC, the following modifications must be done:
81		-
82		- * Disable the default method:
83		-
84		-{auth_method, internal}.
85		-
86		- * Enable autheticantion through ODBC:
87		-
88		-{auth_method, odbc}.
89		-
90		- * Set database server name
91		-
92		-{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.
93		-
94		-
95		- 2.5. Increase the shaper traffic limit
96		-
97		-{ shaper, normal, { maxrate, 10000000 } }.
98		-
99		-
100		- 2.6. Disable unused modules
101		-
102		-Unused modules can be disabled, for example:
103		-
104		- * s2s
105		- * web_admin
106		- * mod_pubsub
107		- * mod_irc
108		- * mod_offline
109		- * mod_admin_extra
110		- * mod_register
111		-
112		-
113		- 2.7. Enable ODBC modules
114		-
115		- * mod_privacy -> mod_privacy_odbc
116		- * mod_private -> mod_private_odbc
117		- * mod_roster -> mod_roster_odbc
118		-
119		-3. Configuring Postgresql
120		-
121		-Login as noosfero user, and execute:
122		-
123		- $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
124		-
125		-Where 'noosfero' may need to be replace by the name of the database used for
126		-Noosfero.
127		-
128		-This will create a new schema inside the noosfero database, called 'ejabberd'.
129		-
130		-Note 'noosfero' user should have permission to create Postgresql schemas. Also,
131		-there should be at least one domain with 'is_default = true' in 'domains'
132		-table, otherwise people won't be able to see their friends online.
133		-
134		-
135		-4. ODBC configuration
136		-
137		-The following files must be created:
138		-
139		- * /etc/odbc.ini
140		-
141		-[PostgreSQLEjabberdNoosfero]
142		-Description = PostgreSQL Noosfero ejabberd database
143		-Driver = PostgreSQL Unicode
144		-Trace = No
145		-TraceFile = /tmp/psqlodbc.log
146		-Database = noosfero
147		-Servername = localhost
148		-UserName = <DBUSER>
149		-Password = <DBPASS>
150		-Port =
151		-ReadOnly = No
152		-RowVersioning = No
153		-ShowSystemTables = No
154		-ShowOidColumn = No
155		-FakeOidIndex = No
156		-ConnSettings = SET search_path TO ejabberd
157		-
158		- * /etc/odbcinst.ini
159		-
160		-[PostgreSQL Unicode]
161		-Description = PostgreSQL ODBC driver (Unicode version)
162		-Driver = /usr/lib/odbc/psqlodbcw.so
163		-Setup = /usr/lib/odbc/libodbcpsqlS.so
164		-Debug = 0
165		-CommLog = 1
166		-UsageCount = 3
167		-
168		- 4.1 testing all:
169		-
170		-# isql 'PostgreSQLEjabberdNoosfero'
171		-
172		-If the configuration was done right, the message "Connected!"
173		-will be displayed.
174		-
175		-
176		-5. Enabling kernel polling and SMP in /etc/default/ejabberd
177		-
178		-POLL=true
179		-SMP=auto
180		-
181		-
182		-6. Increase the file descriptors limit for user ejabberd
183		-
184		- 6.1. Uncomment this line in file /etc/pam.d/su:
185		-
186		-session required pam_limits.so
187		-
188		-
189		- 6.2. Add this lines to file /etc/security/limits.conf:
190		-
191		-ejabberd hard nofile 65536
192		-ejabberd soft nofile 65536
193		-
194		-Now, test the configuration:
195		-
196		-# cat /proc/<EJABBERD_BEAM_PROCESS_PID>/limits
197		-
198		-
199		-7. Apache Configuration
200		-
201		-Apache server must be configurated as follow:
202		-
203		- * /etc/apache2/sites-enabled/noosfero
204		-
205		-RewriteEngine On
206		-Include /usr/share/noosfero/util/chat/apache/xmpp.conf
207		-
208		- * /etc/apache2/apache2.conf:
209		-
210		-<IfModule mpm_worker_module>
211		- StartServers 8
212		- MinSpareThreads 25
213		- MaxSpareThreads 75
214		- ThreadLimit 128
215		- ThreadsPerChild 128
216		- MaxClients 2048
217		- MaxRequestsPerChild 0
218		-</IfModule>
219		-
220		-Note: module proxy_http must be enabled:
221		-
222		-# a2enmod proxy_http
223		-
224		-8. DNS configuration
225		-
226		-For this point, we assume you are using BIND as your DNS server. You need to
227		-add the following entries to the DNS zone file corresponding to the domain
228		-of your noosfero site:
229		-
230		-_xmpp-client._tcp SRV 5 100 5222 master
231		-conference CNAME master
232		-_xmpp-client._tcp.conference SRV 5 100 5222 master
233		-
234		-If you are running a DNS server other than BIND, you will have to figure out
235		-how to create equivalente rules for your zone file. Patches to this
236		-documentation are welcome.
237		-
238		-9. Testing this Setup
239		-
240		-Adjust shell limits to proceed with some benchmarks and load tests:
241		-
242		-# ulimit −s 256
243		-# ulimit −n 8192
244		-# echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
245		-
246		-To measure the bandwidth between server and client:
247		-
248		- * at server side:
249		-
250		-# iperf −s
251		-
252		- * at client side:
253		-
254		-# iperf −c server_ip
255		-
256		-For heavy load tests, clone and use this software:
257		-
258		-git clone http://git.holoscopio.com/git/metal/tester.git
...	...	@@ -0,0 +1,236 @@
	1	+XMPP/Chat Client Setup
	2	+======================
	3	+
	4	+To configure XMPP/BOSH in Noosfero you need:
	5	+
	6	+* REST Client - http://github.com/archiloque/rest-client
	7	+* SystemTimer - http://ph7spot.com/musings/system-timer
	8	+* Pidgin data files - http://www.pidgin.im/
	9	+
	10	+If you use Debian 6.0 (squeeze):
	11	+
	12	+ # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
	13	+ # gem install SystemTimer
	14	+
	15	+The samples of config file to configure a XMPP/BOSH server with ejabberd, postgresql and apache2 can be found at util/chat directory.
	16	+
	17	+XMPP/Chat Server Setup
	18	+======================
	19	+
	20	+This is a step-by-step guide to get a XMPP service working, in a Debian system.
	21	+
	22	+## 1. Install the required packages
	23	+
	24	+ # apt-get install ejabberd odbc-postgresql
	25	+
	26	+## 2. Ejabberd configuration
	27	+
	28	+All the following changes must be done in config file: `/etc/ejabberd/ejabberd.cfg`
	29	+
	30	+### 2.1. Set the default admin user
	31	+
	32	+ { acl, admin, { user, "john", "www.example.com" } }.
	33	+ { acl, admin, { user, "bart", "www.example.com" } }.
	34	+
	35	+### 2.2. Set the default host
	36	+
	37	+ { hosts, [ "www.example.com" ] }.
	38	+
	39	+### 2.3. Http-Bind activation
	40	+
	41	+ { 5280, ejabberd_http, [
	42	+ http_bind,
	43	+ web_admin
	44	+ ]
	45	+ }
	46	+
	47	+ (...)
	48	+
	49	+ { modules, [
	50	+ {mod_http_bind, []},
	51	+ ...
	52	+ ] }.
	53	+
	54	+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.
	55	+
	56	+In non-anonymous rooms the jabber service sends the new occupant's full JID to all occupants in the room [[1]].
	57	+
	58	+Add option "`{default_room_options, [{anonymous, false}]}`" to `/etc/ejabberd/ejabberd.cfg` in mod_muc session. See below:
	59	+
	60	+ { mod_muc, [
	61	+ %%{host, "conference.@HOST@"},
	62	+ {access, muc},
	63	+ {access_create, muc},
	64	+ {access_persistent, muc},
	65	+ {access_admin, muc_admin},
	66	+ {max_users, 500},
	67	+ {default_room_options, [{anonymous, false}]}
	68	+ ]},
	69	+
	70	+[1]: http://xmpp.org/extensions/xep-0045.html#enter-nonanon
	71	+
	72	+
	73	+### 2.4. Authentication method
	74	+
	75	+To use Postgresql through ODBC, the following modifications must be done:
	76	+
	77	+ * Disable the default method:
	78	+ `{auth_method, internal}.`
	79	+
	80	+ * Enable autheticantion through ODBC:
	81	+ `{auth_method, odbc}.`
	82	+
	83	+ * Set database server name
	84	+ `{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.`
	85	+
	86	+
	87	+### 2.5. Increase the shaper traffic limit
	88	+
	89	+ { shaper, normal, { maxrate, 10000000 } }.
	90	+
	91	+
	92	+### 2.6. Disable unused modules
	93	+
	94	+Unused modules can be disabled, for example:
	95	+
	96	+ * s2s
	97	+ * web_admin
	98	+ * mod_pubsub
	99	+ * mod_irc
	100	+ * mod_offline
	101	+ * mod_admin_extra
	102	+ * mod_register
	103	+
	104	+
	105	+### 2.7. Enable ODBC modules
	106	+
	107	+ * mod_privacy -> mod_privacy_odbc
	108	+ * mod_private -> mod_private_odbc
	109	+ * mod_roster -> mod_roster_odbc
	110	+
	111	+## 3. Configuring Postgresql
	112	+
	113	+Login as noosfero user, and execute:
	114	+
	115	+ $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
	116	+
	117	+Where `noosfero` may need to be replace by the name of the database used for Noosfero.
	118	+
	119	+This will create a new schema inside the noosfero database, called `ejabberd`.
	120	+
	121	+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.
	122	+
	123	+## 4. ODBC configuration
	124	+
	125	+The following files must be created:
	126	+
	127	+`/etc/odbc.ini`:
	128	+
	129	+ [PostgreSQLEjabberdNoosfero]
	130	+ Description = PostgreSQL Noosfero ejabberd database
	131	+ Driver = PostgreSQL Unicode
	132	+ Trace = No
	133	+ TraceFile = /tmp/psqlodbc.log
	134	+ Database = noosfero
	135	+ Servername = localhost
	136	+ UserName = <DBUSER>
	137	+ Password = <DBPASS>
	138	+ Port =
	139	+ ReadOnly = No
	140	+ RowVersioning = No
	141	+ ShowSystemTables = No
	142	+ ShowOidColumn = No
	143	+ FakeOidIndex = No
	144	+ ConnSettings = SET search_path TO ejabberd
	145	+
	146	+`/etc/odbcinst.ini`:
	147	+
	148	+ [PostgreSQL Unicode]
	149	+ Description = PostgreSQL ODBC driver (Unicode version)
	150	+ Driver = /usr/lib/odbc/psqlodbcw.so
	151	+ Setup = /usr/lib/odbc/libodbcpsqlS.so
	152	+ Debug = 0
	153	+ CommLog = 1
	154	+ UsageCount = 3
	155	+
	156	+## 4.1 testing all:
	157	+
	158	+ # isql 'PostgreSQLEjabberdNoosfero'
	159	+
	160	+If the configuration was done right, the message "Connected!" will be displayed.
	161	+
	162	+
	163	+## 5. Enabling kernel polling and SMP in `/etc/default/ejabberd`
	164	+
	165	+ POLL=true
	166	+ SMP=auto
	167	+
	168	+## 6. Increase the file descriptors limit for user ejabberd
	169	+
	170	+### 6.1. Uncomment this line in file `/etc/pam.d/su`:
	171	+
	172	+ session required pam_limits.so
	173	+
	174	+### 6.2. Add this lines to file `/etc/security/limits.conf`:
	175	+
	176	+ ejabberd hard nofile 65536
	177	+ ejabberd soft nofile 65536
	178	+
	179	+Now, test the configuration:
	180	+
	181	+ # cat /proc/<EJABBERD_BEAM_PROCESS_PID>/limits
	182	+
	183	+## 7. Apache Configuration
	184	+
	185	+Apache server must be configurated as follow:
	186	+
	187	+`/etc/apache2/sites-enabled/noosfero`:
	188	+
	189	+ RewriteEngine On
	190	+ Include /usr/share/noosfero/util/chat/apache/xmpp.conf
	191	+
	192	+`/etc/apache2/apache2.conf`:
	193	+
	194	+ <IfModule mpm_worker_module>
	195	+ StartServers 8
	196	+ MinSpareThreads 25
	197	+ MaxSpareThreads 75
	198	+ ThreadLimit 128
	199	+ ThreadsPerChild 128
	200	+ MaxClients 2048
	201	+ MaxRequestsPerChild 0
	202	+ </IfModule>
	203	+
	204	+Note: module proxy_http must be enabled:
	205	+
	206	+ # a2enmod proxy_http
	207	+
	208	+## 8. DNS configuration
	209	+
	210	+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:
	211	+
	212	+ _xmpp-client._tcp SRV 5 100 5222 master
	213	+ conference CNAME master
	214	+ _xmpp-client._tcp.conference SRV 5 100 5222 master
	215	+
	216	+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.
	217	+
	218	+## 9. Testing this Setup
	219	+
	220	+Adjust shell limits to proceed with some benchmarks and load tests:
	221	+
	222	+ # ulimit −s 256
	223	+ # ulimit −n 8192
	224	+ # echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
	225	+
	226	+To measure the bandwidth between server and client:
	227	+
	228	+ * at server side:
	229	+ `# iperf −s`
	230	+
	231	+ * at client side:
	232	+ `# iperf −c server_ip`
	233	+
	234	+For heavy load tests, clone and use this software:
	235	+
	236	+ $ git clone http://git.holoscopio.com/git/metal/tester.git
...	...
...	...	@@ -1,43 +0,0 @@
1		-= Noosfero email setup
2		-
3		-If you know mail systems well, you just need to make sure that the local MTA,
4		-listening on localhost:25, is able to deliver e-mails to the internet. Any mail
5		-server will do it. You can stop reading now.
6		-
7		-If you are not an email specialist, then follow the instructions below. We
8		-suggest that you use the Postfix mail server, since it is easy to configure and
9		-very reliable. Just follow the instructions below.
10		-
11		-To install Postfix:
12		-
13		-# apt-get install postfix
14		-
15		-During the installation process, you will be asked a few questions. Your answer
16		-to them will vary in 2 cases:
17		-
18		-Case 1: you can send e-mails directly to the internet. This will be the case
19		-for most commercial private servers. Your answers should be:
20		-
21		- General type of mail configuration: Internet site
22		- System mail name: the name of your domain, e.g. "mysocialnetwork.com"
23		-
24		-Case 2: you cannot, or don't want to, send e-mail directly to the internet.
25		-This happens for example if your server is not allowed to make outbound
26		-connections on port 25, or if you want to concentrate all your outbound mail
27		-through a single SMTP server. Your answers in this case should be:
28		-
29		- General type of mail configuration: Internet with smarthost
30		- System mail name: the name of your domain, e.g. "mysocialnetwork.com"
31		- SMTP relay host: smtp.yourprovider.com
32		-
33		-Note that smtp.yourprovider.com must allow your server to deliver e-mails
34		-through it. You should probably ask your servive provider about this.
35		-
36		-There is another possibility: if you are installing on a shared server, and
37		-don't have permission to configure the local MTA, you can instruct Noosfero to
38		-send e-mails directly through an external server. Please note that this should
39		-be your last option, since contacting an external SMTP server directly may slow
40		-down your Noosfero application server. To configure Noosfero to send e-mails
41		-through an external SMTP server, follow the instructions on
42		-http://noosfero.org/Development/SMTPMailSending
43		-