Merge branch 'master' into rails3_chat

Conflicts: public/javascripts/application.js

Merge branch 'master' into rails3_chat
Conflicts: public/javascripts/application.js
Victor Costa
2 parents d2f53367 538bb500
Showing 180 changed files with 4971 additions and 4208 deletions Show diff stats
AUTHORS.md
DEVELOPMENT.md
Gemfile
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/layout_helper.rb
app/helpers/role_helper.rb
app/helpers/sweeper_helper.rb
app/models/person.rb
app/models/profile.rb
app/models/task.rb
app/models/user.rb
app/sweepers/role_assignment_sweeper.rb
app/views/file_presenter/_generic.html.erb
app/views/file_presenter/_image.html.erb
app/views/home/index.html.erb
@@ -40,6 +40,7 @@ Alessandro Palmeira + João M. M. Silva &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
+analosnak <analosnak@gmail.com>
 Ana Losnak <analosnak@gmail.com>
 Andre Bernardes <andrebsguedes@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
@@ -81,7 +82,6 @@ Carlos Morais + Diego Araújo &lt;diegoamc90@gmail.com&gt;
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
-Daniela Feitosa <dani@dohko.(none)>
 Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
 Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
@@ -119,7 +119,6 @@ Diego Araújo + Renan Teruo &lt;diegoamc90@gmail.com&gt;
 Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
-Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
 Evandro Jr <evandrojr@gmail.com>
@@ -195,9 +194,11 @@ Luis David Aguilar Carlos &lt;ludwig9003@gmail.com&gt;
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
+Michal Čihař <michal@cihar.com>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
@@ -220,6 +221,7 @@ Rafael Reggiani Manzo + João M. M. da Silva &lt;rr.manzo@gmail.com&gt;
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
+Raquel <rcordioli@gmail.com>
 Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
 Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
 Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
@@ -227,13 +229,13 @@ Renan Teruo + Diego Araújo &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
 Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
-Rodrigo Souto <diguliu@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Tallys Martins <tallysmartins@gmail.com>
 tallys <tallys@tallys.(none)>
+Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
@@ -0,0 +1,124 @@
+# Noosfero Development Policy
+
+## Developer Roles
+
+* *Developers* are everyone that is contributing code to Noosfero.
+* *Committers* are the people with direct commit access to the Noosfero source
+  code. They are responsible for reviewing contributions from other developers
+  and integrating them in the Noosfero code base. They are the members of the
+  [Noosfero group on Gitlab](https://gitlab.com/groups/noosfero/members).
+* *Release managers* are the people that are managing the release of a new
+  Noosfero version and/or the maintainance work of an existing Noosfero stable
+  branch. See MAINTAINANCE.md for details on the maintaince policy.
+
+## Development process
+
+* Every new feature or non-trivial bugfix should be reviewed by at least one
+  committer. This must be the case even if the original author is a committer.
+
+  * In the case the original author is a committer, he/she should feel free to
+    commit directly if after 1 week nobody has provided any kind of feedback.
+
+  * Developers who are not committers should feel free to ping committers if
+    they do not get feedback on their contributions after 1 week.
+
+    * On GitLab, one can just add a comment to the merge request; one can also
+      @-mention specific committers or other developers who have expertise on
+      the area of the contribution.
+
+  * Committers should follow the activity of the project, and try to help
+    reviewing contributions from others as much as possible.
+
+    * On GitLab one can get emails for all activity on a project by setting the
+      [notification settings](https://gitlab.com/profile/notifications) to
+      "watch".
+
+  * Anyone can help by reviewing contributions. Committers are the only ones
+    who can give the final approval to a contribution, but everyone is welcome
+    to help with code review, testing, etc.
+
+    * See note above about setting up notification on GitLab.
+
+* Committers should feel free to push trivial (or urgent) changes directly.
+  There are no strict rule on what makes a change trivial or urgent; committers
+  are expected to exercise good judgement on a case by case basis.
+
+  * Usually changes to the database are not trivial.
+
+* In the case of unsolvable conflict between commiters regarding any change to
+  the code, the current release manager(s) will have the final say in the
+  matter.
+
+* Release managers are responsible for stablishing a release schedule, and
+  about deciding when and what to release.
+
+  * Release managers should announce release schedules to the project mailing
+    lists in advance.
+
+  * The release schedule may include a period of feature freeze, during which
+    no new features or any other changes that are not pre-approved by the
+    release manager must be committed to the repository.
+
+  * Committers must respect the release schedule and feature freezes.
+
+## Maintainance process
+
+### Not all feature releases will be maintained as a stable release
+
+We will be choosing specific release series to be maintained as stable
+releases.
+
+This means that a given release is not guaranteed to be maintained as a stable
+release, but does *not* mean it won't be. Any committer (or anyone, really) can
+decide to maintain a given release as stable and seek help from others to do
+so.
+
+### No merges from stable branches to master
+
+*All* changes must be submitted against the master branch first, and when
+applicable, backported to the desired stable releases. Exceptions to this rules
+are bug fixes that only apply to a given stable branch and not to master.
+
+In the past we had non-trivial changes accepted into stable releases while
+master was way ahead (e.g. during the rails3 migration period), that made the
+merge back into master very painful.  By eliminating the need to do these
+merges, we save time for the people responsible for the release, and eliminate
+the possibility of human errors or oversights causing changes to be accepted
+into stable that will be a problem to merge back into master.
+
+By getting all fixes in master first, we improve the chances that  a future
+release will not present regressions against bugs that should already be fixed,
+but the fixes got lost in a big, complicated merge (and those won't exist
+anymore, at least not from stable branches to master).
+
+After a fix gets into master, backporting changes into a stable release branch
+is the responsibility of whoever is maintaing that branch, and those interested
+in it. The stable branch release manager(s) are entitled the final say on any
+matters related to that branch.
+
+## Apendix A: how to become a committer
+
+Every developer that wants to be a committer should create [an issue on
+Gitlab](https://gitlab.com/noosfero/noosfero/issues) requesting to be added as
+a committer. This request must include information about the requestor's
+previous contributions to the project.
+
+If 2 or more commiters consider second the request, the requestor is accepted
+as new commiter and added to the Noosfero group.
+
+The existing committers are free to choose whatever criteria they want to
+second the request, but they must be sure that the new committer is a
+responsible developer and knows what she/he is doing. They must be aware that
+seconding these requests means seconding the actions of the new committer: if
+the new committer screw up, her/his seconds screwed up.
+
+## Apendix B: how to become a release manager
+
+A new release manager for the development version of Noosfero (i.e. the one
+that includes new features, a.k.a. the master branch) is apointed by the
+current release manager, and must be a committer first.
+
+Release managers for stable branches are self-appointed, i.e. whoever takes the
+work takes the role. In case of a conflict (e.g. 2+ different people want to do
+the work but can't agree on working together), the development release manager
+decides.
@@ -41,8 +41,9 @@ group :cucumber do
   gem 'selenium-webdriver',     '~> 2.39.0'
 end
-# include plugin gemfiles
-Dir.glob(File.join('config', 'plugins', '*')).each do |plugin|
-  plugin_gemfile = File.join(plugin, 'Gemfile')
-  eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
+# include gemfiles from enabled plugins
+# plugins in baseplugins/ are not included on purpose. They should not have any
+# dependencies.
+Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
+  eval File.read(gemfile)
 end
@@ -16,14 +16,16 @@ class ProfileEditorController &lt; MyProfileController
     if request.post?
       params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
       Profile.transaction do
-      Image.transaction do
-        if @profile_data.update_attributes(params[:profile_data])
-          redirect_to :action => 'index', :profile => profile.identifier
-        else
-          profile.identifier = params[:profile] if profile.identifier.blank?
+        Image.transaction do
+          begin
+            @plugins.dispatch(:profile_editor_transaction_extras)
+            @profile_data.update_attributes!(params[:profile_data])
+            redirect_to :action => 'index', :profile => profile.identifier
+          rescue Exception => ex
+            profile.identifier = params[:profile] if profile.identifier.blank?
+          end
         end
       end
-      end
     end
   end
@@ -193,7 +193,7 @@ class AccountController &lt; ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
@@ -19,7 +19,7 @@ class ChatController &lt; PublicController
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
-    if filename =~ /^https?:/
+    if filename =~ /^(https?:)?\/\//
       redirect_to filename
     else
       data = File.read(File.join(Rails.root, 'public', filename))
@@ -65,13 +65,13 @@ class ProfileController &lt; PublicController
   def friends
     if is_cache_expired?(profile.friends_cache_key(params))
-      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
     end
   end
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
     end
   end
@@ -433,19 +433,19 @@ module ApplicationHelper
   end
   def theme_site_title
-    theme_include('site_title')
+    @theme_site_title ||= theme_include 'site_title'
   end
   def theme_header
-    theme_include('header')
+    @theme_header ||= theme_include 'header'
   end
   def theme_footer
-    theme_include('footer')
+    @theme_footer ||= theme_include 'footer'
   end
   def theme_extra_navigation
-    theme_include('navigation')
+    @theme_extra_navigation ||= theme_include 'navigation'
   end
   def is_testing_theme
@@ -674,13 +674,14 @@ module ApplicationHelper
     html.join "\n"
   end
+  def theme_javascript_src
+    script = File.join theme_path, 'theme.js'
+    script if File.exists? File.join(Rails.root, 'public', script)
+  end
+
   def theme_javascript_ng
-    script = File.join(theme_path, 'theme.js')
-    if File.exists?(File.join(Rails.root, 'public', script))
-      javascript_include_tag script
-    else
-      nil
-    end
+    script = theme_javascript_src
+    javascript_include_tag script if script
   end
   def file_field_or_thumbnail(label, image, i)
@@ -907,13 +908,15 @@ module ApplicationHelper
   end
   def page_title
-    (@page ? @page.title + ' - ' : '') +
-    (@topic ? @topic.title + ' - ' : '') +
-    (@section ? @section.title + ' - ' : '') +
-    (@toc ? _('Online Manual') + ' - ' : '') +
-    (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    (profile ? profile.short_name : environment.name) +
-    (@category ? " - #{@category.full_name}" : '')
+    CGI.escapeHTML(
+      (@page ? @page.title + ' - ' : '') +
+      (@topic ? @topic.title + ' - ' : '') +
+      (@section ? @section.title + ' - ' : '') +
+      (@toc ? _('Online Manual') + ' - ' : '') +
+      (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
+      (profile ? profile.short_name : environment.name) +
+      (@category ? " - #{@category.full_name}" : '')
+    )
   end
   # DEPRECATED. Do not use this.
@@ -1285,11 +1288,13 @@ module ApplicationHelper
   end
   def delete_article_message(article)
-    if article.folder?
-      _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
-    else
-      _("Are you sure that you want to remove the item \"%s\"?") % article.name
-    end
+    CGI.escapeHTML(
+      if article.folder?
+        _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
+      else
+        _("Are you sure that you want to remove the item \"%s\"?") % article.name
+      end
+    )
   end
   def expirable_link_to(expired, content, url, options = {})
@@ -1377,7 +1382,7 @@ module ApplicationHelper
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
     end
-    html
+    html && html.html_safe
   end
   def convert_macro(html, source)
@@ -10,7 +10,7 @@ module ContentViewerHelper
   end
   def number_of_comments(article)
-    display_number_of_comments(article.comments_count - article.spam_comments_count)
+    display_number_of_comments(article.comments_count - article.spam_comments_count.to_i)
   end
   def article_title(article, args = {})
@@ -17,6 +17,8 @@ module LayoutHelper
     unless plugins_javascripts.empty?
       output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
     end
+    output += theme_javascript_ng.to_s
+
     output
   end
@@ -85,6 +87,10 @@ module LayoutHelper
     theme_path + '/style.css'
   end
+  def layout_template
+    if profile then profile.layout_template else environment.layout_template end
+  end
+
   def addthis_javascript
     if NOOSFERO_CONF['addthis_enabled']
       '<script src="https://s7.addthis.com/js/152/addthis_widget.js"></script>'
@@ -92,7 +98,7 @@ module LayoutHelper
   end
   def meta_description_tag(article=nil)
-    article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
+    article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
   end
 end
 module RoleHelper
+
+  def role_available_permissions(role)
+    role.kind == "Environment" ? ['Environment', 'Profile'] : [role.kind]
+  end
+
 end
@@ -56,12 +56,12 @@ module SweeperHelper
     if profile
       profile.blocks.each {|block|
         conditions = block.class.expire_on
-        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+        blocks_to_expire << block unless (conditions[:profile] & causes).blank?
       }
     end
     environment.blocks.each {|block|
       conditions = block.class.expire_on
-      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+      blocks_to_expire << block unless (conditions[:environment] & causes).blank?
     }
     blocks_to_expire.uniq!
@@ -21,6 +21,12 @@ class Person &lt; Profile
     { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
   }
+  scope :by_role, lambda { |roles|
+    roles = [roles] unless roles.kind_of?(Array)
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
+roles] }
+  }
+
   def has_permission_with_plugins?(permission, profile)
     permissions = [has_permission_without_plugins?(permission, profile)]
     permissions += plugins.map do |plugin|
@@ -97,7 +97,7 @@ class Profile &lt; ActiveRecord::Base
   end
   def members_by_name
-    members.order(:name)
+    members.order('profiles.name')
   end
   class << self
@@ -108,8 +108,8 @@ class Profile &lt; ActiveRecord::Base
     alias_method_chain :count, :distinct
   end
-  def members_by_role(role)
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
+  def members_by_role(roles)
+    Person.members_of(self).by_role(roles)
   end
   acts_as_having_boxes
@@ -285,8 +285,9 @@ class Task &lt; ActiveRecord::Base
   # If
   def send_notification(action)
     if sends_email?
-      if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+      if self.requestor && !self.requestor.notification_emails.empty?
+        message = TaskMailer.generic_message("task_#{action}", self)
+        message.deliver if message
       end
     end
   end
@@ -201,6 +201,10 @@ class User &lt; ActiveRecord::Base
     Digest::MD5.hexdigest(password)
   end
+  add_encryption_method :salted_md5 do |password, salt|
+    Digest::MD5.hexdigest(password+salt)
+  end
+
   add_encryption_method :clear do |password, salt|
     password
   end
@@ -350,6 +354,7 @@ class User &lt; ActiveRecord::Base
     end
     def delay_activation_check
+      return if person.is_template?
       Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
     end
 end
@@ -13,7 +13,7 @@ class RoleAssignmentSweeper &lt; ActiveRecord::Observer
 protected
   def expire_caches(role_assignment)
-    expire_cache(role_assignment.accessor)
+    expire_cache(role_assignment.accessor) if role_assignment.accessor.kind_of?(Profile)
     expire_cache(role_assignment.resource) if role_assignment.resource.kind_of?(Profile)
   end
 <span class="download-link">
   <span>Download</span>
-  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+  <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
 </span>
 <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
@@ -28,7 +28,7 @@
 <%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
-<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+<img src="<%= [Noosfero.root, image.public_filename(:display)].join %>" class="<%=image.css_class_name%>">
 <div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
   <%= image.abstract %>
@@ -61,9 +61,6 @@
         <%= submit_button(:search, _('Search')) %>
       </div>
-      <div>
-        <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
-      </div>
     <% end %>
   </div>
 <% end %>
@@ -0,0 +1,4 @@
+<div id="content-inner">
+  <%= insert_boxes(yield) %>
+  <br style='clear: both'/>
+</div><!-- end id="content-inner" -->
@@ -17,7 +17,7 @@
     <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
     <meta property="og:title" content="<%= h page_title %>">
     <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
-    <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
+    <meta property="og:description" content="<%= meta_description_tag(@page) %>">
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
@@ -72,10 +72,7 @@
           <div id="navigation-end"></div>
         </div><!-- end id="navigation" -->
         <div id="content">
-          <div id="content-inner">
-            <%= insert_boxes(yield) %>
-            <br style='clear: both'/>
-          </div><!-- end id="content-inner" -->
+          <%= render 'layouts/content' %>
         </div><!-- end id="content" -->
       </div><!-- end id="wrap-2" -->
     </div><!-- end id="wrap-1" -->
@@ -84,7 +81,6 @@
       <%= theme_footer %>
     </div><!-- end id="theme-footer" -->
     <%= noosfero_layout_features %>
-    <%= theme_javascript_ng %>
     <%= addthis_javascript %>
     <%=
       @plugins.dispatch(:body_ending).map do |content|
@@ -10,8 +10,8 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment'),
                                  :style => 'color: #ccc' %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
@@ -9,8 +9,8 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment') %>
         <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
         <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
@@ -27,6 +27,10 @@
 <%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
 <%= optional_field(@person, 'image', labelled_form_field(_('Image'), file_field(:file, :image, :rel => _('Image')))) %>
+<% @plugins.dispatch(:extra_optional_fields).each do |field| %>
+  <%= optional_field(@person, field[:name], labelled_form_field(field[:label], text_field(field[:object_name], field[:method], :rel => field[:label], :value => field[:value]))) %>
+<% end %>
+
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
     <label class='formlabel' for='profile_data_schooling'><%= _('Schooling') %></label>
@@ -6,10 +6,14 @@
   <%= required f.text_field(:name) %>
-  <p><%= _('Permissions:') %><p>
-  <% permissions.keys.each do |p| %>
-    <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
-    <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+  <% permissions.each do |key| %>
+  <div class="permissions <%= key.downcase %>">
+    <h4><%= _('%s Permissions:' % key) %></h4>
+    <% ActiveRecord::Base::PERMISSIONS[key].keys.each do |p| %>
+      <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
+      <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+    <% end %>
+  </div>
   <% end %>
   <% button_bar do %>
 <h2> <%= _("Editing #{@role.name}") %> </h2>
-<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
 <h2> <%= _("Create a new role") %> </h2>
-<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
+<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => role_available_permissions(@role) } %>
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -111,9 +111,7 @@ module Noosfero
     # Make sure the secret is at least 30 characters and all random,
     # no regular words or you'll be exposed to dictionary attacks.
     config.secret_token = noosfero_session_secret
-    config.action_dispatch.session = {
-      :key    => '_noosfero_session',
-    }
+    config.session_store :cookie_store, :key => '_noosfero_session'
     config.time_zone = File.read('/etc/timezone').split("\n").first
     config.active_record.default_timezone = :local
@@ -5,7 +5,7 @@ development:
   addthis_pub: your-user-name
   addthis_logo: http://localhost:3000/images/logo-200x50.png
   addthis_options: favorites, email, digg, delicious, technorati, slashdot, twitter, more
-  gravatar: wavatar
+  gravatar: mm
   googlemaps_initial_zoom: 4
   exception_recipients: [admin@example.com]
   max_upload_size: 5MB
@@ -0,0 +1,9 @@
+class RemoveEnvironmentStatisticsBlockSooner < ActiveRecord::Migration
+  def self.up
+    update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
 class FixYamlEncoding < ActiveRecord::Migration
   def self.up
-    fix_encoding(Block, 'settings')
-    fix_encoding(Product, 'data')
-    fix_encoding(Environment, 'settings')
-    fix_encoding(Profile, 'data')
-    fix_encoding(ActionTracker::Record, 'params')
-    fix_encoding(Article, 'setting')
-    fix_encoding(Task, 'data')
+    ActiveRecord::Base.transaction do
+      fix_encoding(Environment, 'settings')
+      fix_encoding(Profile, 'data')
+      fix_encoding(Product, 'data')
+      fix_encoding(ActionTracker::Record, 'params')
+      fix_encoding(Article, 'setting')
+      fix_encoding(Task, 'data')
+      fix_encoding(Block, 'settings')
+    end
   end
   def self.down
@@ -16,15 +18,34 @@ class FixYamlEncoding &lt; ActiveRecord::Migration
   private
   def self.fix_encoding(model, param)
-    result = model.find(:all, :conditions => "#{param} LIKE '%!binary%'")
+    result = model.all
     puts "Fixing #{result.count} rows of #{model} (#{param})"
-    result.each {|r| r.update_column(param, deep_fix(r.send(param)).to_yaml)}
+    result.each do |r|
+      begin
+        yaml = r.send(param)
+        # if deserialization failed then a string is returned
+        if yaml.is_a? String
+          yaml.gsub! ': `', ': '
+          yaml = YAML.load yaml
+        end
+        r.update_column param, deep_fix(yaml).to_yaml
+      rescue => e
+        puts "FAILED #{r.inspect}"
+        puts e.message
+      end
+    end
   end
   def self.deep_fix(hash)
     hash.each do |value|
-      value.force_encoding('UTF-8') if value.is_a?(String) && !value.frozen? && value.encoding == Encoding::ASCII_8BIT
       deep_fix(value) if value.respond_to?(:each)
+      if value.is_a? String and not value.frozen?
+        if value.encoding == Encoding::ASCII_8BIT
+          value.force_encoding "utf-8"
+        else
+          value.encode!("iso-8859-1").force_encoding("utf-8")
+        end
+      end
     end
   end
@@ -1,3 +0,0 @@
----
-BUNDLE_WITHOUT: test:cucumber
-
+noosfero (1.0) wheezy; urgency=low
+
+  * Noosfero 1.0 \o/
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 22 Dec 2014 10:52:21 -0300
+
+noosfero (1.0~rc4) wheezy-test; urgency=low
+
+  * Fourth release candidate
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Wed, 19 Nov 2014 10:31:16 -0300
+
 noosfero (1.0~rc3) wheezy-test; urgency=low
   * Third release candidate to Noosfero 1.0
- -- Antonio Terceiro <terceiro@debian.org>  Fri, 12 Sep 2014 16:20:58 -0300
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Fri, 12 Sep 2014 16:20:58 -0300
 noosfero (1.0~rc2) wheezy-test; urgency=low
   * Second 1.0 release candidate
- -- Antonio Terceiro <terceiro@debian.org>  Fri, 12 Sep 2014 13:01:11 -0300
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Fri, 12 Sep 2014 13:01:11 -0300
 noosfero (1.0~rc1) wheezy-test; urgency=low
   * First 1.0 release candidate
- -- Rodrigo Souto <vagrant@wheezy-base>  Fri, 15 Aug 2014 16:35:35 -0300
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 15 Aug 2014 16:35:35 -0300
 noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
@@ -51,6 +51,7 @@ Depends:
  ruby-hpricot,
  ruby-nokogiri,
  ruby-acts-as-taggable-on,
+ ruby-progressbar,
  ruby-prototype-rails,
  ruby-rails-autolink,
  memcached,
@@ -60,6 +61,11 @@ Depends:
  dbconfig-common,
  adduser,
  exim4 | mail-transport-agent,
+# to minimize upgrade issues:
+ ruby-feedparser (>= 0.7-3~),
+ ruby-eventmachine (>= 0.12.10-4~),
+ ruby-rack (>= 1.4.5-2~),
+ ruby-tzinfo (>= 1.1.0-2~),
  ${misc:Depends}
 Recommends:
  postgresql,
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+sed -e '/^group\s*:\(test\|cucumber\)/,/^end/ d' Gemfile
@@ -7,9 +7,6 @@ util                              usr/share/noosfero
 Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
-Gemfile                           usr/share/noosfero
-debian/bundle/config              usr/share/noosfero/.bundle
-
 config/application.rb             usr/share/noosfero/config
 config/boot.rb                    usr/share/noosfero/config
 config/environment.rb             usr/share/noosfero/config
@@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
-usr/share/noosfero/Gemfile.lock                     /dev/null
+/dev/null                                           usr/share/noosfero/Gemfile.lock
 # See an example of this file at:
 # /usr/share/doc/noosfero/examples/
 production:
-  gravatar: wavatar
+  gravatar: mm
@@ -20,6 +20,10 @@ override_dh_link:
 		dh_link usr/lib/noosfero/dbinstall usr/share/dbconfig-common/scripts/noosfero/install/$$db; \
 	done
+override_dh_auto_install:
+	dh_auto_install
+	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
+
 override_dh_installinit:
 	dh_installinit -pnoosfero --onlyscripts
@@ -10,6 +10,13 @@ sub vcl_recv {
   }
 }
+sub vcl_deliver {
+  # Force clients to aways hit the server again for HTML pages
+  if (resp.http.Content-Type ~ "^text/html") {
+    set resp.http.Cache-Control = "no-cache";
+  }
+}
+
 sub vcl_error {
     set obj.http.Content-Type = "text/html; charset=utf-8";
@@ -1,86 +0,0 @@
-Feature: gallery_navigation
-  As a noosfero user
-  I want to navigate over image gallery
-
-  Background:
-    Given the following users
-      | login       |
-      | marciopunk  |
-    And the following galleries
-      | owner      | name          |
-      | marciopunk | my-gallery    |
-      | marciopunk | other-gallery |
-    And the following files
-      | owner      | file          | mime       | parent        |
-      | marciopunk | rails.png     | image/png  | my-gallery    |
-      | marciopunk | rails.png     | image/png  | other-gallery |
-      | marciopunk | other-pic.jpg | image/jpeg | my-gallery    |
-
-  Scenario: provide link to go to next image
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "Next »"
-
-  @selenium
-  Scenario: view next image when follow next link
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    When I follow "Next »"
-    Then I should see "rails.png" within ".title"
-
-  Scenario: not link to next when in last image
-    When I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "« Previous" within ".gallery-navigation a"
-    And I should not see "Next »" within ".gallery-navigation a"
-
-  Scenario: provide link to go to previous image
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "« Previous"
-
-  @selenium
-  Scenario: view previous image when follow previous link
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    When I follow "« Previous"
-    Then I should see "other-pic.jpg" within ".title"
-
-  Scenario: not link to previous when in first image
-    When I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "Next »" within ".gallery-navigation a"
-    And I should not see "« Previous" within ".gallery-navigation a"
-
-  Scenario: display number of current and total of images
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-
-  Scenario: increment current number when follow next
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-    When I follow "Next »"
-    Then I should see "image 2 of 2" within ".gallery-navigation"
-
-  Scenario: decrement current number when follow next
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "image 2 of 2" within ".gallery-navigation"
-    When I follow "« Previous"
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-
-  Scenario: provide button to go back to gallery
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "Go back to my-gallery"
-    When I follow "Go back to my-gallery"
-    Then I should be on /marciopunk/my-gallery
-
-  # Looking for page title is problematic on selenium since it considers the
-  # title to be invibible. Checkout some information about this:
-  #   * https://github.com/jnicklas/capybara/issues/863
-  #   * https://github.com/jnicklas/capybara/pull/953
-  @selenium
-  Scenario: image title in window title
-    Given I am logged in as "marciopunk"
-    When I go to /marciopunk/other-gallery/rails.png?view=true
-    Then I should see "rails.png" within any "h1"
-#    And the page title should be "rails.png"
-    And I follow "Edit"
-    And I fill in "Title" with "Rails is cool"
-    And I press "Save"
-    When I go to /marciopunk/other-gallery/rails.png?view=true
-    Then I should see "Rails is cool" within any "h1"
-    #Then the page title should be "Rails is cool"
@@ -20,11 +20,11 @@ Feature: Gravatar Support
   Scenario: The Aurium's gravatar picture must link to his gravatar profile
     # because Aurium has his picture registered at garvatar.com.
     When I go to article "My Article"
-    Then I should see "Aurium" linking to "http://www.gravatar.com/24a625896a07aa37fdb2352e302e96de"
+    Then I should see "Aurium" linking to "//www.gravatar.com/24a625896a07aa37fdb2352e302e96de"
   @selenium
   Scenario: The NoOne's gravatar picture must link to Gravatar homepage
     # because NoOne <nobody@colivre.coop.br> has no picture registered.
     When I go to article "My Article"
-    Then I should see "NoOne" linking to "http://www.gravatar.com"
+    Then I should see "NoOne" linking to "//www.gravatar.com"
@@ -278,29 +278,6 @@ Feature: signup
     Then "José da Silva" should be a member of "Free Software"
   @selenium
-  Scenario: join community on direct signup
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner      |
-       | Free Software  | freesoftware  | mariasilva |
-    And feature "skip_new_user_email_confirmation" is enabled on environment
-    And I am on /freesoftware
-    When I follow "Join"
-    And I follow "New user"
-    And I fill in the following within ".no-boxes":
-      | e-Mail                | josesilva@example.com |
-      | Username              | josesilva             |
-      | Password              | secret                |
-      | Password confirmation | secret                |
-      | Full name             | José da Silva         |
-    And wait for the captcha signup time
-    And I press "Create my account"
-    Then I should see "Control panel"
-    And "José da Silva" should be a member of "Free Software"
-
-  @selenium
   Scenario: user registration is moderated by admin
     Given feature "admin_must_approve_new_users" is enabled on environment
     And feature "skip_new_user_email_confirmation" is disabled on environment
@@ -762,3 +762,11 @@ When /^I confirm the &quot;(.*)&quot; dialog$/ do |confirmation|
   assert_equal confirmation, a.text
   a.accept
 end
+
+Given /^the field (.*) is public for all users$/ do |field|
+  Person.all.each do |person|
+    person.fields_privacy = Hash.new if person.fields_privacy.nil?
+    person.fields_privacy[field] = "public"
+    person.save!
+  end
+end
 \ No newline at end of file
 class LogMemoryConsumptionJob < Struct.new(:last_stat)
   # Number of entries do display
   N = 20
-  # In seconds
-  PERIOD = 10
   def perform
     logpath = File.join(Rails.root, 'log', "#{ENV['RAILS_ENV']}_memory_consumption.log")
@@ -70,16 +70,6 @@ module Noosfero
     end
   end
-  def self.term(t)
-    self.terminology.get(t)
-  end
-  def self.terminology
-    @terminology ||= Noosfero::Terminology::Default.instance
-  end
-  def self.terminology=(term)
-    @terminology = term
-  end
-
   def self.url_options
     case Rails.env
     when 'development'
 module Noosfero::Gravatar
   def gravatar_profile_image_url(email, options = {})
-    "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
+    "//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
       :only_path => false,
     }.merge(options).map{|k,v| '%s=%s' % [ k,v ] }.join('&')
   end
   def gravatar_profile_url(email)
-    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+    '//www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
   end
 end
@@ -88,18 +88,29 @@ class Noosfero::Plugin
     # This is a generic method that initialize any possible filter defined by a
     # plugin to a specific controller
     def load_plugin_filters(plugin)
-      plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
-      plugin_methods.each do |plugin_method|
-        controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
-        filters = plugin.new.send(plugin_method)
-        filters = [filters] if !filters.kind_of?(Array)
-
-        filters.each do |plugin_filter|
-          filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
-          controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
-          controller_class.send(:define_method, filter_method) do
-            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
-          end
+      Rails.configuration.to_prepare do
+        filters = plugin.new.send 'application_controller_filters' rescue []
+        Noosfero::Plugin.add_controller_filters ApplicationController, plugin, filters
+
+        plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
+        plugin_methods.each do |plugin_method|
+          controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
+
+          filters = plugin.new.send(plugin_method)
+          Noosfero::Plugin.add_controller_filters controller_class, plugin, filters
+        end
+      end
+    end
+
+    def add_controller_filters(controller_class, plugin, filters)
+      unless filters.is_a?(Array)
+        filters = [filters]
+      end
+      filters.each do |plugin_filter|
+        filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
+        controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
+        controller_class.send(:define_method, filter_method) do
+          instance_exec(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
         end
       end
     end
@@ -531,6 +542,18 @@ class Noosfero::Plugin
     nil
   end
+  # -> Perform extra transactions related to profile in profile editor
+  # returns = true in success or raise and exception if it could not update the data
+  def profile_editor_transaction_extras
+    nil
+  end
+
+  # -> Return a list of hashs with the needed information to create optional fields
+  # returns = a list of hashs as {:name => "string", :label => "string", :object_name => :key, :method => :key}
+  def extra_optional_fields
+    []
+  end
+
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.0~rc3'
+  VERSION = '1.0'
 end
@@ -7,9 +7,18 @@ namespace :ci do
     from = ENV['PREV_HEAD'] || "origin/#{current_branch}"
     to = ENV['HEAD'] || current_branch
     changed_files = `git diff --name-only #{from}..#{to}`.split.select do |f|
-      File.exist?(f)
+      File.exist?(f) && f.split(File::SEPARATOR).first != 'vendor'
     end
+    changed_plugin_files = changed_files.select do |f|
+      f.split(File::SEPARATOR).first == 'plugins'
+    end
+    changed_plugins = changed_plugin_files.map do |f|
+      f.split(File::SEPARATOR)[1]
+    end.uniq
+
+    changed_files -= changed_plugin_files
+
     # explicitly changed tests
     tests = changed_files.select { |f| f =~ /test\/.*_test\.rb$/ }
     features = changed_files.select { |f| f =~ /\.feature$/ }
@@ -26,7 +35,14 @@ namespace :ci do
     sh 'testrb', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
-    sh 'cucumber', '-p', 'selenium', *features unless features.empty?
+    sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty?
+
+    changed_plugins.each do |plugin|
+      task = "test:noosfero_plugins:#{plugin}"
+      puts "Running #{task}"
+      Rake::Task[task].execute
+    end
+
   end
 end
+@broken_plugins = %w[
+  anti_spam
+  bsc
+  comment_classification
+  ldap
+  solr
+]
+
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
 @all_plugins.sort!
 @all_tasks = [:units, :functionals, :integration, :cucumber, :selenium]
@@ -104,7 +112,7 @@ def run_test(name, files)
 end
 def run_testrb(files)
-  sh 'testrb', '-Itest', *files
+  sh 'testrb', '-I.:test', *files
 end
 def run_cucumber(profile, files)
@@ -167,6 +175,7 @@ def test_sequence(plugins, tasks)
     end
   end
   rollback_plugins_state
+  yield(failed) if block_given?
   fail 'There are broken tests to be fixed!' if fail_flag
 end
@@ -195,13 +204,39 @@ namespace :test do
     @all_tasks.each do |taskname|
       desc "Run #{taskname} tests for all plugins"
       task taskname do
-        test_sequence(@all_plugins, taskname)
+        test_sequence(@all_plugins - @broken_plugins, taskname)
       end
     end
   end
   desc "Run all tests for all plugins"
   task :noosfero_plugins do
-    test_sequence(@all_plugins, @all_tasks)
+    test_sequence(@all_plugins - @broken_plugins, @all_tasks) do |failed|
+      plugins_status_report(failed)
+    end
   end
 end
+
+def plugins_status_report(failed)
+  w = @all_plugins.map { |s| s.size }.max
+
+  puts
+  printf ('=' * (w + 21)) + "\n"
+  puts 'Plugins status report'
+  printf ('=' * (w + 21)) + "\n"
+  printf "%-#{w}s %s\n", "Plugin", "Status"
+  printf ('-' * w) + ' ' + ('-' * 20) + "\n"
+
+  @all_plugins.each do |plugin|
+    if @broken_plugins.include?(plugin)
+      status = "SKIP"
+    elsif !failed[plugin] || failed[plugin].empty?
+      status = "PASS"
+    else
+      status = "FAIL: #{failed[plugin].join(', ')}"
+    end
+    printf "%-#{w}s %s\n", plugin, status
+  end
+  printf ('=' * (w + 21)) + "\n"
+  puts
+end
@@ -83,7 +83,7 @@ EOF
     begin
       File.open("AUTHORS.md", 'w') do |output|
         output.puts AUTHORS_HEADER
-        output.puts `git log --pretty=format:'%aN <%aE>' | sort | uniq`
+        output.puts `git log --no-merges --pretty=format:'%aN <%aE>' | sort | uniq`
         output.puts AUTHORS_FOOTER
       end
       commit_changes(['AUTHORS.md'], 'Updating authors file') if !pendencies_on_authors[:ok]
@@ -137,7 +137,17 @@ EOF
         new_version += '~rc1'
       end
     else
-      new_version.sub!(/~rc[0-9]+/, '')
+      if new_version =~ /~rc\d+/
+        new_version.sub!(/~rc[0-9]+/, '')
+      else
+        components = new_version.split('.').map(&:to_i)
+        if components.size < 3
+          components << 1
+        else
+          components[-1] += 1
+        end
+        new_version = components.join('.')
+      end
     end
     puts "Current version: #{$version}"
@@ -1,44 +0,0 @@
-require 'noosfero/terminology'
-
-class UnifreireTerminology < Noosfero::Terminology::Custom
-
-  def initialize
-    # NOTE: the hash values must be marked for translation!! 
-    super({
-      'Enterprises' => N_('Institutions'),
-      'enterprises' => N_('institutions'),
-      'The enterprises where this user works.' => N_('The institution where this user belongs.'),
-      'A block that displays your enterprises' => N_('A block that displays your institutions.'),
-      'All enterprises' => N_('All institutions'),
-      'Disable search for enterprises' => N_('Disable search for institutions'),
-      'One enterprise' => N_('One institution'),
-      '%{num} enterprises' => N_('%{num} institutions'),
-      'Favorite Enterprises' => N_('Favorite Institutions'),
-      'This user\'s favorite enterprises.' => N_('This user\'s favorite institutions'),
-      'A block that displays your favorite enterprises' => N_('A block that displays your favorite institutions'),
-      'All favorite enterprises' => N_('All favorite institutions'),
-      'A search for enterprises by products selled and local' => N_('A search for institutions by products selled and local'),
-      'Edit message for disabled enterprises' => N_('Edit message for disabled institutions'),
-      'Add favorite enterprise' => N_('Add favorite institution'),
-      'Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.' => N_('Validation info is the information the institutions will see about how your organization processes the institutions validations it receives: validation methodology, restrictions to the types of institutions the organization validates etc.'),
-      'Here are all <b>%s</b>\'s enterprises.' => N_('Here are all <b>%s</b>\'s institutions.'),
-      'Here are all <b>%s</b>\'s favorite enterprises.' => N_('Here are all <b>%s</b>\'s favorite institutions.'),
-      'Favorite Enterprises' => N_('Favorite Institutions'),
-      'Enterprises in "%s"' => N_('Institutions in "%s"'),
-      'Register a new Enterprise' => N_('Register a new Institution'),
-      'Events' => N_('Schedule'),
-      'Manage enterprise fields' => N_('Manage institutions fields'),
-      "%s's enterprises" => N_("%s's institutions"),
-      'Activate your enterprise' => N_('Activate your institution'),
-      'Enterprise activation code' => N_('Institution activation code'),
-      'Disable activation of enterprises' => N_('Disable activation of institutions'),
-      "%s's favorite enterprises" => N_("%s's favorite institutions"),
-      'Disable Enterprise' => N_('Disable Institution'),
-      'Enable Enterprise' => N_('Enable Institution'),
-      'Enterprise Validation' => N_('Institution Validation'),
-      'Enterprise Info and settings' => N_('Institution Info and settings'),
-      'Enterprises are disabled when created' => N_('Institutions are disabled when created'),
-    })
-  end
-
-end
 class UserActivationJob < Struct.new(:user_id)
   def perform
     user = User.find(user_id)
-    user.destroy unless user.activated?
+    user.destroy unless user.activated? || user.person.is_template?
   end
 end
@@ -9,7 +9,7 @@ module WhiteListFilter
       unless iframe =~ /src=['"].*src=['"]/
         trusted_sites.each do |trusted_site|
           re_dom = trusted_site.gsub('.', '\.')
-          if iframe =~ /src=["']https?:\/\/(www\.)?#{re_dom}\//
+          if iframe =~ /src=["'](https?:)?\/\/(www\.)?#{re_dom}\//
             result = iframe
           end
         end
@@ -1,88 +0,0 @@
-require 'noosfero/terminology'
-
-class Zen3Terminology < Noosfero::Terminology::Custom
-
-  def initialize
-    # NOTE: the hash values must be marked for translation!! 
-    super({
-      'My Home Page' => N_('My ePortfolio'),
-      'Homepage' => N_('ePortfolio'),
-      'Communities' => N_('Groups'),
-      'communities' => N_('groups'),
-      'A block that displays your communities' => N_('A block that displays your groups'),
-      'A block that displays your friends' => N_('A block that displays your contacts'),
-      'The communities in which the user is a member' => N_('The groups in which the user is a member'),
-      'All communities' => N_('All groups'),
-      'Community' => N_('Group'),
-      'One community' => N_('One group'),
-      '%{num} communities' => N_('%{num} groups'),
-      'Disable search for communities' => N_('Disable search for groups'),
-      'Enterprises' => N_('Organizations'),
-      'enterprises' => N_('organizations'),
-      'The enterprises where this user works.' => N_('The organizations where this user works.'),
-      'A block that displays your enterprises' => N_('A block that displays your organizations.'),
-      'All enterprises' => N_('All organizations'),
-      'Disable search for enterprises' => N_('Disable search for organizations'),
-      'One enterprise' => N_('One organization'),
-      '%{num} enterprises' => N_('%{num} organizations'),
-      'Favorite Enterprises' => N_('Favorite Organizations'),
-      'This user\'s favorite enterprises.' => N_('This user\'s favorite organizations'),
-      'A block that displays your favorite enterprises' => N_('A block that displays your favorite organizations'),
-      'All favorite enterprises' => N_('All favorite organizations'),
-      'A search for enterprises by products selled and local' => N_('A search for organizations by products selled and local'),
-      'Edit message for disabled enterprises' => N_('Edit message for disabled organizations'),
-      'Add enterprise as favorite' => N_('Add organization as favorite'),
-      'Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.' => N_('Validation info is the information the organizations will see about how your organization processes the organizations validations it receives: validation methodology, restrictions to the types of organizations the organization validates etc.'),
-      'Here are all <b>%s</b>\'s enterprises.' => N_('Here all all <b>%s</b>\'s organizations.'),
-      'Here are all <b>%s</b>\'s favorite enterprises.' => N_('Here are all <b>%s</b>\'s favorite organizations.'),
-      'Favorite Enterprises' => N_('Favorite Organizations'),
-      'Enterprises in "%s"' => N_('Organizations in "%s"'),
-      'Register a new Enterprise' => N_('Register a new organization'),
-      'One friend' => N_('One contact'),
-      '%s friends' => N_('%s contacts'),
-      '%s communities' => N_('%s groups'),
-      'Are you sure you want to remove %s from your friends list?' => N_('Are you sure you want to remove %s from your contacts list?'),
-      'Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.' => N_('Note that %s will still have you as a contact, unless he/she also wants to remove you from his/her contact list.'),
-      'Yes, I want to remove %s from my friend list' => N_('Yes, I want to remove %s from my contact list'),
-      'Adding %s as a friend' => N_('Adding %s as a contact'),
-      'Are you sure you want to add %s as your friend?' => N_('Are you sure you want to add %s as your contact?'),
-      'Note that %s will need to accept being added as your friend.' => N_('Note that %s will need to accept being added as your contact.'),
-      'Classify your new friend %s: ' => N_('Classify your new contact %s: '),
-      'Yes, I want to add %s as my friend' => N_('Yes, I want to add %s as my contact'),
-      'Manage friends' => N_('Manage contacts'),
-      'Add friend' => N_('Add contact'),
-      'Removing friend: %s' => N_('Removing friend: %s'),
-      'Clicking on this button will remove your friend relation with %s.' => N_('Clicking on this button will remove your contact relation with %s.'),
-      'You have no friends yet.' => N_('You have no contacts yet.'),
-      '%s\'s friends' => N_('%s\'s contacts'),
-      'Here are all <b>%s</b>\'s friends.' => N_('Here are all <b>%s</b>\'s contacts.'),
-      'Friends' => N_('Contacts'),
-      'Creating new community' => N_('Creating new group'),
-      'Do you want to join this community?' => N_('Do you want to join this group?'),
-      'Activate your enterprise' => N_('Activate your organization'),
-      'Enterprise activation code' => N_('Organization activation code'),
-      'Disable activation of enterprises' => N_('Disable activation of organizations'),
-      'Manage community fields' => N_('Manage group fields'),
-      'Create a new community' => N_('Create a new group'),
-      'Preferred domain name:' => N_('Choose your host community:'),
-      'My communities' => N_('My groups'),
-      'Community Info and settings' => N_('Group Info and Settings'),
-      '{#} community' => N_('{#} group'),
-      '{#} communities' => N_('{#} groups'),
-      '{#} enterprise' => N_('{#} organization'),
-      '{#} enterprises' => N_('{#} organizations'),
-      '{#} friend' => N_('{#} contact'),
-      '{#} friends' => N_('{#} contacts'),
-      "%s's favorite enterprises" => N_("%s's favorite organizations"),
-      'Disable Enterprise' => N_('Disable Organization'),
-      'Enable Enterprise' => N_('Enable Organization'),
-      'Enterprise Validation' => N_('Organization Validation'),
-      'Enterprise Info and settings' => N_('Organization Info and settings'),
-      'Choose the communities you want to join and/or create your own.' => N_('Choose the groups you want to join and/or create your own.'),
-      'New community' => N_('New group'),
-      "Tags are important to new users, they'll be able to find your new community more easily." => N_("Tags are important to new users, they'll be able to find your new group more easily."),
-      'Enterprises are disabled when created' => N_('Organizations are disabled when created'),
-    })
-  end
-
-end
@@ -8,5 +8,5 @@ page.replace_html &quot;comment-count-#{@group_id}&quot;, @comments_count
 if @no_more_pages
   page.replace_html "comments_list_group_#{@group_id}_more", ""
 else
-  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :loaded => visual_effect(:highlight, "comments_list_group_#{@group_id}"), :method => :post, :complete => "loadCompleted(#{@group_id})")
+  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :method => :get)
 end
@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e)
+    raise e
+  end
+end
+
+class ProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @user = create_user('testinguser').person
+    login_as(@user.identifier)
+
+    @community = fast_create(Community, :environment_id => Environment.default)
+    @community.add_member @user
+    @community.add_admin @user
+
+    @environment = @community.environment
+    @environment.enabled_plugins = ['CommunityBlock']
+    @environment.save!
+
+    CommunityBlock.delete_all
+    @box1 = create(Box, :owner => @community)
+    @community.boxes = [@box1]
+
+    @block = CommunityBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @community.blocks<<@block
+    @community.save!
+  end
+
+  should 'display community-block' do
+    get :index, :profile => @community.identifier
+    assert_tag :div, :attributes => {:class => 'community-block-logo'}
+    assert_tag :div, :attributes => {:class => 'community-block-info'}
+    assert_tag :div, :attributes => {:class => 'community-block-title'}
+    assert_tag :div, :attributes => {:class => 'community-block-description'}
+  end
+
+  should 'display *leave* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
+  end
+
+  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
+  end
+
+  should 'display *report* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is logged in and is not a member of the community' do
+    @community.remove_member @user
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'display *control panel* link option when the user is logged in and is community admin' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'not display *arrow* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
+  end
+
+end
@@ -1,87 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-# Re-raise errors caught by the controller.
-class ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
-class ProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = ProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @user = create_user('testinguser').person
-    login_as(@user.identifier)
-
-    @community = fast_create(Community, :environment_id => Environment.default)
-    @community.add_member @user
-    @community.add_admin @user
-
-    @environment = @community.environment
-    @environment.enabled_plugins = ['CommunityBlock']
-    @environment.save!
-
-    CommunityBlock.delete_all
-    @box1 = create(Box, :owner => @community)
-    @community.boxes = [@box1]
-
-    @block = CommunityBlock.new
-    @block.box = @box1
-    @block.save!
-
-    @community.blocks<<@block
-    @community.save!
-  end
-
-  should 'display community-block' do
-    get :index, :profile => @community.identifier
-    assert_tag :div, :attributes => {:class => 'community-block-logo'}
-    assert_tag :div, :attributes => {:class => 'community-block-info'}
-    assert_tag :div, :attributes => {:class => 'community-block-title'}
-    assert_tag :div, :attributes => {:class => 'community-block-description'}
-  end
-
-  should 'display *leave* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
-  end
-
-  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
-  end
-
-  should 'display *report* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
-  end
-
-  should 'display *join* button when the user is logged in and is not a member of the community' do
-    @community.remove_member @user
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
-  end
-
-  should 'display *control panel* link option when the user is logged in and is community admin' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
-  end
-
-  should 'display *join* button when the user is not logged in' do
-    logout
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
-  end
-
-  should 'not display *arrow* button when the user is not logged in' do
-    logout
-    get :index, :profile => @community.identifier
-    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
-  end
-
-end
@@ -23,7 +23,7 @@
       <%= link_to(
             content_tag('span','',:class => 'community-block-button icon-arrow'),
             '#',
-            :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false;",
+            :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false;",
             :class => 'simplemenu-trigger') %>
       <% end %>
@@ -32,11 +32,11 @@
         <% if profile.members.include?(user) || profile.already_request_membership?(user) %>
             <%= link_to(
                   content_tag('span', '', :class => 'community-block-button icon-remove'),
-                  profile.leave_url) %>
+                  profile.leave_url, :class => 'join-community') %>
         <% else %>
             <%= link_to(
                   content_tag('span', '', :class => 'community-block-button icon-add'),
-                  profile.join_url) %>
+                  profile.join_url, :class => 'join-community') %>
         <% end %>
       <% else %>
         <%= link_to(
@@ -101,9 +101,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'render tracks in track list block' do
     @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
     get :view_page, @step.url
-    file = File.open('result.html', 'w+')
-    file.write(@response.body)
-    file.close
     assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
   end
@@ -6,10 +6,13 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
     @plugin = CommunityTrackPlugin.new
     @profile = fast_create(Community)
     @params = {}
-    @plugin.stubs(:context).returns(self)
+    @context = mock
+    @context.stubs(:profile).returns(@profile)
+    @context.stubs(:params).returns(@params)
+    @plugin.stubs(:context).returns(@context)
   end
-  attr_reader :profile, :params
+  attr_reader :profile, :params, :context
   should 'has name' do
     assert CommunityTrackPlugin.plugin_name
@@ -28,37 +31,37 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
   end
   should 'do not return Track as a content type if profile is not a community' do
-    @profile = Organization.new
+    context.stubs(:profile).returns(Organization.new)
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
   end
   should 'do not return Track as a content type if there is a parent' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(Blog, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
   end
   should 'return Step as a content type if parent is a Track' do
-    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_includes @plugin.content_types, CommunityTrackPlugin::Step
   end
   should 'do not return Step as a content type if parent is not a Track' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(Blog, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Step
   end
   should 'return Track and Step as a content type if context has no params' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    expects(:respond_to?).with(:params).returns(false)
+    parent = fast_create(Blog, :profile_id => profile.id)
+    context.expects(:respond_to?).with(:params).returns(false)
     assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
   end
   should 'return Track and Step as a content type if params is nil' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params = nil
+    parent = fast_create(Blog, :profile_id => profile.id)
+    context.stubs(:params).returns(nil)
     assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
   end
@@ -23,7 +23,7 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
     respond_to do |format|
       if @form.save
-        flash[:notice] = _("Custom form #{@form.name} was successfully created.")
+        flash[:notice] = _("Custom form %s was successfully created.") % @form.name
         format.html { redirect_to(:action=>'index') }
       else
         format.html { render :action => 'new' }
@@ -43,7 +43,7 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
     respond_to do |format|
       if @form.save
-        flash[:notice] = _("Custom form #{@form.name} was successfully updated.")
+        flash[:notice] = _("Custom form %s was successfully updated.") % @form.name
         format.html { redirect_to(:action=>'index') }
       else
         session['notice'] = _('Form could not be updated')
@@ -226,7 +226,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
   should 'list pending submissions for a form' do
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :for_admission => true)
     task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + &#39;/../../../../../test/test_helper&#39;
 class CustomFormsPlugin::AdmissionSurveyTest < ActiveSupport::TestCase
   should 'add member to community on perform' do
     profile = fast_create(Community)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
@@ -244,7 +244,7 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
   should 'cancel survey tasks after removing a form' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     form2 = CustomFormsPlugin::Form.create!(:name => 'Operation System', :profile => profile)
@@ -13,7 +13,7 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
   should 'create submission with answers on perform' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     field = CustomFormsPlugin::Field.create!(:name => 'Name', :form => form)
     task = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :submission => {field.id.to_s => 'Jack'}, :target => person, :requestor => profile)
@@ -31,7 +31,7 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
   should 'have a scope that retrieves all tasks requested by profile' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     task1 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
     task2 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => fast_create(Profile))
@@ -5,7 +5,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :on_membership => true)
     f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :on_membership => false)
