merging with master

Leandro Santos
2 parents 97e6b3c1 6e1949cf
Showing 136 changed files with 2164 additions and 423 deletions Show diff stats
AUTHORS.md
Gemfile
app/controllers/admin/role_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/my_profile/profile_roles_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/helpers/layout_helper.rb
app/helpers/tinymce_helper.rb
app/models/article.rb
app/models/block.rb
app/models/blog.rb
app/models/environment.rb
app/models/highlights_block.rb
app/models/organization.rb
app/models/profile.rb
@@ -92,6 +92,7 @@ Daniel Alves + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+daniel <dtygel@eita.org.br>
 David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
@@ -120,6 +121,7 @@ Diego Araujo + Rodrigo Souto + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
 Diego + Renan <renanteruoc@gmail.com>
+dtygel <dtygel@gmail.com>
 DylanGuedes <djmgguedes@gmail.com>
 Eduardo Passos <eduardo@risa.localdomain.localhost>
 Eduardo Passos <eduardosteps@gmail.com>
@@ -144,6 +146,7 @@ Italo Valcy &lt;italo@dcc.ufba.br&gt;
 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>
+Jérôme Jutteau <j.jutteau@gmail.com>
 João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@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>
@@ -247,8 +250,10 @@ Tallys Martins &lt;tallysmartins@gmail.com&gt;
 Tallys Martins <tallysmartins@yahoo.com.br>
 tallys <tallys@tallys>
 tallys <tallys@tallys.(none)>
+Thiago Casotti <thiago.casotti@uol.com.br>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
+TWS <tablettws@gmail.com>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
@@ -20,18 +20,17 @@ gem &#39;locale&#39;,                   &#39;~&gt; 2.0.5&#39;
 gem 'whenever', :require => false
 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
-group :assets do
-  gem 'uglifier', '>= 1.0.3'
-  gem 'sass-rails'
-end
+# asset pipeline
+gem 'uglifier', '>= 1.0.3'
+gem 'sass-rails'
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
 group :test do
-  gem 'rspec',                  '~> 2.10.0'
-  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'rspec',                  '~> 2.14.0'
+  gem 'rspec-rails',            '~> 2.14.1'
   gem 'mocha',                  '~> 1.1.0', :require => false
 end
@@ -2,7 +2,7 @@ class RoleController &lt; AdminController
   protect 'manage_environment_roles', :environment
   def index
-    @roles = environment.roles.find(:all)
+    @roles = environment.roles.find(:all, :conditions => {:profile_id => nil})
   end
   def new
@@ -9,6 +9,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :allow_cross_domain_access
   before_filter :login_required, :if => :private_environment?
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
+  before_filter :redirect_to_current_user
   def verify_members_whitelist
     render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
@@ -192,4 +193,15 @@ class ApplicationController &lt; ActionController::Base
   def private_environment?
     @environment.enabled?(:restrict_to_members)
   end
+
+  def redirect_to_current_user
+    if params[:profile] == '~'
+      if logged_in?
+        redirect_to params.merge(:profile => user.identifier)
+      else
+        render_not_found
+      end
+    end
+  end
+
 end
@@ -357,7 +357,8 @@ class CmsController &lt; MyProfileController
       @task.ip_address = request.remote_ip
       @task.user_agent = request.user_agent
       @task.referrer = request.referrer
-      if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
+      @task.requestor = current_person if logged_in?
+      if (logged_in? || verify_recaptcha(:model => @task, :message => _('Please type the words correctly'))) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
       end
@@ -4,11 +4,19 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
-  before_filter :protect_fixed_block, :only => [:save, :move_block]
+  before_filter :protect_uneditable_block, :only => [:save]
+  before_filter :protect_fixed_block, :only => [:move_block]
+
+  def protect_uneditable_block
+    block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
+    if !current_person.is_admin? && !block.editable?
+      render_access_denied
+    end
+  end
   def protect_fixed_block
     block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
-    if block.fixed && !current_person.is_admin?
+    if !current_person.is_admin? && !block.movable?
       render_access_denied
     end
   end
@@ -58,6 +58,7 @@ class ProfileMembersController &lt; MyProfileController
   def change_role
     @roles = Profile::Roles.organization_member_roles(environment.id)
+    @custom_roles = profile.custom_roles
     begin
       @member = profile.members.find(params[:id])
     rescue ActiveRecord::RecordNotFound
@@ -0,0 +1,116 @@
+class ProfileRolesController < MyProfileController
+
+  protect 'manage_custom_roles', :profile
+
+  def index
+    @roles = profile.custom_roles
+  end
+
+  def new
+    @role = Role.new
+  end
+
+  def create
+    @role = Role.new({:name => params[:role][:name], :permissions => params[:role][:permissions], :environment => environment }, :without_protection => true)
+    if @role.save
+      profile.custom_roles << @role
+      redirect_to :action => 'show', :id => @role
+    else
+      session[:notice] = _('Failed to create role')
+      render :action => 'new'
+    end
+  end
+
+  def show
+    @role = environment.roles.find(params[:id])
+  end
+
+  def edit
+    @role = environment.roles.find(params[:id])
+  end
+
+  def assign_role_by_members
+    return redirect_to "/" if params[:q].nil? or !request.xhr?
+    arg = params[:q].downcase
+    result = find_by_contents(:people, environment, profile.members, params[:q])[:results]
+    render :text => prepare_to_token_input(result).to_json
+  end
+
+  def destroy
+    @role = environment.roles.find(params[:id])
+    @members = profile.members_by_role(@role)
+    @roles_list = all_roles(environment, profile)
+    @roles_list.delete(@role)
+  end
+
+  def remove
+    @role = environment.roles.find(params[:id])
+    @members = profile.members_by_role(@role)
+    member_roles = params[:roles] ? environment.roles.find(params[:roles].select{|r|!r.to_i.zero?}) : []
+    append_roles(@members, member_roles, profile)
+    if @role.destroy
+      session[:notice] = _('Role successfuly removed!')
+    else
+      session[:notice] = _('Failed to remove role!')
+    end
+    redirect_to :action => 'index'
+  end
+
+  def update
+    @role = environment.roles.find(params[:id])
+    if @role.update_attributes(params[:role])
+      redirect_to :action => 'show', :id => @role
+    else
+      session[:notice] = _('Failed to edit role')
+      render :action => 'edit'
+    end
+  end
+
+  def assign
+    @role = environment.roles.find(params[:id])
+    @roles_list = all_roles(environment, profile)
+    @roles_list.delete(@role)
+  end
+
+  def define
+    @role = environment.roles.find(params[:id])
+    selected_role = params[:selected_role] ? environment.roles.find(params[:selected_role].to_i) : nil
+    if params[:assign_role_by].eql? "members"
+      members_list = params[:person_id].split(',').collect {|id| environment.profiles.find(id.to_i)}
+      members_list.collect{|person| person.add_role(@role, profile)}
+    elsif params[:assign_role_by].eql? "roles"
+      members = profile.members_by_role(selected_role)
+      replace_role(members, selected_role, @role, profile)
+    else
+      session[:notice] = _("Error")
+    end
+    redirect_to :action => 'index'
+  end
+
+  protected
+
+  def append_roles(members, roles, profile)
+    members.each do |person|
+      all_roles = person.find_roles(profile).map(&:role) + roles
+      person.define_roles(all_roles, profile)
+    end
+  end
+
+  def all_roles(environment, profile)
+    Profile::Roles.organization_member_roles(environment.id) + profile.custom_roles
+  end
+
+  def replace_roles(members, roles, profile)
+    members.each do |person|
+      person.define_roles(roles, profile)
+    end
+  end
+
+  def replace_role(members, role, new_role, profile)
+    members.each do |person|
+      person.remove_role(role, profile)
+      person.add_role(new_role, profile)
+    end
+  end
+
+end
@@ -707,6 +707,24 @@ module ApplicationHelper
     javascript_include_tag script if script
   end
+  def template_path
+    if profile.nil?
+      "/designs/templates/#{environment.layout_template}"
+    else
+      "/designs/templates/#{profile.layout_template}"
+    end
+  end
+
+  def template_javascript_src
+    script = File.join template_path, '/javascripts/template.js'
+    script if File.exists? File.join(Rails.root, 'public', script)
+  end
+
+  def templete_javascript_ng
+    script = template_javascript_src
+    javascript_include_tag script if script
+  end
+
   def file_field_or_thumbnail(label, image, i)
     display_form_field label, (
       render :partial => (image && image.valid? ? 'shared/show_thumbnail' : 'shared/change_image'),
@@ -17,28 +17,28 @@ module BlogHelper
     _('Configure blog')
   end
-  def list_posts(articles, format = 'full', paginate = true)
+  def list_posts(articles, conf = { format: 'full', paginate: true })
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
       :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
-    }) if articles.present? && paginate
+    }) if articles.present? && conf[:paginate]
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
-      css_add = [ 'position-'+(i+1).to_s() ]
+      css_add = [ 'blog-post', 'position-'+(i+1).to_s() ]
       position = (i%2 == 0) ? 'odd-post' : 'even-post'
       css_add << 'first' if i == 0
       css_add << 'last'  if i == (artic_len-1)
       css_add << 'not-published' if !art.published?
-      css_add << position + '-inner'
-      content << content_tag('div',
-                             content_tag('div',
-                                         display_post(art, format).html_safe + '<br style="clear:both"/>'.html_safe,
-                                         :class => 'blog-post ' + css_add.join(' '),
-                                         :id => "post-#{art.id}"), :class => position
-                            )
+      css_add << position
+      content << (content_tag 'div', id: "post-#{art.id}", class: css_add do
+        content_tag 'div', class: position + '-inner blog-post-inner' do
+          display_post(art, conf[:format]).html_safe +
+          '<br style="clear:both"/>'.html_safe
+        end
+      end)
     }
     content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
   end
@@ -46,7 +46,16 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
     title = article_title(article, :no_comments => no_comments)
-    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
+    method = "display_#{format.split('+')[0]}_format"
+    html = send(method, FilePresenter.for(article)).html_safe
+    if format.split('+')[1] == 'pic'
+      img = article.first_image
+      if img.blank?
+        '<div class="post-pic empty"></div>'
+      else
+        '<div class="post-pic" style="background-image:url('+img+')"></div>'
+      end
+    end.to_s +
     title + html
   end
@@ -190,7 +190,7 @@ module BoxesHelper
       else
         "before-block-#{block.id}"
       end
-    if block.nil? or modifiable?(block)
+    if block.nil? || movable?(block)
       content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
     else
       ""
@@ -199,14 +199,14 @@ module BoxesHelper
   # makes the given block draggable so it can be moved away.
   def block_handle(block)
-    modifiable?(block) ? draggable_element("block-#{block.id}", :revert => true) : ""
+    movable?(block) ? draggable_element("block-#{block.id}", :revert => true) : ""
   end
   def block_edit_buttons(block)
     buttons = []
     nowhere = 'javascript: return false;'
-    if modifiable?(block)
+    if movable?(block)
       if block.first?
         buttons << icon_button('up-disabled', _("Can't move up anymore."), nowhere)
       else
@@ -229,15 +229,15 @@ module BoxesHelper
           buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
         end
       end
+    end
-      if block.editable?
-        buttons << modal_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
-      end
+    if editable?(block)
+      buttons << modal_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+    end
-      if !block.main?
-        buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
-        buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
-      end
+    if movable?(block) && !block.main?
+      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
+      buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
     if block.respond_to?(:help)
