Merge branch 'master' into rails3-merge

Conflicts: app/views/profile_themes/add_css.rhtml app/views/profile_themes/add_image.rhtml app/views/profile_themes/css_editor.rhtml app/views/profile_themes/edit.rhtml app/views/profile_themes/new.rhtml app/views/themes/add_css.html.erb app/views/themes/add_css.rhtml app/views/themes/add_image.html.erb app/views/themes/add_image.rhtml app/views/themes/css_editor.html.erb app/views/themes/css_editor.rhtml app/views/themes/edit.html.erb app/views/themes/edit.rhtml app/views/themes/index.html.erb app/views/themes/new.html.erb app/views/themes/new.rhtml test/factories.rb test/functional/profile_themes_controller_test.rb

Merge branch 'master' into rails3-merge
Conflicts: app/views/profile_themes/add_css.rhtml app/views/profile_themes/add_image.rhtml app/views/profile_themes/css_editor.rhtml app/views/profile_themes/edit.rhtml app/views/profile_themes/new.rhtml app/views/themes/add_css.html.erb app/views/themes/add_css.rhtml app/views/themes/add_image.html.erb app/views/themes/add_image.rhtml app/views/themes/css_editor.html.erb app/views/themes/css_editor.rhtml app/views/themes/edit.html.erb app/views/themes/edit.rhtml app/views/themes/index.html.erb app/views/themes/new.html.erb app/views/themes/new.rhtml test/factories.rb test/functional/profile_themes_controller_test.rb
Rodrigo Souto
2 parents e9fea38f adc4f4fd
Showing 40 changed files with 1132 additions and 642 deletions Show diff stats
AUTHORS
app/controllers/admin/environment_themes_controller.rb
app/controllers/my_profile/profile_themes_controller.rb
app/controllers/my_profile/themes_controller.rb
app/controllers/public/comment_controller.rb
app/controllers/themes_controller.rb
app/models/box.rb
app/models/environment.rb
app/views/admin_panel/index.html.erb
app/views/cms/edit.html.erb
app/views/comment/_comment.html.erb
app/views/environment_themes/index.html.erb
app/views/profile_editor/index.html.erb
app/views/profile_themes/add_css.html.erb
app/views/profile_themes/add_image.html.erb
app/views/profile_themes/css_editor.html.erb
app/views/profile_themes/edit.html.erb
app/views/profile_themes/index.html.erb
app/views/profile_themes/new.html.erb
app/views/shared/_lead_and_body.html.erb
@@ -0,0 +1,231 @@
+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>
+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>
+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 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>
+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 Bucher <daniel.bucher88@gmail.com>
+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>
+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>
+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)>
+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>
+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 <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>
+
+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>
@@ -0,0 +1,11 @@
+class EnvironmentThemesController < ThemesController
+
+  protect 'edit_appearance', :environment
+  
+  no_design_blocks
+
+  def target
+    @target = environment
+  end
+
+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
@@ -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
@@ -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
@@ -10,7 +10,7 @@ class Box &lt; ActiveRecord::Base
   end
   def acceptable_blocks
-    blocks_classes = central?  ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :position => [2, 3])
+    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
@@ -28,7 +28,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
@@ -666,6 +667,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
@@ -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>
 <%= error_messages_for 'article' %>
-<%= javascript_include_tag "article.js" %>
 <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
@@ -63,3 +62,5 @@
 <% end %>
 <br style='clear: both'/>
+
+<%= javascript_include_tag "article.js" %>
@@ -43,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,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 @@
   <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
-  <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>
+  <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
   <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
@@ -0,0 +1,11 @@
+<h2><%= _('Add a CSS file') %></h2>
+
+<%= form_tag do %>
+  <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
+
+  <% button_bar do %>
+    <%= submit_button(:add, _('Add')) %>
+    <%= lightbox_close_button(_('Cancel')) %>
+  <% end %>
+
+<% end %>
@@ -0,0 +1,6 @@
+<%= form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
+  <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
+  <% button_bar do %>
+    <%= submit_button(:add, _('Add image')) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,13 @@
+<h2><%= _('CSS code: "%s"') % @css %></h2>
+
+<%= form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
+  <%= hidden_field_tag('css', @css) %>
+  <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save')) %>
+  <% end %>
+<% end %>
+
+<!--<script type='text/javascript'>-->
+  <!--CodePress.run();-->
+<!--</script>-->
@@ -0,0 +1,41 @@
+<form>
+  <%# FIXME %>
+  <h1 id='theme-name'>
+    <%= _('Editing theme "%s"') % @theme.name %>
+    <%= button(:eyes, _('Preview this theme'), :action => 'start_test', :id => @theme.id) %>
+    <%= button(:back, _('Back'), :action => 'index') %>
+  </h1>
+</form>
+
+
+<div id='css-files-list'>
+  <h2><%= _('CSS files') %></h2>
+  <ul>
+    <% for css in @css_files %>
+      <li><%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %></li>
+    <% end %>
+  </ul>
+  <% button_bar do %>
+    <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
+  <% end %>
+</div>
+
+<div id='image-files-list'>
+  <h2><%= _('Images') %></h2>
+  <ul>
+    <% for image in @image_files %>
+      <li><%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %></li>
+    <% end %> 
+  </ul>
+  <% button_bar do %>
+    <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id =>  @theme.id) %>
+  <% end %>
+</div>
+
+<div id='css-code'>
+  <center style='padding-top: 5em;'>
+    <em><%= _('Select a CSS file to edit') %></em>
+  </center>
+</div>
+
+<%# javascript_include_tag 'codepress/codepress' %>
@@ -0,0 +1,48 @@
+<%= render :partial => 'themes/select_template' %>
+<%= render :partial => 'themes/select_theme' %>
+
+<% if environment.enabled?('user_themes') %>
+  <div id="user-themes" class="list-options">
+
+  <h2><%= _('My themes') %></h2>
+
+  <% for themes in profile.themes.in_groups_of(3)  %>
+    <div class="list-group">
+      <% for theme in themes %><%=
+        if theme
+
+          selected = theme.id == @current_theme
+          sel_html = selected ?
+            content_tag('big', _('(current)') ) :
+            link_to(_('Use this theme'), :action => 'set', :id => theme.id)
+
+          content_tag( 'div',
+            image_tag(
+              '/images/icons-app/design-editor.png',
+              :alt => (_('The "%s" theme.') % theme.name)) +
+            '<div class="opt-info">' +
+              content_tag('strong', theme.name, :class => 'name') +
+              ' <br/> '+ sel_html +' <br/> ' +
+              link_to(_('Edit this theme'), :action => 'edit', :id => theme.id) +
+              ' <br/> ' +
+              link_to(_('Test this theme'), :action => 'start_test', :id => theme.id) +
+            '</div>',
+            :class => 'theme-opt list-opt' + (selected ? ' selected' : '')
+          )
+
+        end
+      %><% end %>
+    </div>
+  <% end %>
+
+  </div><!-- end id="user-themes" -->
+<% end %>
+
+<br style="clear:both" />
+
+<% button_bar do %>
+  <% if environment.enabled?('user_themes')  %>
+    <%= lightbox_button(:add, _('New theme ...'), :action => 'new') %>
+  <% end %>
+  <%= button(:back, _('Back'), :controller => 'profile_editor', :action => 'index') %>
+<% end %>
@@ -0,0 +1,10 @@
+<h2><%= _('Create new theme') %></h2>
+
+<%= form_tag(:action => 'new') do %>
+
+  <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Create')) %>
+  <% end %>
+<% end %>
@@ -33,4 +33,4 @@
   <% end %>
 </div>
-<%= javascript_include_tag 'article'%>
+<%= javascript_include_tag 'article-lead-and-body'%>
@@ -6,8 +6,8 @@
   <p><small><em><%= _('You can move this window away to have a better visualization of specific parts of screen.') %></em></small></p>
   <% button_bar do %>