@@ -19,7 +19,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form', :on_membership => true, :access => 'associated')
     assert_difference 'CustomFormsPlugin::MembershipSurvey.count', 1 do
@@ -31,7 +31,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     form1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     organization.add_member(person)
@@ -59,7 +59,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :for_admission => true)
     f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :for_admission => true)
     f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :for_admission => false)
@@ -0,0 +1,45 @@
+README - Lattes Curriculum (LattesCurriculum Plugin)
+================================
+
+Lattes Curriculum is a plugin that allow users to show their academic informations in the wall, extracted from CNPQ's lattes plataform
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable LattesCurriculum Plugin on your Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable lattes_curriculum
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "LattesCurriculumPlugin" check-box
+
+Running LattesCurriculum tests
+--------------------
+
+$ rake test:noosfero_plugins:lattes_curriculum
+
+LICENSE
+=======
+
+Copyright (c) The Author developers.
+
+See Noosfero license.
+
+
+AUTHORS
+=======
+
+Jose Pedro (1jpsneto at gmail.com)
+Thiago Kairala (thiagor.kairala at gmail.com)
+Ana Paula Vargas (anapaulavnoronha at gmail.com)
+Leandro Veloso (leandrovelosorodrigues at gmail.com)
+Arthur Del Esposte (arthurmde at gmail.com)
 \ No newline at end of file
