Merge branch 'master' into AI2993-display_content_plugin_content

Joenio Costa
2 parents 08976954 040b05e2
Showing 125 changed files with 2581 additions and 366 deletions Show diff stats
INSTALL.md
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/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
@@ -23,7 +23,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or De
     # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
       libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
       libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
-      tango-icon-theme libnokogiri-ruby
+      tango-icon-theme
  
 On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages.
  
@@ -41,7 +41,6 @@ On other systems, they may or may not be available through your regular package 
 * Thin: http://code.macournoyer.com/thin
 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
 * Hpricot: http://hpricot.com
-* Nokogiri: http://nokogiri.org/
  
 If you manage to install Noosfero successfully on other systems than Debian,
 please feel free to contact the Noosfero development mailing with the
@@ -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)
@@ -1382,16 +1351,16 @@ module ApplicationHelper
   end
  
   def convert_macro(html, source)
-    doc = Nokogiri::HTML(html)
+    doc = Hpricot(html)
     #TODO This way is more efficient but do not support macro inside of
     #     macro. You must parse them from the inside-out in order to enable
     #     that.
-    doc.css('.macro').each do |macro|
+    doc.search('.macro').each do |macro|
       macro_name = macro['data-macro']
       result = @plugins.parse_macro(macro_name, macro, source)
-      macro.content = result.kind_of?(Proc) ? self.instance_eval(&result) : result
+      macro.inner_html = result.kind_of?(Proc) ? self.instance_eval(&result) : result
     end
-    CGI.unescapeHTML(doc.xpath('//body/*').to_s)
+    doc.html
   end
  
   def default_folder_for_image_upload(profile)
@@ -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
@@ -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,6 +75,13 @@
 </div>
 <% end %>
  
+<% if !@page.tags.empty? %>
+  <div id="article-tags">
+    <%= _("This article's tags:") %>
+    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
+  </div>
+<% end %>
+
 <%= display_source_info(@page) %>
  
 <div class="comments" id="comments_list">
-<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 %>
@@ -8,4 +8,3 @@ require &#39;route_if&#39;
  
 # third-party libraries
 require 'will_paginate'
-require 'nokogiri'
+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
@@ -41,7 +41,6 @@ Depends:
  thin,
  tango-icon-theme,
  libhpricot-ruby,
- libnokogiri-ruby,
  memcached,
  debconf,
  dbconfig-common,
@@ -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
@@ -33,9 +33,9 @@ class Noosfero::Plugin::Macro
   end
  
   def attributes(macro)
-    macro.attributes.
+    macro.attributes.to_hash.
       select {|key, value| key[0..10] == 'data-macro-'}.
-      inject({}){|result, a| result.merge({a[0][11..-1] => a[1].value})}.
+      inject({}){|result, a| result.merge({a[0][11..-1] => a[1]})}.
       with_indifferent_access
   end
  
@@ -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 %>
 (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();
       });
     }
   });
@@ -33,8 +33,8 @@
       </tr>
     </table>
  
-    <%= labelled_form_field(_('Free delivery price:'), f.text_field(:free_delivery_price)) %>
-    <%= content_tag('small', _('Empty stands for no free delivery price.')) %>
+    <%= labelled_form_field(_("Order's minimum price for free delivery:"), f.text_field(:free_delivery_price)) %>
+    <%= content_tag('small', _('Empty stands for no minimum price for free delivery.')) %>
   </fieldset>
   <br style='clear: both'/>
   <br style='clear: both'/>
