Merge branch 'master' into AI2694-network_activity_email

Joenio Costa
2 parents 225bf66e 12a28da7
Showing 134 changed files with 2941 additions and 355 deletions Show diff stats
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/themes_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/helpers/categories_helper.rb
app/helpers/comment_helper.rb
app/models/box.rb
app/models/environment.rb
app/models/environment_statistics_block.rb
app/models/link_list_block.rb
app/models/profile.rb
app/sweepers/profile_sweeper.rb
app/views/blocks/location.html.erb
@@ -3,6 +3,8 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
@@ -7,7 +7,7 @@ class UsersController &lt; AdminController
   include UsersHelper
   def index
-    @filter = params[:filter]
+    @filter = params[:filter] || 'all_users'
     scope = environment.people.no_templates
     if @filter == 'admin_users'
       scope = scope.admins
@@ -16,6 +16,7 @@ class UsersController &lt; AdminController
     elsif @filter == 'deactivated_users'
       scope = scope.deactivated
     end
+    scope = scope.order('name ASC')
     @q = params[:q]
     @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
   end
@@ -44,6 +45,20 @@ class UsersController &lt; AdminController
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
+
+  def destroy_user
+    if request.post?
+      person = environment.people.find_by_id(params[:id])
+      if person && person.destroy
+        session[:notice] = _('The profile was deleted.')
+      else
+        session[:notice] = _('Could not remove profile')
+      end
+    end
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+
   def download
     respond_to do |format|
       format.html
@@ -21,6 +21,7 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
+    return nil if request.format == :js
     theme_layout = theme_option(:layout)
     if theme_layout
       theme_view_file('layouts/'+theme_layout) || theme_layout
@@ -70,7 +70,7 @@ class BoxOrganizerController &lt; ApplicationController
     else
       @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
       @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
-      @boxes = boxes_holder.boxes
+      @boxes = boxes_holder.boxes.with_position
       render :action => 'add_block', :layout => false
     end
   end
@@ -221,11 +221,10 @@ class CmsController &lt; MyProfileController
   def update_categories
     @object = params[:id] ? @profile.articles.find(params[:id]) : Article.new
+    @categories = @toplevel_categories = environment.top_level_categories
     if params[:category_id]
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
-    else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
   end
@@ -55,11 +55,10 @@ class ProfileEditorController &lt; MyProfileController
   def update_categories
     @object = profile
+    @categories = @toplevel_categories = environment.top_level_categories
     if params[:category_id]
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
-    else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
   end
@@ -2,7 +2,7 @@ class ProfileMembersController &lt; MyProfileController
   protect 'manage_memberships', :profile
   def index
-    @members = profile.members
+    @members = profile.members_by_name
     @member_role = environment.roles.find_by_name('member')
   end
@@ -67,7 +67,7 @@ class ProfileController &lt; PublicController
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
     end
   end
@@ -304,14 +304,6 @@ class ProfileController &lt; PublicController
     end
   end
-  def profile_info
-    begin
-      @block = profile.blocks.find(params[:block_id])
-    rescue
-      render :text => _('Profile information could not be loaded')
-    end
-  end
-
   def report_abuse
     @abuse_report = AbuseReport.new
     render :layout => false
@@ -12,7 +12,7 @@ class ThemesController &lt; ApplicationController
   def index
     @environment = environment
-    @themes = environment.themes + Theme.approved_themes(target)
+    @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
     @current_theme = target.theme
@@ -608,49 +608,18 @@ module ApplicationHelper
   end
   attr_reader :environment
+
   def select_categories(object_name, title=nil, title_size=4)
     return nil if environment.enabled?(:disable_categories)
     if title.nil?
       title = _('Categories')
     end