-    <%= button(:ok, _('Finished testing'), :controller => 'themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
-    <%= button(:edit, _('Edit theme'), :controller => 'themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
+    <%= button(:ok, _('Finished testing'), :controller => 'profile_themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
+    <%= button(:edit, _('Edit theme'), :controller => 'profile_themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
   <% end %>
 </div>
 <%= draggable_element('theme-test-panel') %>
@@ -0,0 +1,35 @@
+<h1><%= _('Editing Appearance') %></h1>
+
+<div id="template-options" class="list-options">
+
+<h2><%= _('Select template') %></h2>
+
+<% for templates in @layout_templates.in_groups_of(3) %>
+  <div class="list-group">
+    <% for template in templates %><%=
+      if template
+        base_content = image_tag(
+          "/designs/templates/#{template.id}/thumbnail.png",
+          :alt => _('The "%s" template')) +
+        '<div class="opt-info">'.html_safe +
+        content_tag('strong', template.name, :class => 'name') +
+        ' <br/> '.html_safe
+
+        if @current_template == template.id  # selected
+          content_tag( 'div',
+            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
+            :class => 'template-opt list-opt selected')
+        else  # Not selected
+          link_to(
+            base_content +'</div>'.html_safe,
+            { :action => 'set_layout_template', :id => template.id },
+            :class => 'template-opt list-opt')
+        end
+
+      end
+    %><% end %>
+  </div>
+<% end %>
+
+</div><!-- end id="template-options" -->
+
@@ -0,0 +1,37 @@
+<% if !@themes.empty? %>
+<div id="theme-options" class="list-options">
+
+<h2><%= _('Select theme') %></h2>
+<%= button :home, _('Use the default theme'), { :action => 'unset'}, :method => 'post', :confirm => _('Are you sure you want to use the environment default theme?') %>
+
+<% for themes in @themes.in_groups_of(3) %>
+  <div class="list-group">
+    <% for theme in themes %><%=
+      if theme
+
+        base_content = image_tag(
+          "/designs/themes/#{theme.id}/preview.png",
+          :alt => (_('The "%s" theme.') % theme.name)) +
+        '<div class="opt-info">'.html_safe +
+        content_tag('strong', theme.name, :class => 'name') +
+        ' <br/> '.html_safe
+
+        if theme.id == @current_theme  # selected
+          content_tag( 'div',
+            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
+            :class => 'theme-opt list-opt selected')
+        else  # Not selected
+          link_to(
+            base_content + '</div>'.html_safe,
+            { :action => 'set', :id => theme.id },
+            :class => 'theme-opt list-opt')
+        end
+
+      end
+    %><% end %>
+  </div>
+<% end %>
+
+</div><!-- end id="theme-options" -->
+<% end %>
+
@@ -1,11 +0,0 @@
-<h2><%= _('Add a CSS file') %></h2>
-
-<%= form_tag do %>
-  <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
-
-  <% button_bar do %>
-    <%= submit_button(:add, _('Add')) %>
-    <%= lightbox_close_button(_('Cancel')) %>
-  <% end %>
-
-<% end %>
@@ -1,6 +0,0 @@
-<%= form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
-  <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
-  <% button_bar do %>
-    <%= submit_button(:add, _('Add image')) %>
-  <% end %>
-<% end %>
@@ -1,13 +0,0 @@
-<h2><%= _('CSS code: "%s"') % @css %></h2>
-
-<%= form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
-  <%= hidden_field_tag('css', @css) %>
-  <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save')) %>
-  <% end %>
-<% end %>
-
-<!--<script type='text/javascript'>-->
-  <!--CodePress.run();-->
-<!--</script>-->
@@ -1,41 +0,0 @@
-<form>
-  <%# FIXME %>
-  <h1 id='theme-name'>
-    <%= _('Editing theme "%s"') % @theme.name %>
-    <%= button(:eyes, _('Preview this theme'), :action => 'start_test', :id => @theme.id) %>
-    <%= button(:back, _('Back'), :action => 'index') %>
-  </h1>
-</form>
-
-
-<div id='css-files-list'>
-  <h2><%= _('CSS files') %></h2>
-  <ul>
-    <% for css in @css_files %>
-      <li><%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %></li>
-    <% end %>
-  </ul>
-  <% button_bar do %>
-    <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
-  <% end %>
-</div>
-
-<div id='image-files-list'>
-  <h2><%= _('Images') %></h2>
-  <ul>
-    <% for image in @image_files %>
-      <li><%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %></li>
-    <% end %> 
-  </ul>
-  <% button_bar do %>
-    <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id =>  @theme.id) %>
-  <% end %>
-</div>
-
-<div id='css-code'>
-  <center style='padding-top: 5em;'>
-    <em><%= _('Select a CSS file to edit') %></em>
-  </center>
-</div>
-
-<%# javascript_include_tag 'codepress/codepress' %>
@@ -1,120 +0,0 @@
-<h1><%= _('Editing Appearance') %></h1>
-
-<div id="template-options" class="list-options">
-
-<h2><%= _('Select template') %></h2>
-
-<% for templates in @layout_templates.in_groups_of(3) %>
-  <div class="list-group">
-    <% for template in templates %><%=
-      if template
-        base_content = image_tag(
-          "/designs/templates/#{template.id}/thumbnail.png",
-          :alt => _('The "%s" template')) +
-        '<div class="opt-info">'.html_safe +
-        content_tag('strong', template.name, :class => 'name') +
-        ' <br/> '.html_safe
-
-        if @current_template == template.id  # selected
-          content_tag( 'div',
-            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
-            :class => 'template-opt list-opt selected')
-        else  # Not selected
-          link_to(
-            base_content +'</div>'.html_safe,
-            { :action => 'set_layout_template', :id => template.id },
-            :class => 'template-opt list-opt')
-        end
-
-      end
-    %><% end %>
-  </div>
-<% end %>
-
-</div><!-- end id="template-options" -->
-
-
-<% if !@themes.empty? %>
-<div id="theme-options" class="list-options">
-
-<h2><%= _('Select theme') %></h2>
-<%= button :home, _('Use the default theme'), { :action => 'unset'}, :method => 'post', :confirm => _('Are you sure you want to use the environment default theme?') %>
-
-<% for themes in @themes.in_groups_of(3) %>
-  <div class="list-group">
-    <% for theme in themes %><%=
-      if theme
-
-        base_content = image_tag(
-          "/designs/themes/#{theme.id}/preview.png",
-          :alt => (_('The "%s" theme.') % theme.name)) +
-        '<div class="opt-info">'.html_safe +
-        content_tag('strong', theme.name, :class => 'name') +
-        ' <br/> '.html_safe
-
-        if theme.id == @current_theme  # selected
-          content_tag( 'div',
-            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
-            :class => 'theme-opt list-opt selected')
-        else  # Not selected
-          link_to(
-            base_content + '</div>'.html_safe,
-            { :action => 'set', :id => theme.id },
-            :class => 'theme-opt list-opt')
-        end
-
-      end
-    %><% end %>
-  </div>
-<% end %>
-
-</div><!-- end id="theme-options" -->
-<% end %>
-
-
-
-<% if environment.enabled?('user_themes') %>
-  <div id="user-themes" class="list-options">
-
-  <h2><%= _('My themes') %></h2>
-
-  <% for themes in profile.themes.in_groups_of(3)  %>
-    <div class="list-group">
-      <% for theme in themes %><%=
-        if theme
-
-          selected = theme.id == @current_theme
-          sel_html = selected ?
-            content_tag('big', _('(current)') ) :
-            link_to(_('Use this theme'), :action => 'set', :id => theme.id)
-
-          content_tag( 'div',
-            image_tag(
-              '/images/icons-app/design-editor.png',
-              :alt => (_('The "%s" theme.') % theme.name)) +
-            '<div class="opt-info">' +
-              content_tag('strong', theme.name, :class => 'name') +
-              ' <br/> '+ sel_html +' <br/> ' +
-              link_to(_('Edit this theme'), :action => 'edit', :id => theme.id) +
-              ' <br/> ' +
-              link_to(_('Test this theme'), :action => 'start_test', :id => theme.id) +
-            '</div>',
-            :class => 'theme-opt list-opt' + (selected ? ' selected' : '')
-          )
-
-        end
-      %><% end %>
-    </div>
-  <% end %>
-
-  </div><!-- end id="user-themes" -->
-<% end %>
-
-<br style="clear:both" />
-
-<% button_bar do %>
-  <% if environment.enabled?('user_themes') %>
-    <%= lightbox_button(:add, _('New theme ...'), :action => 'new') %>
-  <% end %>
-  <%= button(:back, _('Back'), :controller => 'profile_editor', :action => 'index') %>
-<% end %>
@@ -1,10 +0,0 @@
-<h2><%= _('Create new theme') %></h2>
-
-<%= form_tag(:action => 'new') do %>
-
-  <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
-
-  <% button_bar do %>
-    <%= submit_button(:save, _('Create')) %>
-  <% end %>
-<% end %>
+noosfero (0.46.0) unstable; urgency=low
+
+  * New features release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Thu, 20 Feb 2014 17:56:14 -0300
+
+noosfero (0.46.0~rc20140120171635) squeeze-test; urgency=low
+
+  * 0.46.0 RC1
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Mon, 20 Jan 2014 17:16:45 +0000
+
 noosfero (0.45.2) unstable; urgency=low
   * Small release with a critical bugfix
@@ -4,7 +4,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.45.2'
+  VERSION = '0.46.0'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -462,6 +462,25 @@ class Noosfero::Plugin
     nil
   end
+  # -> Adds adittional content to comment visualization
+  # returns = lambda block that creates html code
+  def comment_extra_contents(args)
+    nil
+  end
+
+  # This method is called when the user clicks to send a comment.
+  # A plugin can add new content to comment form and this method can process the params sent to avoid creating field on core tables.
+  # returns = params after processed by plugins
+  # example:
+  #
+  #   def process_extra_comment_params(params)
+  #     params.delete(:extra_field)
+  #   end
+  #
+  def process_extra_comment_params(params)
+    params
+  end
+
   # -> Finds objects by their contents
   # returns = {:results => [a, b, c, ...], ...}
   # P.S.: The plugin might add other informations on the return hash for its
@@ -0,0 +1,8 @@
+jQuery(function($) {
+  $(".lead-button").live('click', function(){
+    article_id = this.getAttribute("article_id");
+    $(this).toggleClass('icon-add').toggleClass('icon-remove');
+    $(article_id).slideToggle();
+    return false;
+  })
+});
 jQuery(function($) {
-  $(".lead-button").live('click', function(){
-    article_id = this.getAttribute("article_id");
-    $(this).toggleClass('icon-add').toggleClass('icon-remove');
-    $(article_id).slideToggle();
-    return false;
-  })
   $("#body-button").click(function(){
     $(this).toggleClass('icon-add').toggleClass('icon-remove');
     $('#article-body-field').slideToggle();
@@ -4323,7 +4323,7 @@ h1#agenda-title {
   padding-left: 0px;
   list-style-type: none;
 }
-/* ==> public/stylesheets/controller_themes.css <== */
+/* ==> public/stylesheets/profile_controller_themes.css <== */
 .action-themes-index .button-bar {
   padding-top: 20px;
@@ -4397,23 +4397,23 @@ h1#agenda-title {
 #user-themes a:hover {
   text-decoration: underline;
 }
-.controller-themes .template-preview-cell {
+.controller-profile_themes .template-preview-cell {
   text-align: center;
 }
-.controller-themes .theme-preview {
+.controller-profile_themes .theme-preview {
   border: 1px solid #BBB;
 }
-.controller-themes #css-files-list h2, .controller-themes #image-files-list h2 {
+.controller-profile_themes #css-files-list h2, .controller-profile_themes #image-files-list h2 {
   margin-top: 0px;
 }
-.controller-themes #css-files-list ul, .controller-themes #image-files-list ul, .controller-themes #css-code textarea {
+.controller-profile_themes #css-files-list ul, .controller-profile_themes #image-files-list ul, .controller-profile_themes #css-code textarea {
   height: 280px;
 }
-.controller-themes #css-files-list ul, .controller-themes #image-files-list ul {
+.controller-profile_themes #css-files-list ul, .controller-profile_themes #image-files-list ul {
   overflow: auto;
 }
 /* header stuff */
-.controller-themes #theme-name input {
+.controller-profile_themes #theme-name input {
   font-size: 18px;
   border: 1px solid black;
   background: white;
@@ -4422,78 +4422,78 @@ h1#agenda-title {
 }
 /* files list */
-.controller-themes #css-files-list {
+.controller-profile_themes #css-files-list {
   width: 200px;
   float: left;
   margin-left: 10px;
 }
-.controller-themes #css-files-list ul {
+.controller-profile_themes #css-files-list ul {
   margin: 0px;
   padding-left: 0px;
   background: white;
   border: 1px solid #bbb;
 }
-.controller-themes #css-files-list li {
+.controller-profile_themes #css-files-list li {
   list-style: none;
   margin-bottom: 5px;
   border-bottom: 1px solid #bbb;
 }
-.controller-themes #css-files-list li a {
+.controller-profile_themes #css-files-list li a {
   display: block;
   padding: 1px 5px;
 }
