Merge branch 'rails235'

Conflicts: features/categories_block.feature public/stylesheets/application.css

Merge branch 'rails235'
Conflicts: features/categories_block.feature public/stylesheets/application.css
Daniela Feitosa
2 parents cbcad870 d5f224bb
Showing 92 changed files with 1924 additions and 205 deletions Show diff stats
app/controllers/box_organizer_controller.rb
app/controllers/embed_controller.rb
app/controllers/my_profile/maps_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/account_helper.rb
app/helpers/boxes_helper.rb
app/helpers/macros_helper.rb
app/helpers/maps_helper.rb
app/helpers/token_helper.rb
app/models/block.rb
app/models/link_list_block.rb
app/models/main_block.rb
app/models/national_region.rb
app/models/text_article.rb
app/views/account/_identifier_status.rhtml
app/views/account/_signup_form.rhtml
app/views/box_organizer/_link_list_block.rhtml
app/views/box_organizer/edit.rhtml
@@ -80,6 +80,22 @@ class BoxOrganizerController &lt; ApplicationController
     render :action => 'edit', :layout => false
   end
  
+  def search_autocomplete
+    if request.xhr? and params[:query]
+      search = params[:query]
+      path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
+        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+      elsif boxes_holder.is_a?(Profile)
+        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+      else
+        []
+      end
+      render :json => path_list.to_json
+    else
+      redirect_to "/"
+    end
+  end
+
   def save
     @block = boxes_holder.blocks.find(params[:id])
     @block.update_attributes(params[:block])
@@ -99,6 +115,12 @@ class BoxOrganizerController &lt; ApplicationController
     end
   end
  
+  def clone_block
+    block = Block.find(params[:id])
+    block.duplicate
+    redirect_to :action => 'index'
+  end
+
   protected :boxes_editor?
  
 end
@@ -0,0 +1,13 @@
+class EmbedController < ApplicationController
+  layout 'embed'
+
+  def block
+    @block = Block.find(params[:id])
+    if !@block.embedable? || !@block.visible?
+      render 'unavailable.rhtml', :status => 403
+    end
+    rescue ActiveRecord::RecordNotFound
+      render 'not_found.rhtml', :status => 404
+  end
+
+end
@@ -31,23 +31,11 @@ class MapsController &lt; MyProfileController
   end
  
   def search_city
-
-    term = params[:term];
-
-    regions = NationalRegion.search_city(term + "%", true).map {|r|{ :label => r.city , :category => r.state}}
-
-    render :json => regions
-
+    render :json => MapsHelper.search_city(params[:term])
   end
  
   def search_state
-
-    term = params[:term];
-
-    regions = NationalRegion.search_state(term + "%", true).map {|r|{ :label => r.state}}
-
-    render :json => regions
-
+    render :json => MapsHelper.search_state(params[:term])
   end
  
 end
@@ -55,10 +55,4 @@ class ProfileDesignController &lt; BoxOrganizerController
     blocks
   end
  
-  def clone
-    block = Block.find(params[:id])
-    block.duplicate
-    redirect_to :action => 'index'
-  end
-
 end
@@ -246,15 +246,19 @@ class AccountController &lt; ApplicationController
     end
   end
  
-  def check_url
+  def check_valid_name
     @identifier = params[:identifier]
     valid = Person.is_available?(@identifier, environment)
     if valid
       @status = _('This login name is available')
       @status_class = 'validated'
-    else
+    elsif !@identifier.empty?
+      @suggested_usernames = suggestion_based_on_username(@identifier)
       @status = _('This login name is unavailable')
       @status_class = 'invalid'
+    else
+      @status_class = 'invalid'
+      @status = _('This field can\'t be blank')
     end
     render :partial => 'identifier_status'
   end
@@ -287,6 +291,23 @@ class AccountController &lt; ApplicationController
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
  
+  def search_cities
+    if request.xhr? and params[:state_name] and params[:city_name]
+      render :json => MapsHelper.search_city(params[:city_name], params[:state_name])
+    else
+      render :json => [].to_json
+    end
+  end
+
+  def search_state
+    if request.xhr? and params[:state_name]
+      render :json => MapsHelper.search_state(params[:state_name])
+    else
+      render :json => [].to_json
+    end
+  end
+
+
   protected
  
   def redirect?
@@ -113,6 +113,15 @@ class ContentViewerController &lt; ApplicationController
     @comments = @plugins.filter(:unavailable_comments, @comments)
     @comments_count = @comments.count
     @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+
+    if request.xhr? and params[:comment_order]
+      if @comment_order == 'newest'
+        @comments = @comments.reverse
+      end
+
+      return render :partial => 'comment/comment', :collection => @comments
+    end
  
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
@@ -12,4 +12,17 @@ module AccountHelper
       _('Checking if e-mail address is already taken...')
     end
   end
+
+  def suggestion_based_on_username(requested_username='')
+    return "" if requested_username.empty?
+    usernames = []
+    3.times do
+      begin
+        valid_name = requested_username + rand(1000).to_s
+      end while (usernames.include?(valid_name) || !Person.is_available?(valid_name, environment))
+      usernames << valid_name
+    end
+    usernames
+  end
+
 end
@@ -65,7 +65,7 @@ module BoxesHelper
   end
  
   def display_box_content(box, main_content)
-    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
+    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
     box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
  
@@ -212,13 +212,24 @@ module BoxesHelper
  
     if !block.main?
       buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
-      buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })
+      buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
  
     if block.respond_to?(:help)
       buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), {}, "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
     end
  
+    if block.embedable?
+      embed_code = block.embed_code
+      embed_code = instance_eval(&embed_code) if embed_code.respond_to?(:call)
+      html = content_tag('div',
+              content_tag('h2', _('Embed block code')) +
+              content_tag('div', _('Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.'), :style => 'margin-bottom: 1em;') +
+              content_tag('textarea', embed_code, :style => 'margin-bottom: 1em; width:100%; height:40%;', :readonly => 'readonly') +
+              thickbox_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
+      buttons << thickbox_inline_popup_icon(:embed, _('Embed code'), {}, "embed-code-box-#{block.id}") << html
+    end
+
     content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')
   end
  
@@ -20,14 +20,16 @@ module MacrosHelper
         jQuery('<div>'+#{macro_configuration_dialog(macro).to_json}+'</div>').dialog({
           title: #{macro_title(macro).to_json},
           modal: true,
-          buttons: [
-            {text: #{_('Ok').to_json}, click: function(){
+          buttons: {
+            #{_('Ok').to_json}: function(){
               tinyMCE.activeEditor.execCommand('mceInsertContent', false,
               (function(dialog){ #{macro_generator(macro)} })(this));
               jQuery(this).dialog('close');
-            }},
-            {text: #{_('Cancel').to_json}, click: function(){jQuery(this).dialog('close');}}
-          ]
+            },
+            #{_('Cancel').to_json}: function(){
+              jQuery(this).dialog('close');
+            }
+          }
         });
       }"
     end
@@ -57,7 +59,11 @@ module MacrosHelper
  
   def macro_generator(macro)
     if macro.configuration[:generator]
-      macro.configuration[:generator]
+      if macro.configuration[:generator].respond_to?(:call)
+        macro.configuration[:generator].call(macro)
+      else
+        macro.configuration[:generator]
+      end
     else
       macro_default_generator(macro)
     end
@@ -66,8 +72,7 @@ module MacrosHelper
  
   def macro_default_generator(macro)
     code = "var params = {};"
-    configuration = macro_configuration(macro)
-    configuration[:params].map do |field|
+    macro.configuration[:params].map do |field|
       code += "params.#{field[:name]} = jQuery('*[name=#{field[:name]}]', dialog).val();"
     end
     code + "
@@ -0,0 +1,14 @@
+module MapsHelper
+  def self.search_city term, state=""
+    cities = if state.empty?
+      NationalRegion.search_city(term + "%", true)
+    else
+      NationalRegion.search_city(term + "%", true, state)
+    end
+    cities.map {|r|{ :label => r.city , :category => r.state}}
+  end
+
+  def self.search_state term
+    NationalRegion.search_state(term + "%", true).map {|r|{ :label => r.state}}
+  end
+end
@@ -27,7 +27,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
-        searchDelay: #{options[:serach_delay].to_json},
+        searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
         queryParam: #{name.to_json},
@@ -16,17 +16,36 @@ class Block &lt; ActiveRecord::Base
  
   named_scope :enabled, :conditions => { :enabled => true }
  
+  def embedable?
+    false
+  end
+
+  def embed_code
+    me = self
+    lambda do
+      content_tag('iframe', '',
+        :src => url_for(:controller => 'embed', :action => 'block', :id => me.id, :only_path => false),
+        :frameborder => 0,
+        :width => 1024,
+        :height => 768,
+        :class => "embed block #{me.class.name.to_css_class}"
+      )
+    end
+  end
+
   # Determines whether a given block must be visible. Optionally a
   # <tt>context</tt> must be specified. <tt>context</tt> must be a hash, and
   # may contain the following keys:
   #
   # * <tt>:article</tt>: the article being viewed currently
   # * <tt>:language</tt>: in which language the block will be displayed
+  # * <tt>:user</tt>: the logged user
   def visible?(context = nil)
     return false if display == 'never'
  
     if context
       return false if language != 'all' && language != context[:locale]
+      return false unless display_to_user?(context[:user])
  
       begin
         return self.send("display_#{display}", context)
@@ -38,6 +57,10 @@ class Block &lt; ActiveRecord::Base
     true
   end
  
+  def display_to_user?(user)
+    display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged')
+  end
+
   def display_always(context)
     true
   end
@@ -68,6 +91,14 @@ class Block &lt; ActiveRecord::Base
   #   the homepage of its owner.
   settings_items :display, :type => :string, :default => 'always'
  
+
+  # The condition for displaying a block to users. It can assume the following values:
+  #
+  # * <tt>'all'</tt>: the block is always displayed
+  # * <tt>'logged'</tt>: the block is displayed to logged users only
+  # * <tt>'not_logged'</tt>: the block is displayed only to not logged users
+  settings_items :display_user, :type => :string, :default => 'all'
+
   # The block can be configured to be displayed in all languages or in just one language. It can assume any locale of the environment:
   #
   # * <tt>'all'</tt>: the block is always displayed
@@ -171,12 +202,20 @@ class Block &lt; ActiveRecord::Base
     'never'            => __('Don\'t display'),
   }
  
-  def display_options
+  def display_options_available
     DISPLAY_OPTIONS.keys
   end
  
-  def display_option_label(option)
-    DISPLAY_OPTIONS[option]
+  def display_options
+    DISPLAY_OPTIONS.slice(*display_options_available)
+  end
+
+  def display_user_options
+    @display_user_options ||= {
+      'all'            => __('All users'),
+      'logged'         => __('Logged'),
+      'not_logged'     => __('Not logged'),
+    }
   end
  
   def duplicate
@@ -70,6 +70,8 @@ class LinkListBlock &lt; Block
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
+    elsif owner.is_a?(Environment) && owner.enabled?('use_portal_community') && owner.portal_community
+      address.gsub('{portal}', owner.portal_community.identifier)
     else
       address
     end
@@ -24,7 +24,7 @@ class MainBlock &lt; Block
     false
   end
  
-  def display_options
+  def display_options_available
     ['always', 'except_home_page']
   end
  
@@ -12,7 +12,7 @@ class NationalRegion &lt; ActiveRecord::Base
     adtional_contions = "";
  
     if like
-     operator  = "like"
+     operator  = "ilike"
      find_return = :all
     end
  
@@ -41,7 +41,7 @@ class NationalRegion &lt; ActiveRecord::Base
     find_return = :first
  
     if like
-     operator  = "like"
+     operator  = "ilike"
      find_return = :all
     end
  
@@ -20,4 +20,23 @@ class TextArticle &lt; Article
   def can_display_versions?
     true
   end