-    object = instance_variable_get("@#{object_name}")
-
-    result = content_tag 'h'+title_size.to_s(), title
-    result << javascript_tag( 'function open_close_cat( link ) {
-      var div = link.parentNode.getElementsByTagName("div")[0];
-      var end = function(){
-        if ( div.style.display == "none" ) {
-          this.link.className="button icon-button icon-down"
-        } else {
-          this.link.className="button icon-button icon-up-red"
-        }
-      }
-      Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
-    }')
-    environment.top_level_categories.select{|i| !i.children.empty?}.each do |toplevel|
-      next unless object.accept_category?(toplevel)
-      # FIXME
-      ([toplevel] + toplevel.children_for_menu).each do |cat|
-        if cat.top_level?
-          result << '<div class="categorie_box">'.html_safe
-          result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
-          result << content_tag('h5', toplevel.name)
-          result << '<div style="display:none"><ul class="categories">'.html_safe
-        else
-          checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
-          result << content_tag('li', labelled_check_box(
-                      cat.full_name_without_leading(1, " &rarr; "),
-                      "#{object_name}[category_ids][]", cat.id,
-                      object.category_ids.include?(cat.id), :id => checkbox_id,
-                      :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
-                    :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
-        end
-      end
-      result << '</ul></div></div>'.html_safe
-    end
+    @object = instance_variable_get("@#{object_name}")
+    @categories = environment.top_level_categories
-    content_tag('div', result)
+    @current_categories = environment.top_level_categories.select{|i| !i.children.empty?}
+    render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
   end
   def theme_option(opt = nil)
@@ -39,7 +39,7 @@ module BoxesHelper
   end
   def display_boxes(holder, main_content)
-    boxes = holder.boxes.first(holder.boxes_limit)
+    boxes = holder.boxes.with_position.first(holder.boxes_limit)
     content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
     content = main_content if (content.blank?)
@@ -48,4 +48,12 @@ module CategoriesHelper
     labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
+  #FIXME make this test
+  def selected_category_link(cat)
+    content_tag('div', button_to_function_without_text(:remove, _('Remove'), nil) {|page| page["selected-category-#{cat.id}"].remove} +
+      link_to_function(cat.full_name(' &rarr; '), nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {|page| page["selected-category-#{cat.id}"].remove},
+      :class => 'selected-category'
+    )
+  end
+
 end
@@ -22,6 +22,12 @@ module CommentHelper
     title
   end
+  def comment_extra_contents(comment)
+    @plugins.dispatch(:comment_extra_contents, comment).collect do |extra_content|
+      extra_content.kind_of?(Proc) ? self.instance_eval(&extra_content) : extra_content
+    end.join('\n')
+  end
+
   def comment_actions(comment)
     url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
     links = links_for_comment_actions(comment)
@@ -5,6 +5,8 @@ class Box &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
+  named_scope :with_position, :conditions => ['boxes.position > 0']
+
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
@@ -24,6 +26,8 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
+      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+      #      the Noosfero core soon, see ActionItem3045
       EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
@@ -50,6 +54,8 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
+      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+      #      the Noosfero core soon, see ActionItem3045
       EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
@@ -161,6 +161,8 @@ class Environment &lt; ActiveRecord::Base
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
@@ -186,7 +188,7 @@ class Environment &lt; ActiveRecord::Base
   has_many :product_categories, :conditions => { :type => 'ProductCategory'}
   has_many :regions
-  has_many :roles
+  has_many :roles, :dependent => :destroy
   has_many :qualifiers
   has_many :certifiers
+# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+#      the Noosfero core soon, see ActionItem3045
+
 class EnvironmentStatisticsBlock < Block
   def self.description
-    _('Environment stastistics')
+    _('Environment stastistics (DEPRECATED)')
   end
   def default_title
@@ -63,7 +63,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
     )
   end
@@ -88,6 +88,10 @@ class Profile &lt; ActiveRecord::Base
     ScopeTool.union *scopes
   end
+  def members_by_name
+    members.order(:name)
+  end
+
   def members_count
     members.count
   end
@@ -8,6 +8,8 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
   def after_create(profile)
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     expire_statistics_block_cache(profile)
   end
@@ -29,6 +31,8 @@ protected
     expire_blogs(profile) if profile.organization?
   end
+  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+  #      the Noosfero core soon, see ActionItem3045
   def expire_statistics_block_cache(profile)
     blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
     BlockSweeper.expire_blocks(blocks)
@@ -3,7 +3,6 @@
   <div class='the-localization-map'>
     <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
   </div>
-</div>
 <% else %>
   <i><%= _('This profile has no geographical position registered.') %></i>
 <% end %>
@@ -16,7 +16,7 @@
 <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
   <div class='admin-link'>
-    <%= link_to _('Control panel'), :controller => 'profile_editor' %>
+    <%= link_to _('Control panel'), block.owner.admin_url %>
   </div>
 <% end %>
@@ -21,7 +21,7 @@
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
   <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
-    <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
+    <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
   <% end %>
   <% if profile.person? %>
     <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
@@ -40,7 +40,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(@block.owner.class) %>
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
 </div>
 </div><!-- end class="vcard" -->
 <strong><%= _('Links') %></strong>
-<div id='edit-link-list-block' style='width:450px'>
+<div id='edit-link-list-block'>
 <table id='links' class='noborder'>
-  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th><th><%= _('Target') %></th></tr>
+  <tr>
+    <th><%= _('Icon') %></th>
+    <th><%= _('Name') %></th>
+    <th><%= _('Address') %></th>
+    <th><%= _('Title') %></th>
+    <th><%= _('Target') %></th>
+  </tr>
   <% for link in @block.links do %>
-    <tr>
-      <td>
-         <%= icon_selector(link['icon']) %>
-      </td>
-      <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
-      <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
-      <td>
-        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
-      </td>
-    </tr>
+  <tr>
+    <td><%= icon_selector(link['icon']) %></td>
+    <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
+    <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
+    <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
+    <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
+  </tr>
   <% end %>
 </table>
 </div>
@@ -22,8 +25,8 @@
       content_tag('td', icon_selector('ok')) +
       content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
       content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
-      content_tag('td', select_tag('block[links][][target]',
-options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
+      content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
+      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
@@ -40,14 +40,6 @@
   </div>
 <% end %>
-<% if !@page.tags.empty? %>
-  <div id="article-tags">
-    <%= _("This article's tags:") %>
-    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
-  </div>
-<% end %>
-
-
 <%= render :partial => 'shared/disabled_enterprise' %>
 <% if NOOSFERO_CONF['addthis_enabled'] %>
@@ -83,8 +75,17 @@
 </div>
 <% end %>
+<% if !@page.tags.empty? %>
+  <div id="article-tags">
+    <%= _("This article's tags:") %>
+    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
+  </div>
+<% end %>
+
 <%= display_source_info(@page) %>
+<%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_eval(&content) }.join("") %>
+
 <div class="comments" id="comments_list">
   <% if @page.accept_comments? || @comments_count > 0 %>
-<h2><%= __('Manage community fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 <table id='community_fields_conf'>
@@ -9,21 +7,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on creation?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="community_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_signup" />
+    </td>
+  </tr>
+
   <% @community_fields.each do |field| %>
   <tr>
     <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
-      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "active_action(this, 'community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
-      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "required_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][signup]", false %>
-      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "signup_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +45,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#community_fields_conf tr');
+  var trs = jQuery('#community_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_community_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<h2><%= __('Manage enterprise fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 <table id='enterprise_fields_conf'>
@@ -9,21 +7,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on registration?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_signup" />
+    </td>
+  </tr>
+
   <% @enterprise_fields.each do |field| %>
   <tr>
     <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "active_action(this, 'enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "required_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][signup]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "signup_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +45,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#enterprise_fields_conf tr');
+  var trs = jQuery('#enterprise_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_enterprise_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<h2><%= _('Manage person fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 <table id='person_fields_conf'>
@@ -9,31 +7,48 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on signup?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="person_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_signup" />
+    </td>
+  </tr>
+
   <% @person_fields.each do |field| %>
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
-      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "active_action(this, 'person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
-      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
-      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "signup_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
   </tr>
   <% end %>
 </table>
 <script type='text/javascript'>// <!--
-  var trs = $$('#person_fields_conf tr');
+  var trs = jQuery('#person_fields_conf tr');
+
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
   // -->
@@ -41,7 +56,7 @@
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_person_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<%= render :partial => 'manage_person_fields' %>
+<h1><%= _('Manage fields displayed for profiles') %></h1>
-<% if !environment.enabled?('disable_asset_enterprises') %>
-  <%= render :partial => 'manage_enterprise_fields' %>
+<% tabs = [] %>
+<% tabs << {:title => _("Person's fields"), :id => 'person-fields',
+  :content => (render :partial => 'manage_person_fields')} %>
+<% tabs << {:title => _("Community's fields"), :id => 'community-fields',
+  :content => (render :partial => 'manage_community_fields')} %>
+<% unless environment.enabled?('disable_asset_enterprises') %>
+  <% tabs << {:title => _("Enterprise's fields"), :id => 'enterprise-fields',
+  :content => (render :partial => 'manage_enterprise_fields')} %>
 <% end %>
-<%= render :partial => 'manage_community_fields' %>
+<%= render_tabs(tabs) %>
+
+<%= javascript_include_tag "manage-fields.js" %>
-<% collection = @collection == :profile_admins ? profile.admins : profile.members %>
+<% collection = @collection == :profile_admins ? profile.admins : profile.members_by_name %>
 <% title = @title ? @title : _('Current members') %>
 <% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
-<div id="category-ajax-selector">
+<% extend CategoriesHelper %>
+
 <% if !@current_category.nil? %>
-  <h3 class="box-title"><%= _('Current category:') %></h3>
   <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
+  <%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
+  <%= button_to_remote_without_text(:back, _('Back'),
+      { :update => "select-categories",
+        :url => { :action => 'update_categories', :id => @object },
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :id => 'cancel-category-button') %>
   <%
     categories = [@current_category]
     categories.push(@current_category) while @current_category = @current_category.parent
   %>
   <%= categories.compact.reverse.map{|i|
-    link_to_remote(i.name, 
+    link_to_remote(i.name,
       :update => "select-categories",
       :url => { :action => 'update_categories', :category_id => i.id, :id => @object },
       :loaded => visual_effect(:highlight, "select-categories"),
       :class => 'select-current-category-link')}.join(' &rarr; ')
   %>
-  <strong>
-  <%= button_to_function_without_text(:save, _('Save'), nil, :id => 'save-category-button') do |page|
-    page.insert_html :bottom, 'selected-categories', content_tag('li', categories.first.full_name +
+  <%= button_to_function_without_text(:add, _('Add'), nil, :id => 'save-category-button') do |page|
+    page.insert_html :bottom, 'selected-categories', content_tag('div',
       hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
-      button_to_function_without_text(:cancel, _('Remove'), nil, :id => "remove-selected-category-#{categories.first.id}-button") {|page| page["selected-category-#{categories.first.id}"].remove}, :id => "selected-category-#{categories.first.id}")
+      selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
+    page.replace_html 'select-categories', :partial => 'shared/select_subcategories',
+      :locals => {:object_name => object_name, :categories => @toplevel_categories}
   end if multiple %>
-  <%= button_to_remote_without_text(:cancel, _('Cancel'),
-      { :update => "select-categories",
-        :url => { :action => 'update_categories', :id => @object },
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :id => 'cancel-category-button') %>
-  </strong>
-<% else %>
-  <h3 class="box-title"><%= _('Select a category:') %></h3>
 <% end %>
-<% if !@categories.empty? %>
-  <h3><%= _('Categories:') %></h3>
-  <% @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)}.each do |category| %>
-    <%= link_to_remote category.name,
-      { :update => "select-categories",
-        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :class => 'select-subcategory-link',
-      :id => "select-category-#{category.id}-link"
-    %>
-  <% end %> &nbsp;
-<% end %>
+<div class="toplevel-categories">
+  <%= render :partial => 'shared/select_subcategories', :locals => {:object_name => object_name, :categories => @categories} %>
 </div>
@@ -0,0 +1,26 @@
+<% categories_selected ||= nil %>
+<% title ||= nil %>
+
+<% extend CategoriesHelper %>
+
+<%= content_tag "h#{title_size}", title, :class => "box-title" %>
+
+<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
+
+<div id="category-ajax-selector">
+<% unless categories_selected.nil? %>
+<div id="selected-categories">
+  <div class="label"><%= _('Selected categories:') %></div>
+  <% categories_selected.each do |cat| %>
+    <div id="selected-category-<%= cat.id %>">
+      <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
+      <%= selected_category_link(cat) %>
+    </div>
+  <% end %>
+</div>
+<% end %>
+<div id="select-categories">
+  <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
+</div>
+
+</div>
@@ -0,0 +1,16 @@
+<% if !categories.nil? && !categories.empty? && !@object.nil? %>
+  <hr>
+  <div class="category-helper-label"><%= _('Click to select a category') %></div>
+
+  <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
+
+    <%= link_to_remote category.name,
+      { :update => "select-categories",
+        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :class => 'select-subcategory-link',
+      :id => "select-category-#{category.id}-link"
+    %>
+  <% end %>
+<% end %>
@@ -19,16 +19,17 @@
       <td class='actions'>
         <div class="members-buttons-cell">
           <% if p.is_admin? %>
-            <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'reset-admin-role', _('Reset admin role'), {:action => 'reset_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to reset this user as administrator?") %>
           <% else %>
-            <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'set-admin-role', _('Set admin role'), {:action => 'set_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to set this user as administrator?") %>
           <% end %>
           <% if !p.user.activated? %>
-            <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'activate-user', _('Activate user'), {:action => 'activate', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to activate this user?") %>
           <% else %>
-            <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'deactivate-user', _('Deactivate user'), {:action => 'deactivate', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to deactivate this user?") %>
           <% end %>
-        </div>
+          <%= button_without_text :'delete', _('Remove'), {:action => :destroy_user, :id => p, :q => @q}, :method => :post, :filter => @filter, :confirm => _("Do you want to remove this user?") %>
+       </div>
       </td>
     </tr>
   <% end %>
+noosfero (0.46.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 07 Mar 2014 10:33:11 +0000
+
 noosfero (0.46.0) unstable; urgency=low
   * New features release
@@ -0,0 +1,76 @@
+Feature: check all manage fields
+  As an administrator
+  I want to check and uncheck all person, enterprise and community's fields
+
+  Background:
+    Given the following users
+      | login      | name        |
+      | mariasilva | Maria Silva |
+    And the following enterprises
+      | identifier   | owner      | name         | contact_email               | contact_phone  | enabled |
+      | paper-street | mariasilva | Paper Street | marial.silva@workerbees.org | (288) 555-0153 | true    |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And I am logged in as admin
+    And I go to /admin/features/manage_fields
+
+  @selenium
+  Scenario: check all active person fields
+    Given I follow "Person's fields"
+    And I check "person_active"
+    And I press "save_person_fields"
+    When I go to admin_user's control panel
+    And I follow "Edit Profile"
+    Then I should see "Custom area of study"
+
+  @selenium
+  Scenario: check all active enterprise fields
+    Given I follow "Enterprise's fields"
+    And I check "enterprise_active"
+    And I press "save_enterprise_fields"
+    When I go to paper-street's control panel
+    And I follow "Enterprise Info and settings"
+    Then I should see "Historic and current context"
+
+  @selenium
+  Scenario: check all active community fields
+    Given I follow "Community's fields"
+    And I check "community_active"
+    And I press "save_community_fields"
+    When I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    Then I should see "Economic activity"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active person field
+    Given I follow "Person's fields"
+    And I check "person_active"
+    And I press "save_person_fields"
+    And I uncheck "person_active"
+    And I press "save_person_fields"
+    And I follow "Control panel"
+    When I follow "Edit Profile"
+    Then I should not see "Custom area of study"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active community field
+    Given I follow "Community's fields"
+    And I check "community_active"
+    And I press "save_community_fields"
+    And I uncheck "community_active"
+    And I press "save_community_fields"
+    When I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    Then I should not see "Economic activity"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active enterprise field
+    Given I follow "Enterprise's fields"
+    And I check "enterprise_active"
+    And I press "save_enterprise_fields"
+    And I uncheck "enterprise_active"
+    And I press "save_enterprise_fields"
+    When I go to paper-street's control panel
+    And I follow "Enterprise Info and settings"
+    Then I should not see "Historic and current context"
@@ -0,0 +1,47 @@
+Feature: manage users
+  As an environment administrator
+  I want to manage users
+  In order to remove, activate, deactivate users, and set admin roles.
+
+Background:
+  Given the following users
+    | login       | name         |
+    | joaosilva   | Joao Silva   |
+    | paulosantos | Paulo Santos |
+  Given I am logged in as admin
+  Given I go to /admin/users
+
+  @selenium
+  Scenario: deactive user
+    When I follow "Deactivate user" within "tr[title='Joao Silva']"
+    And I confirm the "Do you want to deactivate this user?" dialog
+    Then I should see "Activate user" within "tr[title='Joao Silva']"
+
+  @selenium
+  Scenario: activate user
+    Given I follow "Deactivate user" within "tr[title='Paulo Santos']"
+    Given I confirm the "Do you want to deactivate this user?" dialog
+    When I follow "Activate user" within "tr[title='Paulo Santos']"
+    And I confirm the "Do you want to activate this user?" dialog
+    Then I should see "Deactivate user" within "tr[title='Paulo Santos']"
+
+  @selenium
+  Scenario: remove user
+    When I follow "Remove" within "tr[title='Joao Silva']"
+    And I confirm the "Do you want to remove this user?" dialog
+    And I go to /admin/users
+    Then I should not see "Joao Silva"
+
+  @selenium
+  Scenario: admin user
+    When I follow "Set admin role" within "tr[title='Joao Silva']"
+    And I confirm the "Do you want to set this user as administrator?" dialog
+    Then I should see "Reset admin role" within "tr[title='Joao Silva']"
+
+  @selenium
+  Scenario: unadmin user
+    Given I follow "Set admin role" within "tr[title='Paulo Santos']"
+    And I confirm the "Do you want to set this user as administrator?" dialog
+    When I follow "Reset admin role" within "tr[title='Paulo Santos']"
+    And I confirm the "Do you want to reset this user as administrator?" dialog
+    Then I should see "Set admin role" within "tr[title='Paulo Santos']"
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.46.0'
+  VERSION = '0.46.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
 require 'noosfero/core_ext/string'
 require 'noosfero/core_ext/integer'
+require 'noosfero/core_ext/array'
 require 'noosfero/core_ext/object'
 require 'noosfero/core_ext/active_record'
@@ -0,0 +1,9 @@
+class Array
+
+  def uniq_by
+    hash, array = {}, []
+    each { |i| hash[yield(i)] ||= (array << i) }
+    array
+  end
+
+end
@@ -349,6 +349,12 @@ class Noosfero::Plugin
     []
   end
+  # -> Adds adicional content to article
+  # returns = lambda block that creates html code
+  def article_extra_contents(article)
+    nil
+  end
+
   # -> Adds fields to the signup form
   # returns = lambda block that creates html code
   def signup_extra_contents
@@ -15,12 +15,16 @@ Dir.glob(File.join(Rails.root, plugins_root, &#39;*&#39;, &#39;controllers&#39;)) do |controller
   controllers_by_folder.each do |folder, controllers|
     controllers.each do |controller|
       controller_name = controller.gsub("#{plugin_name}_plugin_",'')
-      map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller
+      if %w[profile myprofile].include?(folder)
+        map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller, :profile => /#{Noosfero.identifier_format}/
+      else
+        map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller
+      end
     end
   end
   map.connect 'plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin'
-  map.connect 'profile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile'
-  map.connect 'myprofile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_myprofile'
+  map.connect 'profile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile', :profile => /#{Noosfero.identifier_format}/
+  map.connect 'myprofile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_myprofile', :profile => /#{Noosfero.identifier_format}/
   map.connect 'admin/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_admin'
 end
@@ -0,0 +1,19 @@
+README - Comment Classification Plugin
+======================================
+
+This plugin creates the structure for classifying the comments. The
+initial idea of this plugin is to support the management of public
+consulting, but it can be used in different contexts.
+For now, two kind of classification will be available:
+
+  * Label: when creating a comment, the user identify the kind of it by
+choosing the label of the comment. Example: "Suggestion",
+"Disagreement"...
+  * Status: users with permission can include a Status for a comment.
+Example: "Merged", "Unmerged"
+
+Dependency
+==========
+
+This plugin was developed to help public consulting and needs the
+CommentGroupPlugin enabled to be used.
@@ -0,0 +1,55 @@
+class CommentClassificationPluginLabelsController < AdminController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+
+  def index
+#    @labels = @environment.labels
+    @labels = CommentClassificationPlugin::Label.all
+  end
+
+  def create
+    @label = CommentClassificationPlugin::Label.new(params[:label])
+    @colors = CommentClassificationPlugin::Label::COLORS
+    if request.post?
+      begin
+        @label.owner = environment
+        @label.save!
+        session[:notice] = _('Label created')
+        redirect_to :action => 'index'
+      rescue
+        session[:notice] = _('Label could not be created')
+      end
+    end
+  end
+
+  def edit
+#    @labels = @environment.labels.find(params[:id])
+    @label = CommentClassificationPlugin::Label.find(params[:id])
+    @colors = CommentClassificationPlugin::Label::COLORS
+    if request.post?
+      begin
+        @label.update_attributes!(params[:label])
+        session[:notice] = _('Label updated')
+        redirect_to :action => :index
+      rescue
+        session[:notice] = _('Failed to edit label')
+      end
+    end
+  end
+
+  def remove
+#    @label = environment.labels.find(params[:label])
+    @label = CommentClassificationPlugin::Label.find(params[:id])
+    if request.post?
+      begin
+        @label.destroy
+        session[:notice] = _('Label removed')
+      rescue
+        session[:notice] = _('Label could not be removed')
+      end
+    else
+      session[:notice] = _('Label could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+end
@@ -0,0 +1,53 @@
+class CommentClassificationPluginStatusController < AdminController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+
+  def index
+#    @labels = @environment.labels
+    @status = CommentClassificationPlugin::Status.all
+  end
+
+  def create
+    @status = CommentClassificationPlugin::Status.new(params[:status])
+    if request.post?
+      begin
+        @status.owner = environment
+        @status.save!
+        session[:notice] = _('Status created')
+        redirect_to :action => 'index'
+      rescue
+        session[:notice] = _('Status could not be created')
+      end
+    end
+  end
+
+  def edit
+#    @labels = @environment.labels.find(params[:id])
+    @status = CommentClassificationPlugin::Status.find(params[:id])
+    if request.post?
+      begin
+        @status.update_attributes!(params[:status])
+        session[:notice] = _('Status updated')
+        redirect_to :action => :index
+      rescue
+        session[:notice] = _('Failed to edit status')
+      end
+    end
+  end
+
+  def remove
+#    @label = environment.labels.find(params[:label])
+    @status = CommentClassificationPlugin::Status.find(params[:id])
+    if request.post?
+      begin
+        @status.destroy
+        session[:notice] = _('Status removed')
+      rescue
+        session[:notice] = _('Status could not be removed')
+      end
+    else
+      session[:notice] = _('Status could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+end
@@ -0,0 +1,7 @@
+class CommentClassificationPluginAdminController < AdminController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def index
+  end
+
+end
@@ -0,0 +1,26 @@
+class CommentClassificationPluginMyprofileController < MyProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  before_filter :organizations_only
+  protect 'moderate_comments', :profile
+
+  def index
+    @comments = Comment.all
+  end
+
+  def add_status
+    @comment = Comment.find(params[:id])
+    @statuses = CommentClassificationPlugin::Status.enabled
+    @status = CommentClassificationPlugin::CommentStatusUser.new(:profile => user, :comment => @comment)
+    if request.post? && params[:status]
+      @status.update_attributes(params[:status])
+      @status.save
+    end
+  end
+
+  private
+
+  def organizations_only
+    render_not_found if !profile.organization?
+  end
+end
@@ -0,0 +1,16 @@
+class CreateCommentsLabels < ActiveRecord::Migration
+  def self.up
+    create_table :comment_classification_plugin_labels do |t|
+      t.string      :name
+      t.string      :color
+      t.boolean     :enabled, :default => true
+      t.references  :owner, :polymorphic => true
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :comment_classification_plugin_labels
+  end
+end
@@ -0,0 +1,16 @@
+class CreateCommentLabelUser < ActiveRecord::Migration
+  def self.up
+    create_table :comment_classification_plugin_comment_label_user do |t|
+      t.references  :profile
+      t.references  :comment
+      t.references  :label
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :comment_classification_plugin_comment_label_user
+  end
+end
@@ -0,0 +1,16 @@
+class CreateCommentStatus < ActiveRecord::Migration
+  def self.up
+    create_table :comment_classification_plugin_statuses do |t|
+      t.string      :name
+      t.boolean     :enabled, :default => true
+      t.boolean     :enable_reason, :default => true
+      t.references  :owner, :polymorphic => true
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :comment_classification_plugin_statuses
+  end
+end
@@ -0,0 +1,16 @@
+class CreateCommentStatusUser < ActiveRecord::Migration
+  def self.up
+    create_table :comment_classification_plugin_comment_status_user do |t|
+      t.references  :profile
+      t.references  :comment
+      t.references  :status
+      t.text        :reason
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :comment_classification_plugin_comment_status_user
+  end
+end
@@ -0,0 +1,64 @@
+Feature:
+  As a user
+  I want to add label for comments
+
+Background:
+  Given the following users
+    | login      |  name       |
+    | joaosilva  | Joao Silva  |
+    | mariasilva | Maria Silva |
+  And the following communities
+    | identifier       | name             |
+    | sample-community | Sample Community |
+  And the following articles
+    | owner            | name               | body       |
+    | sample-community | Article to comment | First post |
+  And CommentClassificationPlugin is enabled
+  And "Maria Silva" is a member of "Sample Community"
+  And "Joao Silva" is admin of "Sample Community"
+  And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: dont display labels if admin did not configure status
+    Given I am on article "Article to comment"
+    And I follow "Post a comment"
+    Then I should not see "Label" within "#page-comment-form"
+
+  Scenario: admin configure labels
+    Given I am logged in as "admin_user"
+    And I am on the environment control panel
+    And I follow "Plugins"
+    And I follow "Configuration"
+    And I follow "Manage Labels"
+    Then I should see "no label registered yet" within "#comment-classification-labels"
+    When I follow "Add a new label"
+    And I fill in "Name" with "Question"
+    And I check "Enable this label"
+    And I press "Save"
+    Then I should see "Question" within "#comment-classification-labels"
+
+  @selenium
+  Scenario: save label for comment
+    Given the following labels
+      | owner       | name     | enabled |
+      | environment | Addition | true    |
+    And I go to article "Article to comment"
+    And I follow "Post a comment"
+    And I fill in "Enter your comment" with "Hey ho, let's go!"
+    Then I select "Addition" from "comment_label_id"
+    And I press "Post comment"
+    Then I should see "Addition" within ".comment-details"
+
+  @selenium
+  Scenario: users without permission should not edit the labels
+    Given the following labels
+      | owner       | name     | enabled |
+      | environment | Addition | true    |
+    And I go to article "Article to comment"
+    And I follow "Post a comment"
+    Then I should see "Label" within "#page-comment-form"
+    And I should see "Addition" within "#comment_label_id"
+    When I am not logged in
+    And I am on article "Article to comment"
+    And I follow "Post a comment"
+    Then I should not see "Label" within "#page-comment-form"
@@ -0,0 +1,67 @@
+Feature:
+  As a user
+  I want to add status for comments
+
+Background:
+  Given the following users
+    | login      |  name       |
+    | joaosilva  | Joao Silva  |
+    | mariasilva | Maria Silva |
+  And the following communities
+    | identifier       | name             |
+    | sample-community | Sample Community |
+  And the following articles
+    | owner            | name               | body       |
+    | sample-community | Article to comment | First post |
+    And the following comments
+      | article            | author     | body        |
+      | Article to comment | mariasilva | great post! |
+  And CommentClassificationPlugin is enabled
+  And "Maria Silva" is a member of "Sample Community"
+  And "Joao Silva" is admin of "Sample Community"
+  And I am logged in as "joaosilva"
+
+  Scenario: dont display to add status if not an organization
+    Given the following articles
+      | owner     | name                        | body       |
+      | joaosilva | Article on a person profile | First post |
+    And the following comments
+      | article                     | author     | body        |
+      | Article on a person profile | mariasilva | great post! |
+    Given I am on article "Article on a person profile"
+    Then I should see "great post!" within ".comment-details"
+    And I should not see "Status" within ".comment-details"
+
+  Scenario: dont display to add status if admin did not configure status
+    Given I am on article "Article to comment"
+    Then I should see "great post!" within ".comment-details"
+    And I should not see "Status" within ".comment-details"
+
+  Scenario: admin configure status
+    Given I am logged in as "admin_user"
+    And I am on the environment control panel
+    And I follow "Plugins"
+    And I follow "Configuration"
+    And I follow "Manage Status"
+    Then I should see "no status registered yet" within "#comment-classification-status"
+    When I follow "Add a new status"
+    And I fill in "Name" with "Merged"
+    And I check "Enable this status"
+    And I press "Save"
+    Then I should see "Merged" within "#comment-classification-status"
+
+  Scenario: save status for comment
+    Given the following status
+      | owner       | name   | enabled |
+      | environment | Merged | true    |
+    And I go to article "Article to comment"
+    And I follow "Status"
+    Then I select "Merged" from "status_status_id"
+    And I press "Save"
+    Then I should see "added the status Merged" within "#comment-classification-status-list"
+
+  Scenario: dont display to add status if user not allowed
+    Given I am logged in as "mariasilva"
+    When I go to article "Article to comment"
+    Then I should see "great post!" within ".comment-details"
+    And I should not see "Status" within ".comment-details"
@@ -0,0 +1,24 @@
+Given /^CommentClassificationPlugin is enabled$/ do
+  Given %{I am logged in as admin}
+  And %{I am on the environment control panel}
+  And %{I follow "Plugins"}
+  And %{I check "Comment Classification"}
+  And %{I press "Save changes"}
+  Environment.default.enabled_plugins.should include("CommentClassificationPlugin")
+end
+
+Given /^the following labels$/ do |table|
+  table.hashes.map{|item| item.dup}.each do |item|
+    owner_type = item.delete('owner')
+    owner = owner_type == 'environment' ? Environment.default : Profile[owner_type]
+    CommentClassificationPlugin::Label.create!(item)
+  end
+end
+
+Given /^the following status$/ do |table|
+  table.hashes.map{|item| item.dup}.each do |item|
+    owner_type = item.delete('owner')
+    owner = owner_type == 'environment' ? Environment.default : Profile[owner_type]
+    CommentClassificationPlugin::Status.create!(item)
+  end
+end
@@ -0,0 +1,57 @@
+require 'ext/environment'
+require 'ext/comment'
+
+class CommentClassificationPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Comment Classification"
+  end
+
+  def self.plugin_description
+    _("A plugin that allow classification of comments.")
+  end
+
+#TODO Each organization can add its own status and labels
+#  def control_panel_buttons
+#    if context.profile.organization?
+#      { :title => _('Manage comment classification'), :icon => 'comment_classification', :url => {:controller => 'comment_classification_plugin_myprofile'} }
+#    end
+#  end
+
+  def comment_form_extra_contents(args)
+    comment = args[:comment]
+    lambda {
+      render :file => 'comment/comments_labels_select.rhtml', :locals => {:comment => comment }
+    }
+  end
+
+  def comment_extra_contents(args)
+    comment = args[:comment]
+    lambda {
+      render :file => 'comment/comment_extra.rhtml', :locals => {:comment => comment}
+    }
+  end
+
+  def process_extra_comment_params(args)
+    comment = Comment.find args[0]
+    label_id = args[1][:comment_label_id]
+    if label_id.blank?
+      if !CommentClassificationPlugin::CommentLabelUser.find_by_comment_id(comment.id).nil?
+        CommentClassificationPlugin::CommentLabelUser.find_by_comment_id(comment.id).destroy
+      end
+    else
+      label = CommentClassificationPlugin::Label.find label_id
+      relation = CommentClassificationPlugin::CommentLabelUser.new(:profile => comment.author, :comment => comment, :label => label )
+      relation.save
+    end
+  end
+
+ def js_files
+    'comment_classification.js'
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,11 @@
+class CommentClassificationPlugin::CommentLabelUser < Noosfero::Plugin::ActiveRecord
+  set_table_name :comment_classification_plugin_comment_label_user
+
+  belongs_to :profile
+  belongs_to :comment
+  belongs_to :label, :class_name => 'CommentClassificationPlugin::Label'
+
+  validates_presence_of :profile
+  validates_presence_of :comment
+  validates_presence_of :label
+end
@@ -0,0 +1,11 @@
+class CommentClassificationPlugin::CommentStatusUser < Noosfero::Plugin::ActiveRecord
+  set_table_name :comment_classification_plugin_comment_status_user
+
+  belongs_to :profile
+  belongs_to :comment
+  belongs_to :status, :class_name => 'CommentClassificationPlugin::Status'
+
+  validates_presence_of :profile
+  validates_presence_of :comment
+  validates_presence_of :status
+end
@@ -0,0 +1,10 @@
+class CommentClassificationPlugin::Label < Noosfero::Plugin::ActiveRecord
+
+  belongs_to :owner, :polymorphic => true
+
+  validates_presence_of :name
+
+  named_scope :enabled, :conditions => { :enabled => true }
+
+  COLORS = ['red', 'green', 'yellow', 'gray', 'blue']
+end
@@ -0,0 +1,8 @@
+class CommentClassificationPlugin::Status < Noosfero::Plugin::ActiveRecord
+
+  belongs_to :owner, :polymorphic => true
+
+  validates_presence_of :name
+
+  named_scope :enabled, :conditions => { :enabled => true }
+end
@@ -0,0 +1,13 @@
+require_dependency 'comment'
+require 'comment_classification_plugin.rb'
+require 'comment_classification_plugin/label.rb'
+
+class Comment
+
+  has_one :comment_classification_plugin_comment_label_user, :class_name => 'CommentClassificationPlugin::CommentLabelUser'
+  has_one :label, :through => :comment_classification_plugin_comment_label_user, :foreign_key => 'label_id'
+
+  has_many :comment_classification_plugin_comment_status_users, :class_name => 'CommentClassificationPlugin::CommentStatusUser'
+  has_many :statuses, :through => :comment_classification_plugin_comment_status_users, :foreign_key => 'status_id'
+
+end
@@ -0,0 +1,8 @@
+require_dependency 'environment'
+
+class Environment
+
+  has_many :labels, :as => :owner, :class_name => 'CommentClassificationPlugin::Label'
+
+end
+
@@ -0,0 +1,12 @@
+.controller-profile_editor .control-panel a.control-panel-comment_classification {
+  background-image: url(images/comment-classification.png);
+}
+
+#content .comment-classification-options .label-name {
+  font-style: italic;
+}
+
+#content .comment-classification-options a.button {
+  background-color: transparent;
+  border: none;
+}
@@ -0,0 +1,17 @@
+<div class='comment-classification-options'>
+
+  <% unless comment.label.nil? %>
+    <p class='label-name' style='color:<%= comment.label.color %>'>
+      <%= comment.label.name %>
+    </p>
+  <% end %>
+
+  <% statuses = CommentClassificationPlugin::Status.enabled %>
+  <% if profile.organization? && user && user.has_permission?(:moderate_comments, profile) && !statuses.empty? %>
+    <div class='comment-classification-status'>
+      <%= link_to(_('Status'), :profile => profile.identifier, :controller => :comment_classification_plugin_myprofile, :action => :add_status, :id => comment.id)
+    %>
+    </div>
+  <% end %>
+
+</div>
@@ -0,0 +1,4 @@
+<% labels = CommentClassificationPlugin::Label.enabled  %>
+<% if logged_in? && user.has_permission?(:moderate_comments, profile) && !labels.empty? %>
+  <%= labelled_form_field(_('Label'), select_tag('comment_label_id', options_for_select( [[_('[Select ...]'), nil]] + labels.map{|l|[l.name,l.id]}, @comment.label.nil? ? '' : @comment.label.id)))  %>
+<% end %>
@@ -0,0 +1,6 @@
+<h1><%= _('Comments classification options')%></h1>
+
+<ul>
+  <li><%= link_to _('Manage Labels'), :controller => 'comment_classification_plugin_labels' %></li>
+  <li><%= link_to _('Manage Status'), :controller => 'comment_classification_plugin_status' %></li>
+</ul>
@@ -0,0 +1,13 @@
+<%= error_messages_for :label %>
+
+<% form_for :label, @label do |f| %>
+  <%= required_fields_message %>
+
+  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
+  <%= labelled_form_field(_('Color'), f.select(:color, @colors.map{|s|[s.capitalize,s]}))  %>
+  <%= labelled_form_field(f.check_box(:enabled) + _('Enable this label?'),'') %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Add a new label") %> </h2>
+
+<%= render :partial => 'form' %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Editing label %s") % @label.name %> </h2>
+
+<%= render :partial => 'form' %>
@@ -0,0 +1,32 @@
+<h1><%= _("Manage comments labels") %></h1>
+
+<div id='comment-classification-labels'>
+  <% if @labels.empty? %>
+    <%= _('(no label registered yet)') %>
+  <% else %>
+    <table>
+      <tr>
+        <th><%= _('Label') %></th>
+        <th><%= _('Color') %></th>
+        <th><%= _('Enabled') %></th>
+        <th><%= _('Actions') %></th>
+      </tr>
+      <% @labels.each do |label| %>
+        <tr>
+          <td><%= label.name %></td>
+          <td><%= label.color %></td>
+          <td><%= label.enabled %></td>
+          <td>
+            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => label} %>
+            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => label}, :confirm => _('Are you sure you want to  remove this label?') %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+
+  <% button_bar do %>
+    <%= button(:add, _('Add a new label'), :action => 'create')%>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+  <% end %>
+</div>
@@ -0,0 +1,12 @@
+<%= error_messages_for :status %>
+
+<% form_for :status, @status do |f| %>
+  <%= required_fields_message %>
+
+  <%= labelled_form_field(_('Status'), f.select(:status_id, @statuses.map{|s|[s.name,s.id]}))  %>
+  <%= labelled_form_field(_('Reason:'), f.text_area(:reason, :rows => 5)) %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save') ) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,27 @@
+<h1><%= _('Status for comment') %></h1>
+
+<div id='comment-classification-status-list'>
+  <% unless @comment.title.blank? %>
+    <div class='comment-title'><%= _("Title: %s") % @comment.title %></div>
+  <% end %>
+
+  <b><%= _('Body:') %></b>
+  <p><%= @comment.body %></p>
+
+  <h2> <%= _("History") %> </h2>
+
+    <ul>
+    <% @comment.comment_classification_plugin_comment_status_users.each do |relation| %>
+      <li>
+        <%= _("<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</i>.") % { :user => relation.profile.name, :status_name => relation.status.name, :created_at => time_ago_as_sentence(relation.created_at)} %>
+        <% unless relation.reason.blank? %>
+          <p><%= _("<i>Reason:</i> %s") % relation.reason %></p>
+        <% end %>
+      </li>
+    <% end %>
+    </ul>
+
+  <h2> <%= _("Add a new status") %> </h2>
+
+  <%= render :partial => 'status_form' %>
+</div>
@@ -0,0 +1,3 @@
+<h1><%= _('Manage comment classification') %></h1>
+
+List all classifications
@@ -0,0 +1,13 @@
+<%= error_messages_for :status %>
+
+<% form_for :status, @status do |f| %>
+  <%= required_fields_message %>
+
+  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
+  <%= labelled_form_field(f.check_box(:enabled) + _('Enable this status?'),'') %>
+  <%#= labelled_form_field(f.check_box(:enable_reason) + _('This status allows reason?'),'') %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Add a new status") %> </h2>
+
+<%= render :partial => 'form' %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Editing status %s") % @status.name %> </h2>
+
+<%= render :partial => 'form' %>
@@ -0,0 +1,32 @@
+<h1> <%= _("Manage comments status") %></h1>
+
+<div id='comment-classification-status'>
+  <% if @status.empty? %>
+    <%= _('(no status registered yet)') %>
+  <% else %>
+    <table>
+      <tr>
+        <th><%= _('Status') %></th>
+        <th><%= _('Enabled') %></th>
+        <th><%= _('Reason enabled?') %></th>
+        <th><%= _('Actions') %></th>
+      </tr>
+      <% @status.each do |st| %>
+        <tr>
+          <td><%= st.name %></td>
+          <td><%= st.enabled %></td>
+          <td><%= st.enable_reason %></td>
+          <td>
+            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => st} %>
+            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => st}, :confirm => _('Are you sure you want to remove this status?') %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+
+  <% button_bar do %>
+    <%= button(:add, _('Add a new status'), :action => 'create')%>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+  <% end %>
+</div>
@@ -16,4 +16,8 @@ class ContainerBlockPlugin &lt; Noosfero::Plugin
     true
   end
+  def js_files
+    'container_block.js'
+  end
+
 end
@@ -7,6 +7,16 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   settings_items :container_box_id, :type => Integer, :default => nil
   settings_items :children_settings, :type => Hash, :default => {}
+  validate :no_cyclical_reference, :if => 'container_box_id.present?'
+
+  def no_cyclical_reference
+    errors.add(:box_id, _('cyclical reference is not allowed.')) if box_id == container_box_id
+  end
+
+  before_save do |b|
+    raise "cyclical reference is not allowed" if b.box_id == b.container_box_id && !b.container_box_id.blank?
+  end
+
   def self.description
     _('Container')
   end
@@ -15,6 +25,10 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
     _('This block acts as a container for another blocks')
   end
+  def cacheable?
+    false
+  end
+
   def layout_template
     nil
   end
@@ -24,8 +38,9 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   end
   def create_box
-    box = Box.create!(:owner => owner)
-    settings[:container_box_id] = box.id
+    container_box = Box.create!(:owner => owner)
+    container_box.update_attribute(:position, nil)
+    settings[:container_box_id] = container_box.id
     save!
   end
@@ -0,0 +1,28 @@
+function enableMoveContainerChildren(container, box) {
+  var div = jQuery('#box-'+box+' > .block-outer > .block');
+  if(!div.is('.ui-resizable')) {
+    div.resizable({
+      handles: 'e, w',
+      containment: '#block-'+container+' .block-inner-2',
+      resize: function( event, ui ) {
+        ui.element.height('auto');
+      }
+    });
+  }
+}
+
+function disableMoveContainerChildren(container, box) {
+  var div = jQuery('#box-'+box+' > .block-outer > .block');
+  if(div.is('.ui-resizable')) {
+    div.resizable('destroy');
+  }
+}
+
+function containerChildrenWidth(container, box) {
+  widths = "";
+  jQuery('#box-'+box+' > .block-outer > .block').each(function(i) {
+    childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
+    widths+=childId+","+jQuery(this).width()+"|";
+  });
+  return "widths="+widths;
+}
+#box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar {
+  height: 22px;
+  padding-bottom: 0px;
+  width: auto;
+}
+
 #content .boxes .container-block-plugin_container-block .container_block_child, .container-block-plugin_container-block .block-outer {
   display: inline-block;
   vertical-align: top;
@@ -17,14 +23,10 @@
   background-image: url(/designs/icons/default/Tango/16x16/actions/go-previous.png);
 }
-#content .boxes .container-block-plugin_container-block .block {
-  outline-offset: -2px;
-}
-
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-handle {
   width: 10px;
   height: 28px;
-  z-index: 0;
+  z-index: 1000;
 }
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-e {
@@ -37,6 +39,21 @@
   background-image: url(/plugins/container_block/images/handle_w.png);
 }
-.container-block-plugin_container-block .button-bar .icon-resize {
+.container-block-plugin_container-block .container-block-button-bar .icon-resize {
   background-image: url(/designs/icons/default/Tango/16x16/actions/view-fullscreen.png);
 }
+
+#box-organizer .block .container-block-button-bar {
+  right: 0px;
+  bottom: 0px;
+  height: auto;
+}
+
+#box-organizer .container-block-plugin_container-block:hover .block {
+  outline: 1px dashed black;
+  outline-offset: -1px;
+}
+
+.container-block-plugin_container-block .block-target {
+  background: #afd;
+}
@@ -31,6 +31,13 @@ class HomeControllerTest &lt; ActionController::TestCase
     assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }
   end
+  should 'display block title' do
+    @block.title = "Block Title"
+    @block.save!
+    get :index
+    assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }, :descendant => {:tag => 'h3', :attributes => { :class => "block-title"}, :content => @block.title }
+  end
+
   should 'display container children' do
     c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
     c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')
@@ -1,31 +0,0 @@
-require 'test_helper'
-
-class BlockTest < ActiveSupport::TestCase
-
-  def setup
-    @environment = fast_create(Environment)
-    @box = Box.create!(:owner => @environment)
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-  end
-
-  should 'return environment box if block owner is not a ContainerBlock' do
-    block = Block.create!(:box => @box)
-    assert_equal @box, block.box
-  end
-
-  should 'return container box if block owner is a ContainerBlock' do
-    block = Block.create!(:box => @container.container_box)
-    assert_equal @container.container_box, block.box
-  end
-
-  should 'return block owner if block onwer is not a ContainerBlock' do
-    block = Block.create!(:box => @box)
-    assert_equal @environment, block.owner
-  end
-
-  should 'return environment as owner if block onwer is a ContainerBlock' do
-    block = Block.create!(:box => @container.container_box)
-    assert_equal @environment, block.owner
-  end
-
-end
@@ -20,6 +20,11 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
     assert @block.container_box_id
   end
+  should 'created box should have nil as position' do
+    @block.save!
+    assert_equal nil, @block.container_box.position
+  end
+
   should 'return created box' do
     @block.save!
     assert @block.container_box
@@ -89,4 +94,27 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'not mess up with boxes positions when destroyed' do
+    env = fast_create(Environment)
+    box1 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 1)
+    box2 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 2)
+    box3 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 3)
+    block = ContainerBlockPlugin::ContainerBlock.create!(:box => box1)
+    block.destroy
+    assert_equal [1, 2, 3], [box1.reload.position, box2.reload.position, box3.reload.position]
+  end
+
+  should 'be able to change box' do
+    @block.save!
+    @block.box = Box.new(:owner => Environment.default)
+    @block.save!
+  end
+
+  should 'not able to change box to be the same as container_box' do
+    @block.save!
+    @block.box = @block.container_box
+    @block.save
+    assert @block.errors.invalid?(:box_id)
+  end
+
 end
@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class EnvironmentTest < ActiveSupport::TestCase
-
-  def setup
-    @environment = fast_create(Environment)
-
-    @box = Box.create!(:owner => @environment)
-    @block = Block.create!(:box => @box)
-
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-  end
-
-  should 'return blocks as usual' do
-    assert_equal [@block, @container], @environment.blocks
-  end
-
-  should 'return blocks with container children' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal [@block, @container, child], @environment.blocks
-  end
-
-  should 'return block with id at find method' do
-    assert_equal @block, @environment.blocks.find(@block.id)
-  end
-
-  should 'return child block with id at find method' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal child, @environment.blocks.find(child.id)
-  end
-
-end
@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class ProfileTest < ActiveSupport::TestCase
-
-  def setup
-    @profile = fast_create(Profile)
-
-    @box = Box.create!(:owner => @profile)
-    @block = Block.create!(:box => @box)
-
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-  end
-
-  should 'return blocks as usual' do
-    assert_equal [@block, @container], @profile.blocks
-  end
-
-  should 'return blocks with container children' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal [@block, @container, child], @profile.blocks
-  end
-
-  should 'return block with id at find method' do
-    assert_equal @block, @profile.blocks.find(@block.id)
-  end
-
-  should 'return child block with id at find method' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal child, @profile.blocks.find(child.id)
-  end
-
-end
 <% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>
 <% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
+<%= block_title(block.title) %>
 <div class="box" id="box-<%= block.container_box.id %>">
   <%= display_box_content(block.container_box, nil) %>
@@ -15,8 +16,18 @@
 </style>
 <% if edit_mode %>
-  <div class="button-bar">
-    <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
+
+  <script>
+    jQuery("#block-<%= block.id %>").hover(
+      function() {
+        enableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
+      }, function() {
+        disableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
+      }
+    );
+  </script>
+
+  <div class="container-block-button-bar button-bar">
     <%= link_to_remote '', :url => { :controller => @controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id }, 
                            :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})", 
     :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
@@ -24,37 +35,4 @@
                            :loaded => "close_loading();",
                            :complete => "display_notice(request.responseText);"%>
   </div>
-
-  <script>
-    function toggleMoveContainerChildren(container, box) {
-      var div = jQuery('#box-'+box+' > .block-outer > .block');
-      var targetDiv = jQuery('#box-'+box+' .block-outer .block-target');
-      if(div.is('.ui-resizable')) {
-        targetDiv.show();
-        div.find("a").die("click");
-        div.resizable('destroy');
-      } else {
-        targetDiv.hide();
-        div.find("a").live("click", function(e) {
-          e.preventDefault();
-        });
-        div.resizable({
-          handles: 'e, w',
-          containment: '#block-'+container+' .block-inner-2',
-          resize: function( event, ui ) {
-            ui.element.height('auto');
-          }
-        });
-      }
-    }
-
-    function containerChildrenWidth(container, box) {
-      widths = "";
-      jQuery('#box-'+box+' > .block-outer > .block').each(function(i) { 
-        childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
-        widths+=childId+","+jQuery(this).width()+"|";
-      });
-      return "widths="+widths;
-    }
-  </script>
 <% end %>
 <% if contents.total_pages > 1 %>
-  <%= link_to_remote(nil, :url => {:id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.previous_page, :article_id => article_id }, :html => {:class => "button icon-button icon-left #{contents.previous_page ? '':'disabled'}".strip}, :condition => "#{!contents.previous_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'left'});" )%>
-  <%= link_to_remote(nil, :url => {:id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.next_page, :article_id => article_id }, :html => {:class => "button icon-button icon-right #{contents.next_page ? '':'disabled'}".strip}, :condition => "#{!contents.next_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'right'});" )%>
+  <%= link_to_remote(nil, :url => {:profile => block.owner.identifier, :id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.previous_page, :article_id => article_id }, :html => {:class => "button icon-button icon-left #{contents.previous_page ? '':'disabled'}".strip}, :condition => "#{!contents.previous_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'left'});" )%>
+  <%= link_to_remote(nil, :url => {:profile => block.owner.identifier, :id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.next_page, :article_id => article_id }, :html => {:class => "button icon-button icon-right #{contents.next_page ? '':'disabled'}".strip}, :condition => "#{!contents.next_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'right'});" )%>
 <% end %>
@@ -61,9 +61,12 @@ class DisplayContentBlock &lt; Block
   VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum']
+  include Noosfero::Plugin::HotSpot
+
   def articles_of_parent(parent = nil)
     return [] if self.holder.nil?
-    holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)})
+    types = VALID_CONTENT + plugins.dispatch(:content_types).map(&:name)
+    holder.articles.find(:all, :conditions => {:type => types, :parent_id => (parent.nil? ? nil : parent)})
   end
   include ActionController::UrlWriter
