Merge branch 'master' into stable

Conflicts: public/javascripts/application.js

Merge branch 'master' into stable
Conflicts: public/javascripts/application.js
Victor Costa
2 parents 7ccef053 538bb500
Showing 49 changed files with 1784 additions and 239 deletions Show diff stats
DEVELOPMENT.md
app/helpers/application_helper.rb
app/helpers/layout_helper.rb
app/models/person.rb
app/models/profile.rb
app/views/layouts/_content.html.erb
app/views/layouts/application-ng.html.erb
config/application.rb
db/migrate/20140724134600_remove_environment_statistics_block_sooner.rb
debian/control
etc/noosfero/varnish-noosfero.vcl
lib/noosfero.rb
lib/noosfero/plugin.rb
lib/tasks/release.rake
lib/unifreire_terminology.rb
lib/zen3_terminology.rb
plugins/pjax/lib/pjax_plugin.rb
plugins/pjax/locales/en.yml
plugins/pjax/locales/pt.yml
plugins/pjax/public/images/loading-gears.gif
@@ -19,6 +19,26 @@
   * 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.
@@ -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)
@@ -18,6 +18,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
  
@@ -87,6 +89,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>'
@@ -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|
@@ -146,8 +146,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
@@ -0,0 +1,4 @@
+<div id="content-inner">
+  <%= insert_boxes(yield) %>
+  <br style='clear: both'/>
+</div><!-- end id="content-inner" -->
@@ -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|
@@ -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
@@ -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
@@ -60,6 +60,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,
@@ -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";
  
@@ -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'
@@ -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
@@ -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
@@ -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
@@ -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,179 @@
+
+pjax = {
+
+  states: {},
+  current_state: null,
+  initial_state: null,
+
+  themes: {},
+
+  load: function() {
+    var target = jQuery('#content');
+    var content = jQuery('#content-inner');
+    var loadingTarget = jQuery('#content');
+
+    var container = '.pjax-container';
+    target.addClass('pjax-container');
+
+    jQuery(document).pjax('a', container);
+
+    jQuery(document).on('pjax:beforeSend', function(event, xhr, settings) {
+      var themes = jQuery.map(pjax.themes, function(theme) { return theme.id }).join(',');
+      xhr.setRequestHeader('X-PJAX-Themes', themes);
+    });
+
+    jQuery(document).on('pjax:send', function(event) {
+      /* initial state is only initialized after the first navigation,
+       * so we do associate it here */
+      if (!pjax.states[jQuery.pjax.state.id])
+        pjax.states[jQuery.pjax.state.id] = pjax.initial_state;
+
+      loading_overlay.show(loadingTarget);
+    });
+    jQuery(document).on('pjax:complete', function(event) {
+      loading_overlay.hide(loadingTarget);
+    });
+
+    jQuery(document).on('pjax:popstate', function(event) {
+      pjax.popstate(event.state, event.direction);
+    });
+
+    jQuery(document).on('pjax:timeout', function(event) {
+      // Prevent default timeout redirection behavior
+      event.preventDefault();
+    });
+
+    pjax.patch.document_write();
+    //pjax.patch.xhr();
+  },
+
+  update: function(state, from_state) {
+    if (!from_state)
+      from_state = this.current_state || this.initial_state;
+
+    if (state.layout_template != from_state.layout_template) {
+      var lt_css = jQuery('head link[href^="/designs/templates"]');
+      lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets'));
+    }
+
+    if (state.theme.id != from_state.theme.id)
+      this.update_theme(state, from_state);
+
+    document.body.className = state.body_classes;
+
+    render_all_jquery_ui_widgets();
+
+    userDataCallback(noosfero.user_data);
+
+    // theme's update dependent on content. must be last thing to run
+    if (state.theme_update_js)
+      jQuery.globalEval(state.theme_update_js);
+
+    pjax.current_state = state;
+  },
+
+  update_theme: function(state, from_state) {
+    // wait for the new theme css load
+    this.loading.show(function() {
+      return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css');
+    });
+
+    var css = jQuery('head link[href^="/designs/themes/'+from_state.theme.id+'/style"]');
+    css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style'));
+
+    jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon);
+
+    jQuery('#theme-header').html(state.theme.header);
+    jQuery('#site-title').html(state.theme.site_title);
+    jQuery('#navigation ul').html(state.theme.extra_navigation);
+    jQuery('#theme-footer').html(state.theme.footer);
+
+    jQuery('head script[src^="/designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
+    if (state.theme.js_src) {
+      var script = document.createElement('script');
+      script.type = 'text/javascript', script.src = state.theme.js_src;
+      document.head.appendChild(script);
+    }
+  },
+
+  popstate: function(state, direction) {
+    state = pjax.states[state.id];
+    var from_state = pjax.states[jQuery.pjax.state.id];
+    pjax.update(state, from_state);
+  },
+
+  loading: {
+    repeatCallback: null,
+
+    show: function(repeatCallback) {
+      this.repeatCallback = repeatCallback;
+      this.gears().show();
+      this.pool();
+    },
+
+    pool: function() {
+      setTimeout(this.timeout, 50);
+    },
+
+    timeout: function() {
+      var repeat = pjax.loading.repeatCallback();
+      if (repeat)
+        pjax.loading.pool();
+      else
+        pjax.loading.gears().hide();
+    },
+
+    gears: function() {
+      var gears = jQuery('#pjax-loading-gears');
+      if (!gears.length) {
+        gears = jQuery('<div>', {
+          id: 'pjax-loading-gears',
+        });
+        gears.appendTo(document.body);
+      }
+
+      return gears;
+    },
+  },
+
+  css_loaded: function(path) {
+    var found = false;
+    for (index in document.styleSheets) {
+      var stylesheet = document.styleSheets[index];
+      if (!stylesheet.href)
+        continue;
+
+      found = stylesheet.href.indexOf(path) != -1;
+      if (found)
+        break;
+    }
+    return found;
+  },
+
+  patch: {
+
+    document_write: function () {
+      // document.write doesn't work after ready state
+      document._write = document.write;
+      document.write = function (data) {
+        if (document.readyState != 'loading')
+          content.append(data);
+        else
+          document._write(data);
+      };
+    },
+
+    xhr: function () {
+      XMLHttpRequest = patch(XMLHttpRequest, '_XMLHttpRequest', {
+        constructed: function() {
+          console.log('here')
+
+          var args = [].slice.call(arguments);
+          return new (Function.prototype.bind.apply(_XMLHttpRequest, [{}].concat(args)));
+        },
+      });
+    },
+
+  },
+};
+
@@ -0,0 +1 @@
+stylesheets/pjax.css
 \ No newline at end of file