+
+  before_save :set_relative_path
+
+  def set_relative_path
+    parsed = Hpricot(self.body.to_s)
+    parsed.search('img[@src]').map { |i| change_element_path(i, 'src') }
+    parsed.search('a[@href]').map { |i| change_element_path(i, 'href') }
+    self.body = parsed.to_s
+  end
+
+  def change_element_path(el, attribute)
+    fullpath = /(https?):\/\/(#{environment.default_hostname})(:\d+)?(\/.*)/.match(el[attribute])
+    if fullpath
+      domain = fullpath[2]
+      path = fullpath[4]
+      el[attribute] = path if domain == environment.default_hostname
+    end
+  end
+
 end
 <div class='status-identifier'>
-  <p><span class='<%= @status_class %>'><%= @status %></span></p>
+
+  <span class='<%= @status_class %>'><%= @status %></span>
+  <% if @suggested_usernames %>
+    <div class='suggested_usernames'>
+      <%= _('Available: ') %>
+      <% @suggested_usernames.each do |username| %>
+        <a href='#'><%= username %></a>
+      <% end %>
+    </div>
+  <% end %>
   <script type="text/javascript">
     jQuery('#user_login').removeClass('<%= validation_classes %>');
     jQuery('#user_login').addClass('<%= @status_class %>');
+    jQuery('.suggested_usernames a').click(function(e) {
+      e.preventDefault();
+
+      fill_username(this.innerHTML);
+    });
   </script>
 </div>
@@ -7,6 +7,8 @@
  
 <% @profile_data = @person %>
  
+<%= javascript_include_tag('sign_up_password_rate') %>
+
 <%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
  
 <% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %>
@@ -35,24 +37,30 @@
         <%= required text_field(:user, :login, :id => 'user_login',
                                 :onchange => 'this.value = convToValidUsername(this.value);') %>
         <div id='url-check'><p>&nbsp;</p></div>
+        <span id='checking-message' class='checking' style='display:none'><%= _('Checking availability of login name...') %></span>
       </div>
       <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
       <br style="clear: both;" />
     </div>
   </div>
-  <%= observe_field 'user_login',
-        :url => { :action => 'check_url' },
-        :with => 'identifier',
-        :update => 'url-check',
-        :loading => "jQuery('#user_login').removeClass('#{validation_classes}').addClass('checking');
-                     jQuery('#url-check').html('<p><span class=\"checking\">#{checking_message(:url)}</span></p>');",
-        :complete => "jQuery('#user_login').removeClass('checking')"
-  %>
-
+  <%= javascript_include_tag "signup_form" %>
   <div id='signup-password'>
     <%= required f.password_field(:password, :id => 'user_pw') %>
     <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
-    <div id='fake-check'><p>&nbsp;</p></div>
+    <div id='password-rate'>
+      <p><span class="invalid hidden" id='result-short'>
+        <%=_('Short') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-bad'>
+        <%=_('Bad') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-good'>
+        <%=_('Good') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-strong'>
+        <%=_('Strong') %>
+      </span></p>
+    </div>
   </div>
  
   <div id='signup-password-confirmation'>
@@ -182,4 +190,9 @@ jQuery(function($) {
     else $(this).addClass('validated');
   });
 });
+
+function fill_username(element){
+  jQuery('#url-check').html("<p><span class='checking'><%= _('This login name is available') %></span></p>")
+  jQuery('#user_login').val(element).addClass('validated').removeClass('invalid')
+}
 </script>
+<%= javascript_include_tag "edit-link-list.js" %>
+
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block'>
-<table id='links' class='noborder'>
-  <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><%= 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>
+  <ul class='link-list-header'>
+    <li class='link-list-icon'><%= _('Icon') %></li>
+    <li class='link-list-name'><%= _('Name') %></li>
+    <li class='link-list-address'><%= _('Address') %></li>
+    <li class='link-list-target'><%= _('Target') %></li>
+  </ul>
+  <ul id="dropable-link-list">
+    <% for link in @block.links do %>
+      <li>
+        <ul class="link-list-row">
+          <li>
+            <%= icon_selector(link['icon']) %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
+          </li>
+          <li>
+            <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+          </li>
+          <li>
+            <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+  <input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
 </div>
  
 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'links', content_tag('tr',
-      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', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
-      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
+    page.insert_html :bottom, 'dropable-link-list', content_tag('li',
+      content_tag('ul',
+        content_tag('li', icon_selector('ok')) +
+        content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
+        content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
+        content_tag('li', select_tag('block[links][][target]',
+        options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
+        content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
+      :class=>"link-list-row new_link_row")
     ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+    javascript_tag("new_link_action()")
 end %>
@@ -7,13 +7,14 @@
  
     <%= render :partial => partial_for_class(@block.class) %>
  
-    <%= labelled_form_field _('Display this block:'), '' %>
-    <div style='margin-left: 10px'>
-      <% @block.display_options.each do |option| %>
-        <%= radio_button(:block, :display, option) %>
-        <%= label_tag("block_display_#{option}", _(@block.display_option_label(option))) %>
-        <br/>
-      <% end %>
+    <div class="display">
+      <%= labelled_form_field _('Display this block:'),
+        select_tag('block[display]', options_from_collection_for_select(@block.display_options, :first, :last, @block.display))
+      %>
+    </div>
+    <div class="display_user">
+      <%= labelled_form_field _('Display to users:'), '' %>
+      <%= select_tag('block[display_user]', options_from_collection_for_select(@block.display_user_options, :first, :last, @block.display_user)) %>
     </div>
  
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
@@ -80,8 +80,26 @@
     </h3>
   <% end %>
  
-  <% if @page.accept_comments? && @comments.count > 1 %>
+  <% if @page.accept_comments? && @comments_count > 1 %>
     <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
+
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if @page.accept_comments? and @comments.count > 1 %>
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
   <% end %>
  
   <ul class="article-comments-list">
@@ -0,0 +1 @@
+<%= display_block(@block) %>
@@ -0,0 +1,6 @@
+<div id='not-found'>
+    <p>
+    <%= _('You may have clicked an expired link or mistyped the address.') %>
+    <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %>
+    </p>
+</div>
@@ -0,0 +1,3 @@
+<div id='unavailable'>
+    <p><%= _('Embed unavailable.') %></p>
+</div>
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
+  <head>
+    <title>Noosfero embed block</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <%= noosfero_stylesheets %>
+    <%= noosfero_javascript %>
+  </head>
+  <body class="<%= h body_classes %>">
+    <div id="embed">
+      <div id="wrap-1">
+        <div id="wrap-2">
+          <div id="content">
+            <div id="content-inner">
+              <div class="boxes" id="boxes">
+                <div class="box box-1" id="box-1">
+                  <div class="blocks">
+                    <%= yield %>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script type="text/javascript">
+      jQuery(document).ready(function(){
+        jQuery('a').attr('target','_blank');
+      });
+    </script>
+
+  </body>
+</html>
@@ -19,8 +19,8 @@
 <%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '</div>')) %>
 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
 <%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
-<%= optional_field(@person, 'state', f.text_field(:state, :rel => _('State'))) %>
-<%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
+<%= optional_field(@person, 'state', f.text_field(:state, :id => 'state_field', :rel => _('State'))) %>
+<%= optional_field(@person, 'city', f.text_field(:city, :id => 'city_field', :rel => _('City'))) %>
 <%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
 <%= optional_field(@person, 'address_reference', labelled_form_field(_('Address reference'), text_field(:profile_data, :address_reference, :rel => _('Address reference')))) %>
@@ -36,6 +36,7 @@
   </div>
 <% end %>
  
+<%= javascript_include_tag('city_state_validation') %>
 <script type='text/javascript'>
   function toggle_text_field(id, span_id) {
     if ($(id).value == "Others") {
@@ -13,8 +13,8 @@
 <%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference))) %>
 <%= optional_field(profile, 'district', labelled_form_field(_('District'), text_field(object_name, :district))) %>
 <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
-<%= optional_field(profile, 'city', f.text_field(:city)) %>
-<%= optional_field(profile, 'state', f.text_field(:state)) %>
+<%= optional_field(profile, 'city', f.text_field(:city, :id =>'city_field')) %>
+<%= optional_field(profile, 'state', f.text_field(:state,:id =>'state_field')) %>
 <%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'})) %>
 <%= optional_field(profile, 'tag_list', f.text_field(:tag_list)) %>
  
@@ -29,3 +29,4 @@
   <%= optional_field(profile, 'acronym', f.text_field(:acronym)) %>
   <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year)) %>
 <% end %>
+<%= javascript_include_tag('city_state_validation') %>
@@ -31,6 +31,9 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'nothing'
   map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'nothing'
  
+  # embed controller
+  map.embed 'embed/:action/:id', :controller => 'embed', :id => /\d+/
+
   # online documentation
   map.doc         'doc', :controller => 'doc', :action => 'index'
   map.doc_section 'doc/:section', :controller => 'doc', :action => 'section'
@@ -26,14 +26,9 @@ Feature: categories_block
     And I am logged in as admin
     And I go to /admin/environment_design
  
-  # Note that this @ignore-hidden-elements only works for seeing hidden
-  # elements. It actually doesn't work for following hidden link or pressing
-  # hidden buttons. That's why it's necessary to use this display hack to show
-  # the link.
-  @selenium @ignore-hidden-elements
+  @selenium
   Scenario: List just product categories
-    Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -44,8 +39,7 @@ Feature: categories_block
  
   @selenium
   Scenario: Show submenu if it exists
-    Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -62,8 +56,7 @@ Feature: categories_block
  
   @selenium
   Scenario: Show only one submenu per time
-    Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -73,16 +66,14 @@ Feature: categories_block
  
   @selenium
   Scenario: List just general categories
-    Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
  
   @selenium
   Scenario: List just regions
-    Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
@@ -97,3 +97,41 @@ Feature: comment
     Given I am on /booking/article-to-comment
     And I follow "Post a comment"
     Then "Post a comment" should not be visible within "#article"
+
+  @selenium
+  Scenario: the newest post from a forum should be displayed first.
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following forums
+       | owner     | name  |
+       | joaosilva | Forum |
+    And the following articles
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
+    And the following comments
+       | article  | author    | title  | body   |
+       | Post one | joaosilva | Hi all | Hi all |
+       | Post one | joaosilva | Hello  | Hello  |
+   When I go to /joaosilva/forum/post-one
+   And I select "Newest first" from "comment_order" within ".comment-order"
+   Then I should see "Hello" within ".article-comment"
+
+  @selenium
+  Scenario: the oldest post from a forum should be displayed first.
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following forums
+       | owner     | name  |
+       | joaosilva | Forum |
+    And the following articles
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
+    And the following comments
+       | article  | author    | title  | body   |
+       | Post one | joaosilva | Hi all | Hi all |
+       | Post one | joaosilva | Hello  | Hello  |
+   When I go to /joaosilva/forum/post-one
+   And I select "Oldest first" from "comment_order" within ".comment-order"
+   Then I should see "Hi all" within ".article-comment"
@@ -29,10 +29,20 @@ Feature: signup
     And I press "Log in"
     Then I should be logged in as "josesilva"
  
+  @selenium
+  Scenario: show error message if username is already used
+    Given the following users
+      | login     |
+      | josesilva |
+    When I go to signup page
+    And I fill in "Username" with "josesilva"
+    And I fill in "e-Mail" with "josesilva1"
+    Then I should see "This login name is unavailable"
+
   Scenario: be redirected if user goes to signup page and is logged
     Given the following users
       | login | name |
-      | joaosilva | Joao Silva |
+      | joaosilva | joao silva |
     Given I am logged in as "joaosilva"
     And I go to signup page
     Then I should be on joaosilva's control panel
@@ -6,9 +6,15 @@ class Object
   alias :ngettext :n_
 end
  
+
+custom_locale_dir = Rails.root.join('custom_locales', Rails.env)
+repos = []
+if File.exists?(custom_locale_dir)
+  repos << FastGettext::TranslationRepository.build('environment', :type => 'po', :path => custom_locale_dir)
+end
+
 # translations in place?
 locale_dir = Rails.root.join('locale')
-repos = []
 if File.exists?(locale_dir)
   repos << FastGettext::TranslationRepository.build('noosfero', :type => 'mo', :path => locale_dir)
   repos << FastGettext::TranslationRepository.build('iso_3166', :type => 'mo', :path => locale_dir)
@@ -16,14 +16,7 @@ class Noosfero::Plugin
     end
  
     def init_system
-      enabled_plugins = Dir.glob(File.join(Rails.root, 'config', 'plugins', '*'))
-      if Rails.env.test? && !enabled_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
-        enabled_plugins << File.join(Rails.root, 'plugins', 'foo')
-      end
-
-      enabled_plugins.select do |entry|
-        File.directory?(entry)
-      end.each do |dir|
+      available_plugins.each do |dir|
         load_plugin dir
       end
     end
@@ -76,12 +69,19 @@ class Noosfero::Plugin
       klass(plugin_name)
     end
  
-    def all
-      @all ||= []
+    def available_plugins
+      unless @available_plugins
+        path = File.join(Rails.root, 'config', 'plugins', '*')
+        @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) }
+        if Rails.env.test? && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
+          @available_plugins << File.join(Rails.root, 'plugins', 'foo')
+        end
+      end
+      @available_plugins
     end
  
-    def inherited(subclass)
-      all << subclass.to_s unless all.include?(subclass.to_s)
+    def all
+      @all ||= available_plugins.map{ |dir| (File.basename(dir) + "_plugin").camelize }
     end
  
     def public_name
@@ -12,4 +12,8 @@ class CommunityTrackPlugin::TrackCardListBlock &lt; CommunityTrackPlugin::TrackList
     'track_card'
   end
  
+  def embedable?
+    true
+  end
+
 end
@@ -2,11 +2,9 @@ require_dependency &#39;active_record&#39;
  
 class ActiveRecord::Base
   def self.pg_search_plugin_search(query)