@@ -0,0 +1,12 @@
+class CreateAcademicInfos < ActiveRecord::Migration
+  def self.up
+    create_table :academic_infos do |t|
+      t.references :person
+      t.column :lattes_url, :string
+    end
+   end
+
+  def self.down
+    drop_table :academic_infos
+  end
+end
@@ -0,0 +1,49 @@
+Feature: import lattes information
+  As an user
+  I want to inform my lattes url address
+  So that I can import my academic informations automatically
+
+  Background:
+    Given "LattesCurriculumPlugin" plugin is enabled
+    And I am logged in as admin
+    And I go to /admin/plugins
+    And I check "Lattes Curriculum Plugin"
+    And I press "Save changes"
+    And I go to /admin/features/manage_fields
+    Given I follow "Person's fields"
+    And I check "person_fields_lattes_url_active"
+    And I check "person_fields_lattes_url_signup"
+    And I press "save_person_fields"
+
+  Scenario: Don't accept edit the profile with invalid lattes url
+    Given I am on admin_user's control panel
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://youtube.com.br/"
+    And I press "Save"
+    Then I should see "Academic info lattes url is invalid"
+
+  Scenario: Import lattes informations
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://lattes.cnpq.br/2864976228727880"
+    And I press "Save"
+    And I go to /profile/admin_user#lattes_tab
+    Then I should see "Endereço para acessar este CV: http://lattes.cnpq.br/2864976228727880"
+
+  Scenario: Don't show lattes informations for blank lattes urls
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I press "Save"
+    And I go to /profile/admin_user
+    Then I should not see "Lattes"
+
+  Scenario: Inform problem if the informed lattes doesn't exist
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://lattes.cnpq.br/123456"
+    And I press "Save"
+    And I go to /profile/admin_user#lattes_tab
+    Then I should see "Lattes not found. Please, make sure the informed URL is correct."
 \ No newline at end of file