@@ -273,7 +273,11 @@ module BoxesHelper
     classes
   end
-  def modifiable?(block)
-    return !block.fixed || environment.admins.include?(user)
+  def movable?(block)
+    return block.movable? || user.is_admin?
+  end
+
+  def editable?(block)
+    return block.editable? || user.is_admin?
   end
 end
@@ -28,7 +28,7 @@ module LayoutHelper
   end
   def noosfero_javascript
-    plugins_javascripts = @plugins.flat_map{ |plugin| plugin.js_files.map{ |js| plugin.class.public_path(js, true) } }.flatten
+    plugins_javascripts = @plugins.flat_map{ |plugin| Array.wrap(plugin.js_files).map{ |js| plugin.class.public_path(js, true) } }.flatten
     output = ''
     output += render 'layouts/javascript'
@@ -38,6 +38,8 @@ module LayoutHelper
     output += theme_javascript_ng.to_s
     output += javascript_tag 'render_all_jquery_ui_widgets()'
+    output += templete_javascript_ng.to_s
+
     output
   end
@@ -70,11 +72,7 @@ module LayoutHelper
   end
   def template_stylesheet_path
-    if profile.nil?
-      "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
-    else
-      "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
-    end
+    File.join template_path, "/stylesheets/style.css"
   end
@@ -17,6 +17,7 @@ module TinymceHelper
         searchreplace wordcount visualblocks visualchars code fullscreen
         insertdatetime media nonbreaking save table contextmenu directionality
         emoticons template paste textcolor colorpicker textpattern],
+      :image_advtab => true,
       :language => tinymce_language
     options[:toolbar1] = "insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
@@ -5,7 +5,7 @@ class Article &lt; ActiveRecord::Base
                   :allow_members_to_edit, :translation_of_id, :language,
                   :license_id, :parent_id, :display_posts_in_current_language,
                   :category_ids, :posts_per_page, :moderate_comments,
-                  :accept_comments, :feed, :published, :source,
+                  :accept_comments, :feed, :published, :source, :source_name,
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers
@@ -769,7 +769,9 @@ class Article &lt; ActiveRecord::Base
   end
   def first_image
-    img = Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first || Nokogiri::HTML.fragment(self.body.to_s).search('img').first
+    img = ( image.present? && { 'src' => image.public_filename } ) ||
+          Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first ||
+          Nokogiri::HTML.fragment(self.body.to_s).search('img').first
     img.nil? ? '' : img['src']
   end
 class Block < ActiveRecord::Base
-  attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box, :fixed
+  attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
+                  :visualization_format, :language, :display_user,
+                  :box, :edit_modes, :move_modes
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -23,7 +25,7 @@ class Block &lt; ActiveRecord::Base
   end
   def get_limit
-    [0,limit].max
+    [0,limit.to_i].max
   end
   def embed_code
@@ -110,8 +112,13 @@ class Block &lt; ActiveRecord::Base
   # * <tt>'all'</tt>: the block is always displayed
   settings_items :language, :type => :string, :default => 'all'
-  # The block can be configured to be fixed. Only can be edited by environment admins
-  settings_items :fixed, :type => :boolean, :default => false
+  # The block can be configured to define the edition modes options. Only can be edited by environment admins
+  # It can assume the following values:
+  #
+  # * <tt>'all'</tt>: the block owner has all edit options for this block
+  # * <tt>'none'</tt>: the block owner can't do anything with the block
+  settings_items :edit_modes, :type => :string, :default => 'all'
+  settings_items :move_modes, :type => :string, :default => 'all'
   # returns the description of the block, used when the user sees a list of
   # blocks to choose one to include in the design.
@@ -148,7 +155,11 @@ class Block &lt; ActiveRecord::Base
   # Is this block editable? (Default to <tt>false</tt>)
   def editable?
-    true
+    self.edit_modes == "all"
+  end
+
+  def movable?
+    self.move_modes == "all"
   end
   # must always return false, except on MainBlock clas.
@@ -228,6 +239,21 @@ class Block &lt; ActiveRecord::Base
     }
   end
+  def edit_block_options
+    @edit_options ||= {
+      'all'            => _('Can be modified'),
+      'none'           => _('Cannot be modified')
+    }
+  end
+
+  def move_block_options
+    @move_options ||= {
+      'all'            => _('Can be moved'),
+      'none'           => _('Cannot be moved')
+    }
+  end
+
+
   def duplicate
     duplicated_block = self.dup
     duplicated_block.display = 'never'
@@ -76,7 +76,7 @@ class Blog &lt; Folder
   end
   settings_items :visualization_format, :type => :string, :default => 'full'
-  validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format
+  validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
   settings_items :display_posts_in_current_language, :type => :boolean, :default => false
@@ -19,6 +19,8 @@ class Environment &lt; ActiveRecord::Base
     filename
   end
+  NUMBER_OF_BOXES = 4
+
   PERMISSIONS['Environment'] = {
     'view_environment_admin_panel' => N_('View environment admin panel'),
     'edit_environment_features' => N_('Edit environment features'),
@@ -172,7 +174,7 @@ class Environment &lt; ActiveRecord::Base
   acts_as_having_boxes
   after_create do |env|
-    3.times do
+    NUMBER_OF_BOXES.times do
       env.boxes << Box.new
     end
@@ -737,8 +739,8 @@ class Environment &lt; ActiveRecord::Base
   end
   def is_default_template?(template)
-    is_default = template == community_default_template 
-    is_default = is_default || template == person_default_template 
+    is_default = template == community_default_template
+    is_default = is_default || template == person_default_template
     is_default = is_default || template == enterprise_default_template
     is_default
   end
@@ -26,8 +26,16 @@ class HighlightsBlock &lt; Block
   end
   def featured_images
-    block_images = images.select{|i| !i[:image_src].nil? }.sort { |x, y| x[:position] <=> y[:position] }
-    shuffle ? block_images.shuffle : block_images
+    images = get_images
+    shuffle ? images.shuffle : images
+  end
+
+  def get_images
+    images.select do |i|
+      !i[:image_src].nil?
+    end.sort do |x, y|
+      x[:position] <=> y[:position]
+    end
   end
   def content(args={})
@@ -29,6 +29,8 @@ class Organization &lt; Profile
   has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
+  has_many :custom_roles, :class_name => 'Role', :foreign_key => :profile_id
+
   scope :more_popular, :order => 'members_count DESC'
   validate :presence_of_required_fieds, :unless => :is_template
@@ -22,6 +22,8 @@ class Profile &lt; ActiveRecord::Base
     :display => %w[compact]
   }
+  NUMBER_OF_BOXES = 4
+
   def self.default_search_display
     'compact'
   end
@@ -43,7 +45,7 @@ class Profile &lt; ActiveRecord::Base
       find_role('editor', env_id)
     end
     def self.organization_member_roles(env_id)
-      all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? }
+      all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
     end
     def self.all_roles(env_id)
       Role.all :conditions => { :environment_id => env_id }
@@ -75,6 +77,7 @@ class Profile &lt; ActiveRecord::Base
     'publish_content'      => N_('Publish content'),
     'invite_members'       => N_('Invite members'),
     'send_mail_to_members' => N_('Send e-Mail to members'),
+    'manage_custom_roles'  => N_('Manage custom roles'),
   }
   acts_as_accessible
@@ -361,7 +364,7 @@ class Profile &lt; ActiveRecord::Base
     if template
       apply_template(template, :copy_articles => false)
     else
-      3.times do
+      NUMBER_OF_BOXES.times do
         self.boxes << Box.new
       end
@@ -404,6 +407,7 @@ class Profile &lt; ActiveRecord::Base
   alias_method_chain :template, :default
   def apply_template(template, options = {:copy_articles => true})
+    self.template = template
     copy_blocks_from(template)
     copy_articles_from(template) if options[:copy_articles]
     self.apply_type_specific_template(template)
 class SuggestArticle < Task
-  validates_presence_of :target_id, :article_name, :email, :name, :article_body
+  validates_presence_of :target_id
+  validates_presence_of :email, :name, :if => Proc.new { |task| task.requestor.blank? }
+  validates_associated :article_object
   settings_items :email, :type => String
   settings_items :name, :type => String
-  settings_items :article_name, :type => String
-  settings_items :article_body, :type => String
-  settings_items :article_abstract, :type => String
-  settings_items :article_parent_id, :type => String
-  settings_items :source, :type => String
-  settings_items :source_name, :type => String
-  settings_items :highlighted, :type => :boolean, :default => false
   settings_items :ip_address, :type => String
   settings_items :user_agent, :type => String
   settings_items :referrer, :type => String
+  settings_items :article, :type => Hash, :default => {}
   after_create :schedule_spam_checking
@@ -24,34 +20,49 @@ class SuggestArticle &lt; Task
   include Noosfero::Plugin::HotSpot
   def sender
-    "#{name} (#{email})"
+    requestor ? "#{requestor.name}" : "#{name} (#{email})"
+  end
+
+  def article_object
+    if @article_object.nil?
+      @article_object = article_type.new(article.merge({:profile => target}).except(:type))
+      if requestor.present?
+        @article_object.author = requestor
+      else
+        @article_object.author_name = name
+      end
+    end
+    @article_object
+  end
+
+  def article_type
+    if article[:type].present?
+      type = article[:type].constantize
+      return type if type < Article
+    end
+    TinyMceArticle
   end
   def perform
-    task = TinyMceArticle.new
-    task.profile = target
-    task.name = article_name
-    task.author_name = name
-    task.body = article_body
-    task.abstract = article_abstract
-    task.parent_id = article_parent_id
-    task.source = source
-    task.source_name = source_name
-    task.highlighted = highlighted
-    task.save!
+    article_object.save!
   end
   def title
     _("Article suggestion")
   end
+  def article_name
+    article[:name]
+  end
+
   def subject
     article_name
   end
   def information
-    { :message => _('%{sender} suggested the publication of the article: %{subject}.'),
-      :variables => {:sender => sender} }
+    variables = requestor.blank? ? {:requestor => sender} : {}
+    { :message => _('%{requestor} suggested the publication of the article: %{subject}.'),
+      :variables => variables }
   end
   def accept_details
@@ -63,8 +74,8 @@ class SuggestArticle &lt; Task
   end
   def target_notification_description
-    _('%{sender} suggested the publication of the article: %{article}.') %
-    {:sender => sender, :article => article_name}
+    _('%{requestor} suggested the publication of the article: %{article}.') %
+    {:requestor => sender, :article => article_name}
   end
   def target_notification_message
@@ -45,7 +45,7 @@ class User &lt; ActiveRecord::Base
       p = Person.new
       p.attributes = user.person_data
-      p.identifier = user.login
+      p.identifier = user.login if p.identifier.blank?
       p.user = user
       p.environment = user.environment
       p.name ||= user.name || user.login
-<div class='join-leave-button'>
+<div class='join-leave-button require-login-popup'>
   <% if logged_in? %>
     <% if profile.members.include?(user) %>
       <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
@@ -5,12 +5,6 @@
     <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
-    <% if environment.admins.include?(user) %>
-      <div class="fixed_block">
-        <%= labelled_check_box(_("Fixed"), "block[fixed]", value = "1", checked = @block.fixed) %>
-      </div>
-    <% end %>
-
     <%= render :partial => partial_for_class(@block.class) %>
     <div class="display">