-.controller-themes #css-files-list a:hover {
+.controller-profile_themes #css-files-list a:hover {
   color: red;
 }
 /* images list */
-.controller-themes #image-files-list {
+.controller-profile_themes #image-files-list {
   width: 200px;
   float: right;
   margin-right: 10px;
 }
-.controller-themes #image-files-list ul {
+.controller-profile_themes #image-files-list ul {
   background: white;
   border: 1px solid #bbb;
 }
-.controller-themes #image-files-list ul, .controller-themes #image-files-list li {
+.controller-profile_themes #image-files-list ul, .controller-profile_themes #image-files-list li {
   padding: 0px;
   margin: 0px;
   list-style: none;
 }
-.controller-themes #image-files-list li {
+.controller-profile_themes #image-files-list li {
   border-bottom: 1px solid #bbb;
   padding: 5px 0px;
   text-align: center;
 }
-.controller-themes #image-files-list img {
+.controller-profile_themes #image-files-list img {
   max-width: 98%;
   max-height: 40px;
 }
-.controller-themes .msie6 #image-files-list img {
+.controller-profile_themes .msie6 #image-files-list img {
   width: 50%;
   height: 40px;
 }
-.controller-themes #image-files-list li span {
+.controller-profile_themes #image-files-list li span {
   display: block;
   width: 100%;
   overflow: hidden;
 }
 /* textbox */
-.controller-themes #css-code {
+.controller-profile_themes #css-code {
   margin-left: 220px;
   margin-right: 220px;
 }
-.controller-themes .msie6 #css-code {
+.controller-profile_themes .msie6 #css-code {
   float: left;
   margin-left: 20px;
   margin-right: 240px;
 }
-.controller-themes #css-code textarea {
+.controller-profile_themes #css-code textarea {
   width: 100%;
 }
-.controller-themes .msie6 #css-code textarea {
+.controller-profile_themes .msie6 #css-code textarea {
   width: 500px;
 }
 /* highlights block stuff */
@@ -61,7 +61,7 @@ module Noosfero::Factory
   ###### old stuff to be rearranged
   def create_admin_user(env)
     admin_user = User.find_by_login('adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env)
-    admin_role = Role.find_by_name('admin_role') || create(Role, :name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_trusted_sites', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_templates', 'manage_environment_licenses'])
+    admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_trusted_sites', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_templates', 'manage_environment_licenses', 'edit_appearance'])
     create(RoleAssignment, :accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env])
     admin_user.login
   end