-    query.gsub!(/\|/,' ')
-    formatted_query = query.split.map{|w| w += ":*"}.join('|')
-    
+    filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|')
     if defined?(self::SEARCHABLE_FIELDS)
-      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{formatted_query}')")
+      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')")
     else
       raise "No searchable fields defined for #{self.name}"
     end
@@ -21,6 +21,11 @@ class PgSearchPluginTest &lt; ActiveSupport::TestCase
     assert_includes search(Profile, 'admin deb'), profile2
   end
  
+  should 'locate profile escaping special characters' do
+    profile = fast_create(Profile, :name => 'John', :identifier => 'waterfall')
+    assert_includes search(Profile, ') ( /\/\/\/\/\ o_o oOo o_o /\/\/\/\/\ ) ((tx waterfall)'), profile
+  end
+
   # TODO This feature is available only on Postgresql 9.0
   # http://www.postgresql.org/docs/9.0/static/unaccent.html
   # should 'ignore accents' do
@@ -0,0 +1,95 @@
+require_dependency 'article'
+
+class Article
+
+  named_scope :relevant_content, :conditions => ["articles.published = true and (articles.type != 'UploadedFile' and articles.type != 'Blog' and articles.type != 'RssFeed') OR articles.type is NULL"]
+
+  def self.articles_columns
+    Article.column_names.map {|c| "articles.#{c}"} .join(",")
+  end
+
+  def self.most_accessed(owner, limit = nil)
+    conditions = owner.kind_of?(Environment) ?  ["hits > 0"] : ["profile_id = ? and hits > 0", owner.id]
+    result = Article.relevant_content.find(
+      :all,
+      :order => 'hits desc',
+      :limit => limit,
+      :conditions => conditions)
+    result.paginate({:page => 1, :per_page => limit})
+  end
+
+  def self.most_commented_relevant_content(owner, limit)
+      conditions = owner.kind_of?(Environment) ? ["comments_count > 0"] : ["profile_id = ? and comments_count > 0", owner.id]
+      result = Article.relevant_content.find(
+        :all,
+        :order => 'comments_count desc',
+        :limit => limit,
+        :conditions => conditions)
+      result.paginate({:page => 1, :per_page => limit})
+  end
+
+  def self.more_positive_votes(owner, limit = nil)
+      conditions = owner.kind_of?(Environment) ? {'votes.voteable_type' => 'Article'} : ["profile_id = ? and votes.voteable_type = ? ", owner.id, 'Article']
+      result = Article.relevant_content.find(
+        :all,
+        :order => 'sum(vote) desc',
+        :group => 'voteable_id, ' + articles_columns,
+        :limit => limit,
+        :having => ['sum(vote) > 0'],
+        :conditions => conditions,
+        :joins => 'INNER JOIN votes ON articles.id = votes.voteable_id')
+      result.paginate({:page => 1, :per_page => limit})
+  end
+
+  def self.more_negative_votes(owner, limit = nil)
+      conditions = owner.kind_of?(Environment) ? {'votes.voteable_type' => 'Article'} : ["profile_id = ? and votes.voteable_type = 'Article' ", owner.id]
+      result = Article.relevant_content.find(
+        :all,
+        :order => 'sum(vote) asc',
+        :group => 'voteable_id, ' + articles_columns,
+        :limit => limit,
+        :having => ['sum(vote) < 0'],
+        :conditions => conditions,
+        :joins => 'INNER JOIN votes ON articles.id = votes.voteable_id'
+      )
+      result.paginate({:page => 1, :per_page => limit})
+  end
+
+  def self.most_liked(owner, limit = nil)
+      conditions = owner.kind_of?(Environment) ? ["votes.voteable_type = 'Article' and vote > 0"] : ["votes.voteable_type = 'Article' and vote > 0 and profile_id = ? ", owner.id]
+      result = Article.relevant_content.find(
+        :all,
+        :select => articles_columns,
+        :order => 'count(voteable_id) desc',
+        :group => 'voteable_id, ' + articles_columns,
+        :limit => limit,
+        :conditions => conditions,
+        :joins => 'INNER JOIN votes ON articles.id = votes.voteable_id')
+      result.paginate({:page => 1, :per_page => limit})
+  end
+
+  def self.most_disliked(owner, limit = nil)
+      conditions = owner.kind_of?(Environment) ? ["votes.voteable_type = 'Article' and vote < 0"] : ["votes.voteable_type = 'Article' and vote < 0 and profile_id = ? ", owner.id]
+      result = Article.relevant_content.find(
+        :all,
+        :order => 'count(voteable_id) desc',
+        :group => 'voteable_id, ' + articles_columns,
+        :limit => limit,
+        :conditions => conditions,
+        :joins => 'INNER JOIN votes ON articles.id = votes.voteable_id')
+       result.paginate({:page => 1, :per_page => limit})
+  end
+
+  def self.most_voted(owner, limit = nil)
+    conditions = owner.kind_of?(Environment) ? ["votes.voteable_type = 'Article'"] : ["votes.voteable_type = 'Article' and profile_id = ? ", owner.id]
+      result = Article.relevant_content.find(
+        :all,
+        :select => articles_columns,
+        :order => 'count(voteable_id) desc',
+        :group => 'voteable_id, ' + articles_columns,
+        :limit => limit,
+        :conditions => conditions,
+        :joins => 'INNER JOIN votes ON articles.id = votes.voteable_id')
+      result.paginate({:page => 1, :per_page => limit})
+  end
+end
@@ -0,0 +1,21 @@
+class RelevantContentPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+      "Relevant Content Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that lists the most accessed, most commented, most liked and most disliked contents.")
+  end
+
+  def self.extra_blocks
+    {
+     RelevantContentPlugin::RelevantContentBlock => {}
+    }
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,93 @@
+class RelevantContentPlugin::RelevantContentBlock < Block
+  def self.description
+    _('Relevant content')
+  end
+
+  def default_title
+      _('Relevant content')
+  end
+
+  def help
+    _('This block lists the most popular content.')
+  end
+
+  settings_items :limit,                :type => :integer, :default => 5
+  settings_items :show_most_read,       :type => :boolean, :default => 1
+  settings_items :show_most_commented,  :type => :boolean, :default => 1
+  settings_items :show_most_liked,      :type => :boolean, :default => 1
+  settings_items :show_most_disliked,   :type => :boolean, :default => 0
+  settings_items :show_most_voted,      :type => :boolean, :default => 1
+
+  include ActionController::UrlWriter
+  def content(args={})
+
+    content = block_title(title)
+
+    if self.show_most_read
+      docs = Article.most_accessed(owner, self.limit)
+      if !docs.blank?
+        subcontent = ""
+        subcontent += content_tag(:span, _("Most read articles"), :class=>"title mread") + "\n"
+        subcontent += content_tag(:ul, docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
+        content += content_tag(:div, subcontent, :class=>"block mread") + "\n"
+      end
+    end
+
+    if self.show_most_commented
+      docs = Article.most_commented_relevant_content(owner, self.limit)
+      if !docs.blank?
+        subcontent = ""
+        subcontent += content_tag(:span, _("Most commented articles"), :class=>"title mcommented") + "\n"
+        subcontent += content_tag(:ul, docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
+        content += content_tag(:div, subcontent, :class=>"block mcommented") + "\n"
+      end
+    end
+
+    if owner.kind_of?(Environment)
+      env = owner
+    else
+      env =  owner.environment
+    end
+
+    if env.plugin_enabled?(VotePlugin)
+      if self.show_most_liked
+        docs = Article.more_positive_votes(owner, self.limit)
+        if !docs.blank?
+          subcontent = ""
+          subcontent += content_tag(:span, _("Most liked articles"), :class=>"title mliked") + "\n"
+          subcontent += content_tag(:ul, docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
+          content += content_tag(:div, subcontent, :class=>"block mliked") + "\n"
+        end
+      end
+      if self.show_most_disliked
+        docs = Article.more_negative_votes(owner, self.limit)
+        if !docs.blank?
+          subcontent = ""
+          subcontent += content_tag(:span, _("Most disliked articles"), :class=>"title mdisliked") + "\n"
+          subcontent += content_tag(:ul, docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
+          content += content_tag(:div, subcontent, :class=>"block mdisliked") + "\n"
+        end
+      end
+
+      if self.show_most_voted
+        docs = Article.most_voted(owner, self.limit)
+        if !docs.blank?
+          subcontent = ""
+          subcontent += content_tag(:span, _("Most voted articles"), :class=>"title mvoted") + "\n"
+          subcontent += content_tag(:ul, docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
+          content += content_tag(:div, subcontent, :class=>"block mvoted") + "\n"
+        end
+      end
+    end
+    return content
+  end
+
+  def timeout
+    4.hours
+  end
+
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
+end
 \ No newline at end of file
@@ -0,0 +1,79 @@
+#content .relevant-content-plugin_relevant-content-block  {
+  padding: 10px 0px 10px 10px;
+  word-wrap: break-word;
+}
+
+.relevant-content-plugin_relevant-content-block ul {
+  margin: 0px;
+  padding: 0px 0px 0px 20px;
+}
+.relevant-content-plugin_relevant-content-block li {
+  margin: 0px;
+  padding: 0px;
+  list-style: none
+}
+.relevant-content-plugin_relevant-content-block a {
+  text-decoration: none;
+}
+.relevant-content-plugin_relevant-content-block .block-footer-content {
+  font-size: 10px;
+}
+.relevant-content-plugin_relevant-content-block .block-footer-content a:hover {
+  text-decoration: underline;
+}
+
+.relevant-content-plugin_relevant-content-block p {
+    text-align:center;
+}
+
+.relevant-content-plugin_relevant-content-block  p.like{
+  background-image: url('images/positive-hand.png');
+  background-repeat: no-repeat;
+  min-width: 50px;
+  text-align:center;
+}
+
+.relevant-content-plugin_relevant-content-block  p.dislike{
+  background-image: url('images/negative-hand.png');
+  background-repeat: no-repeat;
+  min-width: 50px;
+  text-align:center;
+}
+
+
+.relevant-content-plugin_relevant-content-block {
+  //overflow: hidden;
+  display: block;
+  width: 100%;
+}
+
+
+.relevant-content-cover img {
+  width: 100%;
+}
+
+.relevant-content-plugin_relevant-content-block span.title {
+  display: block;
+  margin: 20px 0px 0px;
+  padding: 0px 0px 0px 20px;
+}
+
+.relevant-content-plugin_relevant-content-block span.title.mread {
+
+}
+
+.relevant-content-plugin_relevant-content-block span.title.mcommented {
+
+}
+
+.relevant-content-plugin_relevant-content-block span.title.mliked {
+
+}
+
+.relevant-content-plugin_relevant-content-block span.title.mdisliked {
+
+}
+
+.relevant-content-plugin_relevant-content-block span.title.mvoted {
+
+}
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,148 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+require 'comment_controller'
+# Re-raise errors caught by the controller.
+class CommentController; def rescue_action(e) raise e end; end
+
+class RelevantContentBlockTest < ActiveSupport::TestCase
+
+  include AuthenticatedTestHelper
+  fixtures :users, :environments
+
+  def setup
+    @controller = CommentController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('testinguser').person
+    @environment = @profile.environment
+  end
+  attr_reader :profile, :environment
+
+  def enable_vote_plugin
+    enabled = false
+    environment=Environment.default
+    if Noosfero::Plugin.all.include?('VotePlugin')
+      if not environment.enabled_plugins.include?(:vote)
+        environment.enable_plugin(Vote)
+        environment.save!
+      end
+      enabled = true
+    end
+    enabled
+  end
+
+ should 'list most commented articles' do
+    Article.delete_all
+    a1 = create(TextileArticle, :name => "art 1", :profile_id => profile.id)
+    a2 = create(TextileArticle, :name => "art 2", :profile_id => profile.id)
+    a3 = create(TextileArticle, :name => "art 3", :profile_id => profile.id)
+
+    2.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a2).save! }
+    4.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a3).save! }
+
+    # should respect the order (more commented comes first)
+    assert_equal a3.name, profile.articles.most_commented_relevant_content(Environment.default, 3).first.name
+    # It is a2 instead of a1 since it does not list articles without comments
+    assert_equal a2.name, profile.articles.most_commented_relevant_content(Environment.default, 3).last.name
+  end
+
+
+  should 'find the most voted' do
+    if not enable_vote_plugin
+      return
+    end
+    article = fast_create(Article, {:name=>'2 votes'})
+    2.times{
+      person = fast_create(Person)
+      person.vote_for(article)
+    }
+    article = fast_create(Article, {:name=>'10 votes'})
+    10.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    article = fast_create(Article, {:name=>'5 votes'})
+    5.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    articles = Article.most_voted(Environment.default, 5)
+    assert_equal '10 votes', articles.first.name
+    assert_equal '2 votes', articles.last.name
+  end
+
+  should 'list the most postive' do
+    if not enable_vote_plugin
+      return
+    end
+    article = fast_create(Article, {:name=>'23 votes for 20 votes against'})
+    20.times{
+        person = fast_create(Person)
+        person.vote_against(article)
+    }
+    23.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    article = fast_create(Article, {:name=>'10 votes for 5 votes against'})
+    10.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    5.times{
+        person = fast_create(Person)
+        person.vote_against(article)
+    }
+    article = fast_create(Article, {:name=>'2 votes against'})
+    2.times{
+        person = fast_create(Person)
+        person.vote_against(article)
+    }
+
+    article = fast_create(Article, {:name=>'7 votes for'})
+    7.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    articles = Article.more_positive_votes(Environment.default, 5)
+    assert_equal '7 votes for', articles.first.name
+    assert_equal '23 votes for 20 votes against', articles.last.name
+  end
+
+  should 'list the most negative' do
+    if not enable_vote_plugin
+      return
+    end
+    article = fast_create(Article, {:name=>'23 votes for 29 votes against'})
+    29.times{
+        person = fast_create(Person)
+        person.vote_against(article)
+    }
+    23.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    article = fast_create(Article, {:name=>'10 votes for 15 votes against'})
+    10.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    15.times{
+        person = fast_create(Person)
+        person.vote_against(article)
+    }
+    article = fast_create(Article, {:name=>'2 votes against'})
+    2.times{
+        person = fast_create(Person)
+        person.vote_against(article)
+    }
+    article = fast_create(Article, {:name=>'7 votes for'})
+    7.times{
+        person = fast_create(Person)
+        person.vote_for(article)
+    }
+    articles = Article.more_negative_votes(Environment.default, 5)
+    assert_equal '23 votes for 29 votes against', articles.first.name
+    assert_equal '2 votes against', articles.last.name
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+require 'comment_controller'
+# Re-raise errors caught by the controller.
+class CommentController; def rescue_action(e) raise e end; end
+
+class RelevantContentBlockTest < ActiveSupport::TestCase
+
+  include AuthenticatedTestHelper
+  fixtures :users, :environments
+
+  def setup
+    @controller = CommentController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = create_user('testinguser').person
+    @environment = @profile.environment
+  end
+  attr_reader :profile, :environment
+
+  should 'have a default title' do
+    relevant_content_block = RelevantContentPlugin::RelevantContentBlock.new
+    block = Block.new
+    assert_not_equal block.default_title, relevant_content_block.default_title
+  end
+
+  should 'have a help tooltip' do
+    relevant_content_block = RelevantContentPlugin::RelevantContentBlock.new
+    block = Block.new
+    assert_not_equal "", relevant_content_block.help
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, RelevantContentPlugin::RelevantContentBlock.description
+  end
+
+  should 'is editable' do
+    block = RelevantContentPlugin::RelevantContentBlock.new
+    assert block.editable?
+  end
+
+  should 'expire' do
+    assert_equal RelevantContentPlugin::RelevantContentBlock.expire_on, {:environment=>[:article], :profile=>[:article]}
+  end
+
+end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class RelevantContentPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = RelevantContentPlugin.new
+  end
+
+  should 'be a noosfero plugin' do
+    assert_kind_of Noosfero::Plugin, @plugin
+  end
+
+  should 'have name' do
+    assert_equal 'Relevant Content Plugin', RelevantContentPlugin.plugin_name
+  end
+
+  should 'have description' do
+    assert_equal  _("A plugin that lists the most accessed, most commented, most liked and most disliked contents."), RelevantContentPlugin.plugin_description
+  end
+
+  should 'have stylesheet' do
+    assert @plugin.stylesheet?
+  end
+
+  should "return RelevantContentBlock in extra_blocks class method" do
+    assert  RelevantContentPlugin.extra_blocks.keys.include?(RelevantContentPlugin::RelevantContentBlock)
+  end
+
+end
@@ -0,0 +1,8 @@
+<div id='edit-relevant-content-block'>
+  <%= labelled_form_field _('Limit of items per category'), text_field(:block, :limit, :size => 3) %>
+  <%= labelled_check_box _('Display most accessed content'), "block[show_most_read]", 1 ,@block.show_most_read %><BR>
+  <%= labelled_check_box _('Display most commented content'), "block[show_most_commented]", 1 ,@block.show_most_commented %><BR>
+  <%= labelled_check_box _('Display most liked content'), "block[show_most_liked]", 1 ,@block.show_most_liked %><BR>
+  <%= labelled_check_box _('Display most voted content'), "block[show_most_voted]", 1 ,@block.show_most_voted %><BR>
+  <%= labelled_check_box _('Display most disliked content'), "block[show_most_disliked]", 1 , @block.show_most_disliked %><BR>
+</div>
 \ No newline at end of file