@@ -25,6 +19,15 @@
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
+    <% if user.is_admin? %>
+      <div class="edit-modes">
+        <%= labelled_form_field _('Edit options:'), select_tag('block[edit_modes]', options_from_collection_for_select(@block.edit_block_options, :first, :last, @block.edit_modes)) %>
+      </div>
+      <div class="move-modes">
+        <%= labelled_form_field _('Move options:'), select_tag('block[move_modes]', options_from_collection_for_select(@block.move_block_options, :first, :last, @block.move_modes)) %>
+      </div>
+    <% end %>
+
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= modal_close_button(_('Cancel')) %>
@@ -64,7 +64,11 @@
   <%= labelled_check_box(_('Remove cover image'),'remove_image',true,false)%>
 <% end %>
-<%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %>
+<%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [
+  [ _('Full post'), 'full'],
+  [ _('First paragraph'), 'short'],
+  [ _('First paragraph, with post picture'), 'short+pic']
+])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -6,21 +6,22 @@
 <%= labelled_form_for 'task' do |f| %>
-  <%= required labelled_form_field(_('Title'), text_field(:task, 'article_name', :size => 50)) %>
+  <%= required labelled_form_field(_('Title'), text_field('task[article]', 'name', :size => 50)) %>
-  <%= labelled_form_field(_('Source'), text_field(:task, 'source_name')) %>
+  <%= labelled_form_field(_('Source'), text_field('task[article]', 'source_name')) %>
-  <%= labelled_form_field(_('Source URL'), text_field(:task, 'source')) %>
+  <%= labelled_form_field(_('Source URL'), text_field('task[article]', 'source')) %>
-  <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
-
-  <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
+  <% unless logged_in? %>
+    <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
+    <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
+  <% end %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => 'task[article]'} %>
   <%= hidden_field_tag('back_to', @back_to) %>
-  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
+  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
@@ -18,6 +18,9 @@
      format = inside_block.visualization_format
      paginate = false
    end
-   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format, paginate))
+   (blog.empty? ?
+     content_tag('em', _('(no posts)')) :
+     list_posts(posts, format: format, paginate: paginate)
+   )
   %>
 </div>
 <h1><%= _('Manage fields displayed for profiles') %></h1>
+<%= javascript_include_tag "manage-fields.js" %>
+
 <% tabs = [] %>
 <% tabs << {:title => _("Person's fields"), :id => 'person-fields',
   :content => (render :partial => 'manage_person_fields')} %>
@@ -11,5 +13,3 @@
 <% end %>
 <%= render_tabs(tabs) %>
-
-<%= javascript_include_tag "manage-fields.js" %>
@@ -24,7 +24,7 @@
     $('#report-abuse-submit-button').css('cursor', 'progress');
     $.ajax({
       type: 'POST',
-      url: <%= url_for({:controller => 'profile', :action => 'register_report', :profile => profile.identifier}) %>,
+      url: <%= url_for({:controller => 'profile', :action => 'register_report', :profile => profile.identifier}).to_json %>,
       data: $(form).serialize(),
       dataType: 'json',
       success: function(data, status, ajax){
 <h1><%= _('Profile settings for %s') % profile.name %></h1>
-<%= javascript_include_tag 'deactivate_profile' %>
 <%= error_messages_for :profile_data %>
 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>
@@ -28,6 +28,8 @@
   <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
+  <%= control_panel_button(_('Manage Roles'), 'roles', :controller => 'profile_roles') %>
+
   <% unless profile.enterprise? %>
     <%= case profile.blogs.count
       when 0
 <h3> <%= _('Changing role of %s') % @member.name %> </h3>
 <%= labelled_form_for :member, :url => {:action => 'update_roles'} do |f| %>
-  
-  <%= _('Roles:') %> <br>
+
+  <h4><%= _('Roles:') %></h4>
   <% @roles.each do |r| %>
     <%= labelled_check_box(r.name, 'roles[]', r.id, @associations.map(&:role).include?(r) ) %><br/>
     <ul class="role-permissions">
@@ -11,6 +11,17 @@
       <% end %>
     </ul>
   <% end %>
+  <% unless @custom_roles.empty? %>
+    <h4><%= _('Custom Roles:') %></h4>
+    <% @custom_roles.each do |r| %>
+    <%= labelled_check_box(r.name, 'roles[]', r.id, @associations.map(&:role).include?(r) ) %><br/>
+    <ul class="role-permissions">
+      <% r.permissions.each do |p| %>
+      <li> <%= permission_name(p) %> </li>
+      <% end %>
+    </ul>
+    <% end %>
+  <% end %>
   <%= hidden_field_tag 'person', @member.id %>
   <% button_bar do %>
@@ -0,0 +1,22 @@
+<%= error_messages_for :role %>
+
+<%= labelled_form_for :role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
+
+  <%= required_fields_message %>
+
+  <%= required f.text_field(:name) %>
+
+  <% permissions.each do |key| %>
+  <div class="permissions <%= key.downcase %>">
+    <h4><%= _('%s Permissions:' % key) %></h4>
+    <% ActiveRecord::Base::PERMISSIONS[key].keys.each do |p| %>
+      <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
+      <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+    <% end %>
+  </div>
+  <% end %>
+
+  <% button_bar do %>
+    <%= submit_button('save', (mode == :edit) ? _('Save changes') : _('Create role'), :cancel => {:action => 'index'} ) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,35 @@
+<%= javascript_include_tag('assign_role.js') %>
+
+<h1> <%= _("Assign #{@role.name}") %> </h1>
+
+
+<%= labelled_form_for :role, :url => { :action => 'define', :id => @role.id } do |f| %>
+
+  <h2>
+    <%= _("Assign role by:") %>
+  </h2>
+  <p>
+    <%= labelled_radio_button _("Members"), :assign_role_by, "members", true, :id => "assign_role_by_members", :class => "assign_role_by" %>
+    &nbsp;
+    <%= labelled_radio_button _("Roles"), :assign_role_by, "roles", false, :id => "assign_role_by_roles", :class => "assign_role_by" %>
+  </p>
+  <div class="assign_by_members">
+    <%=token_input_field_tag(:person_id, 'search-profile-members', {:action => 'assign_role_by_members'},
+    {:focus => false, :hint_text => _('Select members to assign the role')}) %>
+
+    <% button_bar do %>
+      <%= submit_button(:forward, _("Confirm")) %>
+    <% end %>
+  </div>
+  <div class="assign_by_roles" style="display: none;">
+    <h6>
+      <%= _("Replace role: ") %>
+    </h6>
+    <% @roles_list.each do |role| %>
+      <%= labelled_radio_button role.name , :selected_role, role.id , false, :class => "selected_role" %> <br>
+    <% end %>
+    <% button_bar do %>
+      <%= submit_button('save',_('Confirm'), :cancel => {:action => 'index'} ) %>
+    <% end %>
+  </div>
+<% end %>
@@ -0,0 +1,23 @@
+<h1> <%= _("Deleting #{@role.name}") %> </h1>
+
+<% if @members.nil? || @members.empty? %>
+  <p><%= _('This role is not being currently used.')%></p>
+  <p><%= _('Are you sure you want to delete this role?') %></p>
+
+  <% button_bar do %>
+    <%= button(:remove, _('Yes, I am sure'), {:action => 'remove', :id => @role.id}, :method => :post) %>
+    <%= button(:cancel, _('No, I gave up'), {:action => 'index'}) %>
+  <% end %>
+<% else %>
+  <p><%= _('There are members currently using this role.')%></p>
+  <p><%= _('To which role do you want to change them?') %></p>
+  <%= labelled_form_for :role, :url => { :action => 'remove', :id => @role.id } do |f| %>
+    <% @roles_list.each do |role| %>
+      <%= check_box_tag("roles[]", role.id, false ,{:id => role.key}) %>
+      <%= content_tag(:label, role.name, { :for => role.key }) %><br/>
+    <% end %>
+    <% button_bar do %>
+    <%= submit_button('save',_('Delete role'), :cancel => {:action => 'index'} ) %>
+    <% end %>
+  <% end %>
+<% end %>
@@ -0,0 +1,3 @@
+<h1> <%= _("Editing #{@role.name}") %> </h1>
+
+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => [@role.kind] } %>
@@ -0,0 +1,27 @@
+<h1><%= _('Manage user roles') %></h1>
+
+<table>
+  <tr>
+    <th><%= _('Role') %></th>
+    <th><%= _('Actions') %></th>
+  </tr>
+  <% @roles.each do |role| %>
+    <tr>
+      <td>
+        <%= link_to role.name, :action => 'show', :id => role %>
+      </td>
+      <td>
+        <div style="text-align: center;">
+          <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => role %>
+          <%= button_without_text :delete, _('Delete'), :action => 'destroy', :id => role %>
+          <%= button_without_text 'vertical-toggle', _('Assign'), :action => 'assign', :id => role %>
+        </div>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<% button_bar do %>
+  <%= button :add, _('Create a new role'), :action => 'new' %>
+  <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
+<% end %>
@@ -0,0 +1,3 @@
+<h1> <%= _("Create a new role") %> </h1>
+
+<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ['Profile'] } %>
@@ -0,0 +1,13 @@
+<h1> <%= _(@role.name)  %></h1>
+
+<h3> <%= _('Permissions') %> </h3>
+<ul>
+  <% @role.permissions.each do |p| %>
+    <li> <%= permission_name(p) %> </li> 
+  <% end %>
+</ul>
+
+<% button_bar do %>
+  <%= button :edit, _('Edit'), :action => 'edit', :id => @role %>
+  <%= button :back, _('Back to roles management'), :action => 'index' %>
+<% end %>
+<% search_label = _("Find in %s's content") % profile.short_name %>
 <%= form_tag( { :controller => 'profile_search', :profile => profile.identifier}, :method => 'get', :class => 'search_form' ) do %>
   <div class="search-field">
     <span class="formfield">
-      <%= search_input_with_suggestions 'q', :articles, @q, :title => _("Find in %s's content") % profile.short_name %>
+      <%= search_input_with_suggestions 'q', :articles, @q, :title => search_label, :placeholder => search_label %>
     </span>
     <%= submit_button(:search, _('Search')) %>
     <div>
@@ -7,13 +7,13 @@
     <ul class="suggest-article-details" style="display: none">
       <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
       <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
-      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
-      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
-      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
-      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.article_object.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.article_object.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_object.parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_object.abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_object.abstract%> </li>
       <li><strong><%=_('Body')%></strong>:
       <div class='suggest-article-body'>
-        <%= task.article_body %>
+        <%= task.article_object.body %>
       </div>
       </li>
     </ul>
 <%= content = _("Roles:")+"<br />"
-roles = Profile::Roles.organization_member_roles(task.target.environment.id)
+roles = Profile::Roles.organization_member_roles(task.target.environment.id) + profile.custom_roles
 roles.each do |role|
   content += labelled_check_box(role.name, "tasks[#{task.id}][task][roles][]", role.id, false)+"<br />"
 end
 content_tag('p', content, :class => 'member-classify-suggestion')
 %>
-
 <%= render :file => 'shared/tiny_mce' %>
-<%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
-<p><%= label_tag(_("Email: %s") % task.email) %> </p>
-<%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
-<%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
-<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
+<% unless task.requestor %>
+  <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
+  <p><%= label_tag(_("Email: %s") % task.email) %> </p>
+<% end %>
-<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
-<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
+<%= f.fields_for 'article', OpenStruct.new(task.article) do |a| %>
+  <%= required labelled_form_field(_('Title'), a.text_field(:name, :size => 50)) %>
+  <%= labelled_form_field(_('Source'), a.text_field(:source_name)) %>
+  <%= labelled_form_field(_("Source URL"), a.text_field(:source)) %>
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>
+  <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article][parent_id]", task.target, task.article[:parent_id]) %>
+  <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
+
+  <%= a.hidden_field(:type) %>
+
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
+<% end %>
@@ -10,8 +10,8 @@
     <% @people_suggestions.each do |person| %>
     <li><a href="<%= url_for(person.public_profile_url) %>"><%= person.name %></a></li>
     <% end %>