@@ -0,0 +1,54 @@
+README - Statistics (Statistics Plugin)
+================================
+
+Statistics is a plugin to allow the user adds a block where you could see statistics of it's context.
+
+The Statistics block will be available for all layout columns of communities, peole, enterprises and environments.
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable Statistics Plugin at you Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable statistics
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Statistics Plugin" check-box
+
+Running Statistics tests
+--------------------
+
+$ rake test:noosfero_plugins:statistics
+
+
+Get Involved
+============
+
+If you found any bug and/or want to collaborate, please send an e-mail to eduardo.edington@gmail.com
+
+LICENSE
+=======
+
+Copyright (c) The Author developers.
+
+See Noosfero license.
+
+
+AUTHORS
+=======
+
+ Eduardo Tourinho Edington (eduardo.edington at gmail.com)
+
+ACKNOWLEDGMENTS
+===============
+
+The author has been supported by Serpro
@@ -0,0 +1,146 @@
+class StatisticsBlock < Block
+
+  settings_items :community_counter, :default => false
+  settings_items :user_counter, :default => true
+  settings_items :enterprise_counter, :default => false
+  settings_items :category_counter, :default => false
+  settings_items :tag_counter, :default => true
+  settings_items :comment_counter, :default => true
+  settings_items :hit_counter, :default => false
+  settings_items :templates_ids_counter, Hash, :default => {}
+
+  USER_COUNTERS = [:community_counter, :user_counter, :enterprise_counter, :tag_counter, :comment_counter, :hit_counter]
+  COMMUNITY_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
+  ENTERPRISE_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
+
+  def self.description
+    _('Statistics')
+  end
+
+  def default_title
+    _('Statistics for %s') % owner.name
+  end
+
+  def is_visible? counter
+    value = self.send(counter)
+    value == '1' || value == true
+  end
+
+  def is_counter_available? counter
+    if owner.kind_of?(Environment)
+      true
+    elsif owner.kind_of?(Person)
+      USER_COUNTERS.include?(counter)
+    elsif owner.kind_of?(Community)
+      COMMUNITY_COUNTERS.include?(counter)
+    elsif owner.kind_of?(Enterprise)
+      ENTERPRISE_COUNTERS.include?(counter)
+    end
+
+  end
+
+  def help
+    _('This block presents some statistics about your context.')
+  end
+
+  def timeout
+    60.minutes
+  end
+
+  def environment
+    if owner.kind_of?(Environment)
+      owner
+    elsif owner.kind_of?(Profile)
+      owner.environment
+    else
+      nil
+    end
+  end
+
+  def templates
+    Community.templates(environment)
+  end
+
+  def is_template_counter_active? template_id
+    self.templates_ids_counter[template_id.to_s].to_s == 'true'
+  end
+
+  def template_counter_count(template_id)
+    owner.communities.visible.count(:conditions => {:template_id => template_id})
+  end
+
+  def users
+    if owner.kind_of?(Environment)
+      owner.people.visible.count
+    elsif owner.kind_of?(Organization)
+      owner.members.visible.count
+    elsif owner.kind_of?(Person)
+      owner.friends.visible.count
+    else
+      0
+    end
+  end
+
+  def enterprises
+    if owner.kind_of?(Environment) || owner.kind_of?(Person)
+      owner.enterprises.visible.count
+    else
+      0
+    end
+  end
+
+  def communities
+    if owner.kind_of?(Environment) || owner.kind_of?(Person)
+      owner.communities.visible.count
+    else
+      0
+    end
+  end
+
+  def categories
+    if owner.kind_of?(Environment) then
+      owner.categories.count
+    else
+      0
+    end
+  end
+
+  def tags
+    if owner.kind_of?(Environment) then
+      owner.tag_counts.count
+    elsif owner.kind_of?(Profile) then
+      owner.article_tags.count
+    else
+      0
+    end
+  end
+
+  def comments
+    if owner.kind_of?(Environment) then
+      owner.profiles.joins(:articles).sum(:comments_count).to_i
+    elsif owner.kind_of?(Profile) then
+      owner.articles.sum(:comments_count)
+    else
+      0
+    end
+  end
+
+  def hits
+    if owner.kind_of?(Environment) then
+      owner.profiles.joins(:articles).sum(:hits).to_i
+    elsif owner.kind_of?(Profile) then
+      owner.articles.sum(:hits)
+    else
+      0
+    end
+  end
+
+  def content(args={})
+    block = self
+
+    lambda do
+      render :file => 'statistics_block', :locals => { :block => block }
+    end
+  end
+
+end
@@ -0,0 +1,19 @@
+require_dependency File.dirname(__FILE__) + '/statistics_block'
+
+class StatisticsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Statistics Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a block where you can see statistics of it's context.")
+  end
+
+  def self.extra_blocks
+    {
+      StatisticsBlock => {}
+    }
+  end
+
+end
@@ -0,0 +1,161 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = EnvironmentDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+
+    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['StatisticsPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+
+    StatisticsBlock.delete_all
+    @box1 = Box.create!(:owner => @environment)
+    @environment.boxes = [@box1]
+
+    @block = StatisticsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    login_as(user.login)
+  end
+
+  attr_accessor :block
+
+  should 'be able to edit StatisticsBlock' do
+    get :edit, :id => @block.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save StatisticsBlock' do
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:title => 'Statistics' }
+    @block.reload
+    assert_equal 'Statistics', @block.title
+  end
+
+  should 'be able to uncheck core counters' do
+    @block.user_counter = true
+    @block.community_counter = true
+    @block.enterprise_counter = true
+    @block.category_counter = true
+    @block.tag_counter = true
+    @block.comment_counter = true
+    @block.hit_counter = true
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:user_counter => '0', :community_counter => '0', :enterprise_counter => '0',
+      :category_counter => '0', :tag_counter => '0', :comment_counter => '0', :hit_counter => '0' }
+    @block.reload
+    any_checked = @block.is_visible?('user_counter') ||
+                  @block.is_visible?('community_counter') ||
+                  @block.is_visible?('enterprise_counter') ||
+                  @block.is_visible?('category_counter') ||
+                  @block.is_visible?('tag_counter') ||
+                  @block.is_visible?('comment_counter') ||
+                  @block.is_visible?('hit_counter')
+    assert_equal false, any_checked
+
+  end
+
+  should 'be able to check core counters' do
+    @block.user_counter = false
+    @block.community_counter = false
+    @block.enterprise_counter = false
+    @block.category_counter = false
+    @block.tag_counter = false
+    @block.comment_counter = false
+    @block.hit_counter = false
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:user_counter => '1', :community_counter => '1', :enterprise_counter => '1',
+      :category_counter => '1', :tag_counter => '1', :comment_counter => '1', :hit_counter => '1' }
+    @block.reload
+    all_checked = @block.is_visible?('user_counter') &&
+                  @block.is_visible?('community_counter') &&
+                  @block.is_visible?('enterprise_counter') &&
+                  @block.is_visible?('category_counter') &&
+                  @block.is_visible?('tag_counter') &&
+                  @block.is_visible?('comment_counter') &&
+                  @block.is_visible?('hit_counter')
+    assert all_checked
+
+  end
+
+  should 'be able to check template counters' do
+    template = fast_create(Community, :name => 'Councils', :is_template => true, :environment_id => @environment.id)
+    @block.templates_ids_counter = {template.id.to_s => 'false'}
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:templates_ids_counter => {template.id.to_s => 'true'}}
+    @block.reload
+
+    assert @block.is_template_counter_active?(template.id)
+  end
+
+  should 'be able to uncheck template counters' do
+    template = fast_create(Community, :name => 'Councils', :is_template => true, :environment_id => @environment.id)
+    @block.templates_ids_counter = {template.id.to_s => 'true'}
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:templates_ids_counter => {template.id.to_s => 'false'}}
+    @block.reload
+
+    assert_equal false, @block.is_template_counter_active?(template.id)
+  end
+
+  should 'input user counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_user_counter', :checked => 'checked'}
+  end
+
+  should 'not input community counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_community_counter'}
+    assert_no_tag :input, :attributes => {:id => 'block_community_counter', :checked => 'checked'}
+  end
+
+  should 'not input enterprise counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_enterprise_counter'}
+    assert_no_tag :input, :attributes => {:id => 'block_enterprise_counter', :checked => 'checked'}
+  end
+
+    should 'not input category counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_category_counter'}
+    assert_no_tag :input, :attributes => {:id => 'block_category_counter', :checked => 'checked'}
+  end
+
+    should 'input tag counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_tag_counter', :checked => 'checked'}
+  end
+
+  should 'input comment counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_comment_counter', :checked => 'checked'}
+  end
+
+  should 'input hit counter not be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_no_tag :input, :attributes => {:id => 'block_hit_counter', :checked => 'checked'}
+  end
+end
@@ -0,0 +1,147 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class HomeController; def rescue_action(e) raise e end; end
+
+class HomeControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = HomeController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+
+    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['StatisticsPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+
+    StatisticsBlock.delete_all
+    @box1 = Box.create!(:owner => @environment)
+    @environment.boxes = [@box1]
+
+    @block = StatisticsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    login_as(user.login)
+  end
+
+  attr_accessor :block
+
+  should 'display statistics-block-data class in environment block edition' do
+    get :index
+
+    assert_tag :div, :attributes => {:class => 'statistics-block-data'}
+  end
+
+  should 'display users class in statistics-block-data block' do
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'users'} }
+  end
+
+  should 'not display users class in statistics-block-data block' do
+    @block.user_counter = false
+    @block.save!
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'users'} }
+  end
+
+  should 'display communities class in statistics-block-data block' do
+    @block.community_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'communities'} }
+  end
+
+  should 'not display communities class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'communities'} }
+  end
+
+  should 'display enterprises class in statistics-block-data block' do
+    @block.enterprise_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'enterprises'} }
+  end
+
+  should 'not display enterprises class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'enterprises'} }
+  end
+
+  should 'display categories class in statistics-block-data block' do
+    @block.category_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'categories'} }
+  end
+
+  should 'not display categories class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'categories'} }
+  end
+
+  should 'display tags class in statistics-block-data block' do
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'tags'} }
+  end
+
+  should 'not display tags class in statistics-block-data block' do
+    @block.tag_counter = false
+    @block.save!
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'tags'} }
+  end
+
+  should 'display comments class in statistics-block-data block' do
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'comments'} }
+  end
+
+  should 'not display comments class in statistics-block-data block' do
+    @block.comment_counter = false
+    @block.save!
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'comments'} }
+  end
+
+  should 'display hits class in statistics-block-data block' do
+    @block.hit_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'hits'} }
+  end
+
+  should 'not display hits class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'hits'} }
+  end
+
+  should 'display template name in class in statistics-block-data block' do
+    template = fast_create(Community, :name => 'Councils', :is_template => true, :environment_id => @environment.id)
+    @block.templates_ids_counter = {template.id.to_s => 'true'}
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'councils'} }
+  end
+end
@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileDesignController; def rescue_action(e) raise e end; end
+
+class ProfileDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+
+    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['StatisticsPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @person = user.person
+    @environment.add_admin(@person)
+
+    StatisticsBlock.delete_all
+    @box1 = Box.create!(:owner => @person)
+    @environment.boxes = [@box1]
+
+    @block = StatisticsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    login_as(user.login)
+  end
+
+  attr_accessor :block
+
+  should 'be able to edit StatisticsBlock' do
+    get :edit, :id => @block.id, :profile => @person.identifier
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save StatisticsBlock' do
+    get :edit, :id => @block.id, :profile => @person.identifier
+    post :save, :id => @block.id, :block => {:title => 'Statistics' }, :profile => @person.identifier
+    @block.reload
+    assert_equal 'Statistics', @block.title
+  end
+
+  should 'be able to uncheck core counters' do
+    @block.user_counter = true
+    @block.tag_counter = true
+    @block.comment_counter = true
+    @block.hit_counter = true
+    @block.save!
+    get :edit, :id => @block.id, :profile => @person.identifier
+    post :save, :id => @block.id, :block => {:user_counter => '0', :tag_counter => '0', :comment_counter => '0', :hit_counter => '0' }, :profile => @person.identifier
+    @block.reload
+    any_checked = @block.is_visible?('user_counter') ||
+                  @block.is_visible?('tag_counter') ||
+                  @block.is_visible?('comment_counter') ||
+                  @block.is_visible?('hit_counter')
+    assert_equal false, any_checked
+  end
+
+  should 'be able to check core counters' do
+    @block.user_counter = false
+    @block.community_counter = false
+    @block.enterprise_counter = false
+    @block.category_counter = false
+    @block.tag_counter = false
+    @block.comment_counter = false
+    @block.hit_counter = false
+    @block.save!
+    get :edit, :id => @block.id, :profile => @person.identifier
+    post :save, :id => @block.id, :block => {:user_counter => '1',
+      :tag_counter => '1', :comment_counter => '1', :hit_counter => '1' }, :profile => @person.identifier
+    @block.reload
+    all_checked = @block.is_visible?('user_counter') &&
+                  @block.is_visible?('tag_counter') &&
+                  @block.is_visible?('comment_counter') &&
+                  @block.is_visible?('hit_counter')
+    assert all_checked
+
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,336 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class StatisticsBlockTest < ActiveSupport::TestCase
+
+  ['user_counter', 'tag_counter', 'comment_counter'].map do |counter|
+    should "#{counter} be true by default" do
+      b = StatisticsBlock.new
+      assert b.is_visible?(counter)
+    end
+  end
+
+  ['community_counter', 'enterprise_counter', 'category_counter', 'hit_counter'].map do |counter|
+    should "#{counter} be false by default" do
+      b = StatisticsBlock.new
+      assert !b.is_visible?(counter)
+    end
+  end
+
+  should 'inherit from Block' do
+    assert_kind_of Block, StatisticsBlock.new
+  end
+
+  should 'provide a default title' do
+    block = StatisticsBlock.new
+
+    owner = mock
+    owner.expects(:name).returns('my environment')
+    block.expects(:owner).returns(owner)
+    assert_equal 'Statistics for my environment', block.title
+  end
+
+  should 'describe itself' do
+    assert_not_equal StatisticsBlock.description, Block.description
+  end
+
+  should 'is_visible? return true if setting is true' do
+    b = StatisticsBlock.new
+    b.community_counter = true
+    assert b.is_visible?('community_counter')
+  end
+
+  should 'is_visible? return false if setting is false' do
+    b = StatisticsBlock.new
+    b.community_counter = false
+    assert !b.is_visible?('community_counter')
+  end
+
+  should 'templates return the Community templates of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    t1 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    fast_create(Community, :is_template => false)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    t = b.templates
+    assert_equal [], [t1,t2] - t
+    assert_equal [], t - [t1,t2]
+  end
+
+  should 'users return the amount of users of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Person, :environment_id => e.id)
+    fast_create(Person, :environment_id => e.id)
+    fast_create(Person, :visible => false, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.users
+  end
+
+  should 'users return the amount of members of the community' do
+    b = StatisticsBlock.new
+
+    c1 = fast_create(Community)
+    c1.add_member(fast_create(Person))
+    c1.add_member(fast_create(Person))
+    c1.add_member(fast_create(Person))
+    c1.add_member(fast_create(Person, :visible => false))
+    c1.add_member(fast_create(Person, :visible => false))
+
+    b.expects(:owner).at_least_once.returns(c1)
+    assert_equal 3, b.users
+  end
+
+  should 'users return the amount of friends of the person' do
+    b = StatisticsBlock.new
+
+    p1 = fast_create(Person)
+    p1.add_friend(fast_create(Person))
+    p1.add_friend(fast_create(Person))
+    p1.add_friend(fast_create(Person))
+    p1.add_friend(fast_create(Person, :visible => false))
+    p1.add_friend(fast_create(Person, :visible => false))
+
+    b.expects(:owner).at_least_once.returns(p1)
+    assert_equal 3, b.users
+  end
+
+  should 'communities return the amount of communities of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Community, :environment_id => e.id)
+    fast_create(Community, :environment_id => e.id)
+    fast_create(Community, :visible => false, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.communities
+  end
+
+  should 'enterprises return the amount of enterprises of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Enterprise, :environment_id => e.id)
+    fast_create(Enterprise, :environment_id => e.id)
+    fast_create(Enterprise, :visible => false, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.enterprises
+  end
+
+  should 'categories return the amount of categories of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Category, :environment_id => e.id)
+    fast_create(Category, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.categories
+  end
+
+  should 'tags return the amount of tags of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+    t1 = fast_create(Tag, :name => 'T1')
+    t2 = fast_create(Tag, :name => 'T2')
+    a1.tags << t1
+    a1.tags << t2
+    a2 = fast_create(Article, :profile_id => p1.id)
+    t3 = fast_create(Tag, :name => 'T3')
+    t4 = fast_create(Tag, :name => 'T4')
+    a2.tags << t3
+    a2.tags << t4
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 4, b.tags
+  end
+
+  should 'tags return the amount of tags of the community' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    c1 = fast_create(Community, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => c1.id)
+    t1 = fast_create(Tag, :name => 'T1')
+    t2 = fast_create(Tag, :name => 'T2')
+    a1.tags << t1
+    a1.tags << t2
+    a2 = fast_create(Article, :profile_id => c1.id)
+    t3 = fast_create(Tag, :name => 'T3')
+    t4 = fast_create(Tag, :name => 'T4')
+    a2.tags << t3
+    a2.tags << t4
+
+    b.expects(:owner).at_least_once.returns(c1)
+
+    assert_equal 4, b.tags
+  end
+
+  should 'tags return the amount of tags of the profile (person)' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+    t1 = fast_create(Tag, :name => 'T1')
+    t2 = fast_create(Tag, :name => 'T2')
+    a1.tags << t1
+    a1.tags << t2
+    a2 = fast_create(Article, :profile_id => p1.id)
+    t3 = fast_create(Tag, :name => 'T3')
+    t4 = fast_create(Tag, :name => 'T4')
+    a2.tags << t3
+    a2.tags << t4
+
+    b.expects(:owner).at_least_once.returns(p1)
+
+    assert_equal 4, b.tags
+  end
+
+  should 'comments return the amount of comments of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+
+    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+
+    a2 = fast_create(Article, :profile_id => p1.id)
+    Comment.create!(:source => a2, :body => 'C3', :author_id => 1)
+    Comment.create!(:source => a2, :body => 'C4', :author_id => 1)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 4, b.comments
+  end
+
+  should 'comments return the amount of comments of the community' do
+    b = StatisticsBlock.new
+    e = Environment.default
+
+    c1 = fast_create(Community, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => c1.id)
+    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+
+    a2 = fast_create(Article, :profile_id => c1.id)
+    Comment.create!(:source => a2, :body => 'C3', :author_id => 1)
+    Comment.create!(:source => a2, :body => 'C4', :author_id => 1)
+
+    b.expects(:owner).at_least_once.returns(c1)
+
+    assert_equal 4, b.comments
+  end
+
+  should 'comments return the amount of comments of the profile (person)' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+
+    a2 = fast_create(Article, :profile_id => p1.id)
+    Comment.create!(:source => a1, :body => 'C3', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C4', :author_id => 1)
+
+    b.expects(:owner).at_least_once.returns(p1)
+
+    assert_equal 4, b.comments
+  end
+
+  should 'hits return the amount of hits of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id, :hits => 2)
+    a2 = fast_create(Article, :profile_id => p1.id, :hits => 5)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 7, b.hits
+  end
+
+  should 'hits return the amount of hits of the community' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    c1 = fast_create(Community, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => c1.id, :hits => 2)
+    a2 = fast_create(Article, :profile_id => c1.id, :hits => 5)
+
+    b.expects(:owner).at_least_once.returns(c1)
+
+    assert_equal 7, b.hits
+  end
+
+  should 'hits return the amount of hits of the profile (person)' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id, :hits => 2)
+    a2 = fast_create(Article, :profile_id => p1.id, :hits => 5)
+
+    b.expects(:owner).at_least_once.returns(p1)
+
+    assert_equal 7, b.hits
+  end
+
+  should 'is_counter_available? return true for all counters if owner is environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert b.is_counter_available?(:user_counter)
+  end
+
+  should 'is_template_counter_active? return true if setting is true' do
+    b = StatisticsBlock.new
+    b.templates_ids_counter = {'1' => 'true'}
+    assert b.is_template_counter_active?(1)
+  end
+
+  should 'is_template_counter_active? return false if setting is false' do
+    b = StatisticsBlock.new
+    b.templates_ids_counter = {'1' => 'false'}
+    assert !b.is_template_counter_active?(1)
+  end
+
+  should 'template_counter_count return the amount of communities of the Environment using a template' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    t1 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t1.id, :visible => true)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t1.id, :visible => true)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t1.id, :visible => false)
+
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t2.id, :visible => true)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t2.id, :visible => false)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.template_counter_count(t1.id)
+  end
+end
@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class StatisticsPluginTest < ActiveSupport::TestCase
+
+  should "return StatisticsBlock in extra_mlocks class method" do
+    assert  StatisticsPlugin.extra_blocks.keys.include?(StatisticsBlock)
+  end
+
+end
...	...	@@ -23,7 +23,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or De
23	23	# apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
24	24	libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
25	25	libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
26		- tango-icon-theme libnokogiri-ruby
	26	+ tango-icon-theme