@@ -0,0 +1 @@
+../box_organizer/relevant_content_plugin
 \ No newline at end of file
@@ -0,0 +1 @@
+../box_organizer/relevant_content_plugin
 \ No newline at end of file
@@ -0,0 +1,39 @@
+h1. Variables Plugin
+
+A set of simple variables to be used in a macro context.
+
+h2. Usage
+
+* Create a HTML content using RawHTMLBlock, TinyMceArticle or other
+  article with HTML support
+* Add a HTML div tag with css class "macro" (see Example)
+* Add inner that div tag the variable desired, like {profile}
+
+h2. Usage with TinyMceArticle
+
+The Noosfero's macros add a extra button in toolbar of the editor
+to use macros in a single way, that way this plugin add a option
+called "Variables" under this option.
+
+h2. Supported variables
+
+* {profile} - will be replaced by the identifier of the profile
+* {name} - will be replaced by the name of the profile
+
+h2. Example
+
+<pre>
+<div class="macro" data-macro="variables_plugin/profile">
+  the identifier of the profile = {profile}
+  the name of the profile = {name}
+</div>
+</pre>
+
+h2. Info
+
+This plugin was inspired by the solution proposed by the Serpro in
+the merge-request #419 on the Gitorious:
+
+* https://gitorious.org/noosfero/noosfero/merge_requests/419
+
+And improved by the guys from the UnB.
@@ -0,0 +1,13 @@
+class VariablesPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Variables Plugin"
+  end
+
+  def self.plugin_description
+    _("A set of simple variables to be used in a macro context")
+  end
+
+end
+
+require_dependency 'variables_plugin/macros/profile'
@@ -0,0 +1,37 @@
+ActionView::Base.sanitized_allowed_attributes += ['data-macro']
+
+class VariablesPlugin::Profile < Noosfero::Plugin::Macro
+
+  def self.configuration
+    {
+      :title => _('Variables'),
+      :skip_dialog => false,
+      :generator => method(:macro_default_generator),
+      :params => [
+        {
+          :name   => 'variable',
+          :label  => _('Select the desired variable'),
+          :type   => 'select',
+          :values => ['{profile}', '{name}']
+        }
+      ],
+    }
+  end
+
+  def self.macro_default_generator(macro)
+    "
+      '<div class=\"macro mceNonEditable\" data-macro=\"#{macro.identifier}\">'
+      + jQuery('*[name=variable]', dialog).val()
+      + '</div>';
+    "
+  end
+
+  def parse(params, inner_html, source)
+    if context.profile
+      inner_html.gsub!(/\{profile\}/, context.profile.identifier)
+      inner_html.gsub!(/\{name\}/, context.profile.name)
+    end
+    inner_html
+  end
+
+end
@@ -0,0 +1,41 @@
+class ProfileTest < ActiveSupport::TestCase
+
+  def setup
+    @macro = VariablesPlugin::Profile.new
+    @macro.context = mock()
+    @profile = fast_create(Community)
+    @macro.context.stubs(:profile).returns(@profile)
+  end
+
+  attr_reader :macro, :profile
+
+  should 'have a configuration' do
+    assert VariablesPlugin::Profile.configuration
+  end
+
+  should 'substitute the {profile} variable by the profile idenfifier' do
+    html = 'the profile identifier is {profile}'
+    content = macro.parse({}, html, profile)
+    assert_equal "the profile identifier is #{profile.identifier}", content
+  end
+
+  should 'substitute the {name} variable by the profile name' do
+    html = 'the profile name is {name}'
+    content = macro.parse({}, html, profile)
+    assert_equal "the profile name is #{profile.name}", content
+  end
+
+  should 'do not change the content if the variable is not supported' do
+    html = 'the variable {unsupported} is not supported'
+    content = macro.parse({}, html, profile)
+    assert_equal html, content
+  end
+
+  should 'do nothing out of profile context' do
+    macro.context.stubs(:profile).returns(nil)
+    html = 'there is no {support} out of profile context'
+    content = macro.parse({}, html, profile)
+    assert_equal html, content
+  end
+
+end
@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class VariablesPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @plugin = VariablesPlugin.new
+  end
+
+  attr_reader :environment, :plugin
+
+  should 'have a name' do
+    assert_not_equal Noosfero::Plugin.plugin_name, VariablesPlugin::plugin_name
+  end
+
+  should 'describe yourself' do
+    assert_not_equal Noosfero::Plugin.plugin_description, VariablesPlugin::plugin_description
+  end
+
+end
 /******************SMALL ICONS********************/
+.icon-embed     { background-image: url(Tango/16x16/apps/utilities-terminal.png) }
 .icon-edit      { background-image: url(Tango/16x16/apps/text-editor.png) }
 .icon-undo      { background-image: url(Tango/16x16/actions/edit-undo.png) }
 .icon-home      { background-image: url(Tango/16x16/actions/go-home.png)          }
@@ -1275,6 +1275,11 @@ hr.pre-posts, hr.sep-posts {
   padding-right: 9px;
 }
  
+.comment-order {
+  float: right;
+  display: block;
+}
+
 .comment-from-owner .comment-created-at {
   color: #333;
 }
@@ -1101,4 +1101,4 @@ jQuery(document).ready(function(){
   jQuery("#article_has_terms_of_use").click(function(){
     showHideTermsOfUse();
   });
-});
 \ No newline at end of file
+});
@@ -0,0 +1,60 @@
+(function($){
+  autoCompleteStateCity($);
+  $('[id$="_country"]').change(function(){
+    autoCompleteStateCity($);
+  })
+})(jQuery);
+
+function autoCompleteStateCity($) {
+  var country_selected = $('[id$="_country"] option:selected').val()
+  if(country_selected == "BR")
+  {
+    $('#state_field').autocomplete({
+      source : function(request, response){
+        $.ajax({
+          type: "GET",
+          url: '/account/search_state',
+          data: {state_name: request.term},
+          success: function(result){
+            response(result);
+          },
+          error: function(ajax, stat, errorThrown) {
+            console.log('Link not found : ' + errorThrown);
+          }
+       });
+      },
+
+      minLength: 3
+    });
+
+    $('#city_field').autocomplete({
+      source : function(request, response){
+        $.ajax({
+          type: "GET",
+          url: '/account/search_cities',
+          data: {city_name: request.term, state_name: $("#state_field").val()},
+          success: function(result){
+            response(result);
+          },
+          error: function(ajax, stat, errorThrown) {
+            console.log('Link not found : ' + errorThrown);
+          }
+        });
+      },
+
+      minLength: 3
+    });
+  }
+  else
+  {
+    if ($('#state_field').data('autocomplete')) {
+      $('#state_field').autocomplete("destroy");
+      $('#state_field').removeData('autocomplete');
+    }
+
+    if ($('#city_field').data('autocomplete')) {
+      $('#city_field').autocomplete("destroy");
+      $('#city_field').removeData('autocomplete');
+    }
+  }
+}
@@ -0,0 +1,21 @@
+function send_order(order, url) {
+  open_loading(DEFAULT_LOADING_MESSAGE);
+
+  jQuery.ajax({
+    url:url,
+    data: {"comment_order":order},
+    success: function(response) {
+      close_loading();
+      jQuery(".article-comments-list").html(response);
+    },
+    error: function() { close_loading() }
+  });
+}
+
+
+jQuery(document).ready(function(){
+  jQuery("#comment_order").change(function(){
+    var url = jQuery("#page_url").val();
+    send_order(this.value, url);
+  });
+});
 \ No newline at end of file
@@ -0,0 +1,39 @@
+function send_ajax(source_url) {
+  jQuery(".link-address").autocomplete({
+    source : function(request, response){
+      jQuery.ajax({
+        type: "GET",
+        url: source_url,
+        data: {query: request.term},
+        success: function(result){
+          response(result);
+        },
+        error: function(ajax, stat, errorThrown) {
+          console.log('Link not found : ' + errorThrown);
+        }
+      });
+    },
+
+    minLength: 3
+  });
+}
+
+function new_link_action(){
+  send_ajax(jQuery("#page_url").val());
+
+  jQuery(".delete-link-list-row").click(function(){
+    jQuery(this).parent().parent().remove();
+    return false;
+  });
+
+  jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());
+}
+
+jQuery(document).ready(function(){
+  new_link_action();
+
+  jQuery("#dropable-link-list").sortable({
+    revert: true,
+    axis: "y"
+  });
+});
 \ No newline at end of file