@@ -0,0 +1,23 @@
+class AcademicInfo < ActiveRecord::Base
+
+  belongs_to :person
+
+  attr_accessible :lattes_url
+  validate :lattes_url_validate?
+
+  def lattes_url_validate?
+    unless AcademicInfo.matches?(self.lattes_url)
+      self.errors.add(:lattes_url, _(" is invalid."))
+    end
+  end
+
+  def self.matches?(info)
+    lattes = nil
+    if info.class == String
+      lattes = info
+    elsif info.class == Hash
+      lattes = info[:lattes_url]
+    end
+    return lattes.blank? || lattes =~ /^http:\/\/lattes.cnpq.br\/\d+$/
+  end
+end
@@ -0,0 +1,32 @@
+require_dependency 'person'
+
+class Person
+
+  attr_accessible :lattes_url, :academic_info_attributes
+
+  has_one :academic_info
+
+  after_destroy do |person|
+    if !person.environment.nil? &&
+person.environment.plugin_enabled?(LattesCurriculumPlugin) &&
+!person.academic_info.nil?
+      person.academic_info.destroy
+    end
+  end
+
+  accepts_nested_attributes_for :academic_info
+
+  def lattes_url
+    if self.environment && self.environment.plugin_enabled?(LattesCurriculumPlugin)
+      self.academic_info.nil? ? nil : self.academic_info.lattes_url
+    end
+  end
+
+  def lattes_url= value
+    if self.environment && self.environment.plugin_enabled?(LattesCurriculumPlugin)
+      self.academic_info.lattes_url = value unless self.academic_info.nil?
+    end
+  end
+
+  FIELDS << "lattes_url"
+end
@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'nokogiri'
+require 'open-uri'
+
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
+class Html_parser
+  def get_html(lattes_link = "")
+    begin
+      page = Nokogiri::HTML(open(lattes_link), nil, "UTF-8")
+      page = page.css(".main-content").to_s()
+      page = remove_class_tooltip(page)
+      page = remove_img(page)
+      page = remove_select(page)
+      page = remove_footer(page)
+      page = remove_further_informations(page)
+		rescue OpenURI::HTTPError => e
+      page = _("Lattes not found. Please, make sure the informed URL is correct.")
+    rescue Timeout::Error => e
+      page = _("Lattes Platform is unreachable. Please, try it later.")
+    end
+  end
+
+  def remove_class_tooltip(page = "")
+    while page.include? 'class="tooltip"' do
+      page['class="tooltip"'] = 'class="link_not_to_mark"'
+    end
+
+    return page
+  end
+
+  def remove_img(page = "")
+    fist_part_to_keep, *rest = page.split('<img')
+    second_part = rest.join(" ")
+    part_to_throw_away, *after_img = second_part.split('>',2)
+    page = fist_part_to_keep + after_img.join(" ")
+  end
+
+  def remove_select(page = "")
+    while page.include? '<label' do
+      first_part_to_keep, *rest = page.split('<label')
+      second_part = rest.join(" ")
+      part_to_throw_away, *after_img = second_part.split('</select>')
+      page = first_part_to_keep + after_img.join(" ")
+    end
+
+    return page
+  end
+
+  def remove_footer(page = "")
+    first_part_to_keep, *rest = page.split('<div class="rodape-cv">')
+    second_part = rest.join(" ")
+    part_to_throw_away, *after_img = second_part.split('Imprimir Curr&iacute;culo</a>')
+    page = first_part_to_keep + after_img.join(" ")
+  end
+
+  def remove_further_informations(page = "")
+    first_part_to_keep, *rest = page.split('<a name="OutrasI')
+    second_part = rest.join(" ")
+    part_to_throw_away, *after_img = second_part.split('</div>',2)
+    page = first_part_to_keep + after_img.join(" ")
+  end
+end
@@ -0,0 +1,139 @@
+class LattesCurriculumPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Lattes Curriculum Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that imports the lattes curriculum into the users profiles")
+  end
+
+  def js_files
+    ["singup_complement.js"]
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def extra_optional_fields
+    fields = []
+
+    lattes_url = {
+      :name => 'lattes_url',
+      :label => 'Lattes URL',
+      :object_name => :academic_infos,
+      :method => :lattes_url,
+      :value => context.profile.nil? ? "" : context.profile.academic_info.lattes_url
+    }
+
+    fields << lattes_url
+
+    return fields
+  end
+
+  def profile_tabs
+    if show_lattes_tab?
+      href = context.profile.academic_info.lattes_url
+      html_parser = Html_parser.new
+      {
+        :title => _("Lattes"),
+        :id => 'lattes_tab',
+        :content => lambda{html_parser.get_html(href)},
+        :start => false
+      }
+    end
+  end
+
+  def profile_editor_transaction_extras
+    if context.profile.person?
+      if context.params.has_key?(:academic_infos)
+        academic_info_transaction
+      end
+    end
+  end
+
+  def profile_editor_controller_filters
+    validate_lattes_url_block = proc do
+      if request.post?
+        if !params[:academic_infos].blank?
+          @profile_data = profile
+
+          academic_infos = {"academic_info_attributes" => params[:academic_infos]}
+
+          params_profile_data = params[:profile_data]
+          params_profile_data = params_profile_data.merge(academic_infos)
+
+          @profile_data.attributes = params_profile_data
+          @profile_data.valid?
+
+          @possible_domains = profile.possible_domains
+
+          unless AcademicInfo.matches?(params[:academic_infos])
+            @profile_data.errors.add(:lattes_url, _(' Invalid lattes url'))
+            render :action => :edit, :profile => profile.identifier
+          end
+        end
+      end
+    end
+
+    create_academic_info_block = proc do
+      if profile && profile.person? && profile.academic_info.nil?
+        profile.academic_info = AcademicInfo.new
+      end
+    end
+
+    [{:type => 'before_filter',
+      :method_name => 'validate_lattes_url',
+      :options => {:only => 'edit'},
+      :block => validate_lattes_url_block },
+    {:type => 'before_filter',
+      :method_name => 'create_academic_info',
+      :options => {:only => 'edit'},
+      :block => create_academic_info_block }]
+  end
+
+  def account_controller_filters
+    validate_lattes_url_block = proc do
+      if request.post?
+        params[:profile_data] ||= {}
+        params[:profile_data][:academic_info_attributes] = params[:academic_infos]
+
+        if !params[:academic_infos].blank? && !AcademicInfo.matches?(params[:academic_infos])
+          @person = Person.new(params[:profile_data])
+          @person.environment = environment
+          @user = User.new(params[:user])
+          @person.errors.add(:lattes_url, _(' Invalid lattes url'))
+          render :action => :signup
+        end
+      end
+    end
+
+    create_academic_info_block = proc do
+      if profile && profile.person? && profile.academic_info.nil?
+        profile.academic_info = AcademicInfo.new
+      end
+    end
+
+    [{:type => 'before_filter',
+      :method_name => 'validate_lattes_url',
+      :options => {:only => 'signup'},
+      :block => validate_lattes_url_block },
+    {:type => 'before_filter',
+      :method_name => 'create_academic_info',
+      :options => {:only => 'edit'},
+      :block => create_academic_info_block }]
+  end
+
+  protected
+
+  def academic_info_transaction
+    AcademicInfo.transaction do
+      context.profile.academic_info.update_attributes!(context.params[:academic_infos])
+    end
+  end
+
+  def show_lattes_tab?
+    return context.profile.person? && !context.profile.academic_info.nil? && !context.profile.academic_info.lattes_url.blank? && context.profile.public_fields.include?("lattes_url")
+  end
+end
@@ -0,0 +1,12 @@
+8950 4e47 0d0a 1a0a 0000 000d 4948 4452
+0000 0009 0000 0027 0806 0000 00dd 3762
+5600 0000 0173 5247 4200 aece 1ce9 0000
+0006 624b 4744 00ff 00ff 00ff a0bd a793
+0000 0009 7048 5973 0000 0dd7 0000 0dd7
+0142 289b 7800 0000 0774 494d 4507 dc05
+040f 1a01 22dc e3a3 0000 003b 4944 4154
+38cb 635c 30bd f53f 0301 c0c4 4004 188c
+8a58 18fe 13a3 8808 552c ff87 6810 101b
+4eff 87af efa8 1704 c33e 1550 29b7 0c4a
+dffd 1fa2 b905 009c 4210 1067 9fec 9d00
+0000 0049 454e 44ae 4260 82
 \ No newline at end of file
@@ -0,0 +1,15 @@
+jQuery(function($){
+  $(document).ready(function(){
+    $('#lattes_id_field').blur(function(){
+      var value = this.value
+    })
+
+    $('#lattes_id_field').focus(function(){
+      $('#lattes-id-balloon').fadeIn('slow')
+    })
+
+    $('#lattes_id_field').blur(function(){
+      $('#lattes-id-balloon').fadeOut('slow')
+    })
+  })
+})
 \ No newline at end of file
@@ -0,0 +1,37 @@
+#signup-form label[for="lattes_id_field"],
+{
+  display: block;
+}
+
+#signup-form small#lattes-id-balloon
+{
+  display: none;
+  width: 142px;
+  height: 69px;
+  color: #FFFFFF;
+  font-weight: bold;
+  font-size: 11px;
+  padding: 5px 10px 45px 10px;
+  margin: 0;
+  line-height: 1.5em;
+  background: transparent url(/images/gray-balloon.png) bottom center no-repeat;
+  position: absolute;
+  z-index: 2;
+  right: -150px;
+  top: -75px;
+}
+
+#signup-form .formfield.checking {
+  border-color: transparent;
+  background-image: none;
+}
+
+#signup-form small#lattes-id-balloon
+{
+  top: -80px;
+}
+
+#signup-form #signup-lattes-id
+{
+  position: relative;
+}
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class AcademicInfoTest < ActiveSupport::TestCase
+
+  def setup
+    @academic_info = AcademicInfo.new
+  end
+
+  should 'not ve invalid lattes url' do
+    @academic_info.lattes_url = "http://softwarelivre.org/"
+    assert !@academic_info.save
+  end
+
+  should 'accept blank lattes url' do
+    @academic_info.lattes_url = ""
+    assert @academic_info.save
+  end
+
+  should 'save with correct lattes url' do
+    @academic_info.lattes_url = "http://lattes.cnpq.br/2193972715230641"
+    assert @academic_info.save
+  end
+end
@@ -0,0 +1,24 @@
+#!/bin/env ruby
+# encoding: utf-8
+
+require "test_helper"
+
+class HtmlParserTest < ActiveSupport::TestCase
+
+  def setup
+    @parser = Html_parser.new
+  end
+
+  should 'be not nil the instance' do
+    assert_not_nil @parser
+  end
+
+  should 'be not nil the return get_html' do
+    result = @parser.get_html("http://lattes.cnpq.br/2193972715230641")
+    assert result.include?("Endereço para acessar este CV")
+  end
+
+  should 'inform that lattes was not found' do
+    assert_equal "Lattes not found. Please, make sure the informed URL is correct.", @parser.get_html("http://lattes.cnpq.br/123")
+  end
+end
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class LattesCurriculumPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = LattesCurriculumPlugin.new
+  end
+
+  should 'be a noosfero plugin' do
+    assert_kind_of Noosfero::Plugin, @plugin
+  end
+
+  should 'have name' do
+    assert_equal 'Lattes Curriculum Plugin', LattesCurriculumPlugin.plugin_name
+  end
+
+  should 'have description' do
+    assert_equal _('A plugin that imports the lattes curriculum into the users profiles'), LattesCurriculumPlugin.plugin_description
+  end
+
+  should 'have stylesheet' do
+    assert @plugin.stylesheet?
+  end
+end
@@ -0,0 +1,26 @@
+require "test_helper"
+
+class PersonTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @environment.enable_plugin(LattesCurriculumPlugin)
+  end
+
+  attr_reader :environment
+
+  should 'destroy academic info if person is removed' do
+    person = fast_create(Person)
+    academic_info = fast_create(AcademicInfo, :person_id => person.id,
+:lattes_url => 'http://lattes.cnpq.br/2193972715230')
+
+    assert_difference 'AcademicInfo.count', -1 do
+      person.destroy
+    end
+  end
+
+  should 'add lattes_url field to Person' do
+    assert_includes Person.fields, 'lattes_url'
+  end
+
+end
@@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController &lt; ProfileController
     if is_cache_expired?(profile.members_cache_key(params))
       unless params[:role_key].blank?
         role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
-        @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members = profile.members.with_role(role.id)
         @members_title = role.name
       else
-        @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members = profile.members
         @members_title = 'members'
       end
+      @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count)
     end
     render "profile/members"
   end
 require File.dirname(__FILE__) + '/../test_helper'
-class FriendsBlockTest < ActiveSupport::TestCase
+class FriendsBlockTest < ActionView::TestCase
   should 'inherit from Block' do
     assert_kind_of Block, FriendsBlock.new
@@ -8,6 +8,7 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
   should 'declare its default title' do
+    FriendsBlock.any_instance.expects(:profile_count).returns(0)
     assert_not_equal Block.new.default_title, FriendsBlock.new.default_title
   end
@@ -60,7 +61,7 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
   should 'prioritize profiles with image by default' do
-    assert FriendsBlock.new.prioritize_people_with_image
+    assert FriendsBlock.new.prioritize_profiles_with_image
   end
@@ -98,10 +99,10 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
     block = FriendsBlock.new
     block.expects(:owner).returns(person1).at_least_once
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all', :profile => 'mytestperson', :controller => 'profile', :action => 'friends').returns('link-to-friends')
-
-    assert_equal 'link-to-friends', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestperson/friends]'
+    end
   end
 require File.dirname(__FILE__) + '/../test_helper'