-  <ul>
-  <%= _("To see the full list of friends suggestions, follow the link: %s") % @people_suggestions_url %>
+  </ul>
+  <%= _("To see the full list of friends suggestions, follow the link: %s") % url_for(@people_suggestions_url) %>
 <% end %>
 <% unless @communities_suggestions.empty? %>
@@ -21,13 +21,15 @@
     <% @communities_suggestions.each do |community| %>
     <li><a href="<%= url_for(community.public_profile_url) %>"><%= community.name %></a></li>
     <% end %>
-  <ul>
-  <%= _("To see the full list of communities suggestions, follow the link: %s") % @communities_suggestions_url %>
+  </ul>
+  <%= _("To see the full list of communities suggestions, follow the link: %s") % url_for(@communities_suggestions_url) %>
 <% end %>
 <%= _("Greetings,") %>
---
-<%= _('%s team.') % @environment %>
+<p><%= _("Greetings,") %></p>
+
+--<br/>
+<%= _('%s team.') % @environment %><br/>
 <%= @url %>
@@ -35,4 +35,8 @@ Noosfero::Application.configure do
   config.assets.debug = true
   config.consider_all_requests_local = true
+
+  # send emails to /tmp/mails
+  config.action_mailer.delivery_method = :file
+
 end
@@ -56,37 +56,37 @@ Noosfero::Application.routes.draw do
   match 'search(/:action(/*category_path))', :controller => 'search'
   # events
-  match 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format_in_url}/
   # catalog
-  match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/, :as => :catalog
+  match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/, :as => :catalog
   # invite
-  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format_in_url}/
   # feeds per tag
-  match 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format}/, :as => :tag_feed
+  match 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/, :as => :tag_feed
   # profile tags
-  match 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/tags(/:id)', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/tags(/:id)', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format_in_url}/
   # profile search
-  match 'profile/:profile/search', :controller => 'profile_search', :action => 'index', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/search', :controller => 'profile_search', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/
   # comments
-  match 'profile/:profile/comment/:action/:id', :controller => 'comment', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/comment/:action/:id', :controller => 'comment', :profile => /#{Noosfero.identifier_format_in_url}/
   # public profile information
-  match 'profile/:profile(/:action(/:id))', :controller => 'profile', :action => 'index', :id => /[^\/]*/, :profile => /#{Noosfero.identifier_format}/, :as => :profile
+  match 'profile/:profile(/:action(/:id))', :controller => 'profile', :action => 'index', :id => /[^\/]*/, :profile => /#{Noosfero.identifier_format_in_url}/, :as => :profile
   # contact
-  match 'contact/:profile/:action(/:id)', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format}/
+  match 'contact/:profile/:action(/:id)', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format_in_url}/
   # map balloon
   match 'map_balloon/:action/:id', :controller => 'map_balloon', :id => /.*/
@@ -98,8 +98,8 @@ Noosfero::Application.routes.draw do
   ## Controllers that are profile-specific (for profile admins )
   ######################################################
   # profile customization - "My profile"
-  match 'myprofile/:profile', :controller => 'profile_editor', :action => 'index', :profile => /#{Noosfero.identifier_format}/
-  match 'myprofile/:profile/:controller(/:action(/:id))', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format}/, :as => :myprofile
+  match 'myprofile/:profile', :controller => 'profile_editor', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'myprofile/:profile/:controller(/:action(/:id))', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format_in_url}/, :as => :myprofile
   ######################################################
@@ -127,14 +127,14 @@ Noosfero::Application.routes.draw do
   # cache stuff - hack
   match 'public/:action/:id', :controller => 'public'
-  match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # match requests for profiles that don't have a custom domain
-  match ':profile(/*page)', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile(/*page)', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
   # match requests for content in domains hosted for profiles
   match '/(*page)', :controller => 'content_viewer', :action => 'view_page'
@@ -0,0 +1,8 @@
+class AddReferenceToRole < ActiveRecord::Migration
+  def self.up
+    add_column :roles, :profile_id, :integer
+  end
+  def self.down
+    remove_column :roles , :profile_id
+  end
+end
@@ -0,0 +1,18 @@
+class AddCustomRolesPermissionToAdminRoles < ActiveRecord::Migration
+  def self.up
+    environment_admin = Role.find_by_key("environment_administrator")
+    profile_admin = Role.find_by_key("profile_admin")
+    environment_admin.permissions.append("manage_custom_roles")
+    profile_admin.permissions.append("manage_custom_roles")
+    environment_admin.save!
+    profile_admin.save!
+  end
+  def self.down
+    environment_admin = Role.find_by_key("environment_administrator")
+    profile_admin = Role.find_by_key("profile_admin")
+    environment_admin.permissions.delete("manage_custom_roles")
+    profile_admin.permissions.delete("manage_custom_roles")
+    environment_admin.save!
+    profile_admin.save!
+  end
+end
@@ -0,0 +1,15 @@
+class AddNewBoxToEveryEnvironmentAndProfile < ActiveRecord::Migration
+    def up
+      Environment.find_each do |env|
+        env.boxes << Box.new if env.boxes.count < 4
+      end
+
+      Profile.find_each do |profile|
+        profile.boxes << Box.new if profile.boxes.count < 4
+      end
+    end
+
+    def down
+      say "this migration can't be reverted"
+    end
+end
@@ -593,6 +593,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150408231524) do
     t.boolean "system",         :default => false
     t.text    "permissions"
     t.integer "environment_id"
+    t.integer "profile_id"
   end
   create_table "scraps", :force => true do |t|
+noosfero (1.2~0) UNRELEASED; urgency=medium
+
+  * Temporary version in heavy development
+
+ -- Antonio Terceiro <terceiro@debian.org>  Fri, 08 May 2015 16:08:18 -0300
+
+noosfero (1.1) wheezy; urgency=low
+
+  * Noosfero 1.1 final release
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 04 May 2015 18:47:35 -0300
+
 noosfero (1.1~rc4) wheezy; urgency=medium
   * Fourth release candidate for Noosfero 1.1
@@ -14,8 +14,8 @@ Build-Depends: cucumber,
                ruby-database-cleaner,
                ruby-gettext,
                ruby-mocha,
-               ruby-rspec,
-               ruby-rspec-rails,
+               ruby-rspec (>= 2.14),
+               ruby-rspec-rails (>= 2.14),
                ruby-selenium-webdriver,
                ruby-sqlite3,
                ruby-tidy,
@@ -59,7 +59,9 @@ Depends: adduser,
          ruby-redcloth,
          ruby-rest-client,
          ruby-rmagick,
+         ruby-sass-rails,
          ruby-tzinfo (>= 1.1.0-2~),
+         ruby-uglifier,
          ruby-whenever,
          ruby-will-paginate (>= 2.3.12-1~),
          tango-icon-theme,
@@ -25,6 +25,7 @@ etc/init.d/noosfero               etc/init.d
 etc/logrotate.d/noosfero          etc/logrotate.d
 etc/noosfero/varnish-accept-language.vcl  etc/noosfero
 etc/noosfero/varnish-noosfero.vcl         etc/noosfero
+etc/awstats-noosfero.conf         etc/noosfero
 lib                               usr/share/noosfero
 locale                            usr/share/noosfero
 plugins                           usr/share/noosfero
@@ -0,0 +1,20 @@
+Feature: Change appearance
+  As a user
+  I want to change the appearance of my profile page
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+
+  Scenario: Change appearance from default(3 boxes) to Left Top and Right(4 boxes)
+    Given I am logged in as "joaosilva"
+    And I go to joaosilva's control panel
+    And I follow "Edit sideboxes"
+    And I should not see an element ".box-4"
+    And I go to joaosilva's control panel
+    And I follow "Edit Appearance"
+    And I follow "Left Top and Right"
+    And I go to joaosilva's control panel
+    And I follow "Edit sideboxes"
+    And I should see an element ".box-4"
@@ -267,32 +267,6 @@ Feature: signup
     Then I should be on the homepage
   @selenium
-  Scenario: join community on signup
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner     |
-       | Free Software  | freesoftware  | mariasilva |
-    And feature "skip_new_user_email_confirmation" is disabled on environment
-    And I am on /freesoftware
-    When I follow "Join"
-    And I follow "New user"
-    And I fill in the following within ".no-boxes":
-      | e-Mail                | josesilva@example.com |
-      | Username              | josesilva             |
-      | Password              | secret                |
-      | Password confirmation | secret                |
-      | Full name             | José da Silva         |
-    And wait for the captcha signup time
-    And I press "Create my account"
-    And I go to josesilva's confirmation URL
-    And I fill in "Username" with "josesilva"
-    And I fill in "Password" with "secret"
-    And I press "Log in"
-    Then "José da Silva" should be a member of "Free Software"
-
-  @selenium
   Scenario: user registration is moderated by admin
     Given feature "admin_must_approve_new_users" is enabled on environment
     And feature "skip_new_user_email_confirmation" is disabled on environment
@@ -94,8 +94,8 @@ Given /^the following blocks$/ do |table|
       owner.boxes<< Box.new
       owner.boxes.first.blocks << MainBlock.new
     end
-    box_id = owner.boxes.last.id
-    klass.constantize.create!(item.merge(:box_id => box_id))
+    box = owner.boxes.where(:position => 3).first
+    klass.constantize.create!(item.merge(:box => box))
   end
 end
@@ -60,7 +60,11 @@ module AuthenticatedSystem
       if logged_in? && authorized?
         true
       else
-        access_denied
+        if params[:require_login_popup]
+          render :json => { :require_login_popup => true }
+        else
+          access_denied
+        end
       end
     end
@@ -57,6 +57,12 @@ module Noosfero
     '[a-z0-9][a-z0-9~.]*([_\-][a-z0-9~.]+)*'
   end
+  # All valid identifiers, plus ~ meaning "the current user". See
+  # ApplicationController#redirect_to_current_user
+  def self.identifier_format_in_url
+    "(#{identifier_format}|~)"
+  end
+
   def self.default_hostname
     Environment.table_exists? && Environment.default ? Environment.default.default_hostname : 'localhost'
   end
@@ -8,6 +8,10 @@ class Noosfero::Plugin
     self.context = context
   end
+  def environment
+    context.environment if self.context
+  end
+
   class << self
     attr_writer :should_load
@@ -35,6 +39,7 @@ class Noosfero::Plugin
       # filters must be loaded after all extensions
       klasses.each do |plugin|
         load_plugin_filters plugin
+        load_plugin_hotspots plugin
       end
     end
@@ -108,6 +113,23 @@ class Noosfero::Plugin
       end
     end
+    # This is a generic method to extend the hotspots list with plugins
+    # hotspots. This allows plugins to extend other plugins.
+    # To use this, the plugin must define its hotspots inside a module Hotspots.
+    # Its also needed to include Noosfero::Plugin::HotSpot module
+    # in order to dispatch plugins methods.
+    #
+    # Checkout FooPlugin for usage example.
+    def load_plugin_hotspots(plugin)
+      ActionDispatch::Reloader.to_prepare do
+        begin
+          module_name = "#{plugin.name}::Hotspots"
+          Noosfero::Plugin.send(:include, module_name.constantize)
+        rescue NameError
+        end
+      end
+    end
+
     def add_controller_filters(controller_class, plugin, filters)
       unless filters.is_a?(Array)
         filters = [filters]
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.1~rc4'
+  VERSION = '1.2~0'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
-desc "Creates a backup of the user files stored in public/"
-task :backup do
-  dirs = Dir.glob('public/images/[0-9][0-9][0-9][0-9]') + ['public/articles', 'public/thumbnails', 'public/user_themes'].select { |d| File.exists?(d) }
-  tarball = 'backups/files-' + Time.now.strftime('%Y-%m-%d-%R') + '.tar'
+task :load_backup_config do
+  $config = YAML.load_file('config/database.yml')
+end
+
+task :check_backup_support => :load_backup_config do
+  if $config['production']['adapter'] != 'postgresql'
+    fail("Only PostgreSQL is supported for backups at the moment")
+  end
+end
+
+backup_dirs = [
+  'public/image_uploads',
+  'public/articles',
+  'public/thumbnails',
+  'public/user_themes',
+]
+
+desc "Creates a backup of the database and uploaded files"
+task :backup => :check_backup_support do
+  dirs = backup_dirs.select { |d| File.exists?(d) }
+
+  backup_name = Time.now.strftime('%Y-%m-%d-%R')
+  backup_file = File.join('tmp/backup', backup_name) + '.tar.gz'
+  mkdir_p 'tmp/backup'
+  dump = File.join('tmp/backup', backup_name) + '.sql'
+
+  database = $config['production']['database']
+  host = $config['production']['host']
+  sh "pg_dump -h #{host} #{database} > #{dump}"
+
+  sh 'tar', 'chaf', backup_file, dump, *dirs
+  rm_f dump
+
+  puts "****************************************************"
+  puts "Backup in #{backup_file} !"
+  puts
+  puts "To restore, use:"
+  puts "$ rake restore BACKUP=#{backup_file}"
+  puts "****************************************************"
+end
+
+def invalid_backup!(message, items=[])
+  puts "E: #{message}"
+  items.each do |i|
+    puts "E: - #{i}"
+  end
+  puts "E: Is this a backup archive created by Noosfero with \`rake backup\`?"
+  exit 1
+end
+
+desc "Restores a backup created previousy with \`rake backup\`"
+task :restore => :check_backup_support do
+  backup = ENV["BACKUP"]
+  unless backup
+    puts "usage: rake restore BACKUP=/path/to/backup"
+    exit 1
+  end
+
+  files = `tar taf #{backup}`.split
+
+  # validate files in the backup
+  invalid_files = []
+  files.each do |f|
+    if f !~ /tmp\/backup\// && (backup_dirs.none? { |d| f =~ /^#{d}\// })
+      invalid_files << f
+    end
+  end
+  if invalid_files.size > 0
+    invalid_backup!("Invalid files found in the backup archive", invalid_files)
+  end
+
+  # find database dump in the archive
+  dumps = files.select do |f|
+    File.dirname(f) == 'tmp/backup' && f =~ /\.sql$/
+  end
+  if dumps.size == 0
+    invalid_backup!("Could not find a database dump in the archive.")
+  elsif dumps.size > 1
+    invalid_backup!("Multiple database dumps found in the archive:", dumps)
+  end
+  dump = dumps.first
+
+  database = $config['production']['database']
+  username = $config['production']['username']
+  host = $config['production']['host']
+
+  puts "WARNING: backups should be restored to an empty database, otherwise"
+  puts "data from the backup may not be loaded properly."
+  puts
+  puts 'You can remove the existing database and create a new one with:'
+  puts
+  puts "$ sudo -u postgres dropdb -h #{host} #{database}"
+  puts "$ sudo -u postgres createdb -h #{host} #{database} --owner #{username}"
+  puts
+  print "Are you sure you want to continue (y/N)? "
+  response = $stdin.gets.strip
+  unless ['y', 'yes'].include?(response.downcase)
+    puts "*** ABORTED."
+    exit 1
+  end
+
+  sh 'tar', 'xaf', backup
+  sh "rails dbconsole production < #{dump}"
+  rm_f dump
-  mkdir_p(File.dirname(tarball))
-  sh('tar', 'cf', tarball, *dirs)
+  puts "****************************************************"
+  puts "Backup restored!"
+  puts "****************************************************"
 end
@@ -12,9 +12,8 @@ namespace :noosfero do
       end
     end
     task :unlink_plugins_textiles do
-      root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
-      rm_f Dir.glob(root.join('doc/noosfero/plugins/*.textile')) -
-        [root.join('doc/noosfero/plugins/index.textile')]
+      rm_f Dir.glob('doc/noosfero/plugins/*.textile') -
+        ['doc/noosfero/plugins/index.textile']
     end
     input = Dir.glob('doc/noosfero/**/*.textile') + plugins_textiles.map{|i| "doc/noosfero/plugins/#{File.basename(i)}"}
     topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }.uniq