@@ -0,0 +1,121 @@
+// This jQuery plugin is written by firas kassem [2007.04.05] and was modified to fit noosfero
+// Firas Kassem  phiras.wordpress.com || phiras at gmail {dot} com
+// for more information : http://phiras.wordpress.com/2007/04/08/password-strength-meter-a-jquery-plugin/
+
+var blankPass    = -1
+var shortPass   = 0
+var badPass     = 1
+var goodPass    = 2
+var strongPass  = 3
+
+
+function passwordStrength(password,username)
+{
+  score = 0
+
+  if(password.length == 0) return blankPass
+
+  //password < 4
+  if (password.length < 4 ) { return shortPass }
+
+  //password == username
+  if (password.toLowerCase()==username.toLowerCase()) badPass
+
+  //password length
+  score += password.length * 4
+  score += ( checkRepetition(1,password).length - password.length ) * 1
+  score += ( checkRepetition(2,password).length - password.length ) * 1
+  score += ( checkRepetition(3,password).length - password.length ) * 1
+  score += ( checkRepetition(4,password).length - password.length ) * 1
+
+  //password has 3 numbers
+  if (password.match(/(.*[0-9].*[0-9].*[0-9])/))  score += 5
+
+  //password has 2 sybols
+  if (password.match(/(.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~])/)) score += 5
+
+  //password has Upper and Lower chars
+  if (password.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/))  score += 10
+
+  //password has number and chars
+  if (password.match(/([a-zA-Z])/) && password.match(/([0-9])/))  score += 15
+  //
+  //password has number and symbol
+  if (password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([0-9])/))  score += 15
+
+  //password has char and symbol
+  if (password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([a-zA-Z])/))  score += 15
+
+  //password is just a nubers or chars
+  if (password.match(/^\w+$/) || password.match(/^\d+$/) )  score -= 10
+
+  //verifing 0 < score < 100
+  if ( score < 0 )  score = 0
+  if ( score > 100 )  score = 100
+
+  if (score < 34 )  return badPass
+  if (score < 68 )  return goodPass
+  return strongPass
+}
+
+function checkRepetition(pLen,str)
+{
+  res = ""
+  for ( i=0; i<str.length ; i++ )
+  {
+      repeated=true
+      for (j=0;j < pLen && (j+i+pLen) < str.length;j++)
+          repeated=repeated && (str.charAt(j+i)==str.charAt(j+i+pLen))
+      if (j<pLen) repeated=false
+      if (repeated)
+      {
+          i+=pLen-1
+          repeated=false
+      }
+      else
+      {
+          res+=str.charAt(i)
+      }
+  }
+  return res
+}
+
+jQuery(document).ready(function() {
+    jQuery('#user_pw').keyup(function()
+    {
+      var result = passwordStrength(jQuery('#user_pw').val(),jQuery('#user_login').val())
+      if(result == blankPass)
+      {
+        showRateField('#result-blank')
+      } else
+      if(result == shortPass)
+      {
+        showRateField('#result-short')
+      } else
+      if( result == badPass )
+      {
+        showRateField('#result-bad')
+      } else
+      if( result == goodPass )
+      {
+        showRateField('#result-good')
+      } else
+      if( result == strongPass )
+      {
+        showRateField('#result-strong')
+      }
+
+    })
+})
+
+function showRateField(validation)
+{
+  jQuery('#result-blank').addClass('hidden')
+  jQuery('#result-short').addClass('hidden')
+  jQuery('#result-bad').addClass('hidden')
+  jQuery('#result-good').addClass('hidden')
+  jQuery('#result-strong').addClass('hidden')
+
+  jQuery(validation).removeClass('hidden')
+
+}
 \ No newline at end of file
@@ -0,0 +1,23 @@
+function verifyLoginLoad() {
+  jQuery('#user_login').removeClass('available unavailable valid validated invalid checking').addClass('checking');
+  jQuery('#url-check').html(jQuery('#checking-message').html());
+}
+
+function verifyLoginAjax(value) {
+  verifyLoginLoad();
+
+  jQuery.get(
+    "/account/check_valid_name",
+    {'identifier': encodeURIComponent(value)},
+    function(request){
+      jQuery('#user_login').removeClass('checking');
+      jQuery("#url-check").html(request);
+    }
+  );
+}
+
+jQuery(document).ready(function(){
+  jQuery("#user_login").blur(function(){
+    verifyLoginAjax(this.value);
+  });
+});
@@ -1859,20 +1859,70 @@ a.button.disabled, input.disabled {
   text-decoration: none;
 }
 /* ==> blocks/link-list-block.css <<= */
-
 #edit-link-list-block {
-  width: 820px;
+  width: 620px;
+  position: relative;
+  left: -24px;
 }
-
-#edit-link-list-block table {
-  width: auto;
-  margin-bottom: 10px;
+.link-list-header {
+  width: 98%;
+  height: 25px;
+  padding: 10px 1px 10px 10px;
+  margin-bottom: 5px;
+  cursor: pointer;
 }
-#edit-link-list-block table .cel-address {
-  width: 220px;
+.link-list-header li {
+  list-style-type: none;
+  display: inline;
+  font-weight: bold;
+  font-size: 14px;
+  text-align: center;
 }
-#edit-link-list-block table .cel-address input {
-  width: 100%;
+#dropable-link-list {
+  padding-left: 23px;
+  margin-top: -12px;
+}
+#dropable-link-list li {
+  list-style-type: none;
+}
+.link-list-row {
+  line-height: 25px;
+  margin-bottom: 5px;
+  padding: 10px 1px 10px 10px;
+  cursor: pointer;
+  width: 97%;
+}
+.link-list-row:hover {
+  background: #ddd url(/images/drag-and-drop.png) no-repeat;
+  background-position: 98% 15px;
+}
+.link-list-row li {
+  list-style-type: none;
+  display: inline;
+  margin-left: 5px;
+}
+.link-list-row li div {
+  float: left;
+  margin-top: 4px;
+}
+.link-list-row li a {
+  line-height: 27px !important;
+  padding-right: 5px;
+}
+.link-list-icon {
+  margin-left: 14px;
+}
+.link-list-name {
+  margin-left: 40px;
+}
+.link-list-address {
+  margin-left: 90px;
+}
+.link-list-target {
+  margin-left: 77px;
+}
+.new_link_row li {
+  margin-left: 7px;
 }
 #content .link-list-block {
   padding: 10px 0px 10px 10px;
@@ -5989,8 +6039,14 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   text-align: right;
 }
  
+#url-check .suggested_usernames,
+#url-check .suggested_usernames a {
+  color: #005000;
+}
+
 #email-check,
 #fake-check,
+#password-rate,
 #password-check {
   margin: -2px 16px -5px 13px;
   text-align: right;
@@ -5999,10 +6055,20 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
  
 #email-check p,
 #fake-check p,
+#password-rate p,
 #password-check p {
   margin: 0;
 }
  
+#password-rate {
+  font-weight:bold;
+}
+
+.hidden {
+  visibility: hidden;
+  display: none;
+}
+
 .available {
   color: #88BD00;
 }
@@ -6016,6 +6082,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 }
  
 #email-check p,
+#password-rate p,
 #password-check p,
 #url-check p {
   margin: 0;
@@ -6607,3 +6674,19 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 .diff li.diff-block-info {
   background: none repeat scroll 0 0 gray;
 }
+
+#signup-form #result-short {
+  color: red;
+}
+
+#signup-form #result-bad {
+  color: #825A2C;
+}
+
+#signup-form #result-good {
+  color: #32CD32;
+}
+
+#signup-form #result-strong {
+  color: green;
+}
@@ -8,7 +8,6 @@ class AccountControllerTest &lt; ActionController::TestCase
   # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead
   # Then, you can remove it from this and the units test.
   include AuthenticatedTestHelper
-
   all_fixtures
  
   def teardown
@@ -17,8 +16,8 @@ class AccountControllerTest &lt; ActionController::TestCase
  
   def setup
     @controller = AccountController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
     disable_signup_bot_check
   end
  
@@ -656,21 +655,28 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'home', :action => 'index'
   end
  
-  should 'check_url is available on environment' do
+  should 'check_valid_name is available on environment' do
     env = fast_create(Environment, :name => 'Environment test')
     @controller.expects(:environment).returns(env).at_least_once
     profile = create_user('mylogin').person
-    get :check_url, :identifier => 'mylogin'
+    get :check_valid_name, :identifier => 'mylogin'
     assert_equal 'validated', assigns(:status_class)
   end
  
   should 'check if url is not available on environment' do
     @controller.expects(:environment).returns(Environment.default).at_least_once
     profile = create_user('mylogin').person
-    get :check_url, :identifier => 'mylogin'
+    get :check_valid_name, :identifier => 'mylogin'
     assert_equal 'invalid', assigns(:status_class)
   end
  
+  should 'suggest a list with three possible usernames' do
+    profile = create_user('mylogin').person
+    get :check_valid_name, :identifier => 'mylogin'
+
+    assert_equal 3, assigns(:suggested_usernames).uniq.size
+  end
+
   should 'check if e-mail is available on environment' do
     env = fast_create(Environment, :name => 'Environment test')
     @controller.expects(:environment).returns(env).at_least_once
@@ -699,6 +705,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         {:test => 5}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     e = User.find_by_login('ze').environment
     e.enable_plugin(Plugin1.name)
@@ -789,6 +796,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -805,6 +813,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         User.new(:login => 'testuser')
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     Environment.default.enable_plugin(Plugin1.name)
  
     post :login, :user => {:login => "testuser"}
@@ -819,6 +828,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         nil
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     Environment.default.enable_plugin(Plugin1.name)
     post :login, :user => {:login => 'johndoe', :password => 'test'}
     assert session[:user]
@@ -832,6 +842,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestRegistrationPlugin.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestRegistrationPlugin.new])
  
     post :signup, :user => { :login => 'testuser', :password => '123456', :password_confirmation => '123456', :email => 'testuser@example.com' }
@@ -850,6 +861,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
  
     get :login
@@ -863,6 +875,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestRegistrationPlugin.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestRegistrationPlugin.new])
  
     #Redirect on get action
@@ -886,6 +899,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.new, Plugin2.new])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
  
     get :login
@@ -904,6 +918,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -927,6 +942,30 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert @response.body.blank?
   end
  
+  should "Search for state" do
+    create_state_and_city
+
+    xhr :get, :search_state, :state_name=>"Rio Grande"
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    label = json_response[0]['label']
+
+    assert_equal label, "Rio Grande do Sul"
+  end
+
+  should "Search for city" do
+    create_state_and_city
+
+    xhr :get, :search_cities, :state_name=>"Rio Grande do Sul", :city_name=>"Lavras"
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    label = json_response[0]['label']
+    category =  json_response[0]['category']
+
+    assert_equal category, "Rio Grande do Sul"
+    assert_equal label, "Lavras do Sul"
+  end
+
   protected
   def new_user(options = {}, extra_options ={})
     data = {:profile_data => person_data}
@@ -955,4 +994,18 @@ class AccountControllerTest &lt; ActionController::TestCase
     environment.min_signup_delay = 0
     environment.save!
   end
+
+  def create_state_and_city
+    city = 'Lavras do Sul'
+    state = 'Rio Grande do Sul'
+
+    parent_region = fast_create(NationalRegion, :name => state,
+                                :national_region_code => '43',
+                                :national_region_type_id => NationalRegionType::STATE)
+
+    fast_create(NationalRegion, :name =>  city,
+                                :national_region_code => '431150',
+                                :national_region_type_id => NationalRegionType::CITY,
+                                :parent_national_region_code => parent_region.national_region_code)
+  end
 end
@@ -374,6 +374,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     end
     plugin2_path = '/plugin2/style.css'
  
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
+
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -405,6 +407,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     plugin2_path2 = '/plugin2/'+js2
     plugin2_path3 = '/plugin2/'+js3
  
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
+
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -428,6 +432,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
       end
     end
  
+    Noosfero::Plugin.stubs(:all).returns([TestBodyBeginning1Plugin.name, TestBodyBeginning2Plugin.name])
+
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBodyBeginning1Plugin.new, TestBodyBeginning2Plugin.new])
  
     get :index
@@ -449,6 +455,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
       end
     end
  
+    Noosfero::Plugin.stubs(:all).returns([TestHeadEnding1Plugin.name, TestHeadEnding2Plugin.name])
+
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestHeadEnding1Plugin.new, TestHeadEnding2Plugin.new])
  
     get :index
@@ -513,6 +521,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
           :block => lambda {} }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([FilterPlugin.name])
  
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([FilterPlugin.new])
  
@@ -531,6 +540,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
           :block => lambda {'plugin block called'} }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([OtherFilterPlugin.name])
  
     environment1 = fast_create(Environment, :name => 'test environment')
     environment1.enable_plugin(OtherFilterPlugin.name)