@@ -0,0 +1,140 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class EnvironmentThemesController; def rescue_action(e) raise e end; end
+
+class EnvironmentThemesControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = EnvironmentThemesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
+
+    @env = Environment.default
+    login = create_admin_user(@env)
+    login_as(login)
+    @profile = User.find_by_login(login).person
+  end
+
+  def teardown
+    FileUtils.rm_rf(TMP_THEMES_DIR)
+  end
+
+  TMP_THEMES_DIR = Rails.root.join("test", "tmp", "environment_themes_controller")
+
+  should 'display themes that can be applied' do
+    env = Environment.default
+    Theme.stubs(:approved_themes).with(@env).returns([])
+    t1 = 't1'
+    t2 = 't2'
+    t3 = 't3'
+    env.themes = [t1, t2]
+    env.save
+
+    Theme.stubs(:system_themes).returns([Theme.new(t1), Theme.new(t2), Theme.new(t3)])
+    get :index
+
+    %w[ t1 t2 ].each do |item|
+      assert_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/set/#{item}" }
+    end
+
+    assert_no_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/set/t3" }
+  end
+
+  should 'highlight current theme' do
+    env = Environment.default
+    t1 = 'one'
+    t2 = 'two'
+    env.themes = [t1, t2]
+    env.save
+
+    Theme.stubs(:system_themes).returns([Theme.new(t1), Theme.new(t2)])
+    env.update_theme(t1)
+    get :index
+
+    assert_tag :attributes => { :class => 'theme-opt list-opt selected' }
+    assert_no_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/set/one" }
+  end
+
+  should 'save selection of theme' do
+    get :set, :id => 'onetheme'
+    env = Environment.default
+    assert_equal 'onetheme', env.theme
+  end
+
+
+  should 'unset selection of theme' do
+    get :unset
+    env = Environment.default
+    assert_equal 'default', env.theme
+  end
+
+  should 'display link to use the default theme' do
+    env = Environment.default
+    env.themes = ['new-theme']
+    env.save
+
+    Theme.stubs(:system_themes).returns([Theme.new('new-theme')])
+
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/unset" }
+  end
+
+  should 'point back to admin panel' do
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href =>  '/admin' }, :content => 'Back'
+  end
+
+  should 'list templates' do
+    all = LayoutTemplate.all
+
+    LayoutTemplate.expects(:all).returns(all)
+    get :index
+    assert_same all, assigns(:layout_templates)
+  end
+
+  should 'display links to set template' do
+    env = Environment.default
+    env.layout_template = 'rightbar'
+    env.save!
+    t1 = LayoutTemplate.find('default')
+    t2 = LayoutTemplate.find('leftbar')
+    LayoutTemplate.expects(:all).returns([t1, t2])
+
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/set_layout_template/default"}
+    assert_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/set_layout_template/leftbar"}
+  end
+
+  should 'highlight current template' do
+    env = Environment.default
+    env.update_attributes!(:layout_template => 'default')
+    env.layout_template = 'default'
+
+    t1 = LayoutTemplate.find('default')
+    t2 = LayoutTemplate.find('leftbar')
+    LayoutTemplate.expects(:all).returns([t1, t2])
+
+    get :index
+    assert_tag :attributes => { :class => 'template-opt list-opt selected' }
+    assert_no_tag :tag => 'a', :attributes => { :href => "/admin/environment_themes/set_layout_template/default"}
+  end
+
+  should 'set template' do
+    env = Environment.default
+    post :set_layout_template, :id => 'leftbar'
+    env.reload
+    assert_equal 'leftbar', env.layout_template
+    assert_redirected_to :action => 'index'
+  end
+
+  should 'not display the "Select themes" section if there are no themes to choose from' do
+    env = Environment.default
+    env.themes = []; env.save!
+    Theme.stubs(:system_themes_dir).returns(TMP_THEMES_DIR) # an empty dir
+    get :index
+    assert_no_tag :content => "Select theme"
+  end
+
+end
@@ -0,0 +1,313 @@
+require File.dirname(__FILE__) + '/../test_helper'
+# require 'profile_themes_controller'
+
+class ProfileThemesController; def rescue_action(e) raise e end; end
+
+class ProfileThemesControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileThemesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
+
+    @profile = create_user('testinguser').person
+    login_as('testinguser')
+
+    @env = Environment.default
+    @env.enable('user_themes')
+    @env.save!
+  end
+  attr_reader :profile, :env
+
+  def teardown
+    FileUtils.rm_rf(TMP_THEMES_DIR)
+  end
+
+  TMP_THEMES_DIR = Rails.root.join("test", "tmp", "profile_themes_controller")
+
+  should 'display themes that can be applied' do
+    env = Environment.default
+    Theme.stubs(:approved_themes).with(@profile).returns([Theme.new('t1', :name => 't1')])
+    t2 = 't2'
+    t3 = 't3'
+    env.themes = [t2]
+    env.save
+
+    Theme.stubs(:system_themes).returns([Theme.new(t2), Theme.new(t3)])
+    get :index, :profile => 'testinguser'
+
+    %w[ t1 t2 ].each do |item|
+      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/set/#{item}" }
+    end
+
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/set/t3" }
+  end
+
+  should 'highlight current theme' do
+    env = Environment.default
+    t1 = 'one'
+    t2 = 'two'
+    env.themes = [t1, t2]
+    env.save
+
+    Theme.stubs(:system_themes).returns([Theme.new(t1), Theme.new(t2)])
+    profile.update_theme(t1)
+    get :index, :profile => 'testinguser'
+
+    assert_tag :attributes => { :class => 'theme-opt list-opt selected' }
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/set/one" }
+  end
+
+  should 'display list of my themes for edition' do
+    Theme.create('three', :owner => profile)
+    Theme.create('four', :owner => profile)
+
+    get :index, :profile => 'testinguser'
+
+    %w[ three four ].each do |item|
+      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/edit/#{item}" }
+    end
+  end
+
+  should 'save selection of theme' do
+    get :set, :profile => 'testinguser', :id => 'onetheme'
+    profile = Profile.find(@profile.id)
+    assert_equal 'onetheme', profile.theme
+  end
+
+  should 'save selection of theme even if model is invalid' do
+    @profile.sex = nil
+    @profile.save!
+    @profile.environment.custom_person_fields = { 'sex' => {'required' => 'true', 'active' => 'true'} }; @profile.environment.save!
+
+    get :set, :profile => 'testinguser', :id => 'onetheme'
+    profile = Profile.find(@profile.id)
+    assert_equal 'onetheme', profile.theme
+  end
+
+  should 'unset selection of theme' do
+    get :unset, :profile => 'testinguser'
+    assert_equal nil, profile.theme
+  end
+
+  should 'display link to use the default theme' do
+    env = Environment.default
+    env.themes = ['new-theme']
+    env.save
+
+    Theme.stubs(:system_themes).returns([Theme.new('new-theme')])
+
+    get :index, :profile => 'testinguser'
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/unset" }
+  end
+
+  should 'point back to control panel' do
+    get :index, :profile => 'testinguser'
+    assert_tag :tag => 'a', :attributes => { :href =>  '/myprofile/testinguser' }, :content => 'Back'
+  end
+
+  should 'display screen for creating new theme' do
+    @request.expects(:xhr?).returns(true).at_least_once
+    get :new, :profile => 'testinguser'
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/profile_themes/new', :method => /post/i }, :descendant => { :tag => 'input', :attributes => { :type => 'text', :name => 'name' } }
+  end
+
+  should 'create a new theme' do
+    post :new, :profile => 'testinguser', :name => 'My theme'
+    
+    ok('theme should be created') do
+      profile.themes.first.id == 'my-theme'
+    end
+  end
+
+  should 'edit a theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+
+    assert_equal theme, assigns(:theme)
+  end
+
+  should 'list CSS files in theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    theme.add_css('one.css')
+    theme.add_css('two.css')
+
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+
+    %w[ one.css two.css ].each do |item|
+      assert_includes assigns(:css_files), item
+      assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => item}
+    end
+  end
+
+  should 'display dialog for creating new CSS' do
+    theme = Theme.create('mytheme', :owner => profile)
+    @request.stubs(:xhr?).returns(true)
+    get :add_css, :profile => 'testinguser', :id => 'mytheme'
+
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/profile_themes/add_css/mytheme', :method => /post/i}
+    assert_tag :tag => 'input', :attributes => { :name => 'css', :type => 'text' }
+    assert_tag :tag => 'input', :attributes => { :type => 'submit' }
+  end
+
+  should 'be able to add new CSS to theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    post :add_css, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
+
+    assert_response :redirect
+
+    reloaded_theme = Theme.find('mytheme')
+    assert_includes reloaded_theme.css_files, 'test.css'
+  end
+
+  should 'load code from a given CSS file' do
+    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
+    get :css_editor, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
+
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/profile_themes/update_css/mytheme' }, :descendant => { :tag => 'textarea', :content => /\/\* sample code \*\// }
+  end
+
+  should 'be able to save CSS code' do
+    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
+    get :css_editor, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
+
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/profile_themes/update_css/mytheme' }, :descendant => { :tag => 'input', :attributes => { :type => 'submit' } }
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/profile_themes/update_css/mytheme' }, :descendant => { :tag => 'input', :attributes => { :type => 'hidden', :name => 'css', :value => 'test.css' } }
+  end
+
+  should 'update css code when saving' do
+    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
+    post :update_css, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css', :csscode => 'body { background: white; }'
+    assert_equal 'body { background: white; }', theme.read_css('test.css')
+  end
+
+  should 'list image files in theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    theme.add_image('one.png', 'FAKE IMAGE DATA 1')
+    theme.add_image('two.png', 'FAKE IMAGE DATA 2')
+
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+
+    assert_tag :tag => 'img', :attributes => { :src => '/user_themes/mytheme/images/one.png' }
+    assert_tag :tag => 'img', :attributes => { :src => '/user_themes/mytheme/images/two.png' }
+  end
+
+  should 'display "add image" button' do
+    theme = Theme.create('mytheme', :owner => profile)
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+    
+    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/profile_themes/add_image/mytheme' }
+  end
+
+  should 'display the "add image" dialog' do
+    theme = Theme.create('mytheme', :owner => profile)
+    @request.stubs(:xhr?).returns(true)
+
+    get :add_image, :profile => 'testinguser', :id => 'mytheme'
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/profile_themes/add_image/mytheme', :method => /post/i, :enctype => 'multipart/form-data' }, :descendant => { :tag => 'input', :attributes => { :name => 'image', :type => 'file' } }
+  end
+
+  should 'be able to add new image to theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    @request.stubs(:xhr?).returns(false)
+
+    post :add_image, :profile => 'testinguser', :id => 'mytheme', :image => fixture_file_upload('/files/rails.png', 'image/png', :binary)
+    assert_redirected_to :action => "edit", :id => 'mytheme'
+    assert theme.image_files.include?('rails.png')
+    assert(system('diff', Rails.root.join('test', 'fixtures', 'files','rails.png').to_s, TMP_THEMES_DIR.join('mytheme/images/rails.png').to_s), 'should put the correct uploaded file in the right place')
+  end
+
+  should 'link to "test theme"' do
+    Theme.create('one', :owner => profile)
+    Theme.create('two', :owner => profile)
+    get :index, :profile => 'testinguser'
+
+    %w[ one two ].each do |item|
+      assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/profile_themes/start_test/' + item }
+    end
+  end
+
+  should 'start testing theme' do
+    theme = Theme.create('theme-under-test', :owner => profile)
+    post :start_test, :profile => 'testinguser', :id => 'theme-under-test'
+
+    assert_equal 'theme-under-test', session[:theme]
+    assert_redirected_to :controller => 'content_viewer', :profile => 'testinguser', :action => 'view_page'
+  end
+
+  should 'stop testing theme' do
+    theme = Theme.create('theme-under-test', :owner => profile)
+    post :stop_test, :profile => 'testinguser', :id => 'theme-under-test'
+
+    assert_nil session[:theme]
+    assert_redirected_to :action => 'index'
+  end
+
+  should 'list templates' do
+    all = LayoutTemplate.all
+
+    LayoutTemplate.expects(:all).returns(all)
+    get :index, :profile => 'testinguser'
+    assert_equal all, assigns(:layout_templates)
+  end
+
+  should 'display links to set template' do
+    profile.layout_template = 'rightbar'
+    profile.save!
+    t1 = LayoutTemplate.find('default')
+    t2 = LayoutTemplate.find('leftbar')
+    LayoutTemplate.expects(:all).returns([t1, t2])
+
+    get :index, :profile => 'testinguser'
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/set_layout_template/default"}
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/set_layout_template/leftbar"}
+  end
+
+  should 'highlight current template' do
+    profile.layout_template = 'default'
+    profile.save!
+
+    t1 = LayoutTemplate.find('default')
+    t2 = LayoutTemplate.find('leftbar')
+    LayoutTemplate.expects(:all).returns([t1, t2])
+
+    get :index, :profile => 'testinguser'
+    assert_tag :attributes => { :class => 'template-opt list-opt selected' }
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/profile_themes/set_layout_template/default"}
+  end
+
+  should 'set template' do
+    post :set_layout_template, :profile => 'testinguser', :id => 'leftbar'
+    profile = Profile.find(@profile.id)
+    assert_equal 'leftbar', profile.layout_template
+    assert_redirected_to :action => 'index'
+  end
+
+  should 'set template even if the model is invalid' do
+    @profile.sex = nil
+    @profile.save!
+    @profile.environment.custom_person_fields = { 'sex' => {'required' => 'true', 'active' => 'true'} }; @profile.environment.save!
+
+    post :set_layout_template, :profile => 'testinguser', :id => 'leftbar'
+    profile = Profile.find(@profile.id)
+    assert_equal 'leftbar', profile.layout_template
+    assert_redirected_to :action => 'index'
+  end
+
+  should 'not display "new theme" button when user themes are disabled' do
+    env.disable('user_themes')
+    env.save!
+    get :index, :profile => 'testinguser'
+    assert_no_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/profile_themes/new' }
+  end
+
+  should 'not display the "Select themes" section if there are no themes to choose from' do
+    env.themes = []; env.save!
+    Theme.stubs(:system_themes_dir).returns(TMP_THEMES_DIR) # an empty dir
+    get :index, :profile => "testinguser"
+    assert_no_tag :content => "Select theme"
+  end
+
+end
@@ -1,311 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'themes_controller'
-
-class ThemesController; def rescue_action(e) raise e end; end
-
-class ThemesControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = ThemesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
-
-    @profile = create_user('testinguser').person
-    login_as('testinguser')
-
-    @env = Environment.default
-    @env.enable('user_themes')
-    @env.save!
-  end
-  attr_reader :profile, :env
-
-  def teardown
-    FileUtils.rm_rf(TMP_THEMES_DIR)
-  end
-
-  TMP_THEMES_DIR = Rails.root.join("test", "tmp", "themes_controller")
-
-  should 'display themes that can be applied' do
-    env = Environment.default
-    Theme.stubs(:approved_themes).with(@profile).returns([Theme.new('t1', :name => 't1')])
-    t2 = 't2'
-    t3 = 't3'
-    env.themes = [t2]
-    env.save
-
-    Theme.stubs(:system_themes).returns([Theme.new(t2), Theme.new(t3)])
-    get :index, :profile => 'testinguser'
-
-    %w[ t1 t2 ].each do |item|
-      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/#{item}" }
-    end
-
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/t3" }
-  end
-
-  should 'highlight current theme' do
-    env = Environment.default
-    t1 = 'one'
-    t2 = 'two'
-    env.themes = [t1, t2]
-    env.save
-
-    Theme.stubs(:system_themes).returns([Theme.new(t1), Theme.new(t2)])
-    profile.update_theme(t1)
-    get :index, :profile => 'testinguser'
-
-    assert_tag :attributes => { :class => 'theme-opt list-opt selected' }
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/one" }
-  end
-
-  should 'display list of my themes for edition' do
-    Theme.create('three', :owner => profile)
-    Theme.create('four', :owner => profile)
-
-    get :index, :profile => 'testinguser'
-
-    %w[ three four ].each do |item|
-      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/edit/#{item}" }
-    end
-  end
-
-  should 'save selection of theme' do
-    get :set, :profile => 'testinguser', :id => 'onetheme'
-    profile = Profile.find(@profile.id)
-    assert_equal 'onetheme', profile.theme
-  end
-
-  should 'save selection of theme even if model is invalid' do
-    @profile.sex = nil
-    @profile.save!
-    @profile.environment.custom_person_fields = { 'sex' => {'required' => 'true', 'active' => 'true'} }; @profile.environment.save!
-
-    get :set, :profile => 'testinguser', :id => 'onetheme'
-    profile = Profile.find(@profile.id)
-    assert_equal 'onetheme', profile.theme
-  end
-
-  should 'unset selection of theme' do
-    get :unset, :profile => 'testinguser'
-    assert_equal nil, profile.theme
-  end
-
-  should 'display link to use the default theme' do
-    env = Environment.default
-    env.themes = ['new-theme']
-    env.save
-
-    Theme.stubs(:system_themes).returns([Theme.new('new-theme')])
-
-    get :index, :profile => 'testinguser'
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/unset" }
-  end
-
-  should 'point back to control panel' do
-    get :index, :profile => 'testinguser'
-    assert_tag :tag => 'a', :attributes => { :href =>  '/myprofile/testinguser' }, :content => 'Back'
-  end
-
-  should 'display screen for creating new theme' do
-    @request.expects(:xhr?).returns(true).at_least_once
-    get :new, :profile => 'testinguser'
-    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/new', :method => /post/i }, :descendant => { :tag => 'input', :attributes => { :type => 'text', :name => 'name' } }
-  end
-
-  should 'create a new theme' do
-    post :new, :profile => 'testinguser', :name => 'My theme'
-    
-    ok('theme should be created') do
-      profile.themes.first.id == 'my-theme'
-    end
-  end
-
-  should 'edit a theme' do
-    theme = Theme.create('mytheme', :owner => profile)
-    get :edit, :profile => 'testinguser', :id => 'mytheme'
-
-    assert_equal theme, assigns(:theme)
-  end
-
-  should 'list CSS files in theme' do
-    theme = Theme.create('mytheme', :owner => profile)
-    theme.add_css('one.css')
-    theme.add_css('two.css')
-
-    get :edit, :profile => 'testinguser', :id => 'mytheme'
-
-    %w[ one.css two.css ].each do |item|
-      assert_includes assigns(:css_files), item
-      assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => item}
-    end
-  end
-
-  should 'display dialog for creating new CSS' do
-    theme = Theme.create('mytheme', :owner => profile)
-    @request.stubs(:xhr?).returns(true)
-    get :add_css, :profile => 'testinguser', :id => 'mytheme'
-
-    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/add_css/mytheme', :method => /post/i}
-    assert_tag :tag => 'input', :attributes => { :name => 'css', :type => 'text' }
-    assert_tag :tag => 'input', :attributes => { :type => 'submit' }
-  end
-
-  should 'be able to add new CSS to theme' do
-    theme = Theme.create('mytheme', :owner => profile)
-    post :add_css, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
-
-    assert_response :redirect
-
-    reloaded_theme = Theme.find('mytheme')
-    assert_includes reloaded_theme.css_files, 'test.css'
-  end
-
-  should 'load code from a given CSS file' do
-    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
-    get :css_editor, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
-
-    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/update_css/mytheme' }, :descendant => { :tag => 'textarea', :content => /\/\* sample code \*\// }
-  end
-
-  should 'be able to save CSS code' do
-    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
-    get :css_editor, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
-
-    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/update_css/mytheme' }, :descendant => { :tag => 'input', :attributes => { :type => 'submit' } }
-    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/update_css/mytheme' }, :descendant => { :tag => 'input', :attributes => { :type => 'hidden', :name => 'css', :value => 'test.css' } }
-  end
-
-  should 'update css code when saving' do
-    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
-    post :update_css, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css', :csscode => 'body { background: white; }'
-    assert_equal 'body { background: white; }', theme.read_css('test.css')
-  end
-
-  should 'list image files in theme' do
-    theme = Theme.create('mytheme', :owner => profile)
-    theme.add_image('one.png', 'FAKE IMAGE DATA 1')
-    theme.add_image('two.png', 'FAKE IMAGE DATA 2')
-
-    get :edit, :profile => 'testinguser', :id => 'mytheme'
-
-    assert_tag :tag => 'img', :attributes => { :src => '/user_themes/mytheme/images/one.png' }
-    assert_tag :tag => 'img', :attributes => { :src => '/user_themes/mytheme/images/two.png' }
-  end
-
-  should 'display "add image" button' do
-    theme = Theme.create('mytheme', :owner => profile)
-    get :edit, :profile => 'testinguser', :id => 'mytheme'
-    
-    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/add_image/mytheme' }
-  end
-
-  should 'display the "add image" dialog' do
-    theme = Theme.create('mytheme', :owner => profile)
-    @request.stubs(:xhr?).returns(true)
-
-    get :add_image, :profile => 'testinguser', :id => 'mytheme'
-    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/add_image/mytheme', :method => /post/i, :enctype => 'multipart/form-data' }, :descendant => { :tag => 'input', :attributes => { :name => 'image', :type => 'file' } }
-  end
-
-  should 'be able to add new image to theme' do
-    theme = Theme.create('mytheme', :owner => profile)
-    @request.stubs(:xhr?).returns(false)
-
-    post :add_image, :profile => 'testinguser', :id => 'mytheme', :image => fixture_file_upload('/files/rails.png', 'image/png', :binary)
-    assert_redirected_to :action => "edit", :id => 'mytheme'
-    assert theme.image_files.include?('rails.png')
-    assert(system('diff', Rails.root.join('test', 'fixtures', 'files','rails.png').to_s, TMP_THEMES_DIR.join('mytheme/images/rails.png').to_s), 'should put the correct uploaded file in the right place')
-  end
-
-  should 'link to "test theme"' do
-    Theme.create('one', :owner => profile)
-    Theme.create('two', :owner => profile)
-    get :index, :profile => 'testinguser'
-
-    %w[ one two ].each do |item|
-      assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/start_test/' + item }
-    end
-  end
-
-  should 'start testing theme' do
-    theme = Theme.create('theme-under-test', :owner => profile)
-    post :start_test, :profile => 'testinguser', :id => 'theme-under-test'
-
-    assert_equal 'theme-under-test', session[:theme]
-    assert_redirected_to :controller => 'content_viewer', :profile => 'testinguser', :action => 'view_page'
-  end
-
-  should 'stop testing theme' do
-    theme = Theme.create('theme-under-test', :owner => profile)
-    post :stop_test, :profile => 'testinguser', :id => 'theme-under-test'
-
-    assert_nil session[:theme]
-    assert_redirected_to :action => 'index'
-  end
-
-  should 'list templates' do
-    all = LayoutTemplate.all
-
-    LayoutTemplate.expects(:all).returns(all)
-    get :index, :profile => 'testinguser'
-    assert_equal all, assigns(:layout_templates)
-  end
-
-  should 'display links to set template' do
-    profile.update_attributes!({:layout_template => 'rightbar'}, :without_protection => true)
-    t1 = LayoutTemplate.find('default')
-    t2 = LayoutTemplate.find('leftbar')
-    LayoutTemplate.expects(:all).returns([t1, t2])
-
-    get :index, :profile => 'testinguser'
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set_layout_template/default"}
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set_layout_template/leftbar"}
-  end
-
-  should 'highlight current template' do
-    profile.update_attributes!({:layout_template => 'default'}, :without_protection => true)
-
-    t1 = LayoutTemplate.find('default')
-    t2 = LayoutTemplate.find('leftbar')
-    LayoutTemplate.expects(:all).returns([t1, t2])
-
-    get :index, :profile => 'testinguser'
-    assert_tag :attributes => { :class => 'template-opt list-opt selected' }
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set_layout_template/default"}
-  end
-
-  should 'set template' do
-    post :set_layout_template, :profile => 'testinguser', :id => 'leftbar'
-    profile = Profile.find(@profile.id)
-    assert_equal 'leftbar', profile.layout_template
-    assert_redirected_to :action => 'index'
-  end
-
-  should 'set template even if the model is invalid' do
-    @profile.sex = nil
-    @profile.save!
-    @profile.environment.custom_person_fields = { 'sex' => {'required' => 'true', 'active' => 'true'} }; @profile.environment.save!
-
-    post :set_layout_template, :profile => 'testinguser', :id => 'leftbar'
-    profile = Profile.find(@profile.id)
-    assert_equal 'leftbar', profile.layout_template
-    assert_redirected_to :action => 'index'
-  end
-
-  should 'not display "new theme" button when user themes are disabled' do
-    env.disable('user_themes')
-    env.save!
-    get :index, :profile => 'testinguser'
-    assert_no_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/new' }
-  end
-
-  should 'not display the "Select themes" section if there are no themes to choose from' do
-    env.themes = []; env.save!
-    Theme.stubs(:system_themes_dir).returns(TMP_THEMES_DIR) # an empty dir
-    get :index, :profile => "testinguser"
-    assert_no_tag :content => "Select theme"
-  end
-
-end
@@ -119,4 +119,25 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('box-test_plugin-block')
   end