@@ -4,7 +4,7 @@ targets = []
 templates.each do |template|
   target = template.gsub(/.erb$/, '')
   targets << target
-  file target => [:makemo, template] do
+  file target => [:makemo, template, :environment] do
     require 'erb'
     erb = ERB.new(File.read(template))
     File.open(target, 'w') do |file|
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1~rc4\n"
+"POT-Creation-Date: 2015-04-20 19:44-0300\n"
 "PO-Revision-Date: 2015-01-30 00:18-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,61 +16,53 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: plugins/event/lib/event_plugin.rb:4
+msgid "Event Extras"
+msgstr "Extras para Eventos"
+
+#: plugins/event/lib/event_plugin.rb:8
+msgid ""
+"Include a new block to show the environment's or profiles' events information"
+msgstr ""
+"Adiciona um novo bloco para apresentar as informações de eventos do ambiente "
+"ou dos perfis"
+
 #: plugins/event/lib/event_plugin/event_block.rb:12
 msgid "Events"
 msgstr "Eventos"
 #: plugins/event/lib/event_plugin/event_block.rb:16
 msgid "Show the profile events or all environment events."
-msgstr "Mostrar todos os eventos."
+msgstr "Mostra todos os eventos de um perfil ou do ambiente."
 #: plugins/event/lib/event_plugin/event_block.rb:65
-#, fuzzy
 msgid "One month ago"
 msgid_plural "%d months ago"
-msgstr[0] "Iniciou a um mês atrás."
-msgstr[1] "Iniciou a %d meses atrás."
+msgstr[0] "Um mês atrás"
+msgstr[1] "%d meses atrás."
 #: plugins/event/lib/event_plugin/event_block.rb:67
 msgid "Yesterday"
 msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ontem"
+msgstr[1] "%d dias atrás"
 #: plugins/event/lib/event_plugin/event_block.rb:69
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
 #: plugins/event/lib/event_plugin/event_block.rb:71
 msgid "Tomorrow"
 msgid_plural "%d days left to start"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Amanhã"
+msgstr[1] "%d dias para começar"
 #: plugins/event/lib/event_plugin/event_block.rb:73
-#, fuzzy
 msgid "One month left to start"
 msgid_plural "%d months left to start"
 msgstr[0] "Um mês para iniciar"
 msgstr[1] "% meses para iniciar"
-#: plugins/event/lib/event_plugin.rb:4
-msgid "Event Extras"
-msgstr "Eventos"
-
-#: plugins/event/lib/event_plugin.rb:8
-msgid ""
-"Include a new block to show the environment's or profiles' events information"
-msgstr ""
-"Adiciona um novo bloco para apresentar as informações de eventos do ambiente "
-"ou de perfis"
-
-#: plugins/event/views/event_plugin/event_block_item.html.erb:6
-msgid "Duration: 1 day"
-msgid_plural "Duration: %s days"
-msgstr[0] ""
-msgstr[1] ""
-
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:1
 msgid "Limit of items"
 msgstr "Limite de itens"
@@ -94,12 +86,17 @@ msgstr &quot;Mostrar apenas eventos futuros&quot;
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:22
 msgid "Limit of days to display"
-msgstr "Limite de dias de distância para mostrar eventos"
+msgstr "Limite de dias para mostrar"
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:24
-#, fuzzy
 msgid "Only show events in this interval of days."
-msgstr "Mostar somente eventos que acontecem dentro do limite de dias"
+msgstr "Mostar somente os eventos nesse intervalo de dias"
+
+#: plugins/event/views/event_plugin/event_block_item.html.erb:6
+msgid "Duration: 1 day"
+msgid_plural "Duration: %s days"
+msgstr[0] "Duração: 1 dia"
+msgstr[1] "Duração: %s dias"
 #~ msgid "Started one day ago."
 #~ msgid_plural "Started %d days ago."
 class FooPlugin < Noosfero::Plugin
+  include Noosfero::Plugin::HotSpot
   def self.plugin_name
     "Foo"
@@ -8,12 +9,29 @@ class FooPlugin &lt; Noosfero::Plugin
     _("A sample plugin to test autoload craziness.")
   end
+  module Hotspots
+    # -> Custom foo plugin hotspot
+    # do something to extend the FooPlugin behaviour
+    # receive params a, b and c
+    # returns = boolean or something else
+    def foo_plugin_my_hotspot(a, b, c)
+    end
+
+    # -> Custom title for foo profiles tab
+    # returns = a string with a custom title
+    def foo_plugin_tab_title
+    end
+  end
+
   def control_panel_buttons
     {:title => 'Foo plugin button', :icon => '', :url => ''}
   end
   def profile_tabs
-    {:title => 'Foo plugin tab', :id => 'foo_plugin', :content => lambda {'Foo plugin random content'} }
+    title = plugins.dispatch_first(:foo_plugin_tab_title)
+    title = 'Foo plugin tab' unless title
+
+    {:title => title, :id => 'foo_plugin', :content => lambda {'Foo plugin random content'} }
   end
 end
@@ -4,7 +4,25 @@ class FooPluginTest &lt; ActiveSupport::TestCase
   def test_foo
     FooPlugin::Bar.create!
   end
+
   def test_monkey_patch
     Profile.new.bar
   end
+
+  should "respond to new hotspots" do
+    plugin = FooPlugin.new
+
+    assert plugin.respond_to?(:foo_plugin_my_hotspot)
+    assert plugin.respond_to?(:foo_plugin_tab_title)
+  end
+
+  should "other plugin respond to new hotspots" do
+    class TestPlugin < Noosfero::Plugin
+    end
+
+    plugin = TestPlugin.new
+
+    assert plugin.respond_to?(:foo_plugin_my_hotspot)
+    assert plugin.respond_to?(:foo_plugin_tab_title)
+  end
 end
@@ -2,4 +2,9 @@ require_dependency &#39;profile&#39;
 class Profile
   settings_items :google_analytics_profile_id
+  attr_accessible :google_analytics_profile_id
+
+  descendants.each do |descendant|
+    descendant.attr_accessible :google_analytics_profile_id
+  end
 end
@@ -19,12 +19,15 @@ class GoogleAnalyticsPlugin &lt; Noosfero::Plugin
   def head_ending
     unless profile_id.blank?