@@ -238,6 +238,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.nodes= [a1.id, a2.id, a3.id]
     box = mock()
     box.stubs(:owner).returns(profile)
+    box.stubs(:environment).returns(Environment.default)
     block.stubs(:box).returns(box)
     assert_equal [], [a1, a2] - block.articles_of_parent
     assert_equal [], block.articles_of_parent - [a1, a2]
@@ -253,6 +254,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     box = mock()
     box.stubs(:owner).returns(profile)
+    box.stubs(:environment).returns(Environment.default)
     block.stubs(:box).returns(box)
     assert_equal [], [a3] - block.articles_of_parent(a2)
     assert_equal [], block.articles_of_parent(a2) - [a3]
@@ -270,6 +272,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(environment)
+    box.stubs(:environment).returns(Environment.default)
     environment.stubs(:portal_community).returns(profile)
     assert_equal [], [a1, a2] - block.articles_of_parent
@@ -288,6 +291,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(environment)
+    box.stubs(:environment).returns(Environment.default)
     environment.stubs(:portal_community).returns(profile)
     assert_equal [], [a3] - block.articles_of_parent(a2)
@@ -301,6 +305,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(environment)
+    box.stubs(:environment).returns(Environment.default)
     assert_equal [], block.articles_of_parent()
   end