27	27
28	28	On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages.
29	29
...	...	@@ -41,7 +41,6 @@ On other systems, they may or may not be available through your regular package
41	41	* Thin: http://code.macournoyer.com/thin
42	42	* tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
43	43	* Hpricot: http://hpricot.com
44		-* Nokogiri: http://nokogiri.org/
45	44
46	45	If you manage to install Noosfero successfully on other systems than Debian,
47	46	please feel free to contact the Noosfero development mailing with the
...	...
...	...	@@ -3,6 +3,8 @@ class EnvironmentDesignController < BoxOrganizerController
3	3	protect 'edit_environment_design', :environment
4	4
5	5	def available_blocks
	6	+ # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
	7	+ # the Noosfero core soon, see ActionItem3045
6	8	@available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
7	9	@available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
8	10	end
...	...
...	...	@@ -7,7 +7,7 @@ class UsersController < AdminController
7	7	include UsersHelper
8	8
9	9	def index
10		- @filter = params[:filter]
	10	+ @filter = params[:filter] \|\| 'all_users'
11	11	scope = environment.people.no_templates
12	12	if @filter == 'admin_users'
13	13	scope = scope.admins
...	...	@@ -16,6 +16,7 @@ class UsersController < AdminController
16	16	elsif @filter == 'deactivated_users'
17	17	scope = scope.deactivated
18	18	end
	19	+ scope = scope.order('name ASC')