-      expanded_template('tracking-code.rhtml',{:profile_id => profile_id})
+      expanded_template('tracking-code.html.erb',{:profile_id => profile_id})
     end
   end
   def profile_editor_extras
-    expanded_template('profile-editor-extras.rhtml',{:profile_id => profile_id})
+    analytics_id = profile_id
+    lambda {
+      render :file => 'profile-editor-extras', :locals => { :profile_id => analytics_id }
+    }
   end
 end
@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'profile_editor_controller'
+
+# Re-raise errors caught by the controller.
+class ProfileEditorController; def rescue_action(e) raise e end; end
+
+class ProfileEditorControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileEditorController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('default_user').person
+    login_as(@profile.identifier)
+    Environment.default.enable_plugin(GoogleAnalyticsPlugin.name)
+  end
+
+  attr_accessor :profile
+
+  should 'add extra fields to profile editor info and settings' do
+    get :edit, :profile => profile.identifier
+    assert_tag_in_string @response.body, :tag => 'label', :content => /Google Analytics/,  :attributes => { :for => 'profile_data_google_analytics_profile_id' }
+    assert_tag_in_string @response.body, :tag => 'input', :attributes => { :id => 'profile_data_google_analytics_profile_id' }
+  end
+
+  should 'save code filled in on field' do
+    post :edit, :profile => profile.identifier, :profile_data => {:google_analytics_profile_id => 12345678}
+    assert_equal '12345678', Person.find(profile.id).google_analytics_profile_id
+  end
+
+end
@@ -27,11 +27,6 @@ class GoogleAnalyticsPluginTest &lt; ActiveSupport::TestCase
     assert_equal 'content', @plugin.head_ending
   end
-  should 'add extra fields to profile editor info and settings' do
-    assert_tag_in_string @plugin.profile_editor_extras,
-      :tag => 'input', :attributes => {:id => 'profile_data_google_analytics_profile_id', :value => 10}
-  end
-
   should 'extends Profile with attr google_analytics_profile_id' do
     assert_respond_to Profile.new, :google_analytics_profile_id
   end
@@ -0,0 +1,3 @@
+<h2><%= c_('Statistics') %></h2>
+<%= labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => profile_id)) %>
+<%= link_to(_('See how to configure statistics for your profile'), '/doc/plugins/google_analytics', :target => '_blank') %>
@@ -1,5 +0,0 @@
-<% extend ApplicationHelper %>
-
-<h2><%= c_('Statistics') %></h2>
-<%= labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => profile_id)) %>
-<%= link_to(_('See how to configure statistics for your profile'), '/doc/plugins/google_analytics', :target => '_blank') %>
@@ -0,0 +1,9 @@
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '<%= escape_javascript locals[:profile_id] %>', 'auto');
+  ga('send', 'pageview');
+</script>
@@ -1,10 +0,0 @@
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= escape_javascript locals[:profile_id] %>']);
-  _gaq.push(['_trackPageview']);
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
@@ -77,18 +77,20 @@ class LdapAuthentication
   end
   def get_user_attributes_from_ldap_entry(entry)
-    {
-     :dn => entry.dn,
-     :fullname => LdapAuthentication.get_attr(entry, self.attr_fullname),
-     :mail => LdapAuthentication.get_attr(entry, self.attr_mail),
-    }
+    attributes = entry.instance_values["myhash"]
+
+    attributes[:dn] = entry.dn
+    attributes[:fullname] = LdapAuthentication.get_attr(entry, self.attr_fullname)
+    attributes[:mail] = LdapAuthentication.get_attr(entry, self.attr_mail)
+
+    attributes
   end
   # Return the attributes needed for the LDAP search.  It will only
   # include the user attributes if on-the-fly registration is enabled
   def search_attributes
     if onthefly_register?
-      ['dn', self.attr_fullname, self.attr_mail]
+      nil
     else
       ['dn']
     end
@@ -111,6 +113,7 @@ class LdapAuthentication
     end
     login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
     object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
+
     attrs = {}
     search_filter = object_filter & login_filter
 require File.dirname(__FILE__) + '/ldap_authentication.rb'
 class LdapPlugin < Noosfero::Plugin
+  include Noosfero::Plugin::HotSpot
   def self.plugin_name
     "LdapPlugin"
@@ -10,6 +11,26 @@ class LdapPlugin &lt; Noosfero::Plugin
     _("A plugin that add ldap support.")
   end
+  module Hotspots
+    # -> Custom ldap plugin hotspot to set profile data before user creation
+    # receive the followings params:
+    # - attrs with ldap received data
+    # - login received by ldap
+    # - params from current context
+    # returns = updated person_data hash
+    def ldap_plugin_set_profile_data(attrs, params)
+      [attrs, params]
+    end
+
+    # -> Custom ldap plugin hotspot to update user object
+    # receive the followings params:
+    # - user: user object
+    # - attrs with ldap received data
+    # returns = none
+    def ldap_plugin_update_user(user, attrs)
+    end
+  end
+
   def allow_user_registration
     false
   end
@@ -35,17 +56,22 @@ class LdapPlugin &lt; Noosfero::Plugin
       if attrs
         user.login = login
-        user.email = attrs[:mail]
+        user.email = get_email(attrs, login)
         user.name =  attrs[:fullname]
         user.password = password
         user.password_confirmation = password
-        user.person_data = context.params[:profile_data]
+        user.person_data = plugins.pipeline(:ldap_plugin_set_profile_data, attrs, context.params).last[:profile_data]
         user.activated_at = Time.now.utc
         user.activation_code = nil
         ldap = LdapAuthentication.new(context.environment.ldap_plugin_attributes)
         begin
-          user = nil unless user.save
+          if user.save
+            user.activate
+            plugins.dispatch(:ldap_plugin_update_user, user, attrs)
+          else
+            user = nil
+          end
         rescue
           #User not saved
         end
@@ -54,7 +80,6 @@ class LdapPlugin &lt; Noosfero::Plugin
       end
     else
-
       return nil if !user.activated?
       begin
@@ -69,6 +94,16 @@ class LdapPlugin &lt; Noosfero::Plugin
     user
   end
+  def get_email(attrs, login)
+    return attrs[:mail] unless attrs[:mail].blank?
+
+    if attrs[:fullname]
+      return attrs[:fullname].to_slug + "@ldap.user"
+    else
+      return login.to_slug + "@ldap.user"
+    end
+  end
+
   def login_extra_contents
     proc do
       @person = Person.new(:environment => @environment)
@@ -0,0 +1,14 @@
+class RequireAuthToCommentPluginAdminController < AdminController
+
+  def index
+    settings = params[:settings]
+    settings ||= {}
+    @settings = Noosfero::Plugin::Settings.new(environment, RequireAuthToCommentPlugin, settings)
+    if request.post?
+      @settings.save!
+      session[:notice] = 'Settings succefully saved.'
+      redirect_to :action => 'index'
+    end
+  end
+
+end
@@ -21,11 +21,20 @@ class RequireAuthToCommentPlugin &lt; Noosfero::Plugin
   end
   def stylesheet?
-    true
+    !display_login_popup?
+  end
+
+  def display_login_popup?
+    settings = Noosfero::Plugin::Settings.new(context.environment, self.class)
+    settings.require_type == 'display_login_popup'
+  end
+
+  def self.require_type_default_setting
+    'hide_button'
   end
   def js_files
-    ['hide_comment_form.js', 'jquery.livequery.min.js']
+    ['hide_comment_form.js', 'jquery.livequery.min.js'] + (display_login_popup? ? ['comment_require_login.js'] : [])
   end
   def body_beginning
@@ -0,0 +1,8 @@
+(function($) {
+  $(window).bind('userDataLoaded', function(event, data) {
+    if (!data.login && $('meta[name="profile.allow_unauthenticated_comments"]').length <= 0) {
+      $('.display-comment-form').unbind();
+      $('.display-comment-form').addClass('require-login-popup');
+    }
+  });
+})(jQuery);
@@ -5,9 +5,10 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
   def setup
     @plugin = RequireAuthToCommentPlugin.new
     @comment = Comment.new
+    @environment = fast_create(Environment)
   end
-  attr_reader :plugin, :comment
+  attr_reader :plugin, :comment, :environment
   should 'reject comments for unauthenticated users' do
     plugin.context = logged_in(false)
@@ -29,6 +30,35 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
     assert !comment.rejected?
   end
+  should 'the default require type setting be hide_button' do
+    assert_equal 'hide_button', plugin.class.require_type_default_setting
+  end
+
+  should 'display_login_popup? be false by default' do
+    context = mock();
+    context.expects(:environment).returns(environment)
+    plugin.expects(:context).returns(context)
+    assert !plugin.display_login_popup?
+  end
+
+  should 'display_login_popup? be true if require_type is defined as display_login_popup' do
+    context = mock();
+    context.expects(:environment).returns(environment)
+    environment[:settings] = {:require_auth_to_comment_plugin => {:require_type => "display_login_popup"}}
+    plugin.expects(:context).returns(context)
+    assert plugin.display_login_popup?
+  end
+
+  should 'not display stylesheet if login popup is active' do
+    plugin.expects(:display_login_popup?).returns(true)
+    assert !plugin.stylesheet?
+  end
+
+  should 'display stylesheet if login popup is inactive' do
+    plugin.expects(:display_login_popup?).returns(false)
+    assert plugin.stylesheet?
+  end
+
   protected
   def logged_in(boolean)
@@ -0,0 +1,20 @@
+<h1><%= _('Require auth to comment Settings')%></h1>
+
+<%= form_for(:settings) do |f| %>
+
+  <div class="require-type">
+    <strong>
+      <div class="hide-button">
+        <%= radio_button(:settings, :require_type, 'hide_button') %> <%= _('Hide button') %>
+      </div>
+      <div class="display-login-popup">
+        <%= radio_button(:settings, :require_type, 'display_login_popup') %> <%= _('Display login popup') %>
+      </div>
+    </strong>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
@@ -11,7 +11,8 @@ module SendEmailPluginBaseController
       )
       @mail.subject = params[:subject] unless params[:subject].blank?
       if @mail.valid?
-        SendEmailPlugin::Sender.send_message(request.referer, @context_url, @mail).deliver
+        @referer = request.referer
+        SendEmailPlugin::Sender.send_message(@referer, @context_url, @mail).deliver
         if request.xhr?
           render :text => _('Message sent')
         else
@@ -16,9 +16,9 @@ class SendEmailPlugin &lt; Noosfero::Plugin
   def parse_content(html, source)
     if context.profile