@@ -0,0 +1,7 @@
+
+.loading-overlay {
+  position: absolute;
+  background-image: url(/plugins/pjax/images/loading-overlay.gif);
+  opacity: 0.1;
+  z-index: 10;
+}
@@ -0,0 +1,16 @@
+.loading-overlay {
+  position: absolute;
+  background-image: url(/plugins/pjax/images/loading-overlay.gif);
+  opacity: 0.1;
+  z-index: 10; }
+
+#pjax-loading-gears {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background: white url(/plugins/pjax/images/loading-gears.gif) no-repeat center center;
+  background-size: 5%; }
@@ -0,0 +1,14 @@
+@import 'loading-overlay';
+
+#pjax-loading-gears {
+  display: none; //default
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background: white url(/plugins/pjax/images/loading-gears.gif) no-repeat center center;
+  background-size: 5%;
+}
+
@@ -0,0 +1,11 @@
+class ActionDispatch::Request
+
+  def xml_http_request_with_pjax?
+    xml_http_request_without_pjax? and @env['HTTP_X_PJAX'].blank?
+  end
+
+end
+
+ ActionDispatch::Request.send :alias_method_chain, :xml_http_request?, :pjax
+ ActionDispatch::Request.send :alias_method, :xhr?, :xml_http_request?
+
@@ -0,0 +1,19 @@
+<%
+  update_js = render(:file => "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
+%>
+
+<title><%= h page_title %></title>
+
+<%= render :file => "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
+    render "layouts/content" %>
+
+<%= javascript_tag do %>
+  <%= render 'pjax_shared/load_state.js' %>
+
+  <% if update_js %>
+    state.theme_update_js = <%= update_js %>;
+  <% end %>
+
+  pjax.update(state);
+<% end %>
+
@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  jQuery(function($) {
+    pjax.load();
+
+    <%= render 'pjax_shared/load_state.js' %>
+  });
+</script>
@@ -0,0 +1,26 @@
+var theme_id = <%= current_theme.to_json %>;
+
+<% if @pjax_loaded_themes.blank? or not @pjax_loaded_themes.include? current_theme %>
+  pjax.themes[theme_id] = {
+    id: theme_id,
+    favicon: '<%= image_path theme_favicon %>',
+    header: '<%= escape_javascript theme_header %>',
+    site_title: '<%= escape_javascript theme_site_title %>',
+    extra_navigation: '<%= escape_javascript theme_extra_navigation %>',
+    footer: '<%= escape_javascript theme_footer %>',
+    js_src: <%= theme_javascript_src.to_json %>,
+  };
+<% end %>
+
+var state = {
+  body_classes: <%= body_classes.to_json %>,
+  layout_template: <%= layout_template.to_json %>,
+  theme: pjax.themes[theme_id],
+};
+
+if (jQuery.pjax.state)
+  pjax.states[jQuery.pjax.state.id] = state;
+
+if (!pjax.initial_state)
+  pjax.initial_state = state;
+
@@ -0,0 +1,38 @@
+README - Profile Members Headlines (ProfileMembersHeadlines Plugin)
+===================================================================
+
+ProfileMembersHeadlines is a plugin that allow users to add a block that
+displays the most recent post from members with the defined roles.
+
+The user also can configure the limit of headlines.
+
+This block will be available for all layout columns of communities and enterprises.
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable ProfileMembersHeadlines Plugin at you Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable profile_members_headlines
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Profile Members Headlines Plugin" checkbox
+
+Running DisplayContent tests
+--------------------
+
+$ rake test:noosfero_plugins:profile_members_headlines_plugin
+
+LICENSE
+=======
+
+See Noosfero license.
@@ -0,0 +1,13 @@
+require_dependency 'person'
+class Person
+
+  def has_headline?
+    !headline.nil?
+  end
+
+  def headline
+    return nil unless blog
+    blog.posts.published.first
+  end
+
+end
@@ -0,0 +1,43 @@
+class ProfileMembersHeadlinesBlock < Block
+
+  settings_items :interval, :type => 'integer', :default => 10
+  settings_items :limit, :type => 'integer', :default => 10
+  settings_items :navigation, :type => 'boolean', :default => true
+  settings_items :filtered_roles, :type => Array, :default => []
+
+  attr_accessible :interval, :limit, :navigation, :filtered_roles
+
+  def self.description
+    _('Display headlines from members of a community')
+  end
+
+  def help
+    _('This block displays one post from members of a community.')
+  end
+
+  include Noosfero::Plugin::HotSpot
+
+  def default_title
+    _('Profile members headlines')
+  end
+
+  def filtered_roles=(array)
+    self.settings[:filtered_roles] = array.map(&:to_i).select { |r| !r.to_i.zero? }
+  end
+
+  def authors_list
+    result = owner.members_by_role(filtered_roles).public.includes([:image,:domains,:preferred_domain,:environment]).order('updated_at DESC')
+
+    result.all(:limit => limit * 5).select { |p| p.has_headline?
+}.slice(0..limit-1)
+  end
+
+  def content(args={})
+    block = self
+    members = authors_list
+    proc do
+      render :file => 'blocks/headlines', :locals => { :block => block, :members => members }
+    end
+  end
+
+end
@@ -0,0 +1,23 @@
+require_dependency File.dirname(__FILE__) + '/profile_members_headlines_block'
+require 'ext/person'
+
+class ProfileMembersHeadlinesPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Profile Members Headlines Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a block where you can display posts from members.")
+  end
+
+  def self.extra_blocks
+    { ProfileMembersHeadlinesBlock => { :type => [Community], :position =>
+['1'] }}
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,59 @@
+.profile-members-headlines-block {
+  width: 100%;
+}
+
+.profile-members-headlines-block .headlines-container {
+  height: 180px;
+}
+
+.profile-members-headlines-block .headlines-container .author,
+.profile-members-headlines-block .headlines-container .post {
+  vertical-align: top;
+  min-width: 150px;
+}
+
+.profile-members-headlines-block .headlines-container .author {
+  position: absolute;
+}
+
+.profile-members-headlines-block .headlines-container .author p {
+  text-align: center;
+}
+
+.profile-members-headlines-block .headlines-container .post {
+  margin-left: 160px;
+}
+
+.profile-members-headlines-block #content .headlines-container h4 {
+  margin-top: 15px;
+  font-weight: bold;
+}
+
+.profile-members-headlines-block .headlines-container a {
+  text-decoration: none;
+}
+
+.profile-members-headlines-block .headlines-container a:hover {
+  text-decoration: underline;
+}
+
+.profile-members-headlines-block .headlines-container .post .date {
+  margin-top: 15px;
+}
+
+.profile-members-headlines-block .headlines-block-pager {
+  text-align: center;
+}
+
+.profile-members-headlines-block .headlines-block-pager a {
+  padding: 0px 5px;
+}
+
+.profile-members-headlines-block .headlines-block-pager a.activeSlide {
+  text-decoration: none;
+}
+
+.profile-members-headlines-block .headlines-block-pager a.activeSlide:visited,
+.profile-members-headlines-block .headlines-block-pager a.activeSlide {
+  color: #000;
+}
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,81 @@
+require 'test_helper'
+
+class ProfileMembersHeadlinesBlockTest < ActiveSupport::TestCase
+
+  include Noosfero::Plugin::HotSpot
+
+  def setup
+    @environment = fast_create(Environment)
+    @environment.enable_plugin(ProfileMembersHeadlinesPlugin)
+
+    @member1 = fast_create(Person)
+    @member2 = fast_create(Person)
+    @community = fast_create(Community)
+    community.add_member member1
+    community.add_member member2
+  end
+  attr_accessor :environment, :community, :member1, :member2
+
+  should 'inherit from Block' do
+    assert_kind_of Block, ProfileMembersHeadlinesBlock.new
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, ProfileMembersHeadlinesBlock.description
+  end
+
+  should 'provide a default title' do
+    assert_not_equal Block.new.default_title, ProfileMembersHeadlinesBlock.new.default_title
+  end
+
+  should 'not have authors if they have no blog' do
+    block = ProfileMembersHeadlinesBlock.create
+    block.stubs(:owner).returns(community)
+
+    self.expects(:render).with(:file => 'blocks/headlines', :locals => { :block => block, :members => []}).returns('file-without-authors-and-headlines')
+    assert_equal 'file-without-authors-and-headlines', instance_eval(&block.content)
+  end
+
+  should 'display headlines file' do
+    block = ProfileMembersHeadlinesBlock.create
+    block.stubs(:owner).returns(community)
+    blog = fast_create(Blog, :profile_id => member1.id)
+    post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
+    self.expects(:render).with(:file => 'blocks/headlines', :locals => { :block => block, :members => []}).returns('file-with-authors-and-headlines')
+    assert_equal 'file-with-authors-and-headlines', instance_eval(&block.content)
+  end
+
+  should 'select only authors with articles and selected roles to display' do
+    role = Role.create!(:name => 'role1')
+    community.affiliate(member1, role)
+    block = ProfileMembersHeadlinesBlock.new(:limit => 1, :filtered_roles => [role.id])
+    block.expects(:owner).returns(community)
+    blog = fast_create(Blog, :profile_id => member1.id)
+    post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
+    assert_equal [member1], block.authors_list
+  end
+
+  should 'not select private authors to display' do
+    block = ProfileMembersHeadlinesBlock.new(:limit => 1)
+    block.expects(:owner).returns(community)
+    private_author = fast_create(Person, :public_profile => false)
+    blog = fast_create(Blog, :profile_id => private_author.id)
+    post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => private_author.id, :parent_id => blog.id)
+    assert_equal [], block.authors_list
+  end
+
+  should 'filter authors by roles to display' do
+    role = Role.create!(:name => 'role1')
+    author = fast_create(Person)
+    community.affiliate(author, role)
+
+    block = ProfileMembersHeadlinesBlock.new(:limit => 3, :filtered_roles =>
+[role.id])
+    block.stubs(:owner).returns(community)
+    community.members.each do |member|
+      blog = fast_create(Blog, :profile_id => member.id)
+      post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member.id, :parent_id => blog.id)
+    end
+    assert_equal [author], block.authors_list
+  end
+end
@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class ProfileMembersHeadlinesPluginTest < ActiveSupport::TestCase
+
+  include Noosfero::Plugin::HotSpot
+
+  def setup
+    @environment = fast_create(Environment)
+    @environment.enable_plugin(ProfileMembersHeadlinesPlugin)
+  end
+  attr_accessor :environment
+
+  should 'has a name' do
+    assert_not_equal Noosfero::Plugin.plugin_name, ProfileMembersHeadlinesPlugin.plugin_name
+  end
+
+  should 'describe itself' do
+    assert_not_equal Noosfero::Plugin.plugin_description, ProfileMembersHeadlinesPlugin.plugin_description
+  end
+
+  should 'return ProfileMembersHeadlinesBlock in extra_blocks class method' do
+    assert ProfileMembersHeadlinesPlugin.extra_blocks.keys.include?(ProfileMembersHeadlinesBlock)
+  end
+
+  should 'ProfileMembersHeadlinesBlock not available for environment' do
+    assert_not_includes plugins.dispatch(:extra_blocks, :type => Environment), ProfileMembersHeadlinesBlock
+  end
+
+  should 'ProfileMembersHeadlinesBlock not available for people' do
+    assert_not_includes plugins.dispatch(:extra_blocks, :type => Person), ProfileMembersHeadlinesBlock
+  end
+
+  should "ProfileMembersHeadlinesBlock be available for community" do
+    assert_includes plugins.dispatch(:extra_blocks, :type => Community), ProfileMembersHeadlinesBlock
+  end
+
+  should 'has stylesheet' do
+    assert ProfileMembersHeadlinesPlugin.new.stylesheet?
+  end
+
+end
@@ -0,0 +1,39 @@
+<%= block_title(block.title) %>
+
+<% unless members.empty? %>
+  <div class='headlines-container'>
+    <% members.each do |member| %>
+      <div>
+        <% headline = member.headline %>
+        <%= link_to_profile(profile_image(member, :big) + content_tag(:p, member.short_name), member.identifier, {:class => 'author'})  %>
+        <div class='post'>
+          <h4><%= link_to(headline.title, headline.url, :class => 'title') %></h4>
+          <div class='lead'>
+            <%= headline.short_lead %>
+          </div>
+          <div class='date'>
+            <%= show_date(headline.published_at) %>
+          </div>
+          <div class='tags'>
+            <%= headline.tags.map { |t| link_to(t, :controller => 'profile', :profile => member.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <% if block.navigation %>
+    <div class='headlines-block-pager'>
+    </div>
+  <% end %>
+
+  <script>
+    (function($) {
+     var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
+      options.pager = '#block-<%= block.id %> .headlines-block-pager';
+      $('#block-<%= block.id %> .headlines-container').cycle(options);
+    })(jQuery);
+  </script>
+<% else %>
+  <em><%= _('No headlines to be shown.') %></em>
+<% end %>
+
@@ -0,0 +1,13 @@
+<div id="profile_members_headlines_plugin">
+
+  <%= labelled_form_field _('Headlines transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
+
+  <%= labelled_form_field check_box(:block, :navigation) + _('Display navigation buttons'), '' %>
+  <%= labelled_form_field _('Limit of headlines'), text_field(:block, :limit, :size => 3) %>
+
+  <%= label :block, :filtered_roles, _('Choose which roles should be displayed:'), :class => 'formlabel' %>
+
+  <% Profile::Roles.organization_member_roles(environment).each do |role| %>
+    <%= labelled_check_box(role.name, 'block[filtered_roles][]', role.id, @block.filtered_roles.include?(role.id)) %>
+  <% end %>
+</div>
@@ -0,0 +1 @@
+box_organizer/
 \ No newline at end of file
@@ -105,11 +105,11 @@
       <div id='pt' style='display: none' class='message'>
         <h1>Problema temporário no sistema</h1>
         <p>
-        Nossa equipe técnica está trabalhando nele, por favor tente mais tarde. Perdoe o incoveniente. 
+        Nossa equipe técnica está trabalhando nele, por favor tente mais tarde. Perdoe o inconveniente.
         </p>
         <ul>
           <li><a href='javascript: history.back()'>Voltar</a></li>
-          <li><a href='/'>Ir para a página inicial do site.</a></li>
+          <li><a href='/'>Ir para a página inicial do site</a></li>
         </ul>
       </div>
  
@@ -518,6 +518,21 @@ function new_qualifier_row(selector, select_qualifiers, delete_button) {
   jQuery(selector).append("<tr><td>" + select_qualifiers + "</td><td id='certifier-area-" + index + "'><select></select>" + delete_button + "</td></tr>");
 }
  
+function userDataCallback(data) {
+  noosfero.user_data = data;
+  if (data.login) {
+    jQuery('head').append('<meta content="authenticity_token" name="csrf-param" />');
+    jQuery('head').append('<meta content="'+jQuery.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
+  }
+  if (data.notice) {
+    display_notice(data.notice);
+    // clear notice so that it is not display again in the case this function is called again.
+    data.notice = null;
+  }
+  // Bind this event to do more actions with the user data (for example, inside plugins)
+  jQuery(window).trigger("userDataLoaded", data);
+};
+
 // controls the display of the login/logout stuff
 jQuery(function($) {
   $.ajaxSetup({
@@ -528,18 +543,9 @@ jQuery(function($) {
   });
  
   var user_data = noosfero_root() + '/account/user_data';
-  $.getJSON(user_data, function userDataCallBack(data) {
-    if (data.login) {
-      $('head').append('<meta content="authenticity_token" name="csrf-param" />');
-      $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
-    }
-    if (data.notice) {
-      display_notice(data.notice);
-    }
-    // Bind this event to do more actions with the user data (for example, inside plugins)
-    $(window).trigger("userDataLoaded", data);
-  });
+  $.getJSON(user_data, userDataCallback)
  
+  $.ajaxSetup({ cache: false });
 });
  
 // controls the display of contact list
@@ -582,12 +588,9 @@ function display_notice(message) {
 }
  
 function open_chat_window(self_link, anchor) {
-   if(anchor) {
-      jQuery('#chat').show('fast');
-      jQuery("#chat" ).trigger('opengroup', anchor);
-   } else {
-      jQuery('#chat').toggle('fast');
-   }
+   anchor = anchor || '#';
+   var noosfero_chat_window = window.open(noosfero_root() + '/chat' + anchor,'noosfero_chat','width=900,height=500');
+   noosfero_chat_window.focus();
    return false;
 }
  
@@ -1050,7 +1053,7 @@ jQuery(document).ready(function(){
 function apply_zoom_to_images(zoom_text) {
   jQuery(function($) {
     $(window).load( function() {
-      $('#article .article-body img:not(.disable-zoom)').each( function(index) {
+      $('#article .article-body img').each( function(index) {
         var original = original_image_dimensions($(this).attr('src'));
         if ($(this).width() < original['width'] || $(this).height() < original['height']) {
           $(this).wrap('<div class="zoomable-image" />');
@@ -1069,41 +1072,3 @@ function apply_zoom_to_images(zoom_text) {
     });
   });
 }
-
-function getQueryParams(qs) {
-  qs = qs.split("+").join(" ");
-  var params = {},
-      tokens,
-      re = /[?&]?([^=]+)=([^&]*)/g;
-  while (tokens = re.exec(qs)) {
-      params[decodeURIComponent(tokens[1])]
-          = decodeURIComponent(tokens[2]);
-  }
-  return params;
-}
-
-var fullwidth=false;
-function toggle_fullwidth(itemId){
-  if(fullwidth){
-    jQuery(itemId).removeClass("fullwidth");
-    jQuery("#fullscreen-btn").show()
-    jQuery("#exit-fullscreen-btn").hide()
-    fullwidth = false;
-  }
-  else{
-    jQuery(itemId).addClass("fullwidth");
-    jQuery("#exit-fullscreen-btn").show()
-    jQuery("#fullscreen-btn").hide()
-    fullwidth = true;
-  }
-  jQuery(window).trigger("toggleFullwidth", fullwidth);
-}
-
-function fullscreenPageLoad(itemId){
-  jQuery(document).ready(function(){
-    var $_GET = getQueryParams(document.location.search);
-    if ($_GET['fullscreen']==1){
-      toggle_fullwidth(itemId);
-    }
-  });
-}
@@ -383,6 +383,33 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     assert !organization.errors[:cnpj.to_s].present?
   end
  
+  should 'get members by role' do
+    community = fast_create(Community)
+    role1 = Role.create!(:name => 'role1')
+    person1 = fast_create(Person)
+    community.affiliate(person1, role1)
+    role2 = Role.create!(:name => 'role2')
+    person2 = fast_create(Person)
+    community.affiliate(person2, role2)
+
+    assert_equal [person1], community.members_by_role([role1])
+  end
+
+  should 'get members by more than one role' do
+    community = fast_create(Community)
+    role1 = Role.create!(:name => 'role1')
+    person1 = fast_create(Person)
+    community.affiliate(person1, role1)
+    role2 = Role.create!(:name => 'role2')
+    person2 = fast_create(Person)
+    community.affiliate(person2, role2)
+    role3 = Role.create!(:name => 'role3')
+    person3 = fast_create(Person)
+    community.affiliate(person3, role3)
+
+    assert_equal [person2, person3], community.members_by_role([role2, role3])
+  end
+
   should 'return members by role in a json format' do
     organization = fast_create(Organization)
     p1 = create_user('person-1').person
@@ -49,11 +49,11 @@ module NoosferoHttpCaching
  
     # filter off all cookies except for plugin-provided ones that are
     # path-specific (i.e path != "/").
-    def remove_unwanted_cookies(cookie_list)
-      return nil if cookie_list.nil?
-      cookie_list.select do |c|
+    def remove_unwanted_cookies(set_cookie)
+      return nil if set_cookie.nil?
+      set_cookie.split(/\s*,\s*/).select do |c|
         c =~ /^_noosfero_plugin_\w+=/ && c =~ /path=\/\w+/
-      end
+      end.join(', ')
     end
  
   end
@@ -61,7 +61,7 @@ module NoosferoHttpCaching
 end
  
 unless Rails.env.development?
-  middleware = Rails.application.config.middleware
+  middleware = Noosfero::Application.config.middleware
   ActionController::Base.send(:include, NoosferoHttpCaching)
-  middleware.use NoosferoHttpCaching::Middleware
+  middleware.insert_before ::ActionDispatch::Cookies, NoosferoHttpCaching::Middleware
 end
...	...	@@ -19,6 +19,26 @@
19	19	* In the case the original author is a committer, he/she should feel free to
20	20	commit directly if after 1 week nobody has provided any kind of feedback.
21	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	+
22	42	* Committers should feel free to push trivial (or urgent) changes directly.
23	43	There are no strict rule on what makes a change trivial or urgent; committers
24	44	are expected to exercise good judgement on a case by case basis.
...	...
...	...	@@ -433,19 +433,19 @@ module ApplicationHelper
433	433	end
434	434
435	435	def theme_site_title
436		- theme_include('site_title')
	436	+ @theme_site_title \|\|= theme_include 'site_title'
437	437	end
438	438
439	439	def theme_header
440		- theme_include('header')
	440	+ @theme_header \|\|= theme_include 'header'
441	441	end
442	442
443	443	def theme_footer
444		- theme_include('footer')
	444	+ @theme_footer \|\|= theme_include 'footer'
445	445	end
446	446
447	447	def theme_extra_navigation
448		- theme_include('navigation')
	448	+ @theme_extra_navigation \|\|= theme_include 'navigation'
449	449	end
450	450
451	451	def is_testing_theme
...	...	@@ -674,13 +674,14 @@ module ApplicationHelper
674	674	html.join "\n"
675	675	end
676	676
	677	+ def theme_javascript_src
	678	+ script = File.join theme_path, 'theme.js'
	679	+ script if File.exists? File.join(Rails.root, 'public', script)
	680	+ end
	681	+
677	682	def theme_javascript_ng
678		- script = File.join(theme_path, 'theme.js')
679		- if File.exists?(File.join(Rails.root, 'public', script))
680		- javascript_include_tag script
681		- else
682		- nil
683		- end
	683	+ script = theme_javascript_src
	684	+ javascript_include_tag script if script
684	685	end
685	686
686	687	def file_field_or_thumbnail(label, image, i)
...	...
...	...	@@ -18,6 +18,8 @@ module LayoutHelper
18	18	unless plugins_javascripts.empty?
19	19	output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
20	20	end
	21	+ output += theme_javascript_ng.to_s
	22	+
21	23	output
22	24	end
23	25
...	...	@@ -87,6 +89,10 @@ module LayoutHelper
87	89	theme_path + '/style.css'
88	90	end
89	91
	92	+ def layout_template
	93	+ if profile then profile.layout_template else environment.layout_template end
	94	+ end
	95	+
90	96	def addthis_javascript
91	97	if NOOSFERO_CONF['addthis_enabled']
92	98	'<script src="https://s7.addthis.com/js/152/addthis_widget.js"></script>'
...	...
...	...	@@ -21,6 +21,12 @@ class Person < Profile
21	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	30	def has_permission_with_plugins?(permission, profile)
25	31	permissions = [has_permission_without_plugins?(permission, profile)]
26	32	permissions += plugins.map do \|plugin\|
...	...
...	...	@@ -146,8 +146,8 @@ class Profile < ActiveRecord::Base
146	146	alias_method_chain :count, :distinct
147	147	end
148	148
149		- def members_by_role(role)
150		- Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
	149	+ def members_by_role(roles)
	150	+ Person.members_of(self).by_role(roles)
151	151	end
152	152
153	153	acts_as_having_boxes
...	...
...	...	@@ -0,0 +1,4 @@
	1	+<div id="content-inner">
	2	+ <%= insert_boxes(yield) %>
	3	+ <br style='clear: both'/>
	4	+</div><!-- end id="content-inner" -->
...	...
...	...	@@ -72,10 +72,7 @@
72	72	<div id="navigation-end"></div>
73	73	</div><!-- end id="navigation" -->
74	74	<div id="content">
75		- <div id="content-inner">
76		- <%= insert_boxes(yield) %>
77		- <br style='clear: both'/>
78		- </div><!-- end id="content-inner" -->
	75	+ <%= render 'layouts/content' %>
79	76	</div><!-- end id="content" -->
80	77	</div><!-- end id="wrap-2" -->
81	78	</div><!-- end id="wrap-1" -->
...	...	@@ -84,7 +81,6 @@
84	81	<%= theme_footer %>
85	82	</div><!-- end id="theme-footer" -->
86	83	<%= noosfero_layout_features %>
87		- <%= theme_javascript_ng %>
88	84	<%= addthis_javascript %>
89	85	<%=
90	86	@plugins.dispatch(:body_ending).map do \|content\|
...	...
...	...	@@ -111,9 +111,7 @@ module Noosfero
111	111	# Make sure the secret is at least 30 characters and all random,
112	112	# no regular words or you'll be exposed to dictionary attacks.
113	113	config.secret_token = noosfero_session_secret
114		- config.action_dispatch.session = {
115		- :key => '_noosfero_session',
116		- }
	114	+ config.session_store :cookie_store, :key => '_noosfero_session'
117	115
118	116	config.time_zone = File.read('/etc/timezone').split("\n").first
119	117	config.active_record.default_timezone = :local
...	...
...	...	@@ -0,0 +1,9 @@
	1	+class RemoveEnvironmentStatisticsBlockSooner < ActiveRecord::Migration
	2	+ def self.up
	3	+ update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
	4	+ end
	5	+
	6	+ def self.down
	7	+ say("Nothing to undo (cannot recover the data)")
	8	+ end
	9	+end
...	...
...	...	@@ -60,6 +60,11 @@ Depends:
60	60	dbconfig-common,
61	61	adduser,
62	62	exim4 \| mail-transport-agent,
	63	+# to minimize upgrade issues:
	64	+ ruby-feedparser (>= 0.7-3~),
	65	+ ruby-eventmachine (>= 0.12.10-4~),
	66	+ ruby-rack (>= 1.4.5-2~),
	67	+ ruby-tzinfo (>= 1.1.0-2~),
63	68	${misc:Depends}
64	69	Recommends:
65	70	postgresql,
...	...