-class MembersBlockTest < ActiveSupport::TestCase
+class MembersBlockTest < ActionView::TestCase
   should 'inherit from Block' do
     assert_kind_of Block, MembersBlock.new
@@ -60,7 +60,7 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
   should 'prioritize profiles with image by default' do
-    assert MembersBlock.new.prioritize_people_with_image
+    assert MembersBlock.new.prioritize_profiles_with_image
   end
@@ -145,10 +145,10 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     block.box = profile.boxes.first
     block.save!
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
-
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/plugin/people_block/members]'
+    end
   end
   should 'provide link to members page with a selected role' do
@@ -158,10 +158,10 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     block.visible_role = 'profile_member'
     block.save!
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
-
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/plugin/people_block/members?role_key=profile_member]'
+    end
   end
   should 'provide a role to be displayed (and default to nil)' do
 require File.dirname(__FILE__) + '/../test_helper'
-class PeopleBlockTest < ActiveSupport::TestCase
+class PeopleBlockTest < ActionView::TestCase
   should 'inherit from Block' do
     assert_kind_of Block, PeopleBlock.new
@@ -106,14 +106,12 @@ class PeopleBlockTest &lt; ActiveSupport::TestCase
   should 'link to "all people"' do
     env = fast_create(Environment)
-
     block = PeopleBlock.new
-    stubs(:_).with('View all').returns('View all')
-    stubs(:link_to).returns('link-to-people')
-    stubs(:url_for).returns('  ')
-
-    assert_equal 'link-to-people', instance_exec(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/search/people]'
+    end
   end