@@ -91,6 +91,7 @@ class CatalogControllerTest &lt; ActionController::TestCase
         lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     product = fast_create(Product, :profile_id => @enterprise.id)
     environment = Environment.default
@@ -1197,6 +1197,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     class Plugin2 < Noosfero::Plugin
       def content_remove_edit(content); false; end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -1213,6 +1214,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     class Plugin2 < Noosfero::Plugin
       def content_expire_edit(content); nil; end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -1258,6 +1260,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
          }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -1282,6 +1285,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
         scope.where(:referrer => 'kernel.org')
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -1339,6 +1343,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
          }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class EmbedControllerTest < ActionController::TestCase
+
+  def setup
+    login_as(create_admin_user(Environment.default))
+    @block = LoginBlock.create!
+    @block.class.any_instance.stubs(:embedable?).returns(true)
+    @environment = Environment.default
+    @environment.boxes.create!
+    @environment.boxes.first.blocks << @block
+  end
+
+  should 'be able to get embed block' do
+    get :block, :id => @block.id
+    assert_tag :tag => 'div', :attributes => { :id => "block-#{@block.id}" }
+  end
+
+  should 'display error message when not found block' do
+    Block.delete_all
+    get :block, :id => 1
+    assert_tag :tag => 'div', :attributes => { :id => "not-found" }
+  end
+
+  should 'display error message when block is not visible/public' do
+    @block.display = 'never'
+    assert @block.save
+    get :block, :id => @block.id
+    assert_tag :tag => 'div', :attributes => { :id => "unavailable" }
+  end
+
+  should 'display error message when block is not embedable' do
+    @block.class.any_instance.stubs(:embedable?).returns(false)
+    get :block, :id => @block.id
+    assert_tag :tag => 'div', :attributes => { :id => "unavailable" }
+  end
+
+
+end
@@ -193,6 +193,7 @@ class EnterpriseRegistrationControllerTest &lt; ActionController::TestCase
         {'plugin2' => 'Plugin 2'}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
@@ -370,4 +370,47 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
   end
  
+  should 'clone a block' do
+    login_as(create_admin_user(Environment.default))
+    block = TagsBlock.create!
+    assert_difference TagsBlock, :count, 1 do
+      post :clone_block, :id => block.id
+      assert_response :redirect
+    end
+  end
+
+  should 'return a list of paths from portal related to the words used in the query search' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+    community = fast_create(Community, :environment_id => env)
+    env.portal_community = community
+    env.enable('use_portal_community')
+    env.save
+    @controller.stubs(:boxes_holder).returns(env)
+    article1 = fast_create(Article, :profile_id => community.id, :name => "Some thing")
+    article2 = fast_create(Article, :profile_id => community.id, :name => "Some article")
+    article3 = fast_create(Article, :profile_id => community.id, :name => "Not an article")
+
+    xhr :get, :search_autocomplete, :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response.include?("/{portal}/"+article1.path), true
+    assert_equal json_response.include?("/{portal}/"+article2.path), true
+    assert_equal json_response.include?("/{portal}/"+article3.path), false
+  end
+
+  should 'return empty if portal not configured' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+
+    xhr :get, :search_autocomplete, :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response, []
+  end
+
 end
@@ -68,6 +68,7 @@ class FriendsControllerTest &lt; ActionController::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     e = profile.environment
     e.enable_plugin(Plugin1.name)
@@ -107,6 +107,7 @@ class HomeControllerTest &lt; ActionController::TestCase
         lambda {"<a href='plugin2'>Plugin2 link</a>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -129,6 +130,7 @@ class HomeControllerTest &lt; ActionController::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
  
     get :index
@@ -234,6 +234,7 @@ class MembershipsControllerTest &lt; ActionController::TestCase
         {'plugin2' => 'Plugin 2'}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
@@ -47,7 +47,7 @@ class PluginsControllerTest &lt; ActionController::TestCase
       end
     end
  
-    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s,Plugin2.to_s])
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
  
     get :index
  
@@ -1255,6 +1255,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
         {:title => 'Plugin2 tab', :id => 'plugin2_tab', :content => lambda { 'Content from plugin2.' }}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
  
     e = profile.environment
     e.enable_plugin(Plugin1.name)
@@ -173,7 +173,8 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'have options to display blocks' do
     get :edit, :profile => 'designtestuser', :id => @b1.id
     %w[always home_page_only except_home_page never].each do |option|
-      assert_tag :input, :attributes => { :type => 'radio', :value => option}
+      assert_tag :select, :attributes => {:name => 'block[display]'},
+       :descendant => {:tag => 'option', :attributes => {:value => option}}
     end
   end
  
@@ -302,24 +303,42 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
  
   should 'not edit main block with never option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_no_tag :input, :attributes => { :type => 'radio', :value => 'never'}
+    assert_no_tag :select, :attributes => {:name => 'block[display]'},
+      :descendant => {:tag => 'option', :attributes => {:value => 'never'}}
   end
  
   should 'not edit main block with home_page_only option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_no_tag :input, :attributes => { :type => 'radio', :value => 'home_page_only'}
+    assert_no_tag :select, :attributes => {:name => 'block[display]'},
+     :descendant => {:tag => 'option', :attributes => {:value => 'home_page_only'}}
   end
  
   should 'edit main block with always option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_tag :input, :attributes => { :type => 'radio', :value => 'always'}
+    assert_tag :select, :attributes => {:name => 'block[display]'},
+     :descendant => {:tag => 'option', :attributes => {:value => 'always'}}
   end
  
   should 'edit main block with except_home_page option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_tag :input, :attributes => { :type => 'radio', :value => 'except_home_page'}
+    assert_tag :select, :attributes => {:name=> 'block[display]'},
+     :descendant => {:tag => 'option', :attributes => {:value => 'except_home_page'}}
   end
  
+  should 'return a list of paths related to the words used in the query search' do
+    article1 = fast_create(Article, :profile_id => @profile.id, :name => "Some thing")
+    article2 = fast_create(Article, :profile_id => @profile.id, :name => "Some article")
+    article3 = fast_create(Article, :profile_id => @profile.id, :name => "Not an article")
+
+    xhr :get, :search_autocomplete, :profile => 'designtestuser' , :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response.include?("/{profile}/"+article1.path), true
+    assert_equal json_response.include?("/{profile}/"+article2.path), true
+    assert_equal json_response.include?("/{profile}/"+article3.path), false
+  end
  
   ######################################################
   # END - tests for BoxOrganizerController features
@@ -739,7 +758,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'clone a block' do
     block = ProfileImageBlock.create!(:box => profile.boxes.first)
     assert_difference ProfileImageBlock, :count, 1 do
-      post :clone, :id => block.id, :profile => profile.identifier
+      post :clone_block, :id => block.id, :profile => profile.identifier
       assert_response :redirect
     end
   end
@@ -868,6 +868,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         {:title => "Plugin2 button", :icon => 'plugin2_icon', :url => 'plugin2_url'}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestControlPanelButtons1.to_s, TestControlPanelButtons2.to_s])
  
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestControlPanelButtons1.new, TestControlPanelButtons2.new])
  
@@ -883,6 +884,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         "<input id='field_added_by_plugin' value='value_of_field_added_by_plugin'/>"
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestProfileEditPlugin.to_s])
  
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestProfileEditPlugin.new])
  
@@ -911,6 +913,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
  
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -932,6 +935,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
  
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -74,14 +74,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:searches)[:articles][:results], art
   end
  
-	should 'redirect contents to articles' do
+  should 'redirect contents to articles' do
     person = fast_create(Person)
     art = create_article_with_optional_category('an article to be found', person)
  
     get 'contents', :query => 'article found'
-		# full description to avoid deprecation warning
+    # full description to avoid deprecation warning
     assert_redirected_to :controller => :search, :action => :articles, :query => 'article found'
-	end
+  end
  
   # 'assets' outside any category
   should 'list articles in general' do
@@ -163,6 +163,7 @@ class SearchControllerTest &lt; ActionController::TestCase
         lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
  
     enterprise = fast_create(Enterprise)
     prod_cat = fast_create(ProductCategory)
@@ -189,6 +190,7 @@ class SearchControllerTest &lt; ActionController::TestCase
         return { :name => _('Property2'), :content => lambda { link_to(product.name, '/plugin2') } }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     enterprise = fast_create(Enterprise)
     prod_cat = fast_create(ProductCategory)
     product = fast_create(Product, {:profile_id => enterprise.id, :name => "produto1", :product_category_id => prod_cat.id}, :search => true)
@@ -257,10 +259,10 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'render specific action when only one asset is enabled' do
     environment = Environment.default
-		# article is not disabled
+    # article is not disabled
     [:enterprises, :people, :communities, :products, :events].select do |key, name|
-			environment.enable('disable_asset_' + key.to_s)
-		end
+      environment.enable('disable_asset_' + key.to_s)
+    end
     environment.save!
     @controller.stubs(:environment).returns(environment)
  
@@ -272,25 +274,25 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert !assigns(:searches).has_key?(:communities)
     assert !assigns(:searches).has_key?(:products)
     assert !assigns(:searches).has_key?(:events)
-	end
+  end
  
   should 'search all enabled assets in general search' do
     ent1 = create_profile_with_optional_category(Enterprise, 'test enterprise')
     prod_cat = ProductCategory.create!(:name => 'pctest', :environment => Environment.default)
     prod = ent1.products.create!(:name => 'test product', :product_category => prod_cat)
-		art = Article.create!(:name => 'test article', :profile_id => fast_create(Person).id)
-		per = Person.create!(:name => 'test person', :identifier => 'test-person', :user_id => fast_create(User).id)
-		com = Community.create!(:name => 'test community')
-		eve = Event.create!(:name => 'test event', :profile_id => fast_create(Person).id)
+    art = Article.create!(:name => 'test article', :profile_id => fast_create(Person).id)
+    per = Person.create!(:name => 'test person', :identifier => 'test-person', :user_id => fast_create(User).id)
+    com = Community.create!(:name => 'test community')
+    eve = Event.create!(:name => 'test event', :profile_id => fast_create(Person).id)
  
     get :index, :query => 'test'
  
     [:articles, :enterprises, :people, :communities, :products, :events].select do |key, name|
-			!assigns(:environment).enabled?('disable_asset_' + key.to_s)
-		end.each do |asset|
-			assert !assigns(:searches)[asset][:results].empty?
-		end
-	end
+      !assigns(:environment).enabled?('disable_asset_' + key.to_s)
+    end.each do |asset|
+      assert !assigns(:searches)[asset][:results].empty?
+    end
+  end
  
   should 'display category image while in directory' do
     parent = Category.create!(:name => 'category1', :environment => Environment.default)
@@ -316,8 +318,8 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = create_user('someone').person
     ten_days_ago = Date.today - 10.day
  
-    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],	:start_date => ten_days_ago)
-    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],	:start_date => Date.today - 2.month)
+    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => ten_days_ago)
+    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],  :start_date => Date.today - 2.month)
  
     get :events, :day => ten_days_ago.day, :month => ten_days_ago.month, :year => ten_days_ago.year
     assert_equal [ev1], assigns(:events)
@@ -327,7 +329,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = create_user('someone').person
     ten_days_ago = Date.today - 10.day
  
-    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],	:start_date => ten_days_ago)
+    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => ten_days_ago)
     ev2 = create_event(person, :name => 'event 2', :start_date => ten_days_ago)
  
     get :events, :day => ten_days_ago.day, :month => ten_days_ago.month, :year => ten_days_ago.year, :category_path => @category.path.split('/')
@@ -337,8 +339,8 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'return events of today when no date specified' do
     person = create_user('someone').person
-    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],	:start_date => Date.today)
-    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],	:start_date => Date.today - 2.month)
+    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => Date.today)
+    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],  :start_date => Date.today - 2.month)
  
     get :events
  
@@ -349,9 +351,9 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = create_user('someone').person
  
     ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],
-			:start_date => Date.today + 2.month)
+      :start_date => Date.today + 2.month)
     ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],
-			:start_date => Date.today + 2.day)
+      :start_date => Date.today + 2.day)
  
     get :events
  
@@ -373,7 +375,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'see the events paginated' do
     person = create_user('testuser').person
     30.times do |i|
-      create_event(person, :name => "Event #{i}",	:start_date => Date.today)
+      create_event(person, :name => "Event #{i}", :start_date => Date.today)
     end
     get :events
     assert_equal 20, assigns(:events).count
@@ -432,8 +434,8 @@ class SearchControllerTest &lt; ActionController::TestCase
   end
  
   should 'show link to article asset in the see all foot link of the articles block in the category page' do
-	(1..SearchController::MULTIPLE_SEARCH_LIMIT+1).each do |i|
-	  a = create_user("test#{i}").person.articles.create!(:name => "article #{i} to be found")
+    (1..SearchController::MULTIPLE_SEARCH_LIMIT+1).each do |i|
+      a = create_user("test#{i}").person.articles.create!(:name => "article #{i} to be found")
       ArticleCategorization.add_category_to_article(@category, a)
     end
  