@@ -316,6 +321,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
       block = DisplayContentBlock.new
       box = mock()
       box.stubs(:owner).returns(profile)
+      box.stubs(:environment).returns(Environment.default)
       block.stubs(:box).returns(box)
       assert_equal [], [a2] - block.articles_of_parent
       assert_equal [], block.articles_of_parent - [a2]
@@ -334,6 +340,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
       block = DisplayContentBlock.new
       box = mock()
       box.stubs(:owner).returns(profile)
+      box.stubs(:environment).returns(Environment.default)
       block.stubs(:box).returns(box)
       assert_equal [a1], block.articles_of_parent
     end
@@ -526,4 +533,28 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equivalent [f1.id, a1.id, a2.id, a3.id], block.nodes
   end
+  should "test should return plugins articles in articles of parent method" do
+    class PluginArticle < Article; end
+
+    class Plugin1 < Noosfero::Plugin
+      def content_types
+        [PluginArticle]
+      end
+    end
+
+    profile = create_user('testuser').person
+    Article.delete_all
+    a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)
+
+    env = fast_create(Environment)
+    env.enable_plugin(Plugin1)
+
+    block = DisplayContentBlock.new
+    box = mock()
+    box.stubs(:owner).returns(profile)
+    box.stubs(:environment).returns(env)
+    block.stubs(:box).returns(box)
+    assert_equal [a1], block.articles_of_parent
+  end
+
 end