+  should 'list plugin block as allowed for the right holder' do
+    class SomePlugin < Noosfero::Plugin
+      def self.extra_blocks
+        { PluginBlock => {:position => 1, :type => [Person, Enterprise]} }
+      end
+    end
+    class PluginBlock < Block
+      def self.to_s; 'plugin-block'; end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
+
+    blocks = Box.new(:position => 1, :owner => Person.new).acceptable_blocks
+    assert blocks.include?('box-test_plugin-block')
+
+    blocks = Box.new(:position => 1, :owner => Enterprise.new).acceptable_blocks
+    assert blocks.include?('box-test_plugin-block')
+
+    blocks = Box.new(:position => 1, :owner => Community.new).acceptable_blocks
+    assert !blocks.include?('box-test_plugin-block')
+  end
+
 end
@@ -0,0 +1,231 @@		@@ -0,0 +1,231 @@
	1	+If you are not listed here, but should be, please write to the noosfero mailing
	2	+list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
	3	+(this list requires subscription to post, but since you are an author of
	4	+noosfero, that's not a problem).
	5	+
	6	+Developers
	7	+==========
	8	+
	9	+Alan Freihof Tygel <alantygel@gmail.com>
	10	+Alessandro Palmeira <alessandro.palmeira@gmail.com>
	11	+Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
	12	+Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
	13	+Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
	14	+Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
	15	+Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
	16	+Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
	17	+Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
	18	+Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
	19	+Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
	20	+Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
	21	+Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
	22	+Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
	23	+Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
	24	+Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
	25	+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
	26	+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
	27	+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
	28	+Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	29	+Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
	30	+Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
	31	+Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
	32	+Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
	33	+Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
	34	+Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
	35	+Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
	36	+Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
	37	+Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
	38	+Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
	39	+Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
	40	+Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
	41	+Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
	42	+Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
	43	+Antonio Terceiro <terceiro@colivre.coop.br>
	44	+Arthur Del Esposte <arthurmde@yahoo.com.br>
	45	+Aurelio A. Heckert <aurelio@colivre.coop.br>
	46	+Braulio Bhavamitra <brauliobo@gmail.com>
	47	+Bráulio Bhavamitra <brauliobo@gmail.com>
	48	+Braulio Bhavamitra <braulio@eita.org.br>
	49	+Caio <caio.csalgado@gmail.com>
	50	+Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
	51	+Caio Formiga <caio.formiga@gmail.com>
	52	+Caio, Pedro <caio.csalgado@gmail.com>
	53	+Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
	54	+Caio Salgado <caio.csalgado@gmail.com>
	55	+Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	56	+Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
	57	+Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
	58	+Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
	59	+Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
	60	+Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
	61	+Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
	62	+Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	63	+Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
	64	+Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
	65	+Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
	66	+Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
	67	+Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
	68	+Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
	69	+Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
	70	+Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
	71	+Caio SBA <caio@colivre.coop.br>
	72	+Carlos Andre de Souza <carlos.andre.souza@msn.com>
	73	+Carlos Morais <carlos88morais@gmail.com>
	74	+Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
	75	+Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
	76	+Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
	77	+Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
	78	+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
	79	+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
	80	+Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
	81	+Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
	82	+Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
	83	+Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
	84	+Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
	85	+Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
	86	+Daniel Bucher <daniel.bucher88@gmail.com>
	87	+Daniel Cunha <daniel@colivre.coop.br>
	88	+diegoamc <diegoamc90@gmail.com>
	89	+Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
	90	+Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
	91	+Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
	92	+Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
	93	+Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
	94	+Diego Araújo <diegoamc90@gmail.com>
	95	+Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
	96	+Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
	97	+Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
	98	+Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
	99	+Diego Araújo + João Machini <diegoamc90@gmail.com>
	100	+Diego Araújo + João Machini <digoamc90@gmail.com>
	101	+Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	102	+Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
	103	+Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
	104	+Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
	105	+Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
	106	+Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
	107	+Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
	108	+Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
	109	+Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
	110	+Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
	111	+Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
	112	+Diego + Jefferson <diegoamc90@gmail.com>
	113	+Diego Martinez <diegoamc90@gmail.com>
	114	+Diego Martinez <diego@diego-K55A.(none)>
	115	+Diego + Renan <renanteruoc@gmail.com>
	116	+Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
	117	+Fernanda Lopes <nanda.listas+psl@gmail.com>
	118	+Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
	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>
	122	+Grazieno Pellegrino <grazieno@gmail.com>
	123	+Isaac Canan <isaac@intelletto.com.br>
	124	+Italo Valcy <italo@dcc.ufba.br>
	125	+Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
	126	+Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
	127	+Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
	128	+João da Silva <jaodsilv@linux.ime.usp.br>
	129	+João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
	130	+João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
	131	+João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
	132	+Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	133	+João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	134	+João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
	135	+João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
	136	+João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
	137	+João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
	138	+João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
	139	+João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
	140	+João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
	141	+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
	142	+Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
	143	+João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
	144	+João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
	145	+João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
	146	+João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
	147	+João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
	148	+João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
	149	+João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
	150	+João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
	151	+João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
	152	+Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
	153	+João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
	154	+João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
	155	+João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
	156	+Joenio Costa <joenio@colivre.coop.br>
	157	+Josef Spillner <josef.spillner@tu-dresden.de>
	158	+Junior Silva <juniorsilva1001@gmail.com>
	159	+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
	160	+Junior Silva <juniorsilva@colivre.coop.br>
	161	+Keilla Menezes <keilla@colivre.coop.br>
	162	+Larissa Reis <larissa@colivre.coop.br>
	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)>
	166	+Leandro Nunes dos Santos <leandronunes@gmail.com>
	167	+Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
	168	+LinguÁgil 2010 <linguagil.bahia@gmail.com>
	169	+Lucas Melo <lucas@colivre.coop.br>
	170	+Lucas Melo <lucaspradomelo@gmail.com>
	171	+Luis David Aguilar Carlos <ludwig9003@gmail.com>
	172	+Marcos Ramos <ms.ramos@outlook.com>
	173	+Martín Olivera <molivera@solar.org.ar>
	174	+Moises Machado <moises@colivre.coop.br>
	175	+Naíla Alves <naila@colivre.coop.br>
	176	+Nanda Lopes <nanda.listas+psl@gmail.com>
	177	+Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
	178	+Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
	179	+Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
	180	+Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
	181	+Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
	182	+Paulo Meirelles <paulo@softwarelivre.org>
	183	+Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
	184	+Rafael Gomes <rafaelgomes@techfree.com.br>
	185	+Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
	186	+Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
	187	+Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
	188	+Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
	189	+Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
	190	+Rafael Martins <rmmartins@gmail.com>
	191	+Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
	192	+Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
	193	+Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
	194	+Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
	195	+Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
	196	+Rafael Reggiani Manzo <rr.manzo@gmail.com>
	197	+Raphaël Rousseau <raph@r4f.org>
	198	+Raquel Lira <raquel.lira@gmail.com>
	199	+Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
	200	+Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
	201	+Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
	202	+Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
	203	+Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
	204	+Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
	205	+Rodrigo Souto <diguliu@gmail.com>
	206	+Rodrigo Souto <rodrigo@colivre.coop.br>
	207	+Ronny Kursawe <kursawe.ronny@googlemail.com>
	208	+root <root@debian.sdr.serpro>
	209	+Samuel R. C. Vale <srcvale@holoscopio.com>
	210	+Valessio Brito <contato@valessiobrito.com.br>
	211	+Valessio Brito <contato@valessiobrito.info>
	212	+Valessio Brito <valessio@gmail.com>
	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>
	217	+Vinicius Cubas Brand <viniciuscb@gmail.com>
	218	+Visita <visita@debian.(none)>
	219	+Yann Lugrin <yann.lugrin@liquid-concept.ch>
	220	+
	221	+Ideas, specifications and incentive
	222	+===================================
	223	+Daniel Tygel <dtygel@fbes.org.br>
	224	+Guilherme Rocha <guilherme@gf7.com.br>
	225	+Raphael Rousseau <raph@r4f.org>
	226	+Théo Bondolfi <move@cooperation.net>
	227	+Vicente Aguiar <vicenteaguiar@colivre.coop.br>
	228	+
	229	+Arts
	230	+===================================
	231	+Nara Oliveira <narananet@gmail.com>
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class EnvironmentThemesController < ThemesController
	2	+
	3	+ protect 'edit_appearance', :environment
	4	+
	5	+ no_design_blocks
	6	+
	7	+ def target
	8	+ @target = environment
	9	+ end
	10	+
	11	+end