-      html.gsub!(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
+      html.gsub!(/({|%7[Bb])sendemail(}|%7[Dd])/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
     else
-      html.gsub!(/\{sendemail\}/, '/plugin/send_email/deliver')
+      html.gsub!(/({|%7[Bb])sendemail(}|%7[Dd])/, '/plugin/send_email/deliver')
     end
     [html, source]
   end
@@ -10,12 +10,11 @@ class SendEmailPlugin::Mail
   validate :recipients_format
   def initialize(attributes = {:subject => 'New mail'})
-    @environment = attributes[:environment]
-    @from = attributes[:from]
-    @to = attributes[:to]
-    @subject = attributes[:subject]
-    @message = attributes[:message]
-    @params = attributes[:params]
+    if attributes
+      attributes.each do |attr,value|
+        self.send("#{attr}=", value)
+      end
+    end
   end
   def recipients_format
@@ -36,7 +35,7 @@ class SendEmailPlugin::Mail
   end
   def params=(value = {})
-    [:action, :controller, :to, :message, :subject, :from].each{|k| value.delete(k)}
+    [:profile, :action, :controller, :to, :message, :subject, :from, :commit].each{|k| value.delete(k)}
     @params = value
   end
@@ -7,9 +7,9 @@ class SendEmailPlugin::Sender &lt; Noosfero::Plugin::MailerBase
     @params = mail.params
     mail(
+      content_type: 'text/plain',
       to: mail.to,
       from: mail.from,
-      body: mail.params,
       subject: "[#{mail.environment.name}] #{mail.subject}"
     )
   end
@@ -54,6 +54,13 @@ def run_common_tests
     post :deliver, @extra_args.merge(:to => 'john@example.com', :message => 'Hi john', :subject => 'Hello john')
     assert_equal '[Colivre.net] Hello john', ActionMailer::Base.deliveries.first.subject
   end
+
+  should 'deliver mail with message from view' do
+    Environment.any_instance.stubs(:send_email_plugin_allow_to).returns('john@example.com')
+    post :deliver, @extra_args.merge(:to => 'john@example.com', :message => 'Hi john', :subject => 'Hello john')
+    assert_match /Contact from/, ActionMailer::Base.deliveries.first.body.to_s
+  end
+
 end
 class SendEmailPluginProfileControllerTest < ActionController::TestCase
@@ -15,12 +15,14 @@ class SendEmailPluginSenderTest &lt; ActiveSupport::TestCase
   end
   should 'be able to deliver mail' do
+    @mail.expects(:params).returns({})
     response = SendEmailPlugin::Sender.send_message("http://localhost/contact", 'http//profile', @mail)
     assert_equal 'noreply@localhost', response.from.join
     assert_equal "[Noosfero] #{@mail.subject}", response.subject
   end
   should 'deliver mail to john@example.com' do
+    @mail.expects(:params).returns({})
     response = SendEmailPlugin::Sender.send_message("http://localhost/contact", 'http//profile', @mail)
     assert_equal ['john@example.com'], response.to
   end
@@ -26,4 +26,12 @@ class SendEmailPluginTest &lt; ActiveSupport::TestCase
     assert_match /profile\/#{@plugin.context.profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}", nil).first
   end
+  should 'expand macro used on form on profile context' do
+    profile = fast_create(Community)
+    @plugin.context.stubs(:profile).returns(profile)
+    article = RawHTMLArticle.create!(:name => 'Raw HTML', :body => "<form action='{sendemail}'></form>", :profile => profile)
+
+    assert_match /profile\/#{profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content(article.to_html, nil).first
+  end
+
 end
@@ -1,8 +0,0 @@
-<%= _('Contact from %s') % @referer %>
-
-<%= word_wrap(@message || @mail.message) %>
-<% (@params || @mail.params).each_pair do |key, value| %>
-<%= key %>: <%= word_wrap(value) %>
-<% end %>
----
-<%= url_for @context_url %>
@@ -0,0 +1,9 @@
+<%= _('Contact from %s') % @referer %>
+
+<%= word_wrap(@message || @mail.message) %>
+
+<% (@params || @mail.params).each_pair do |key, value| %>
+<%= key %>: <%= word_wrap(value) %>
+<% end %>
+---
+<%= url_for @context_url %>
@@ -2,7 +2,7 @@
 <table class='sendemail-plugin-message-sent'>
   <tr><td class='label'><strong><%= c_('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
-  <tr><td class='label'><strong><%= c_('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
+  <tr><td class='label'><strong><%= c_('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/send_message' %></pre></td></tr>
 </table>
 <p><%= button :back, c_('Back'), :back %></p>
@@ -0,0 +1,6 @@
+class AddTimestampToRelation < ActiveRecord::Migration
+  def change
+    add_column :sub_organizations_plugin_relations, :created_at, :datetime
+    add_column :sub_organizations_plugin_relations, :updated_at, :datetime
+  end
+end
 class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord
-  record_timestamps = false
-
   belongs_to :parent, :polymorphic => true
   belongs_to :child, :polymorphic => true
 .vote-actions {
-  position: absolute;
   top: 40px;
   right: 0px;
 }
@@ -5,7 +5,7 @@ reload_url = url_for(:controller =&gt; &#39;vote_plugin_profile&#39;, :profile =&gt; profile.i
 <span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">
-  <%= link_to_remote content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), :url => url, :html => {:class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'}"} %>
+  <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'} require-login-popup" %>
   <% if !voters.blank? %>
     <span class="vote-detail">
@@ -0,0 +1,4 @@
+name: "Top and Side Bars"
+title: "1 max colum at left, 1 min colum at right, 1 top line"
+description: "A template with 1 colum in left, 1 colum in right and 1 line in top"
+number_of_boxes: 4
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+  var box_4_height = $(".box-4").height();
+
+  // Make box-2(the most left one) stay align with box-4
+  $(".box-2").css("margin-top", "-"+box_4_height+"px");
+});
@@ -0,0 +1,42 @@
+#boxes {
+  display: table;
+  width: 100%;
+}
+
+.box-1 {
+  width: 58%;
+  float: left;
+  margin: 1% 1% 0% 1%;
+}
+
+
+.box-2 {
+  position: relative;
+  float: left;
+  width: 20%;
+}
+
+.box-3 {
+  position: relative;
+  float: right;
+  width: 20%;
+  margin-top: 1%;
+}
+
+.box-4 {
+  float: left;
+  width: 79%;
+  margin-left: 21%;
+}
+
+#profile-activity ul,
+#profile-network ul,
+#profile-wall ul {
+  width: 460px;
+}
+#profile-activity ul.comment-replies,
+#profile-network ul.comment-replies,
+#profile-wall ul.comment-replies {
+  width: auto;
+}
+
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="thumbnail.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="thumbnail.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   version="1.1">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3263">
+      <stop
+         id="stop3265"
+         offset="0"
+         style="stop-color:#204a87;stop-opacity:1" />
+      <stop
+         id="stop3267"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3257"
+       inkscape:collect="always">
+      <stop
+         id="stop3259"
+         offset="0"
+         style="stop-color:#204a87;stop-opacity:1" />
+      <stop
+         id="stop3261"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3245">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3247" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3249" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <filter
+       inkscape:collect="always"
+       id="filter3241">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.9075"
+         id="feGaussianBlur3243" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245"
+       id="linearGradient3251"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3253"
+       x1="49.5"
+       y1="60.5"
+       x2="23.5"
+       y2="3.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3257"
+       id="linearGradient3255"
+       x1="60.5"
+       y1="60.5"
+       x2="51.5"
+       y2="3.5"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3241-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.9075"
+         id="feGaussianBlur3243-4" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245-1"
+       id="linearGradient3251-0"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(249.71429,298.93361)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3245-1">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3247-6" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3249-5" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3241-4-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.9075"
+         id="feGaussianBlur3243-0-7" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263-5-8"
+       id="linearGradient5185"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4160224,0,0,0.76166072,243.22589,313.33388)"
+       x1="42.5"
+       y1="60.5"
+       x2="19.5"
+       y2="3.5" />
+    <linearGradient
+       id="linearGradient3263-5-8">
+      <stop
+         id="stop3265-4-3"
+         offset="0"
+         style="stop-color:#204a87;stop-opacity:1" />
+      <stop
+         id="stop3267-2-4"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3241-0">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.9075"
+         id="feGaussianBlur3243-3" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245-7"
+       id="linearGradient5168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3245-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3247-0" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3249-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245-70"
+       id="linearGradient3251-55"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3245-70">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3247-2" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3249-87" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245-1"
+       id="linearGradient5832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(249.71429,298.93361)"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263-5-8"
+       id="linearGradient5834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4160224,0,0,0.76166072,243.22589,313.33388)"
+       x1="42.5"
+       y1="60.5"
+       x2="19.5"
+       y2="3.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245-7"
+       id="linearGradient5836"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3245-70"
+       id="linearGradient5838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)"
+       x1="11.5"
+       y1="60.5"
+       x2="3.5"
+       y2="3.5" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.5351563"
+     inkscape:cx="-16.066434"
+     inkscape:cy="0.12147739"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1364"
+     inkscape:window-height="678"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2382"
+       visible="true"
+       enabled="true"
+       originx="0.5px"
+       originy="0.5px"
+       empcolor="#0000ff"
+       empopacity="0.1254902"
+       dotted="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(-247.62879,-298.93361)"
+       id="g5187">
+      <g
+         id="g4846">
+        <g
+           id="g3190-2"
+           style="opacity:0.4;filter:url(#filter3241-2)"
+           transform="translate(250.71429,299.93361)">
+          <rect
+             y="1.5"
+             x="1.5"
+             height="59"
+             width="11"
+             id="rect3184-1"
+             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             ry="2"
+             rx="2" />
+        </g>
+        <rect
+           y="300.43362"
+           x="251.21428"
+           height="59"
+           width="11"
+           id="rect2395-8"
+           style="fill:url(#linearGradient5832);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           ry="2"
+           rx="2" />
+        <rect
+           ry="1"
+           style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect3158-7"
+           width="9"
+           height="57"
+           x="252.21428"
+           y="301.43362"
+           rx="1" />
+      </g>
+      <g
+         transform="matrix(0.69260722,0,0,1,81.51265,0)"
+         id="g5180">
+        <rect
+           rx="2"
+           ry="2"
+           style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241-4-8);enable-background:accumulate"
+           id="rect3188-8"
+           width="31"
+           height="59"
+           x="16.5"
+           y="2.5"
+           transform="matrix(1.4160224,0,0,0.76166071,243.80989,314.09132)" />
+        <rect
+           y="314.47638"
+           x="265.17426"
+           height="44.937984"
+           width="43.896694"
+           id="rect3156-3"
+           style="fill:url(#linearGradient5834);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.03852236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           ry="1.5233214" />
+        <rect
+           y="315.23804"
+           x="266.59027"
+           height="43.414661"
+           width="41.064651"
+           id="rect3162-1"
+           style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1.03852236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           ry="0.7616607"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+      </g>
+      <g
+         transform="matrix(0.9761091,0,0,1,6.3333026,0)"
+         id="g5108">
+        <rect
+           rx="2"
+           ry="2"
+           style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241-0);enable-background:accumulate"
+           id="rect3184-5"
+           width="11"
+           height="59"
+           x="2.5"
+           y="2.5"
+           transform="matrix(0,1.0025263,-0.76423683,0,312.09322,298.92289)" />
+        <g
+           transform="matrix(0,1,-1,0,611.46116,-45.820829)"
+           id="g4877-9">
+          <rect
+             ry="1.5284736"
+             style="fill:url(#linearGradient5836);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect2395-95"
+             width="11.02779"
+             height="45.089973"
+             x="346.19211"
+             y="301.27853" />
+          <rect
+             y="302.04276"
+             x="347.19461"
+             height="43.561501"
+             width="9.0227375"
+             id="rect3158-2"
+             style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             ry="0.76423681" />
+        </g>
+      </g>
+      <g
+         id="g4877-8"
+         transform="translate(-47.956003,13.002947)">
+        <rect
+           y="301.27853"
+           x="346.19211"
+           height="45.089973"
+           width="11.02779"
+           id="rect2395-1"
+           style="fill:url(#linearGradient5838);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           ry="1.5284736" />
+        <rect
+           ry="0.76423681"
+           style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect3158-71"
+           width="9.0227375"
+           height="43.561501"
+           x="347.19461"
+           y="302.04276" />
+      </g>
+    </g>
+  </g>
+</svg>
	@@ -2,7 +2,7 @@ class RoleController < AdminController		@@ -2,7 +2,7 @@ class RoleController < AdminController