@@ -579,55 +581,55 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_not_includes assigns(:searches)[:communities][:results], p1
   end
  
-	should 'keep old urls working' do
-		get :assets, :asset => 'articles'
+  should 'keep old urls working' do
+    get :assets, :asset => 'articles'
     assert_redirected_to :controller => :search, :action => :articles
-		get :assets, :asset => 'people'
+    get :assets, :asset => 'people'
     assert_redirected_to :controller => :search, :action => :people
-		get :assets, :asset => 'communities'
+    get :assets, :asset => 'communities'
     assert_redirected_to :controller => :search, :action => :communities
-		get :assets, :asset => 'products'
+    get :assets, :asset => 'products'
     assert_redirected_to :controller => :search, :action => :products
-		get :assets, :asset => 'enterprises'
+    get :assets, :asset => 'enterprises'
     assert_redirected_to :controller => :search, :action => :enterprises
-		get :assets, :asset => 'events'
+    get :assets, :asset => 'events'
     assert_redirected_to :controller => :search, :action => :events
-	end
+  end
  
-	should 'show tag cloud' do
-		@controller.stubs(:is_cache_expired?).returns(true)
+  should 'show tag cloud' do
+    @controller.stubs(:is_cache_expired?).returns(true)
     a = Article.create!(:name => 'my article', :profile_id => fast_create(Person).id)
     a.tag_list = ['one', 'two']
-		a.save_tags
+    a.save_tags
  
-		get :tags
+    get :tags
  
-		assert assigns(:tags)["two"] = 1
-		assert assigns(:tags)["one"] = 1
-	end
+    assert assigns(:tags)["two"] = 1
+    assert assigns(:tags)["one"] = 1
+  end
  
   should 'show tagged content' do
-		@controller.stubs(:is_cache_expired?).returns(true)
+    @controller.stubs(:is_cache_expired?).returns(true)
     a = Article.create!(:name => 'my article', :profile_id => fast_create(Person).id)
     a2 = Article.create!(:name => 'my article 2', :profile_id => fast_create(Person).id)
     a.tag_list = ['one', 'two']
     a2.tag_list = ['two', 'three']
-		a.save_tags
+    a.save_tags
     a2.save_tags
  
-		get :tag, :tag => 'two'
+    get :tag, :tag => 'two'
  
     assert_equivalent [a, a2], assigns(:searches)[:tag][:results]
  
-		get :tag, :tag => 'one'
+    get :tag, :tag => 'one'
  
     assert_equivalent [a], assigns(:searches)[:tag][:results]
   end
  
   should 'not show assets from other environments' do
     other_env = Environment.create!(:name => 'Another environment')
-		p1 = Person.create!(:name => 'Hildebrando', :identifier => 'hild', :user_id => fast_create(User).id, :environment_id => other_env.id)
-		p2 = Person.create!(:name => 'Adamastor', :identifier => 'adam', :user_id => fast_create(User).id)
+    p1 = Person.create!(:name => 'Hildebrando', :identifier => 'hild', :user_id => fast_create(User).id, :environment_id => other_env.id)
+    p2 = Person.create!(:name => 'Adamastor', :identifier => 'adam', :user_id => fast_create(User).id)
     art1 = Article.create!(:name => 'my article', :profile_id => p1.id)
     art2 = Article.create!(:name => 'my article', :profile_id => p2.id)
  
@@ -638,9 +640,9 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'order articles by more recent' do
     Article.destroy_all
-		art1 = Article.create!(:name => 'review C', :profile_id => fast_create(Person).id, :created_at => Time.now-1.days)
-		art2 = Article.create!(:name => 'review A', :profile_id => fast_create(Person).id, :created_at => Time.now)
-		art3 = Article.create!(:name => 'review B', :profile_id => fast_create(Person).id, :created_at => Time.now-2.days)
+    art1 = Article.create!(:name => 'review C', :profile_id => fast_create(Person).id, :created_at => Time.now-1.days)
+    art2 = Article.create!(:name => 'review A', :profile_id => fast_create(Person).id, :created_at => Time.now)
+    art3 = Article.create!(:name => 'review B', :profile_id => fast_create(Person).id, :created_at => Time.now-2.days)
  
     get :articles, :filter => :more_recent
  
@@ -270,5 +270,8 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/work/free-software/versions', :controller => 'content_viewer', :action =>  'article_versions', :page => [ 'work', 'free-software'] )
   end
  
+  should 'have route to get HTML code of Blocks to embed' do
+    assert_routing('/embed/block/12345', :controller => 'embed', :action => 'block', :id => '12345')
+  end
  
 end
@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AccountHelperTest < ActiveSupport::TestCase
+
+  include AccountHelper
+  include ActionView::Helpers::TagHelper
+
+  should 'not suggest usernames if username is empty' do
+    assert_equal '', suggestion_based_on_username
+  end
+
+  should 'suggest valid usernames' do
+    ze = create_user('ze').person
+    stubs(:environment).returns(ze.environment)
+    suggestions = suggestion_based_on_username('ze')
+    suggestions.each do |suggestion|
+      assert_equal true, Person.is_available?(suggestion, ze.environment)
+    end
+  end
+
+end
@@ -676,6 +676,7 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
   should 'parse macros' do
     class Plugin1 < Noosfero::Plugin
     end
+    Noosfero::Plugin.stubs(:all).returns(['ApplicationHelperTest::Plugin1'])
  
     class Plugin1::Macro1 < Noosfero::Plugin::Macro
       def parse(params, inner_html, source)
@@ -223,6 +223,61 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert !block.visible?(3)
   end
  
+  should 'not be embedable by default' do
+    assert !Block.new.embedable?
+  end
+
+  should 'generate embed code' do
+    b = Block.new
+    b.stubs(:url_for).returns('http://myblogtest.com/embed/block/1')
+    assert_equal "<iframe class=\"embed block block\" frameborder=\"0\" height=\"768\" src=\"http://myblogtest.com/embed/block/1\" width=\"1024\"></iframe>", b.embed_code.call
+  end
+
+  should 'default value for display_user is all' do
+    block = Block.new
+    assert_equal 'all', block.display_user
+  end
+
+  should 'display block to not logged users for display_user = all' do
+    block = Block.new
+    assert block.display_to_user?(nil)
+  end
+
+  should 'display block to logged users for display_user = all' do
+    block = Block.new
+    assert block.display_to_user?(User.new)
+  end
+
+  should 'display block to logged users for display_user = logged' do
+    block = Block.new
+    block.display_user = 'logged'
+    assert block.display_to_user?(User.new)
+  end
+
+  should 'do not display block to logged users for display_user = not_logged' do
+    block = Block.new
+    block.display_user = 'not_logged'
+    assert !block.display_to_user?(User.new)
+  end
+
+  should 'do not display block to not logged users for display_user = logged' do
+    block = Block.new
+    block.display_user = 'logged'
+    assert !block.display_to_user?(nil)
+  end
+
+  should 'display block to not logged users for display_user = not_logged' do
+    block = Block.new
+    block.display_user = 'not_logged'
+    assert block.display_to_user?(nil)
+  end
+
+  should 'not be visible if display_to_user? is false' do
+    block = Block.new
+    block.expects(:display_to_user?).once.returns(false)
+    assert !block.visible?({})
+  end
+
   should 'accept user as parameter on cache_key without change its value' do
     person = fast_create(Person)
     block = Block.new
@@ -54,6 +54,7 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     expects(:display_block).with(b, '')
     stubs(:request).returns(request)
     stubs(:block_target).returns('')
+    stubs(:user).returns(nil)
     expects(:locale).returns('en')
     with_box_decorator self do
       display_box_content(box, '')
@@ -73,6 +74,7 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     box.save!
     expects(:display_block).with(b, '').never
     stubs(:request).returns(request)
+    stubs(:user).returns(nil)
     stubs(:block_target).returns('')
     expects(:locale).returns('en')
     display_box_content(box, '')
@@ -111,8 +113,9 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     request.expects(:path).returns('/')
     request.expects(:params).returns({})
     stubs(:request).returns(request)
+    stubs(:user).returns(nil)
     expects(:locale).returns('en')
-    box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en', :params => {}}).returns([])
+    box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en', :params => {}, :user => nil}).returns([])
  
     display_box_content(box, '')
   end
@@ -468,8 +468,8 @@ class CommentTest &lt; ActiveSupport::TestCase
     end
   end
  
-
   should 'delegate spam detection to plugins' do
+    Noosfero::Plugin.stubs(:all).returns(['CommentTest::EverythingIsSpam'])
     Environment.default.enable_plugin(EverythingIsSpam)
  
     c1 = create_comment
@@ -495,6 +495,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
  
   should 'notify plugins of comments being marked as spam' do
+    Noosfero::Plugin.stubs(:all).returns(['CommentTest::SpamNotification'])
     Environment.default.enable_plugin(SpamNotification)
  
     c = create_comment
@@ -506,6 +507,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
  
   should 'notify plugins of comments being marked as ham' do
+    Noosfero::Plugin.stubs(:all).returns(['CommentTest::SpamNotification'])
     Environment.default.enable_plugin(SpamNotification)
  
     c = create_comment
@@ -22,6 +22,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'person'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -43,6 +44,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'person'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -64,6 +66,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'user'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -85,6 +88,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'user'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -39,6 +39,32 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/test_profile/address'}
   end
  
+  should 'replace {portal} with environment portal identifier' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    portal = fast_create(Community, :identifier => 'portal-community', :environment_id => env.id)
+    env.portal_community = portal
+    env.save
+
+    stubs(:environment).returns(env)
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{portal}/address'}])
+    l.stubs(:owner).returns(env)
+    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/portal-community/address'}
+  end
+
+  should 'not change address if no {portal} there' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    portal = fast_create(Community, :identifier => 'portal-community', :environment_id => env.id)
+    env.portal_community = portal
+    env.save
+
+    stubs(:environment).returns(env)
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}])
+    l.stubs(:owner).returns(env)
+    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/address'}
+  end
+
   should 'display options for icons' do
     l = LinkListBlock.new
     l.icons_options.each do |option|
@@ -28,6 +28,7 @@ class MacrosHelperTest &lt; ActiveSupport::TestCase
   end
  
   def setup
+    Noosfero::Plugin.stubs(:all).returns(['MacrosHelperTest::Plugin1'])
     @environment = Environment.default
     @environment.enable_plugin(Plugin1)
     @plugins = Noosfero::Plugin::Manager.new(@environment, self)
@@ -129,4 +130,27 @@ class MacrosHelperTest &lt; ActiveSupport::TestCase
     assert_equal 'macro_generator', macro_generator(Plugin1::Macro)
   end
  
+  should 'get macro default generator' do
+    class Plugin1::Macro < Noosfero::Plugin::Macro
+      def self.configuration
+        { :params => [] }
+      end
+    end
+    assert_nothing_raised NoMethodError do
+      assert macro_generator(Plugin1::Macro)
+    end
+  end
+
+  should 'can use a code reference as macro generator' do
+    class Plugin1::Macro < Noosfero::Plugin::Macro
+      def self.configuration
+        { :params => [], :generator => method(:macro_generator_method) }
+      end
+      def self.macro_generator_method(macro)
+        "macro generator method return"
+      end
+    end
+    assert_equal "macro generator method return", macro_generator(Plugin1::Macro)
+  end
+
 end
@@ -1255,6 +1255,7 @@ class PersonTest &lt; ActiveSupport::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PersonTest::Plugin1', 'PersonTest::Plugin2'])
  
     e = Environment.default
     e.enable_plugin(Plugin1.name)
@@ -1424,6 +1425,7 @@ class PersonTest &lt; ActiveSupport::TestCase
         Profile.memberships_of(Person.find_by_identifier('person2'))
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PersonTest::Plugin1', 'PersonTest::Plugin2'])
  
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -26,6 +26,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     class Plugin2 < Noosfero::Plugin; end;
     class Plugin3 < Noosfero::Plugin; end;
     class Plugin4 < Noosfero::Plugin; end;
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3', 'PluginManagerTest::Plugin4'])
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin4.to_s])
     Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin3.to_s, Plugin4.to_s])
     results = plugins.enabled_plugins.map { |instance| instance.class.to_s }
@@ -51,6 +52,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         'Plugin 2 action.'
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
  
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s])
  
@@ -83,6 +85,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         'Plugin 3 action.'
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
  
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin3.to_s])
     p1 = Plugin1.new
@@ -107,6 +110,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         'Plugin3'
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
  
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -134,6 +138,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
  
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -162,6 +167,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
  
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -178,6 +184,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         [Macro1, Macro2]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1'])
  
     class Plugin1::Macro1 < Noosfero::Plugin::Macro
       def convert(macro, source)