@@ -0,0 +1,75 @@		@@ -0,0 +1,75 @@
	1	+class ProfileThemesController < ThemesController
	2	+
	3	+ needs_profile
	4	+
	5	+ protect 'edit_appearance', :profile
	6	+
	7	+ no_design_blocks
	8	+
	9	+ def target
	10	+ @target = profile
	11	+ end
	12	+
	13	+ def new
	14	+ if !request.xhr?
	15	+ id = params[:name] ? params[:name].to_slug : 'my-theme'
	16	+ t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
	17	+ t.save
	18	+ redirect_to :action => 'index'
	19	+ else
	20	+ render :action => 'new', :layout => false
	21	+ end
	22	+ end
	23	+
	24	+ def edit
	25	+ @theme = profile.find_theme(params[:id])
	26	+ @css_files = @theme.css_files
	27	+ @image_files = @theme.image_files
	28	+ end
	29	+
	30	+ def add_css
	31	+ @theme = profile.find_theme(params[:id])
	32	+ if request.xhr?
	33	+ render :action => 'add_css', :layout => false
	34	+ else
	35	+ @theme.add_css(params[:css])
	36	+ redirect_to :action => 'edit', :id => @theme.id
	37	+ end
	38	+ end
	39	+
	40	+ def css_editor
	41	+ @theme = profile.find_theme(params[:id])
	42	+ @css = params[:css]
	43	+
	44	+ @code = @theme.read_css(@css)
	45	+ render :action => 'css_editor', :layout => false
	46	+ end
	47	+
	48	+ post_only :update_css
	49	+ def update_css
	50	+ @theme = profile.find_theme(params[:id])
	51	+ @theme.update_css(params[:css], params[:csscode])
	52	+ redirect_to :action => 'edit', :id => @theme.id
	53	+ end
	54	+
	55	+ def add_image
	56	+ @theme = profile.find_theme(params[:id])
	57	+ if request.xhr?
	58	+ render :action => 'add_image', :layout => false
	59	+ else
	60	+ @theme.add_image(params[:image].original_filename, params[:image].read)
	61	+ redirect_to :action => 'edit', :id => @theme.id
	62	+ end
	63	+ end
	64	+
	65	+ def start_test
	66	+ session[:theme] = params[:id]
	67	+ redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
	68	+ end
	69	+
	70	+ def stop_test
	71	+ session[:theme] = nil
	72	+ redirect_to :action => 'index'
	73	+ end
	74	+
	75	+end
	@@ -1,91 +0,0 @@	@@ -1,91 +0,0 @@