@@ -0,0 +1,17 @@
+class MarkCommentAsReadPluginProfileController < ProfileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def mark_as_read
+    comment = Comment.find(params[:id])
+    comment.mark_as_read(user)
+    render :text => {'ok' => true}.to_json, :content_type => 'application/json'
+  end
+
+  def mark_as_not_read
+    comment = Comment.find(params[:id])
+    comment.mark_as_not_read(user)
+    render :text => {'ok' => true}.to_json, :content_type => 'application/json'
+  end
+
+end
@@ -0,0 +1,13 @@
+class CreateMarkCommentAsReadPlugin < ActiveRecord::Migration
+  def self.up
+    create_table :mark_comment_as_read_plugin do |t|
+      t.integer :comment_id
+      t.integer :person_id
+    end
+    add_index :mark_comment_as_read_plugin, [:comment_id, :person_id], :unique => true
+  end
+
+  def self.down
+    drop_table :mark_comment_as_read_plugin
+  end
+end
@@ -0,0 +1,45 @@
+require_dependency 'mark_comment_as_read_plugin/ext/comment'
+
+class MarkCommentAsReadPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "MarkCommentAsReadPlugin"
+  end
+
+  def self.plugin_description
+    _("Provide a button to mark a comment as read.")
+  end
+
+  def js_files
+    'mark_comment_as_read.js'
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def comment_actions(comment)
+    lambda do
+      [{:link => link_to_function(_('Mark as not read'), 'toggle_comment_read(this, %s, false);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_not_read', :id => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-not-read-#{comment.id}")},
+      {:link => link_to_function(_('Mark as read'), 'toggle_comment_read(this, %s, true);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_read', :id => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-read-#{comment.id}")}] if user
+    end
+  end
+
+  def check_comment_actions(comment)
+    lambda do
+      if user
+        comment.marked_as_read?(user) ? "#comment-action-mark-as-not-read-#{comment.id}" : "#comment-action-mark-as-read-#{comment.id}"
+      end
+    end
+  end
+
+  def article_extra_contents(article)
+    lambda do
+      if user
+        ids = article.comments.marked_as_read(user).collect { |comment| comment.id}
+        "<script type=\"text/javascript\">mark_comments_as_read(#{ids.to_json});</script>" if !ids.empty?
+      end
+    end
+  end
+
+end
@@ -0,0 +1,24 @@
+require_dependency 'comment'
+
+class Comment
+
+  has_many :read_comments, :class_name => 'MarkCommentAsReadPlugin::ReadComments'
+  has_many :people, :through => :read_comments
+
+  def mark_as_read(person)
+    people << person
+  end
+
+  def mark_as_not_read(person)
+    people.delete(person)
+  end
+
+  def marked_as_read?(person)
+    person && people.find(:first, :conditions => {:id => person.id})
+  end
+
+  def self.marked_as_read(person)
+    find(:all, :joins => [:read_comments], :conditions => {:author_id => person.id})
+  end
+
+end
@@ -0,0 +1,7 @@
+class MarkCommentAsReadPlugin::ReadComments < Noosfero::Plugin::ActiveRecord
+  set_table_name 'mark_comment_as_read_plugin'
+  belongs_to :comment
+  belongs_to :person
+
+  validates_presence_of :comment, :person
+end
@@ -0,0 +1,28 @@
+function mark_comments_as_read(comments) {
+  jQuery(document).ready(function($) {
+    for(var i=0; i<comments.length; i++) {
+      $comment = jQuery('#comment-'+comments[i]);
+      $comment.find('.comment-content').first().addClass('comment-mark-read');
+    }
+  });
+}
+
+function toggle_comment_read(button, url, mark) {
+  var $ = jQuery;
+  var $button = $(button);
+  $button.addClass('comment-button-loading');
+  $.post(url, function(data) {
+    if (data.ok) {
+      var $comment = $button.closest('.article-comment');
+      var $content = $comment.find('.comment-content').first();
+      if(mark)
+        $content.addClass('comment-mark-read');
+      else
+        $content.removeClass('comment-mark-read');
+      $button.hide();
+      $button.removeClass('comment-button-loading');
+      return;
+    }
+  });
+}
+
@@ -0,0 +1,3 @@
+.article-comments-list .comment-mark-read .comment-text, .article-comments-list .comment-mark-read h4, .article-comments-list .comment-mark-read .comment-picture {
+  opacity: 0.2;
+}
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/mark_comment_as_read_plugin_profile_controller'
+
+# Re-raise errors caught by the controller.
+class MarkCommentAsReadPluginProfileController; def rescue_action(e) raise e end; end
+
+class MarkCommentAsReadPluginProfileControllerTest < ActionController::TestCase
+  def setup
+    @controller = MarkCommentAsReadPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('profile').person
+    @article = TinyMceArticle.create!(:profile => @profile, :name => 'An article')
+    @comment = Comment.new(:source => @article, :author => @profile, :body => 'test')
+    @comment.save!
+    login_as(@profile.identifier)
+    environment = Environment.default
+    environment.enable_plugin(MarkCommentAsReadPlugin)
+    self.stubs(:user).returns(@profile)
+  end
+
+  attr_reader :profile, :comment
+
+  should 'mark comment as read' do
+    xhr :post, :mark_as_read, :profile => profile.identifier, :id => comment.id
+    assert_match /\{\"ok\":true\}/, @response.body
+  end
+
+  should 'mark comment as not read' do
+    xhr :post, :mark_as_not_read, :profile => profile.identifier, :id => comment.id
+    assert_match /\{\"ok\":true\}/, @response.body
+  end
+end
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase
+
+  def setup
+    @person = create_user('user').person
+    @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
+    @comment = Comment.create!(:title => 'title', :body => 'body', :author_id => @person.id, :source => @article)
+  end
+
+  should 'mark comment as read' do
+    assert !@comment.marked_as_read?(@person)
+    @comment.mark_as_read(@person)
+    assert @comment.marked_as_read?(@person)
+  end
+
+  should 'do not mark a comment as read again' do
+    @comment.mark_as_read(@person)
+    assert_raise ActiveRecord::StatementInvalid do
+      @comment.mark_as_read(@person)
+    end
+  end
+
+  should 'mark comment as not read' do
+    @comment.mark_as_read(@person)
+    assert @comment.marked_as_read?(@person)
+    @comment.mark_as_not_read(@person)
+    assert !@comment.marked_as_read?(@person)
+  end
+
+  should 'return comments marked as read for a user' do
+    person2 = create_user('user2').person
+    @comment.mark_as_read(@person)
+    assert_equal [], @article.comments.marked_as_read(@person) - [@comment]
+    assert_equal [], @article.comments.marked_as_read(person2)
+  end
+
+end
@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class MarkCommentAsReadPluginTest < ActiveSupport::TestCase
+
+  include ActionView::Helpers::TagHelper
+  include NoosferoTestHelper
+
+  def setup
+    @plugin = MarkCommentAsReadPlugin.new
+    @person = create_user('user').person
+    @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
+    @comment = Comment.create!(:source => @article, :author => @person, :body => 'test')
+    self.stubs(:user).returns(@person)
+    self.stubs(:profile).returns(@person)
+  end
+
+  attr_reader :plugin, :comment
+
+  should 'show link when person is logged in' do
+    action = @plugin.comment_actions(@comment)
+    link = self.instance_eval(&action)
+    assert link
+  end
+
+  should 'do not show link when person is not logged in' do
+    self.stubs(:user).returns(nil)
+    action = @plugin.comment_actions(@comment)
+    link = self.instance_eval(&action)
+    assert !link
+  end
+
+  should 'return actions when comment is not read' do
+    action = @plugin.comment_actions(@comment)
+    links = self.instance_eval(&action)
+    assert_equal 2, links.size
+  end
+
+  should 'return actions when comment is read' do
+    @comment.mark_as_read(@person)
+    action = @plugin.comment_actions(@comment)
+    links = self.instance_eval(&action)
+    assert_equal 2, links.size
+  end
+
+  should 'do not return any id when user is not logged in' do
+    self.stubs(:user).returns(nil)
+    action = @plugin.check_comment_actions(@comment)
+    id = self.instance_eval(&action)
+    assert !id
+  end
+
+  should 'return id of mark as not read link when comment is read' do
+    @comment.mark_as_read(@person)
+    action = @plugin.check_comment_actions(@comment)
+    id = self.instance_eval(&action)
+    assert_equal "#comment-action-mark-as-not-read-#{@comment.id}", id
+  end
+
+  should 'return id of mark as read link when comment is not read' do
+    action = @plugin.check_comment_actions(@comment)
+    id = self.instance_eval(&action)
+    assert_equal "#comment-action-mark-as-read-#{@comment.id}", id
+  end
+
+  should 'return javascript to mark comment as read' do
+    @comment.mark_as_read(@person)
+    content = @plugin.article_extra_contents(@article)
+    assert self.instance_eval(&content)
+  end
+
+  should 'do not return extra content if comment is not marked as read' do
+    content = @plugin.article_extra_contents(@article)
+    assert !self.instance_eval(&content)
+  end
+
+  should 'do not return extra content if user is not logged in' do
+    @comment.mark_as_read(@person)
+    self.stubs(:user).returns(nil)
+    content = @plugin.article_extra_contents(@article)
+    assert !self.instance_eval(&content)
+  end
+
+  def link_to_function(content, url, options = {})
+    link_to(content, url, options)
+  end
+
+end
 (function($) {
   $(window).bind('userDataLoaded', function(event, data) {
-    if (data.login || $('meta[name=profile.allow_unauthenticated_comments]').length > 0) {
+    if (data.login || $('meta[name="profile.allow_unauthenticated_comments"]').length > 0) {
       $('.post-comment-button').livequery(function() {
         $(this).show();
       });
@@ -8,7 +8,7 @@
         $(this).show();
       });
       $('.comment-footer').livequery(function() {
-        $(this).show();      
+        $(this).show();
       });
     }
   });
	@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController		@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController
70	else	70	else
71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)	71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
72	@side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])	72	@side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
73	- @boxes = boxes_holder.boxes	73	+ @boxes = boxes_holder.boxes.with_position
74	render :action => 'add_block', :layout => false	74	render :action => 'add_block', :layout => false
75	end	75	end
76	end	76	end
	@@ -2,7 +2,7 @@ class ProfileMembersController < MyProfileController		@@ -2,7 +2,7 @@ class ProfileMembersController < MyProfileController
2	protect 'manage_memberships', :profile	2	protect 'manage_memberships', :profile
3		3
4	def index	4	def index
5	- @members = profile.members	5	+ @members = profile.members_by_name
6	@member_role = environment.roles.find_by_name('member')	6	@member_role = environment.roles.find_by_name('member')
7	end	7	end
8		8
	@@ -12,7 +12,7 @@ class ThemesController < ApplicationController		@@ -12,7 +12,7 @@ class ThemesController < ApplicationController
12		12
13	def index	13	def index
14	@environment = environment	14	@environment = environment
15	- @themes = environment.themes + Theme.approved_themes(target)	15	+ @themes = (environment.themes + Theme.approved_themes(target)).sort_by { \|t\| t.name }
16		16
17	@current_theme = target.theme	17	@current_theme = target.theme
18		18
	@@ -608,49 +608,18 @@ module ApplicationHelper		@@ -608,49 +608,18 @@ module ApplicationHelper
608	end	608	end
609		609
610	attr_reader :environment	610	attr_reader :environment
		611	+
611	def select_categories(object_name, title=nil, title_size=4)	612	def select_categories(object_name, title=nil, title_size=4)
612	return nil if environment.enabled?(:disable_categories)	613	return nil if environment.enabled?(:disable_categories)
613	if title.nil?	614	if title.nil?
614	title = _('Categories')	615	title = _('Categories')
615	end	616	end
616		617
617	- object = instance_variable_get("@#{object_name}")
618	-
619	- result = content_tag 'h'+title_size.to_s(), title
620	- result << javascript_tag( 'function open_close_cat( link ) {
621	- var div = link.parentNode.getElementsByTagName("div")[0];
622	- var end = function(){
623	- if ( div.style.display == "none" ) {
624	- this.link.className="button icon-button icon-down"
625	- } else {
626	- this.link.className="button icon-button icon-up-red"
627	- }
628	- }
629	- Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
630	- }')
631	- environment.top_level_categories.select{\|i\| !i.children.empty?}.each do \|toplevel\|
632	- next unless object.accept_category?(toplevel)
633	- # FIXME
634	- ([toplevel] + toplevel.children_for_menu).each do \|cat\|
635	- if cat.top_level?
636	- result << '<div class="categorie_box">'.html_safe
637	- result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
638	- result << content_tag('h5', toplevel.name)
639	- result << '<div style="display:none"><ul class="categories">'.html_safe
640	- else
641	- checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+\|\//, '_')}"
642	- result << content_tag('li', labelled_check_box(
643	- cat.full_name_without_leading(1, " → "),
644	- "#{object_name}[category_ids][]", cat.id,
645	- object.category_ids.include?(cat.id), :id => checkbox_id,
646	- :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
647	- :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
648	- end
649	- end
650	- result << '</ul></div></div>'.html_safe
651	- end	618	+ @object = instance_variable_get("@#{object_name}")
		619	+ @categories = environment.top_level_categories
652		620
653	- content_tag('div', result)	621	+ @current_categories = environment.top_level_categories.select{\|i\| !i.children.empty?}
		622	+ render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
654	end	623	end
655		624
656	def theme_option(opt = nil)	625	def theme_option(opt = nil)
	@@ -39,7 +39,7 @@ module BoxesHelper		@@ -39,7 +39,7 @@ module BoxesHelper
39	end	39	end
40		40
41	def display_boxes(holder, main_content)	41	def display_boxes(holder, main_content)
42	- boxes = holder.boxes.first(holder.boxes_limit)	42	+ boxes = holder.boxes.with_position.first(holder.boxes_limit)
43	content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")	43	content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")
44	content = main_content if (content.blank?)	44	content = main_content if (content.blank?)
45		45
	@@ -48,4 +48,12 @@ module CategoriesHelper		@@ -48,4 +48,12 @@ module CategoriesHelper
48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))	48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
49	end	49	end
50		50
		51	+ #FIXME make this test
		52	+ def selected_category_link(cat)
		53	+ content_tag('div', button_to_function_without_text(:remove, _('Remove'), nil) {\|page\| page["selected-category-#{cat.id}"].remove} +
		54	+ link_to_function(cat.full_name(' → '), nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {\|page\| page["selected-category-#{cat.id}"].remove},
		55	+ :class => 'selected-category'
		56	+ )
		57	+ end
		58	+
51	end	59	end
	@@ -22,6 +22,12 @@ module CommentHelper		@@ -22,6 +22,12 @@ module CommentHelper
22	title	22	title
23	end	23	end
24		24
		25	+ def comment_extra_contents(comment)
		26	+ @plugins.dispatch(:comment_extra_contents, comment).collect do \|extra_content\|
		27	+ extra_content.kind_of?(Proc) ? self.instance_eval(&extra_content) : extra_content
		28	+ end.join('\n')
		29	+ end
		30	+
25	def comment_actions(comment)	31	def comment_actions(comment)
26	url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)	32	url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
27	links = links_for_comment_actions(comment)	33	links = links_for_comment_actions(comment)
	@@ -63,7 +63,7 @@ class LinkListBlock < Block		@@ -63,7 +63,7 @@ class LinkListBlock < Block
63	def link_html(link)	63	def link_html(link)
64	klass = 'icon-' + link[:icon] if link[:icon]	64	klass = 'icon-' + link[:icon] if link[:icon]
65	sanitize_link(	65	sanitize_link(
66	- link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)	66	+ link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
67	)	67	)
68	end	68	end
69		69
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16		16
17	<% if !user.nil? and user.has_permission?('edit_profile', profile) %>	17	<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
18	<div class='admin-link'>	18	<div class='admin-link'>
19	- <%= link_to _('Control panel'), :controller => 'profile_editor' %>	19	+ <%= link_to _('Control panel'), block.owner.admin_url %>
20	</div>	20	</div>
21	<% end %>	21	<% end %>
22		22
	@@ -21,7 +21,7 @@		@@ -21,7 +21,7 @@
21	<li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>	21	<li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
22	<% end %>	22	<% end %>
23	<% if !user.nil? and user.has_permission?('edit_profile', profile) %>	23	<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
24	- <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>	24	+ <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
25	<% end %>	25	<% end %>
26	<% if profile.person? %>	26	<% if profile.person? %>
27	<li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>	27	<li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
	@@ -40,7 +40,7 @@		@@ -40,7 +40,7 @@
40	<% end %>	40	<% end %>
41		41
42	<div class="profile-info-options">	42	<div class="profile-info-options">
43	- <%= render :file => view_for_profile_actions(@block.owner.class) %>	43	+ <%= render :file => view_for_profile_actions(block.owner.class) %>
44	</div>	44	</div>
45		45
46	</div><!-- end class="vcard" -->	46	</div><!-- end class="vcard" -->