@@ -212,6 +219,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         [v1 * v, v2 * v]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -231,6 +239,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         value * 5
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -252,6 +261,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         [v1 * v, v2 * v, 666]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -273,6 +283,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         numbers.reject {|n| n<=5}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
  
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -9,15 +9,9 @@ class PluginTest &lt; ActiveSupport::TestCase
  
   include Noosfero::Plugin::HotSpot
  
-  should 'keep the list of all loaded subclasses' do
-    class Plugin1 < Noosfero::Plugin
-    end
-
-    class Plugin2 < Noosfero::Plugin
-    end
-
-    assert_includes  Noosfero::Plugin.all, Plugin1.to_s
-    assert_includes  Noosfero::Plugin.all, Plugin2.to_s
+  should 'keep the list of all available plugins' do
+    assert File.directory?(File.join(Rails.root, 'plugins', 'foo'))
+    assert_includes  Noosfero::Plugin.all, 'FooPlugin'
   end
  
   should 'returns url to plugin management if plugin has admin_controller' do
@@ -1790,6 +1790,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
         Person.members_of(Community.find_by_identifier('community2'))
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ProfileTest::Plugin1', 'ProfileTest::Plugin2'])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
  
@@ -1947,6 +1948,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     end
  
     environment = Environment.default
+    Noosfero::Plugin.stubs(:all).returns(['ProfileTest::Plugin1'])
     environment.enable_plugin(Plugin1)
     plugins = Noosfero::Plugin::Manager.new(environment, self)
     p = fast_create(Profile)
@@ -7,6 +7,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
     @profile = create_user('test_user').person
+    Noosfero::Plugin.stubs(:all).returns(['SuggestArticleTest::EverythingIsSpam', 'SuggestArticleTest::SpamNotification'])
   end
   attr_reader :profile
  
@@ -37,4 +37,51 @@ class TextArticleTest &lt; ActiveSupport::TestCase
     assert_equal Blog.icon_name, TextArticle.icon_name(article)
   end
  
+  should 'change image path to relative' do
+    person = create_user('testuser').person
+    article = TextArticle.new(:profile => person, :name => 'test')
+    env = Environment.default
+    article.body = "<img src=\"http://#{env.default_hostname}/test.png\" />"
+    article.save!
+    assert_equal "<img src=\"/test.png\" />", article.body
+  end
+
+  should 'change link to relative path' do
+    person = create_user('testuser').person
+    article = TextArticle.new(:profile => person, :name => 'test')
+    env = Environment.default
+    article.body = "<a href=\"http://#{env.default_hostname}/test\">test</a>"
+    article.save!
+    assert_equal "<a href=\"/test\">test</a>", article.body
+  end
+
+  should 'change image path to relative for domain with https' do
+    person = create_user('testuser').person
+    article = TextArticle.new(:profile => person, :name => 'test')
+    env = Environment.default
+    article.body = "<img src=\"https://#{env.default_hostname}/test.png\" />"
+    article.save!
+    assert_equal "<img src=\"/test.png\" />", article.body
+  end
+
+  should 'change image path to relative for domain with port' do
+    person = create_user('testuser').person
+    article = TextArticle.new(:profile => person, :name => 'test')
+    env = Environment.default
+    article.body = "<img src=\"http://#{env.default_hostname}:3000/test.png\" />"
+    article.save!
+    assert_equal "<img src=\"/test.png\" />", article.body
+  end
+
+  should 'change image path to relative for domain with www' do
+    person = create_user('testuser').person
+    article = TextArticle.new(:profile => person, :name => 'test')
+    env = Environment.default
+    env.force_www = true
+    env.save!
+    article.body = "<img src=\"http://#{env.default_hostname}:3000/test.png\" />"
+    article.save!
+    assert_equal "<img src=\"/test.png\" />", article.body
+  end
+
 end
...	...	@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController
80	80	render :action => 'edit', :layout => false
81	81	end
82	82
	83	+ def search_autocomplete
	84	+ if request.xhr? and params[:query]
	85	+ search = params[:query]
	86	+ path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
	87	+ boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{portal}/"+content.path }
	88	+ elsif boxes_holder.is_a?(Profile)
	89	+ boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{profile}/"+content.path }
	90	+ else
	91	+ []
	92	+ end
	93	+ render :json => path_list.to_json
	94	+ else
	95	+ redirect_to "/"
	96	+ end
	97	+ end
	98	+
83	99	def save
84	100	@block = boxes_holder.blocks.find(params[:id])
85	101	@block.update_attributes(params[:block])
...	...	@@ -99,6 +115,12 @@ class BoxOrganizerController < ApplicationController
99	115	end
100	116	end
101	117
	118	+ def clone_block
	119	+ block = Block.find(params[:id])
	120	+ block.duplicate
	121	+ redirect_to :action => 'index'
	122	+ end
	123	+
102	124	protected :boxes_editor?
103	125
104	126	end
...	...
...	...	@@ -0,0 +1,13 @@
	1	+class EmbedController < ApplicationController
	2	+ layout 'embed'
	3	+
	4	+ def block
	5	+ @block = Block.find(params[:id])
	6	+ if !@block.embedable? \|\| !@block.visible?
	7	+ render 'unavailable.rhtml', :status => 403
	8	+ end
	9	+ rescue ActiveRecord::RecordNotFound
	10	+ render 'not_found.rhtml', :status => 404
	11	+ end
	12	+
	13	+end
...	...
...	...	@@ -31,23 +31,11 @@ class MapsController < MyProfileController
31	31	end
32	32
33	33	def search_city
34		-
35		- term = params[:term];
36		-
37		- regions = NationalRegion.search_city(term + "%", true).map {\|r\|{ :label => r.city , :category => r.state}}
38		-
39		- render :json => regions
40		-
	34	+ render :json => MapsHelper.search_city(params[:term])
41	35	end
42	36
43	37	def search_state
44		-
45		- term = params[:term];
46		-
47		- regions = NationalRegion.search_state(term + "%", true).map {\|r\|{ :label => r.state}}
48		-
49		- render :json => regions
50		-
	38	+ render :json => MapsHelper.search_state(params[:term])
51	39	end
52	40
53	41	end
...	...
...	...	@@ -55,10 +55,4 @@ class ProfileDesignController < BoxOrganizerController
55	55	blocks
56	56	end
57	57
58		- def clone
59		- block = Block.find(params[:id])
60		- block.duplicate
61		- redirect_to :action => 'index'
62		- end
63		-
64	58	end
...	...
...	...	@@ -246,15 +246,19 @@ class AccountController < ApplicationController
246	246	end
247	247	end
248	248
249		- def check_url
	249	+ def check_valid_name
250	250	@identifier = params[:identifier]
251	251	valid = Person.is_available?(@identifier, environment)
252	252	if valid
253	253	@status = _('This login name is available')
254	254	@status_class = 'validated'
255		- else
	255	+ elsif !@identifier.empty?
	256	+ @suggested_usernames = suggestion_based_on_username(@identifier)
256	257	@status = _('This login name is unavailable')
257	258	@status_class = 'invalid'
	259	+ else
	260	+ @status_class = 'invalid'
	261	+ @status = _('This field can\'t be blank')
258	262	end
259	263	render :partial => 'identifier_status'
260	264	end
...	...	@@ -287,6 +291,23 @@ class AccountController < ApplicationController
287	291	render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
288	292	end
289	293
	294	+ def search_cities
	295	+ if request.xhr? and params[:state_name] and params[:city_name]
	296	+ render :json => MapsHelper.search_city(params[:city_name], params[:state_name])
	297	+ else
	298	+ render :json => [].to_json
	299	+ end
	300	+ end
	301	+
	302	+ def search_state
	303	+ if request.xhr? and params[:state_name]
	304	+ render :json => MapsHelper.search_state(params[:state_name])
	305	+ else
	306	+ render :json => [].to_json
	307	+ end
	308	+ end
	309	+
	310	+
290	311	protected
291	312
292	313	def redirect?
...	...
...	...	@@ -113,6 +113,15 @@ class ContentViewerController < ApplicationController
113	113	@comments = @plugins.filter(:unavailable_comments, @comments)
114	114	@comments_count = @comments.count
115	115	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
	116	+ @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
	117	+
	118	+ if request.xhr? and params[:comment_order]
	119	+ if @comment_order == 'newest'
	120	+ @comments = @comments.reverse
	121	+ end
	122	+
	123	+ return render :partial => 'comment/comment', :collection => @comments
	124	+ end
116	125
117	126	if params[:slideshow]
118	127	render :action => 'slideshow', :layout => 'slideshow'
...	...
...	...	@@ -12,4 +12,17 @@ module AccountHelper
12	12	_('Checking if e-mail address is already taken...')
13	13	end
14	14	end
	15	+
	16	+ def suggestion_based_on_username(requested_username='')
	17	+ return "" if requested_username.empty?
	18	+ usernames = []
	19	+ 3.times do
	20	+ begin
	21	+ valid_name = requested_username + rand(1000).to_s
	22	+ end while (usernames.include?(valid_name) \|\| !Person.is_available?(valid_name, environment))
	23	+ usernames << valid_name
	24	+ end
	25	+ usernames
	26	+ end
	27	+
15	28	end
...	...
...	...	@@ -65,7 +65,7 @@ module BoxesHelper
65	65	end
66	66
67	67	def display_box_content(box, main_content)
68		- context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
	68	+ context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
69	69	box_decorator.select_blocks(box.blocks.includes(:box), context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
70	70	end
71	71
...	...	@@ -212,13 +212,24 @@ module BoxesHelper
212	212
213	213	if !block.main?
214	214	buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
215		- buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })
	215	+ buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
216	216	end
217	217
218	218	if block.respond_to?(:help)
219	219	buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), {}, "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
220	220	end
221	221
	222	+ if block.embedable?
	223	+ embed_code = block.embed_code
	224	+ embed_code = instance_eval(&embed_code) if embed_code.respond_to?(:call)
	225	+ html = content_tag('div',
	226	+ content_tag('h2', _('Embed block code')) +
	227	+ content_tag('div', _('Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.'), :style => 'margin-bottom: 1em;') +
	228	+ content_tag('textarea', embed_code, :style => 'margin-bottom: 1em; width:100%; height:40%;', :readonly => 'readonly') +
	229	+ thickbox_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
	230	+ buttons << thickbox_inline_popup_icon(:embed, _('Embed code'), {}, "embed-code-box-#{block.id}") << html
	231	+ end
	232	+
222	233	content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')
223	234	end
224	235
...	...
...	...	@@ -20,14 +20,16 @@ module MacrosHelper
20	20	jQuery('<div>'+#{macro_configuration_dialog(macro).to_json}+'</div>').dialog({
21	21	title: #{macro_title(macro).to_json},
22	22	modal: true,
23		- buttons: [
24		- {text: #{_('Ok').to_json}, click: function(){
	23	+ buttons: {
	24	+ #{_('Ok').to_json}: function(){
25	25	tinyMCE.activeEditor.execCommand('mceInsertContent', false,
26	26	(function(dialog){ #{macro_generator(macro)} })(this));
27	27	jQuery(this).dialog('close');
28		- }},
29		- {text: #{_('Cancel').to_json}, click: function(){jQuery(this).dialog('close');}}
30		- ]
	28	+ },
	29	+ #{_('Cancel').to_json}: function(){
	30	+ jQuery(this).dialog('close');
	31	+ }
	32	+ }
31	33	});
32	34	}"
33	35	end
...	...	@@ -57,7 +59,11 @@ module MacrosHelper
57	59
58	60	def macro_generator(macro)
59	61	if macro.configuration[:generator]
60		- macro.configuration[:generator]
	62	+ if macro.configuration[:generator].respond_to?(:call)
	63	+ macro.configuration[:generator].call(macro)
	64	+ else
	65	+ macro.configuration[:generator]
	66	+ end
61	67	else
62	68	macro_default_generator(macro)
63	69	end
...	...	@@ -66,8 +72,7 @@ module MacrosHelper
66	72
67	73	def macro_default_generator(macro)
68	74	code = "var params = {};"
69		- configuration = macro_configuration(macro)
70		- configuration[:params].map do \|field\|
	75	+ macro.configuration[:params].map do \|field\|
71	76	code += "params.#{field[:name]} = jQuery('*[name=#{field[:name]}]', dialog).val();"
72	77	end
73	78	code + "
...	...
...	...	@@ -0,0 +1,14 @@
	1	+module MapsHelper
	2	+ def self.search_city term, state=""
	3	+ cities = if state.empty?
	4	+ NationalRegion.search_city(term + "%", true)
	5	+ else
	6	+ NationalRegion.search_city(term + "%", true, state)
	7	+ end
	8	+ cities.map {\|r\|{ :label => r.city , :category => r.state}}
	9	+ end
	10	+
	11	+ def self.search_state term
	12	+ NationalRegion.search_state(term + "%", true).map {\|r\|{ :label => r.state}}
	13	+ end
	14	+end
...	...