1	-class ThemesController < MyProfileController
2	-
3	- protect 'edit_appearance', :profile
4	- no_design_blocks
5	-
6	- def set
7	- profile.update_theme(params[:id])
8	- redirect_to :action => 'index'
9	- end
10	-
11	- def unset
12	- profile.update_theme(nil)
13	- redirect_to :action => 'index'
14	- end
15	-
16	- def index
17	- @themes = profile.environment.themes + Theme.approved_themes(profile)
18	- @current_theme = profile.theme
19	-
20	- @layout_templates = LayoutTemplate.all
21	- @current_template = profile.layout_template
22	- end
23	-
24	- def new
25	- if !request.xhr?
26	- id = params[:name] ? params[:name].to_slug : 'my-theme'
27	- t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
28	- t.save
29	- redirect_to :action => 'index'
30	- else
31	- render :action => 'new', :layout => false
32	- end
33	- end
34	-
35	- def edit
36	- @theme = profile.find_theme(params[:id])
37	- @css_files = @theme.css_files
38	- @image_files = @theme.image_files
39	- end
40	-
41	- def add_css
42	- @theme = profile.find_theme(params[:id])
43	- if request.xhr?
44	- render :action => 'add_css', :layout => false
45	- else
46	- @theme.add_css(params[:css])
47	- redirect_to :action => 'edit', :id => @theme.id
48	- end
49	- end
50	-
51	- def css_editor
52	- @theme = profile.find_theme(params[:id])
53	- @css = params[:css]
54	-
55	- @code = @theme.read_css(@css)
56	- render :action => 'css_editor', :layout => false
57	- end
58	-
59	- post_only :update_css
60	- def update_css
61	- @theme = profile.find_theme(params[:id])
62	- @theme.update_css(params[:css], params[:csscode])
63	- redirect_to :action => 'edit', :id => @theme.id
64	- end
65	-
66	- def add_image
67	- @theme = profile.find_theme(params[:id])
68	- if request.xhr?
69	- render :action => 'add_image', :layout => false
70	- else
71	- @theme.add_image(params[:image].original_filename, params[:image].read)
72	- redirect_to :action => 'edit', :id => @theme.id
73	- end
74	- end
75	-
76	- def start_test
77	- session[:theme] = params[:id]
78	- redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
79	- end
80	-
81	- def stop_test
82	- session[:theme] = nil
83	- redirect_to :action => 'index'
84	- end
85	-
86	- def set_layout_template
87	- profile.update_layout_template(params[:id])
88	- redirect_to :action => 'index'
89	- end
90	-
91	-end
@@ -0,0 +1,42 @@		@@ -0,0 +1,42 @@
	1	+class ThemesController < ApplicationController
	2	+
	3	+ before_filter :login_required
	4	+
	5	+ no_design_blocks
	6	+
	7	+ # attr_reader :target
	8	+
	9	+ def target
	10	+ @target
	11	+ end
	12	+
	13	+ def index
	14	+ @environment = environment
	15	+ @themes = environment.themes + Theme.approved_themes(target)
	16	+
	17	+ @current_theme = target.theme
	18	+
	19	+ @layout_templates = LayoutTemplate.all
	20	+ @current_template = target.layout_template
	21	+ end
	22	+
	23	+ def set
	24	+ target.update_theme(params[:id])
	25	+ redirect_to :action => 'index'
	26	+ end
	27	+
	28	+ def unset
	29	+ if target.kind_of?(Environment)
	30	+ target.update_theme('default')
	31	+ else
	32	+ target.update_theme(nil)
	33	+ end
	34	+ redirect_to :action => 'index'
	35	+ end
	36	+
	37	+ def set_layout_template
	38	+ target.update_layout_template(params[:id])
	39	+ redirect_to :action => 'index'
	40	+ end
	41	+
	42	+end
	@@ -10,7 +10,7 @@ class Box < ActiveRecord::Base		@@ -10,7 +10,7 @@ class Box < ActiveRecord::Base