@@ -0,0 +1,52 @@
+class PjaxPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    I18n.t('pjax_plugin.lib.plugin.name')
+  end
+
+  def self.plugin_description
+    I18n.t('pjax_plugin.lib.plugin.description')
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def js_files
+    ['jquery.pjax.js', 'patchwork.js', 'loading-overlay', 'pjax', ].map{ |j| "javascripts/#{j}" }
+  end
+
+  def head_ending
+    #TODO: add pjax meta
+  end
+
+  def body_beginning
+    lambda{ render 'pjax_layouts/load_state_script' }
+  end
+
+  PjaxCheck = lambda do
+    return unless request.headers['X-PJAX']
+    # raise makes pjax fallback to a regular request
+    raise "Pjax can't be used here" if params[:controller] == 'account'
+
+    @pjax = true
+    @pjax_loaded_themes = request.headers['X-PJAX-Themes'].to_s.split(',') || []
+
+    unless self.respond_to? :get_layout_with_pjax
+      self.class.send :define_method, :get_layout_with_pjax do
+        if @pjax then 'pjax' else get_layout_without_pjax end
+      end
+      self.class.alias_method_chain :get_layout, :pjax
+    end
+  end
+
+  def application_controller_filters
+    [{
+      :type => 'before_filter', :method_name => 'pjax_check',
+      :options => {}, :block => PjaxCheck,
+    }]
+  end
+
+  protected
+
+end
@@ -0,0 +1,12 @@
+
+"en": &en-US
+  pjax_plugin:
+    lib:
+      plugin:
+        name: "pjax plugin"
+        description: "Use pjax for page's links"
+
+'en_US':
+  <<: *en-US
+'en-US':
+  <<: *en-US
@@ -0,0 +1,13 @@
+
+"pt": &pt-BR
+  pjax_plugin:
+    lib:
+      plugin:
+        name: "pjax plugin"
+        description: "Usa o pjax para os links da página"
+
+'pt_BR':
+  <<: *pt-BR
+'pt-BR':
+  <<: *pt-BR
+
@@ -0,0 +1,838 @@
+// jquery.pjax.js
+// copyright chris wanstrath
+// https://github.com/defunkt/jquery-pjax
+
+(function($){
+
+// When called on a container with a selector, fetches the href with
+// ajax into the container or with the data-pjax attribute on the link
+// itself.
+//
+// Tries to make sure the back button and ctrl+click work the way
+// you'd expect.
+//
+// Exported as $.fn.pjax
+//
+// Accepts a jQuery ajax options object that may include these
+// pjax specific options:
+//
+//
+// container - Where to stick the response body. Usually a String selector.
+//             $(container).html(xhr.responseBody)
+//             (default: current jquery context)
+//      push - Whether to pushState the URL. Defaults to true (of course).
+//   replace - Want to use replaceState instead? That's cool.
+//
+// For convenience the second parameter can be either the container or
+// the options object.
+//
+// Returns the jQuery object
+function fnPjax(selector, container, options) {
+  var context = this
+  return this.on('click.pjax', selector, function(event) {
+    var opts = $.extend({}, optionsFor(container, options))
+    if (!opts.container)
+      opts.container = $(this).attr('data-pjax') || context
+    handleClick(event, opts)
+  })
+}
+
+// Public: pjax on click handler
+//
+// Exported as $.pjax.click.
+//
+// event   - "click" jQuery.Event
+// options - pjax options
+//
+// Examples
+//
+//   $(document).on('click', 'a', $.pjax.click)
+//   // is the same as
+//   $(document).pjax('a')
+//
+//  $(document).on('click', 'a', function(event) {
+//    var container = $(this).closest('[data-pjax-container]')
+//    $.pjax.click(event, container)
+//  })
+//
+// Returns nothing.
+function handleClick(event, container, options) {
+  options = optionsFor(container, options)
+
+  var link = event.currentTarget
+
+  if (link.tagName.toUpperCase() !== 'A')
+    throw "$.fn.pjax or $.pjax.click requires an anchor element"
+
+  // Middle click, cmd click, and ctrl click should open
+  // links in a new tab as normal.
+  if ( event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey )
+    return
+
+  // Ignore cross origin links
+  if ( location.protocol !== link.protocol || location.hostname !== link.hostname )
+    return
+
+  // Ignore anchors on the same page
+  if (link.hash && link.href.replace(link.hash, '') ===
+       location.href.replace(location.hash, ''))
+    return
+
+  // Ignore empty anchor "foo.html#"
+  if (link.href === location.href + '#')
+    return
+
+  var defaults = {
+    url: link.href,
+    container: $(link).attr('data-pjax'),
+    target: link
+  }
+
+  var opts = $.extend({}, defaults, options)
+  var clickEvent = $.Event('pjax:click')
+  $(link).trigger(clickEvent, [opts])
+
+  if (!clickEvent.isDefaultPrevented()) {
+    pjax(opts)
+    event.preventDefault()
+  }
+}
+
+// Public: pjax on form submit handler
+//
+// Exported as $.pjax.submit
+//
+// event   - "click" jQuery.Event
+// options - pjax options
+//
+// Examples
+//
+//  $(document).on('submit', 'form', function(event) {
+//    var container = $(this).closest('[data-pjax-container]')
+//    $.pjax.submit(event, container)
+//  })
+//
+// Returns nothing.
+function handleSubmit(event, container, options) {
+  options = optionsFor(container, options)
+
+  var form = event.currentTarget
+
+  if (form.tagName.toUpperCase() !== 'FORM')
+    throw "$.pjax.submit requires a form element"
+
+  var defaults = {
+    type: form.method.toUpperCase(),
+    url: form.action,
+    data: $(form).serializeArray(),
+    container: $(form).attr('data-pjax'),
+    target: form
+  }
+
+  pjax($.extend({}, defaults, options))
+
+  event.preventDefault()
+}
+
+// Loads a URL with ajax, puts the response body inside a container,
+// then pushState()'s the loaded URL.
+//
+// Works just like $.ajax in that it accepts a jQuery ajax
+// settings object (with keys like url, type, data, etc).
+//
+// Accepts these extra keys:
+//
+// container - Where to stick the response body.
+//             $(container).html(xhr.responseBody)
+//      push - Whether to pushState the URL. Defaults to true (of course).
+//   replace - Want to use replaceState instead? That's cool.
+//
+// Use it just like $.ajax:
+//
+//   var xhr = $.pjax({ url: this.href, container: '#main' })
+//   console.log( xhr.readyState )
+//
+// Returns whatever $.ajax returns.
+function pjax(options) {
+  options = $.extend(true, {}, $.ajaxSettings, pjax.defaults, options)
+
+  if ($.isFunction(options.url)) {
+    options.url = options.url()
+  }
+
+  var target = options.target
+
+  var hash = parseURL(options.url).hash
+
+  var context = options.context = findContainerFor(options.container)
+
+  // We want the browser to maintain two separate internal caches: one
+  // for pjax'd partial page loads and one for normal page loads.
+  // Without adding this secret parameter, some browsers will often
+  // confuse the two.
+  if (!options.data) options.data = {}
+  options.data._pjax = context.selector
+
+  function fire(type, args) {
+    var event = $.Event(type, { relatedTarget: target })
+    context.trigger(event, args)
+    return !event.isDefaultPrevented()
+  }
+
+  var timeoutTimer
+
+  options.beforeSend = function(xhr, settings) {
+    // No timeout for non-GET requests
+    // Its not safe to request the resource again with a fallback method.
+    if (settings.type !== 'GET') {
+      settings.timeout = 0
+    }
+
+    xhr.setRequestHeader('X-PJAX', 'true')
+    xhr.setRequestHeader('X-PJAX-Container', context.selector)
+
+    if (!fire('pjax:beforeSend', [xhr, settings]))
+      return false
+
+    if (settings.timeout > 0) {
+      timeoutTimer = setTimeout(function() {
+        if (fire('pjax:timeout', [xhr, options]))
+          xhr.abort('timeout')
+      }, settings.timeout)
+
+      // Clear timeout setting so jquerys internal timeout isn't invoked
+      settings.timeout = 0
+    }
+
+    options.requestUrl = parseURL(settings.url).href
+  }
+
+  options.complete = function(xhr, textStatus) {
+    if (timeoutTimer)
+      clearTimeout(timeoutTimer)
+
+    fire('pjax:complete', [xhr, textStatus, options])
+
+    fire('pjax:end', [xhr, options])
+  }
+
+  options.error = function(xhr, textStatus, errorThrown) {
+    var container = extractContainer("", xhr, options)
+
+    var allowed = fire('pjax:error', [xhr, textStatus, errorThrown, options])
+    if (options.type == 'GET' && textStatus !== 'abort' && allowed) {
+      locationReplace(container.url)
+    }
+  }
+
+  options.success = function(data, status, xhr) {
+    // If $.pjax.defaults.version is a function, invoke it first.
+    // Otherwise it can be a static string.
+    var currentVersion = (typeof $.pjax.defaults.version === 'function') ?
+      $.pjax.defaults.version() :
+      $.pjax.defaults.version
+
+    var latestVersion = xhr.getResponseHeader('X-PJAX-Version')
+
+    var container = extractContainer(data, xhr, options)
+
+    // If there is a layout version mismatch, hard load the new url
+    if (currentVersion && latestVersion && currentVersion !== latestVersion) {
+      locationReplace(container.url)
+      return
+    }
+
+    // If the new response is missing a body, hard load the page
+    if (!container.contents) {
+      locationReplace(container.url)
+      return
+    }
+
+    pjax.state = {
+      id: options.id || uniqueId(),
+      url: container.url,
+      title: container.title,
+      container: context.selector,
+      fragment: options.fragment,
+      timeout: options.timeout
+    }
+
+    if (options.push || options.replace) {
+      window.history.replaceState(pjax.state, container.title, container.url)
+    }
+
+    // Clear out any focused controls before inserting new page contents.
+    document.activeElement.blur()
+
+    if (container.title) document.title = container.title
+    context.html(container.contents)
+
+    // FF bug: Won't autofocus fields that are inserted via JS.
+    // This behavior is incorrect. So if theres no current focus, autofocus
+    // the last field.
+    //
+    // http://www.w3.org/html/wg/drafts/html/master/forms.html
+    var autofocusEl = context.find('input[autofocus], textarea[autofocus]').last()[0]
+    if (autofocusEl && document.activeElement !== autofocusEl) {
+      autofocusEl.focus();
+    }
+
+    executeScriptTags(container.scripts)
+
+    // Scroll to top by default
+    if (typeof options.scrollTo === 'number')
+      $(window).scrollTop(options.scrollTo)
+
+    // If the URL has a hash in it, make sure the browser
+    // knows to navigate to the hash.
+    if ( hash !== '' ) {
+      // Avoid using simple hash set here. Will add another history
+      // entry. Replace the url with replaceState and scroll to target
+      // by hand.
+      //
+      //   window.location.hash = hash
+      var url = parseURL(container.url)
+      url.hash = hash
+
+      pjax.state.url = url.href
+      window.history.replaceState(pjax.state, container.title, url.href)
+
+      var target = $(url.hash)
+      if (target.length) $(window).scrollTop(target.offset().top)
+    }
+
+    fire('pjax:success', [data, status, xhr, options])
+  }
+
+
+  // Initialize pjax.state for the initial page load. Assume we're
+  // using the container and options of the link we're loading for the
+  // back button to the initial page. This ensures good back button
+  // behavior.
+  if (!pjax.state) {
+    pjax.state = {
+      id: uniqueId(),
+      url: window.location.href,
+      title: document.title,
+      container: context.selector,
+      fragment: options.fragment,
+      timeout: options.timeout
+    }
+    window.history.replaceState(pjax.state, document.title)
+  }
+
+  // Cancel the current request if we're already pjaxing
+  var xhr = pjax.xhr
+  if ( xhr && xhr.readyState < 4) {
+    xhr.onreadystatechange = $.noop
+    xhr.abort()
+  }
+
+  pjax.options = options
+  var xhr = pjax.xhr = $.ajax(options)
+
+  if (xhr.readyState > 0) {
+    if (options.push && !options.replace) {
+      // Cache current container element before replacing it
+      cachePush(pjax.state.id, context.clone().contents())
+
+      window.history.pushState(null, "", stripPjaxParam(options.requestUrl))
+    }
+
+    fire('pjax:start', [xhr, options])
+    fire('pjax:send', [xhr, options])
+  }
+
+  return pjax.xhr
+}
+
+// Public: Reload current page with pjax.
+//
+// Returns whatever $.pjax returns.
+function pjaxReload(container, options) {
+  var defaults = {
+    url: window.location.href,
+    push: false,
+    replace: true,
+    scrollTo: false
+  }
+
+  return pjax($.extend(defaults, optionsFor(container, options)))
+}
+
+// Internal: Hard replace current state with url.
+//
+// Work for around WebKit
+//   https://bugs.webkit.org/show_bug.cgi?id=93506
+//
+// Returns nothing.
+function locationReplace(url) {
+  window.history.replaceState(null, "", "#")
+  window.location.replace(url)
+}
+
+
+var initialPop = true
+var initialURL = window.location.href
+var initialState = window.history.state
+
+// Initialize $.pjax.state if possible
+// Happens when reloading a page and coming forward from a different
+// session history.
+if (initialState && initialState.container) {
+  pjax.state = initialState
+}
+
+// Non-webkit browsers don't fire an initial popstate event
+if ('state' in window.history) {
+  initialPop = false
+}
+
+// popstate handler takes care of the back and forward buttons
+//
+// You probably shouldn't use pjax on pages with other pushState
+// stuff yet.
+function onPjaxPopstate(event) {
+  var state = event.state
+
+  if (state && state.container) {
+    // When coming forward from a separate history session, will get an
+    // initial pop with a state we are already at. Skip reloading the current
+    // page.
+    if (initialPop && initialURL == state.url) return
+
+    // If popping back to the same state, just skip.
+    // Could be clicking back from hashchange rather than a pushState.
+    if (pjax.state.id === state.id) return
+
+    var container = $(state.container)
+    if (container.length) {
+      var direction, contents = cacheMapping[state.id]
+
+      if (pjax.state) {
+        // Since state ids always increase, we can deduce the history
+        // direction from the previous state.
+        direction = pjax.state.id < state.id ? 'forward' : 'back'
+
+        // Cache current container before replacement and inform the
+        // cache which direction the history shifted.
+        cachePop(direction, pjax.state.id, container.clone().contents())
+      }
+
+      var popstateEvent = $.Event('pjax:popstate', {
+        state: state,
+        direction: direction
+      })
+      container.trigger(popstateEvent)
+
+      var options = {
+        id: state.id,
+        url: state.url,
+        container: container,
+        push: false,
+        fragment: state.fragment,
+        timeout: state.timeout,
+        scrollTo: false
+      }
+
+      if (contents) {
+        container.trigger('pjax:start', [null, options])
+
+        if (state.title) document.title = state.title
+        container.html(contents)
+        pjax.state = state
+
+        container.trigger('pjax:end', [null, options])
+      } else {
+        pjax(options)
+      }
+
+      // Force reflow/relayout before the browser tries to restore the
+      // scroll position.
+      container[0].offsetHeight
+    } else {
+      locationReplace(location.href)
+    }
+  }
+  initialPop = false
+}
+
+// Fallback version of main pjax function for browsers that don't
+// support pushState.
+//
+// Returns nothing since it retriggers a hard form submission.
+function fallbackPjax(options) {
+  var url = $.isFunction(options.url) ? options.url() : options.url,
+      method = options.type ? options.type.toUpperCase() : 'GET'
+
+  var form = $('<form>', {
+    method: method === 'GET' ? 'GET' : 'POST',
+    action: url,
+    style: 'display:none'
+  })
+
+  if (method !== 'GET' && method !== 'POST') {
+    form.append($('<input>', {
+      type: 'hidden',
+      name: '_method',
+      value: method.toLowerCase()
+    }))
+  }
+
+  var data = options.data
+  if (typeof data === 'string') {
+    $.each(data.split('&'), function(index, value) {
+      var pair = value.split('=')
+      form.append($('<input>', {type: 'hidden', name: pair[0], value: pair[1]}))
+    })
+  } else if (typeof data === 'object') {
+    for (key in data)
+      form.append($('<input>', {type: 'hidden', name: key, value: data[key]}))
+  }
+
+  $(document.body).append(form)
+  form.submit()
+}
+
+// Internal: Generate unique id for state object.
+//
+// Use a timestamp instead of a counter since ids should still be
+// unique across page loads.
+//
+// Returns Number.
+function uniqueId() {
+  return (new Date).getTime()
+}
+
+// Internal: Strips _pjax param from url
+//
+// url - String
+//
+// Returns String.
+function stripPjaxParam(url) {
+  return url
+    .replace(/\?_pjax=[^&]+&?/, '?')
+    .replace(/_pjax=[^&]+&?/, '')
+    .replace(/[\?&]$/, '')
+}
+
+// Internal: Parse URL components and returns a Locationish object.
+//
+// url - String URL
+//
+// Returns HTMLAnchorElement that acts like Location.
+function parseURL(url) {
+  var a = document.createElement('a')
+  a.href = url
+  return a
+}
+
+// Internal: Build options Object for arguments.
+//
+// For convenience the first parameter can be either the container or
+// the options object.
+//
+// Examples
+//
+//   optionsFor('#container')
+//   // => {container: '#container'}
+//
+//   optionsFor('#container', {push: true})
+//   // => {container: '#container', push: true}
+//
+//   optionsFor({container: '#container', push: true})
+//   // => {container: '#container', push: true}
+//
+// Returns options Object.
+function optionsFor(container, options) {
+  // Both container and options
+  if ( container && options )
+    options.container = container
+
+  // First argument is options Object
+  else if ( $.isPlainObject(container) )
+    options = container
+
+  // Only container
+  else
+    options = {container: container}
+
+  // Find and validate container
+  if (options.container)
+    options.container = findContainerFor(options.container)
+
+  return options
+}
+
+// Internal: Find container element for a variety of inputs.
+//
+// Because we can't persist elements using the history API, we must be
+// able to find a String selector that will consistently find the Element.
+//
+// container - A selector String, jQuery object, or DOM Element.
+//
+// Returns a jQuery object whose context is `document` and has a selector.
+function findContainerFor(container) {
+  container = $(container)
+
+  if ( !container.length ) {
+    throw "no pjax container for " + container.selector
+  } else if ( container.selector !== '' && container.context === document ) {
+    return container
+  } else if ( container.attr('id') ) {
+    return $('#' + container.attr('id'))
+  } else {
+    throw "cant get selector for pjax container!"
+  }
+}
+
+// Internal: Filter and find all elements matching the selector.
+//
+// Where $.fn.find only matches descendants, findAll will test all the
+// top level elements in the jQuery object as well.
+//
+// elems    - jQuery object of Elements
+// selector - String selector to match
+//
+// Returns a jQuery object.
+function findAll(elems, selector) {
+  return elems.filter(selector).add(elems.find(selector));
+}
+
+function parseHTML(html) {
+  return $.parseHTML(html, document, true)
+}
+
+// Internal: Extracts container and metadata from response.
+//
+// 1. Extracts X-PJAX-URL header if set
+// 2. Extracts inline <title> tags
+// 3. Builds response Element and extracts fragment if set
+//
+// data    - String response data
+// xhr     - XHR response
+// options - pjax options Object
+//
+// Returns an Object with url, title, and contents keys.
+function extractContainer(data, xhr, options) {
+  var obj = {}
+
+  // Prefer X-PJAX-URL header if it was set, otherwise fallback to
+  // using the original requested url.
+  obj.url = stripPjaxParam(xhr.getResponseHeader('X-PJAX-URL') || options.requestUrl)
+
+  // Attempt to parse response html into elements
+  if (/<html/i.test(data)) {
+    var $head = $(parseHTML(data.match(/<head[^>]*>([\s\S.]*)<\/head>/i)[0]))
+    var $body = $(parseHTML(data.match(/<body[^>]*>([\s\S.]*)<\/body>/i)[0]))
+  } else {
+    var $head = $body = $(parseHTML(data))
+  }
+
+  // If response data is empty, return fast
+  if ($body.length === 0)
+    return obj
+
+  // If there's a <title> tag in the header, use it as
+  // the page's title.
+  obj.title = findAll($head, 'title').last().text()
+
+  if (options.fragment) {
+    // If they specified a fragment, look for it in the response
+    // and pull it out.
+    if (options.fragment === 'body') {
+      var $fragment = $body
+    } else {
+      var $fragment = findAll($body, options.fragment).first()
+    }
+
+    if ($fragment.length) {
+      obj.contents = $fragment.contents()
+
+      // If there's no title, look for data-title and title attributes
+      // on the fragment
+      if (!obj.title)
+        obj.title = $fragment.attr('title') || $fragment.data('title')
+    }
+
+  } else if (!/<html/i.test(data)) {
+    obj.contents = $body
+  }
+
+  // Clean up any <title> tags
+  if (obj.contents) {
+    // Remove any parent title elements
+    obj.contents = obj.contents.not(function() { return $(this).is('title') })
+
+    // Then scrub any titles from their descendants
+    obj.contents.find('title').remove()
+
+    // Gather all script[src] elements
+    //obj.scripts = findAll(obj.contents, 'script[src]').remove()
+    obj.contents = obj.contents.not(obj.scripts)
+  }
+
+  // Trim any whitespace off the title
+  if (obj.title) obj.title = $.trim(obj.title)
+
+  return obj
+}
+
+// Load an execute scripts using standard script request.
+//
+// Avoids jQuery's traditional $.getScript which does a XHR request and
+// globalEval.
+//
+// scripts - jQuery object of script Elements
+//
+// Returns nothing.
+function executeScriptTags(scripts) {
+  if (!scripts) return
+
+  var existingScripts = $('script[src]')
+
+  scripts.each(function() {
+    var src = this.src
+    var matchedScripts = existingScripts.filter(function() {
+      return this.src === src
+    })
+    if (matchedScripts.length) return
+
+    var script = document.createElement('script')
+    script.type = $(this).attr('type')
+    script.src = $(this).attr('src')
+    document.head.appendChild(script)
+  })
+}
+
+// Internal: History DOM caching class.
+var cacheMapping      = {}
+var cacheForwardStack = []
+var cacheBackStack    = []
+
+// Push previous state id and container contents into the history
+// cache. Should be called in conjunction with `pushState` to save the
+// previous container contents.
+//
+// id    - State ID Number
+// value - DOM Element to cache
+//
+// Returns nothing.
+function cachePush(id, value) {
+  cacheMapping[id] = value
+  cacheBackStack.push(id)
+
+  // Remove all entires in forward history stack after pushing
+  // a new page.
+  while (cacheForwardStack.length)
+    delete cacheMapping[cacheForwardStack.shift()]
+
+  // Trim back history stack to max cache length.
+  while (cacheBackStack.length > pjax.defaults.maxCacheLength)
+    delete cacheMapping[cacheBackStack.shift()]
+}
+
+// Shifts cache from directional history cache. Should be
+// called on `popstate` with the previous state id and container
+// contents.
+//
+// direction - "forward" or "back" String
+// id        - State ID Number
+// value     - DOM Element to cache
+//
+// Returns nothing.
+function cachePop(direction, id, value) {
+  var pushStack, popStack
+  cacheMapping[id] = value
+
+  if (direction === 'forward') {
+    pushStack = cacheBackStack
+    popStack  = cacheForwardStack
+  } else {
+    pushStack = cacheForwardStack
+    popStack  = cacheBackStack
+  }
+
+  pushStack.push(id)
+  if (id = popStack.pop())
+    delete cacheMapping[id]
+}
+
+// Public: Find version identifier for the initial page load.
+//
+// Returns String version or undefined.
+function findVersion() {
+  return $('meta').filter(function() {
+    var name = $(this).attr('http-equiv')
+    return name && name.toUpperCase() === 'X-PJAX-VERSION'
+  }).attr('content')
+}
+
+// Install pjax functions on $.pjax to enable pushState behavior.
+//
+// Does nothing if already enabled.
+//
+// Examples
+//
+//     $.pjax.enable()
+//
+// Returns nothing.
+function enable() {
+  $.fn.pjax = fnPjax
+  $.pjax = pjax
+  $.pjax.enable = $.noop
+  $.pjax.disable = disable
+  $.pjax.click = handleClick
+  $.pjax.submit = handleSubmit
+  $.pjax.reload = pjaxReload
+  $.pjax.defaults = {
+    timeout: 650,
+    push: true,
+    replace: false,
+    type: 'GET',
+    dataType: 'html',
+    scrollTo: 0,
+    maxCacheLength: 20,
+    version: findVersion
+  }
+  $(window).on('popstate.pjax', onPjaxPopstate)
+}
+
+// Disable pushState behavior.
+//
+// This is the case when a browser doesn't support pushState. It is
+// sometimes useful to disable pushState for debugging on a modern
+// browser.
+//
+// Examples
+//
+//     $.pjax.disable()
+//
+// Returns nothing.
+function disable() {
+  $.fn.pjax = function() { return this }
+  $.pjax = fallbackPjax
+  $.pjax.enable = enable
+  $.pjax.disable = $.noop
+  $.pjax.click = $.noop
+  $.pjax.submit = $.noop
+  $.pjax.reload = function() { window.location.reload() }
+
+  $(window).off('popstate.pjax', onPjaxPopstate)
+}
+
+
+// Add the state property to jQuery's event object so we can use it in
+// $(window).bind('popstate')
+if ( $.inArray('state', $.event.props) < 0 )
+  $.event.props.push('state')
+
+// Is pjax supported by this browser?
+$.support.pjax =
+  window.history && window.history.pushState && window.history.replaceState &&
+  // pushState isn't reliable on iOS until 5.
+  !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]|WebApps\/.+CFNetwork)/)
+
+$.support.pjax ? enable() : disable()
+
+})(jQuery);
@@ -0,0 +1,34 @@
+if (typeof loading_overlay === 'undefined') {
+
+// block user actions while making a post. Also indicate the network transaction
+loading_overlay = {
+
+  show: function (selector) {
+    var element = jQuery(selector);
+    var overlay = jQuery('<div>', {
+      class: 'loading-overlay',
+      css: {
+        width: element.outerWidth(),
+        height: element.outerHeight(),
+        left: element.position().left,
+        top: element.position().top,
+        marginLeft: parseFloat(element.css('margin-left')),
+        marginTop: parseFloat(element.css('margin-top')),
+        marginRight: parseFloat(element.css('margin-right')),
+        marginBottom: parseFloat(element.css('margin-bottom')),
+      },
+    }).appendTo(element).get(0);
+
+    overlay.dest = element;
+    element.loading_overlay = overlay;
+  },
+
+  hide: function (selector) {
+    var element = jQuery(selector);
+    var overlay = element.find('.loading-overlay');
+    overlay.remove();
+  },
+
+};
+
+}
@@ -0,0 +1,41 @@
+var patch = (function () {
+    /*jshint evil: true */
+
+    "use strict";
+
+    var global = new Function("return this;")(), // Get a reference to the global object
+        fnProps = Object.getOwnPropertyNames(Function); // Get the own ("static") properties of the Function constructor
+
+    return function (original, originalRef, patches) {
+
+        var ref = global[originalRef] = original, // Maintain a reference to the original constructor as a new property on the global object
+            args = [],
+            newRef, // This will be the new patched constructor
+            i;
+
+        patches.called = patches.called || originalRef; // If we are not patching static calls just pass them through to the original function
+
+        for (i = 0; i < original.length; i++) { // Match the arity of the original constructor
+            args[i] = "a" + i; // Give the arguments a name (native constructors don't care, but user-defined ones will break otherwise)
+        }
+
+        if (patches.constructed) { // This string is evaluated to create the patched constructor body in the case that we are patching newed calls
+            args.push("'use strict'; return (!!this ? " + patches.constructed + " : " + patches.called + ").apply(null, arguments);"); 
+        } else { // This string is evaluated to create the patched constructor body in the case that we are only patching static calls
+            args.push("'use strict'; return (!!this ? new (Function.prototype.bind.apply(" + originalRef + ", [{}].concat([].slice.call(arguments))))() : " + patches.called + ".apply(null, arguments));");
+        }
+
+        newRef = new (Function.prototype.bind.apply(Function, [{}].concat(args)))(); // Create a new function to wrap the patched constructor
+        newRef.prototype = original.prototype; // Keep a reference to the original prototype to ensure instances of the patch appear as instances of the original
+        newRef.prototype.constructor = newRef; // Ensure the constructor of patched instances is the patched constructor
+
+        Object.getOwnPropertyNames(ref).forEach(function (property) { // Add any "static" properties of the original constructor to the patched one
+            if (fnProps.indexOf(property) < 0) { // Don't include static properties of Function since the patched constructor will already have them
+                newRef[property] = ref[property];
+            }
+        });
+
+        return newRef; // Return the patched constructor
+    };
+
+}());
 \ No newline at end of file