19	20	@q = params[:q]
20	21	@collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
21	22	end
...	...	@@ -44,6 +45,20 @@ class UsersController < AdminController
44	45	redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
45	46	end
46	47
	48	+
	49	+ def destroy_user
	50	+ if request.post?
	51	+ person = environment.people.find_by_id(params[:id])
	52	+ if person && person.destroy
	53	+ session[:notice] = _('The profile was deleted.')
	54	+ else
	55	+ session[:notice] = _('Could not remove profile')
	56	+ end
	57	+ end
	58	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
	59	+ end
	60	+
	61	+
47	62	def download
48	63	respond_to do \|format\|
49	64	format.html
...	...
...	...	@@ -21,6 +21,7 @@ class ApplicationController < ActionController::Base
21	21	include ApplicationHelper
22	22	layout :get_layout
23	23	def get_layout
	24	+ return nil if request.format == :js
24	25	theme_layout = theme_option(:layout)
25	26	if theme_layout
26	27	theme_view_file('layouts/'+theme_layout) \|\| theme_layout
...	...
...	...	@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController
70	70	else
71	71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
72	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	74	render :action => 'add_block', :layout => false
75	75	end
76	76	end
...	...
...	...	@@ -221,11 +221,10 @@ class CmsController < MyProfileController
221	221
222	222	def update_categories
223	223	@object = params[:id] ? @profile.articles.find(params[:id]) : Article.new
	224	+ @categories = @toplevel_categories = environment.top_level_categories