10	end	10	end
11		11
12	def acceptable_blocks	12	def acceptable_blocks
13	- blocks_classes = central? ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :position => [2, 3])	13	+ 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])
14	to_css_class_name(blocks_classes)	14	to_css_class_name(blocks_classes)
15	end	15	end
16		16
	@@ -43,6 +43,7 @@		@@ -43,6 +43,7 @@
43	<p/>	43	<p/>
44	<%= txt2html comment.body %>	44	<%= txt2html comment.body %>
45	</div>	45	</div>
		46	+ <%= @plugins.dispatch(:comment_extra_contents, local_assigns).collect { \|content\| instance_eval(&content) }.join("") %>
46	</div>	47	</div>
47		48
48	<div class="comment_reply post_comment_box closed" id="comment_reply_to_<%= comment.id %>">	49	<div class="comment_reply post_comment_box closed" id="comment_reply_to_<%= comment.id %>">
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+<%= render :partial => 'themes/select_template' %>
	2	+<%= render :partial => 'themes/select_theme' %>
	3	+
	4	+<br style="clear:both" />
	5	+
	6	+<% button_bar do %>
	7	+ <%= button(:back, _('Back'), :controller => 'admin_panel', :action => 'index') %>
	8	+<% end %>
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22		22
23	<%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>	23	<%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
24		24
25	- <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>	25	+ <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
26		26
27	<%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>	27	<%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
28		28
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+<h2><%= _('Add a CSS file') %></h2>
	2	+
	3	+<%= form_tag do %>
	4	+ <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
	5	+
	6	+ <% button_bar do %>
	7	+ <%= submit_button(:add, _('Add')) %>
	8	+ <%= lightbox_close_button(_('Cancel')) %>
	9	+ <% end %>
	10	+
	11	+<% end %>