@@ -0,0 +1,124 @@		@@ -0,0 +1,124 @@
	1	+# Noosfero Development Policy
	2	+
	3	+## Developer Roles
	4	+
	5	+* Developers are everyone that is contributing code to Noosfero.
	6	+* Committers are the people with direct commit access to the Noosfero source
	7	+ code. They are responsible for reviewing contributions from other developers
	8	+ and integrating them in the Noosfero code base. They are the members of the
	9	+ [Noosfero group on Gitlab](https://gitlab.com/groups/noosfero/members).
	10	+* Release managers are the people that are managing the release of a new
	11	+ Noosfero version and/or the maintainance work of an existing Noosfero stable
	12	+ branch. See MAINTAINANCE.md for details on the maintaince policy.
	13	+
	14	+## Development process
	15	+
	16	+* Every new feature or non-trivial bugfix should be reviewed by at least one
	17	+ committer. This must be the case even if the original author is a committer.
	18	+
	19	+ * In the case the original author is a committer, he/she should feel free to
	20	+ commit directly if after 1 week nobody has provided any kind of feedback.
	21	+
	22	+ * Developers who are not committers should feel free to ping committers if
	23	+ they do not get feedback on their contributions after 1 week.
	24	+
	25	+ * On GitLab, one can just add a comment to the merge request; one can also
	26	+ @-mention specific committers or other developers who have expertise on
	27	+ the area of the contribution.
	28	+
	29	+ * Committers should follow the activity of the project, and try to help
	30	+ reviewing contributions from others as much as possible.
	31	+
	32	+ * On GitLab one can get emails for all activity on a project by setting the
	33	+ [notification settings](https://gitlab.com/profile/notifications) to
	34	+ "watch".
	35	+
	36	+ * Anyone can help by reviewing contributions. Committers are the only ones
	37	+ who can give the final approval to a contribution, but everyone is welcome
	38	+ to help with code review, testing, etc.
	39	+
	40	+ * See note above about setting up notification on GitLab.
	41	+
	42	+* Committers should feel free to push trivial (or urgent) changes directly.
	43	+ There are no strict rule on what makes a change trivial or urgent; committers
	44	+ are expected to exercise good judgement on a case by case basis.
	45	+
	46	+ * Usually changes to the database are not trivial.
	47	+
	48	+* In the case of unsolvable conflict between commiters regarding any change to
	49	+ the code, the current release manager(s) will have the final say in the
	50	+ matter.
	51	+
	52	+* Release managers are responsible for stablishing a release schedule, and
	53	+ about deciding when and what to release.
	54	+
	55	+ * Release managers should announce release schedules to the project mailing
	56	+ lists in advance.
	57	+
	58	+ * The release schedule may include a period of feature freeze, during which
	59	+ no new features or any other changes that are not pre-approved by the
	60	+ release manager must be committed to the repository.
	61	+
	62	+ * Committers must respect the release schedule and feature freezes.
	63	+
	64	+## Maintainance process
	65	+
	66	+### Not all feature releases will be maintained as a stable release
	67	+
	68	+We will be choosing specific release series to be maintained as stable
	69	+releases.
	70	+
	71	+This means that a given release is not guaranteed to be maintained as a stable
	72	+release, but does not mean it won't be. Any committer (or anyone, really) can
	73	+decide to maintain a given release as stable and seek help from others to do
	74	+so.
	75	+
	76	+### No merges from stable branches to master
	77	+
	78	+All changes must be submitted against the master branch first, and when
	79	+applicable, backported to the desired stable releases. Exceptions to this rules
	80	+are bug fixes that only apply to a given stable branch and not to master.
	81	+
	82	+In the past we had non-trivial changes accepted into stable releases while
	83	+master was way ahead (e.g. during the rails3 migration period), that made the
	84	+merge back into master very painful. By eliminating the need to do these
	85	+merges, we save time for the people responsible for the release, and eliminate
	86	+the possibility of human errors or oversights causing changes to be accepted
	87	+into stable that will be a problem to merge back into master.
	88	+
	89	+By getting all fixes in master first, we improve the chances that a future
	90	+release will not present regressions against bugs that should already be fixed,
	91	+but the fixes got lost in a big, complicated merge (and those won't exist
	92	+anymore, at least not from stable branches to master).
	93	+
	94	+After a fix gets into master, backporting changes into a stable release branch
	95	+is the responsibility of whoever is maintaing that branch, and those interested
	96	+in it. The stable branch release manager(s) are entitled the final say on any
	97	+matters related to that branch.
	98	+
	99	+## Apendix A: how to become a committer
	100	+
	101	+Every developer that wants to be a committer should create [an issue on
	102	+Gitlab](https://gitlab.com/noosfero/noosfero/issues) requesting to be added as
	103	+a committer. This request must include information about the requestor's
	104	+previous contributions to the project.
	105	+
	106	+If 2 or more commiters consider second the request, the requestor is accepted
	107	+as new commiter and added to the Noosfero group.
	108	+
	109	+The existing committers are free to choose whatever criteria they want to
	110	+second the request, but they must be sure that the new committer is a
	111	+responsible developer and knows what she/he is doing. They must be aware that
	112	+seconding these requests means seconding the actions of the new committer: if
	113	+the new committer screw up, her/his seconds screwed up.
	114	+
	115	+## Apendix B: how to become a release manager
	116	+
	117	+A new release manager for the development version of Noosfero (i.e. the one
	118	+that includes new features, a.k.a. the master branch) is apointed by the
	119	+current release manager, and must be a committer first.
	120	+
	121	+Release managers for stable branches are self-appointed, i.e. whoever takes the
	122	+work takes the role. In case of a conflict (e.g. 2+ different people want to do
	123	+the work but can't agree on working together), the development release manager
	124	+decides.
	@@ -193,7 +193,7 @@ class AccountController < ApplicationController		@@ -193,7 +193,7 @@ class AccountController < ApplicationController
193	else	193	else
194	@change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]	194	@change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
195	end	195	end
196	- rescue ActiveRecord::RecordInvald	196	+ rescue ActiveRecord::RecordInvalid
197	@change_password.errors[:base] << _('Could not perform password recovery for the user.')	197	@change_password.errors[:base] << _('Could not perform password recovery for the user.')
198	end	198	end
199	end	199	end
	@@ -19,7 +19,7 @@ class ChatController < PublicController		@@ -19,7 +19,7 @@ class ChatController < PublicController
19	def avatar	19	def avatar
20	profile = environment.profiles.find_by_identifier(params[:id])	20	profile = environment.profiles.find_by_identifier(params[:id])
21	filename, mimetype = profile_icon(profile, :minor, true)	21	filename, mimetype = profile_icon(profile, :minor, true)
22	- if filename =~ /^https?:/	22	+ if filename =~ /^(https?:)?\/\//
23	redirect_to filename	23	redirect_to filename
24	else	24	else
25	data = File.read(File.join(Rails.root, 'public', filename))	25	data = File.read(File.join(Rails.root, 'public', filename))
	@@ -65,13 +65,13 @@ class ProfileController < PublicController		@@ -65,13 +65,13 @@ class ProfileController < PublicController
65		65
66	def friends	66	def friends
67	if is_cache_expired?(profile.friends_cache_key(params))	67	if is_cache_expired?(profile.friends_cache_key(params))
68	- @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])	68	+ @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
69	end	69	end
70	end	70	end
71		71
72	def members	72	def members
73	if is_cache_expired?(profile.members_cache_key(params))	73	if is_cache_expired?(profile.members_cache_key(params))
74	- @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])	74	+ @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
75	end	75	end
76	end	76	end
77		77
	@@ -10,7 +10,7 @@ module ContentViewerHelper		@@ -10,7 +10,7 @@ module ContentViewerHelper
10	end	10	end
11		11
12	def number_of_comments(article)	12	def number_of_comments(article)
13	- display_number_of_comments(article.comments_count - article.spam_comments_count)	13	+ display_number_of_comments(article.comments_count - article.spam_comments_count.to_i)
14	end	14	end
15		15
16	def article_title(article, args = {})	16	def article_title(article, args = {})
1	module RoleHelper	1	module RoleHelper
		2	+
		3	+ def role_available_permissions(role)
		4	+ role.kind == "Environment" ? ['Environment', 'Profile'] : [role.kind]
		5	+ end
		6	+
2	end	7	end
	@@ -56,12 +56,12 @@ module SweeperHelper		@@ -56,12 +56,12 @@ module SweeperHelper
56	if profile	56	if profile
57	profile.blocks.each {\|block\|	57	profile.blocks.each {\|block\|
58	conditions = block.class.expire_on	58	conditions = block.class.expire_on
59	- blocks_to_expire << block unless (conditions[:profile] & causes).empty?	59	+ blocks_to_expire << block unless (conditions[:profile] & causes).blank?
60	}	60	}
61	end	61	end
62	environment.blocks.each {\|block\|	62	environment.blocks.each {\|block\|
63	conditions = block.class.expire_on	63	conditions = block.class.expire_on
64	- blocks_to_expire << block unless (conditions[:environment] & causes).empty?	64	+ blocks_to_expire << block unless (conditions[:environment] & causes).blank?
65	}	65	}
66		66
67	blocks_to_expire.uniq!	67	blocks_to_expire.uniq!
	@@ -21,6 +21,12 @@ class Person < Profile		@@ -21,6 +21,12 @@ class Person < Profile
21	{ :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }	21	{ :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
22	}	22	}
23		23
		24	+ scope :by_role, lambda { \|roles\|
		25	+ roles = [roles] unless roles.kind_of?(Array)
		26	+ { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
		27	+roles] }
		28	+ }
		29	+
24	def has_permission_with_plugins?(permission, profile)	30	def has_permission_with_plugins?(permission, profile)
25	permissions = [has_permission_without_plugins?(permission, profile)]	31	permissions = [has_permission_without_plugins?(permission, profile)]
26	permissions += plugins.map do \|plugin\|	32	permissions += plugins.map do \|plugin\|
	@@ -13,7 +13,7 @@ class RoleAssignmentSweeper < ActiveRecord::Observer		@@ -13,7 +13,7 @@ class RoleAssignmentSweeper < ActiveRecord::Observer
13	protected	13	protected
14		14
15	def expire_caches(role_assignment)	15	def expire_caches(role_assignment)
16	- expire_cache(role_assignment.accessor)	16	+ expire_cache(role_assignment.accessor) if role_assignment.accessor.kind_of?(Profile)
17	expire_cache(role_assignment.resource) if role_assignment.resource.kind_of?(Profile)	17	expire_cache(role_assignment.resource) if role_assignment.resource.kind_of?(Profile)
18	end	18	end
19		19
1	<span class="download-link">	1	<span class="download-link">
2	<span>Download</span>	2	<span>Download</span>
3	- <strong><%= link_to generic.filename, generic.public_filename %></strong>	3	+ <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
4	</span>	4	</span>
5		5
6	<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">	6	<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">