2	protect 'manage_environment_roles', :environment	2	protect 'manage_environment_roles', :environment
3		3
4	def index	4	def index
5	- @roles = environment.roles.find(:all)	5	+ @roles = environment.roles.find(:all, :conditions => {:profile_id => nil})
6	end	6	end
7		7
8	def new	8	def new
	@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base		@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
9	before_filter :allow_cross_domain_access	9	before_filter :allow_cross_domain_access
10	before_filter :login_required, :if => :private_environment?	10	before_filter :login_required, :if => :private_environment?
11	before_filter :verify_members_whitelist, :if => [:private_environment?, :user]	11	before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
		12	+ before_filter :redirect_to_current_user
12		13
13	def verify_members_whitelist	14	def verify_members_whitelist
14	render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)	15	render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)
	@@ -192,4 +193,15 @@ class ApplicationController < ActionController::Base		@@ -192,4 +193,15 @@ class ApplicationController < ActionController::Base
192	def private_environment?	193	def private_environment?
193	@environment.enabled?(:restrict_to_members)	194	@environment.enabled?(:restrict_to_members)
194	end	195	end
		196	+
		197	+ def redirect_to_current_user
		198	+ if params[:profile] == '~'
		199	+ if logged_in?
		200	+ redirect_to params.merge(:profile => user.identifier)
		201	+ else
		202	+ render_not_found
		203	+ end
		204	+ end
		205	+ end
		206	+
195	end	207	end
	@@ -58,6 +58,7 @@ class ProfileMembersController < MyProfileController		@@ -58,6 +58,7 @@ class ProfileMembersController < MyProfileController
58		58
59	def change_role	59	def change_role
60	@roles = Profile::Roles.organization_member_roles(environment.id)	60	@roles = Profile::Roles.organization_member_roles(environment.id)
		61	+ @custom_roles = profile.custom_roles
61	begin	62	begin
62	@member = profile.members.find(params[:id])	63	@member = profile.members.find(params[:id])
63	rescue ActiveRecord::RecordNotFound	64	rescue ActiveRecord::RecordNotFound
@@ -0,0 +1,116 @@		@@ -0,0 +1,116 @@
	1	+class ProfileRolesController < MyProfileController
	2	+
	3	+ protect 'manage_custom_roles', :profile
	4	+
	5	+ def index
	6	+ @roles = profile.custom_roles
	7	+ end
	8	+
	9	+ def new
	10	+ @role = Role.new
	11	+ end
	12	+
	13	+ def create
	14	+ @role = Role.new({:name => params[:role][:name], :permissions => params[:role][:permissions], :environment => environment }, :without_protection => true)
	15	+ if @role.save
	16	+ profile.custom_roles << @role
	17	+ redirect_to :action => 'show', :id => @role
	18	+ else
	19	+ session[:notice] = _('Failed to create role')
	20	+ render :action => 'new'
	21	+ end
	22	+ end
	23	+
	24	+ def show
	25	+ @role = environment.roles.find(params[:id])
	26	+ end
	27	+
	28	+ def edit
	29	+ @role = environment.roles.find(params[:id])
	30	+ end
	31	+
	32	+ def assign_role_by_members
	33	+ return redirect_to "/" if params[:q].nil? or !request.xhr?
	34	+ arg = params[:q].downcase
	35	+ result = find_by_contents(:people, environment, profile.members, params[:q])[:results]
	36	+ render :text => prepare_to_token_input(result).to_json
	37	+ end
	38	+
	39	+ def destroy
	40	+ @role = environment.roles.find(params[:id])
	41	+ @members = profile.members_by_role(@role)
	42	+ @roles_list = all_roles(environment, profile)
	43	+ @roles_list.delete(@role)
	44	+ end
	45	+
	46	+ def remove
	47	+ @role = environment.roles.find(params[:id])
	48	+ @members = profile.members_by_role(@role)
	49	+ member_roles = params[:roles] ? environment.roles.find(params[:roles].select{\|r\|!r.to_i.zero?}) : []
	50	+ append_roles(@members, member_roles, profile)
	51	+ if @role.destroy
	52	+ session[:notice] = _('Role successfuly removed!')
	53	+ else
	54	+ session[:notice] = _('Failed to remove role!')
	55	+ end
	56	+ redirect_to :action => 'index'
	57	+ end
	58	+
	59	+ def update
	60	+ @role = environment.roles.find(params[:id])
	61	+ if @role.update_attributes(params[:role])
	62	+ redirect_to :action => 'show', :id => @role
	63	+ else
	64	+ session[:notice] = _('Failed to edit role')
	65	+ render :action => 'edit'
	66	+ end
	67	+ end
	68	+
	69	+ def assign
	70	+ @role = environment.roles.find(params[:id])
	71	+ @roles_list = all_roles(environment, profile)
	72	+ @roles_list.delete(@role)
	73	+ end
	74	+
	75	+ def define
	76	+ @role = environment.roles.find(params[:id])
	77	+ selected_role = params[:selected_role] ? environment.roles.find(params[:selected_role].to_i) : nil
	78	+ if params[:assign_role_by].eql? "members"
	79	+ members_list = params[:person_id].split(',').collect {\|id\| environment.profiles.find(id.to_i)}
	80	+ members_list.collect{\|person\| person.add_role(@role, profile)}
	81	+ elsif params[:assign_role_by].eql? "roles"
	82	+ members = profile.members_by_role(selected_role)
	83	+ replace_role(members, selected_role, @role, profile)
	84	+ else
	85	+ session[:notice] = _("Error")
	86	+ end
	87	+ redirect_to :action => 'index'
	88	+ end
	89	+
	90	+ protected
	91	+
	92	+ def append_roles(members, roles, profile)
	93	+ members.each do \|person\|
	94	+ all_roles = person.find_roles(profile).map(&:role) + roles
	95	+ person.define_roles(all_roles, profile)
	96	+ end
	97	+ end
	98	+
	99	+ def all_roles(environment, profile)
	100	+ Profile::Roles.organization_member_roles(environment.id) + profile.custom_roles
	101	+ end
	102	+
	103	+ def replace_roles(members, roles, profile)
	104	+ members.each do \|person\|
	105	+ person.define_roles(roles, profile)
	106	+ end
	107	+ end
	108	+
	109	+ def replace_role(members, role, new_role, profile)
	110	+ members.each do \|person\|
	111	+ person.remove_role(role, profile)
	112	+ person.add_role(new_role, profile)
	113	+ end
	114	+ end
	115	+
	116	+end
	@@ -707,6 +707,24 @@ module ApplicationHelper		@@ -707,6 +707,24 @@ module ApplicationHelper
707	javascript_include_tag script if script	707	javascript_include_tag script if script
708	end	708	end
709		709
		710	+ def template_path
		711	+ if profile.nil?
		712	+ "/designs/templates/#{environment.layout_template}"
		713	+ else
		714	+ "/designs/templates/#{profile.layout_template}"
		715	+ end
		716	+ end
		717	+
		718	+ def template_javascript_src
		719	+ script = File.join template_path, '/javascripts/template.js'
		720	+ script if File.exists? File.join(Rails.root, 'public', script)
		721	+ end
		722	+
		723	+ def templete_javascript_ng
		724	+ script = template_javascript_src
		725	+ javascript_include_tag script if script
		726	+ end
		727	+
710	def file_field_or_thumbnail(label, image, i)	728	def file_field_or_thumbnail(label, image, i)
711	display_form_field label, (	729	display_form_field label, (
712	render :partial => (image && image.valid? ? 'shared/show_thumbnail' : 'shared/change_image'),	730	render :partial => (image && image.valid? ? 'shared/show_thumbnail' : 'shared/change_image'),
	@@ -17,6 +17,7 @@ module TinymceHelper		@@ -17,6 +17,7 @@ module TinymceHelper
17	searchreplace wordcount visualblocks visualchars code fullscreen	17	searchreplace wordcount visualblocks visualchars code fullscreen
18	insertdatetime media nonbreaking save table contextmenu directionality	18	insertdatetime media nonbreaking save table contextmenu directionality
19	emoticons template paste textcolor colorpicker textpattern],	19	emoticons template paste textcolor colorpicker textpattern],
		20	+ :image_advtab => true,
20	:language => tinymce_language	21	:language => tinymce_language
21		22
22	options[:toolbar1] = "insertfile undo redo \| copy paste \| bold italic underline \| styleselect fontsizeselect \| forecolor backcolor \| alignleft aligncenter alignright alignjustify \| bullist numlist outdent indent \| link image"	23	options[:toolbar1] = "insertfile undo redo \| copy paste \| bold italic underline \| styleselect fontsizeselect \| forecolor backcolor \| alignleft aligncenter alignright alignjustify \| bullist numlist outdent indent \| link image"
	@@ -76,7 +76,7 @@ class Blog < Folder		@@ -76,7 +76,7 @@ class Blog < Folder
76	end	76	end
77		77
78	settings_items :visualization_format, :type => :string, :default => 'full'	78	settings_items :visualization_format, :type => :string, :default => 'full'
79	- validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format	79	+ validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
80		80
81	settings_items :display_posts_in_current_language, :type => :boolean, :default => false	81	settings_items :display_posts_in_current_language, :type => :boolean, :default => false
82		82
	@@ -26,8 +26,16 @@ class HighlightsBlock < Block		@@ -26,8 +26,16 @@ class HighlightsBlock < Block
26	end	26	end
27		27
28	def featured_images	28	def featured_images
29	- block_images = images.select{\|i\| !i[:image_src].nil? }.sort { \|x, y\| x[:position] <=> y[:position] }
30	- shuffle ? block_images.shuffle : block_images	29	+ images = get_images
		30	+ shuffle ? images.shuffle : images
		31	+ end
		32	+
		33	+ def get_images
		34	+ images.select do \|i\|
		35	+ !i[:image_src].nil?
		36	+ end.sort do \|x, y\|
		37	+ x[:position] <=> y[:position]
		38	+ end
31	end	39	end
32		40
33	def content(args={})	41	def content(args={})
	@@ -29,6 +29,8 @@ class Organization < Profile		@@ -29,6 +29,8 @@ class Organization < Profile
29		29
30	has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'	30	has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
31		31
		32	+ has_many :custom_roles, :class_name => 'Role', :foreign_key => :profile_id
		33	+
32	scope :more_popular, :order => 'members_count DESC'	34	scope :more_popular, :order => 'members_count DESC'
33		35
34	validate :presence_of_required_fieds, :unless => :is_template	36	validate :presence_of_required_fieds, :unless => :is_template
	@@ -45,7 +45,7 @@ class User < ActiveRecord::Base		@@ -45,7 +45,7 @@ class User < ActiveRecord::Base
45	p = Person.new	45	p = Person.new
46		46
47	p.attributes = user.person_data	47	p.attributes = user.person_data
48	- p.identifier = user.login	48	+ p.identifier = user.login if p.identifier.blank?
49	p.user = user	49	p.user = user
50	p.environment = user.environment	50	p.environment = user.environment
51	p.name \|\|= user.name \|\| user.login	51	p.name \|\|= user.name \|\| user.login