224	225	if params[:category_id]
225	226	@current_category = Category.find(params[:category_id])
226	227	@categories = @current_category.children
227		- else
228		- @categories = environment.top_level_categories.select{\|i\| !i.children.empty?}
229	228	end
230	229	render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
231	230	end
...	...
...	...	@@ -55,11 +55,10 @@ class ProfileEditorController < MyProfileController
55	55
56	56	def update_categories
57	57	@object = profile
	58	+ @categories = @toplevel_categories = environment.top_level_categories
58	59	if params[:category_id]
59	60	@current_category = Category.find(params[:category_id])
60	61	@categories = @current_category.children
61		- else
62		- @categories = environment.top_level_categories.select{\|i\| !i.children.empty?}
63	62	end
64	63	render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
65	64	end
...	...
...	...	@@ -2,7 +2,7 @@ class ProfileMembersController < MyProfileController
2	2	protect 'manage_memberships', :profile
3	3
4	4	def index
5		- @members = profile.members
	5	+ @members = profile.members_by_name
6	6	@member_role = environment.roles.find_by_name('member')
7	7	end
8	8
...	...
...	...	@@ -67,7 +67,7 @@ class ProfileController < PublicController
67	67
68	68	def members
69	69	if is_cache_expired?(profile.members_cache_key(params))
70		- @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
	70	+ @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
71	71	end
72	72	end
73	73
...	...	@@ -304,14 +304,6 @@ class ProfileController < PublicController
304	304	end
305	305	end
306	306
307		- def profile_info
308		- begin
309		- @block = profile.blocks.find(params[:block_id])
310		- rescue
311		- render :text => _('Profile information could not be loaded')
312		- end
313		- end
314		-
315	307	def report_abuse
316	308	@abuse_report = AbuseReport.new
317	309	render :layout => false
...	...
...	...	@@ -12,7 +12,7 @@ class ThemesController < ApplicationController
12	12
13	13	def index
14	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	17	@current_theme = target.theme
18	18
...	...