Merge branch 'master' into custom-forms

Rodrigo Souto
2 parents 51314a6f f4012a36
Showing 331 changed files with 14300 additions and 8252 deletions Show diff stats
AUTHORS
INSTALL.varnish
app/controllers/admin/licenses_controller.rb
app/controllers/admin/templates_controller.rb
app/controllers/application_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/colorbox_helper.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/comment.rb
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/input.rb
app/models/license.rb
app/models/location_block.rb
app/models/mailing.rb
app/models/organization.rb
@@ -22,6 +22,7 @@ Diego Araújo &lt;diegoamc90@gmail.com&gt;
 Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
+Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
@@ -15,6 +15,10 @@ Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
 should, unless Debian already released Squeeze by now), make sure you install
 varnish from the lenny-backports suite.
  
+Install the RPAF apache module (or skip this step if not using apache):
+
+  # apt-get install libapache2-mod-rpaf
+
 3) Enable varnish logging:
  
 3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
@@ -0,0 +1,50 @@
+class LicensesController < AdminController
+  protect 'manage_environment_licenses', :environment
+
+  def index
+    @licenses = environment.licenses
+  end
+
+  def create
+    @license = License.new(params[:license])
+    if request.post?
+      begin
+        @license.environment = environment
+        @license.save!
+        session[:notice] = _('License created')
+        redirect_to :action => 'index'
+      rescue
+        session[:notice] = _('License could not be created')
+      end
+    end
+  end
+
+  def edit
+    @license = environment.licenses.find(params[:license_id])
+    if request.post?
+      begin
+        @license.update_attributes!(params[:license])
+        session[:notice] = _('License updated')
+        redirect_to :action => 'index'
+      rescue
+        session[:notice] = _('License could not be updated')
+      end
+    end
+  end
+
+  def remove
+    @license = environment.licenses.find(params[:license_id])
+    if request.post?
+      begin
+        @license.destroy
+        session[:notice] = _('License removed')
+      rescue
+        session[:notice] = _('License could not be removed')
+      end
+    else
+      session[:notice] = _('License could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+end
@@ -0,0 +1,52 @@
+class TemplatesController < AdminController
+  protect 'manage_environment_templates', :environment
+
+  def create_person_template
+    if request.post?
+      begin
+        identifier = params[:name].to_slug
+        password = Digest::MD5.hexdigest(rand.to_s)
+        template = User.new(:login => identifier, :email => identifier+'@templates.noo', :password => password, :password_confirmation => password, :person_data => {:name => params[:name], :is_template => true})
+        template.save!
+        session[:notice] = _('New template created')
+        redirect_to :action => 'index'
+      rescue
+        @error = _('Name has already been taken')
+      end
+    end
+  end
+
+  def create_community_template
+    if request.post?
+      begin
+        create_organization_template(Community)
+        session[:notice] = _('New template created')
+        redirect_to :action => 'index'
+      rescue
+        @error = _('Name has already been taken')
+      end
+    end
+  end
+
+  def create_enterprise_template
+    if request.post?
+      begin
+        create_organization_template(Enterprise)
+        session[:notice] = _('New template created')
+        redirect_to :action => 'index'
+      rescue
+        @error = _('Name has already been taken')
+      end
+    end
+  end
+
+  private
+
+  def create_organization_template(klass)
+    identifier = params[:name].to_slug
+    template = klass.new(:name => params[:name], :identifier => identifier, :is_template => true)
+    template.save!
+  end
+
+end
+
 class ApplicationController < ActionController::Base
  
   before_filter :setup_multitenancy
+  before_filter :detect_stuff_by_domain
+  before_filter :init_noosfero_plugins
  
   include ApplicationHelper
   layout :get_layout
@@ -51,8 +53,6 @@ class ApplicationController &lt; ActionController::Base
  
   include NeedsProfile
  
-  before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
   attr_reader :environment
  
   before_filter :load_terminology
@@ -19,7 +19,7 @@ class ContentViewerController &lt; ApplicationController
       unless @page
         page_from_old_path = profile.articles.find_by_old_path(path)
         if page_from_old_path
-          redirect_to :profile => profile.identifier, :page => page_from_old_path.explode_path
+          redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
           return
         end
       end
@@ -99,6 +99,14 @@ class ContentViewerController &lt; ApplicationController
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
  
+    @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
+    if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
+      @page.followers -= [params[:email]]
+      if @page.save
+        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
+      end
+    end
+
     @comments = @page.comments(true).as_thread
     @comments_count = @page.comments.count
     if params[:slideshow]
@@ -4,10 +4,17 @@ class SearchController &lt; PublicController
   include SearchHelper
   include ActionView::Helpers::NumberHelper
  
+  before_filter :redirect_asset_param, :except => [:facets_browse, :assets]
   before_filter :load_category
   before_filter :load_search_assets
   before_filter :load_query
  
+  # Backwards compatibility with old URLs
+  def redirect_asset_param
+    return unless params.has_key?(:asset)
+    redirect_to params.merge(:action => params.delete(:asset))
+  end
+
   no_design_blocks
  
   def facets_browse
@@ -243,17 +250,16 @@ class SearchController &lt; PublicController
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
-      @titles[key] = name
+      @titles[key] = _(name)
       @searching[key] = params[:action] == 'index' || params[:action] == key.to_s
     end
     @names = @titles if @names.nil?
   end
  
   def limit
-    searching = @searching.values.select{ |v| v }
-    if params[:display] == 'map'
+    if map_search?
       MAP_SEARCH_LIMIT
-    elsif searching.size <= 1
+    elsif !multiple_search?
       if [:people, :communities].include? @asset
         BLOCKS_SEARCH_LIMIT
       elsif @asset == :enterprises and @empty_query
@@ -267,31 +273,34 @@ class SearchController &lt; PublicController
   end
  
   def paginate_options(page = params[:page])
+    page = 1 if multiple_search? or params[:display] == 'map'
     { :per_page => limit, :page => page }
   end
  
   def full_text_search(filters = [], options = {})
     paginate_options = paginate_options(params[:page])
     asset_class = asset_class(@asset)
-
     solr_options = options
-    if !@results_only and asset_class.respond_to? :facets
-      solr_options.merge! asset_class.facets_find_options(params[:facet])
-      solr_options[:all_facets] = true
-      solr_options[:limit] = 0 if @facets_only
-    end
-    solr_options[:filter_queries] ||= []
-    solr_options[:filter_queries] += filters
-    solr_options[:filter_queries] << "environment_id:#{environment.id}"
-    solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
-
-    solr_options[:boost_functions] ||= []
-    params[:order_by] = nil if params[:order_by] == 'none'
-    if params[:order_by]
-      order = SortOptions[@asset][params[:order_by].to_sym]
-      raise "Unknown order by" if order.nil?
-      order[:solr_opts].each do |opt, value|
-        solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
+    pg_options = paginate_options(params[:page])
+
+    if !multiple_search?
+      if !@results_only and asset_class.respond_to? :facets
+        solr_options.merge! asset_class.facets_find_options(params[:facet])
+        solr_options[:all_facets] = true
+      end
+      solr_options[:filter_queries] ||= []
+      solr_options[:filter_queries] += filters
+      solr_options[:filter_queries] << "environment_id:#{environment.id}"
+      solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
+
+      solr_options[:boost_functions] ||= []
+      params[:order_by] = nil if params[:order_by] == 'none'
+      if params[:order_by]
+        order = SortOptions[@asset][params[:order_by].to_sym]
+        raise "Unknown order by" if order.nil?
+        order[:solr_opts].each do |opt, value|
+          solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
+        end
       end
     end
  
@@ -10,6 +10,8 @@ module ApplicationHelper
  
   include ThickboxHelper
  
+  include ColorboxHelper
+
   include BoxesHelper
  
   include FormsHelper
@@ -1076,24 +1078,24 @@ module ApplicationHelper
  
   def search_contents_menu
     links = [
-      {s_('contents|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
-      {s_('contents|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
-      {s_('contents|Most Commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
+      {s_('contents|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
+      {s_('contents|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
+      {s_('contents|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
     ]
     if logged_in?
-      links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
+      links.push(_('New content') => colorbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
     end
  
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
-    link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
   end
   alias :browse_contents_menu :search_contents_menu
  
   def search_people_menu
      links = [
-       {s_('people|More Recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
-       {s_('people|More Active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
-       {s_('people|More Popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
+       {s_('people|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
+       {s_('people|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
+       {s_('people|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
@@ -1101,15 +1103,15 @@ module ApplicationHelper
      end
  
     link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
-    link_to(content_tag(:span, _('People Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
+    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
   end
   alias :browse_people_menu :search_people_menu
  
   def search_communities_menu
      links = [
-       {s_('communities|More Recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
-       {s_('communities|More Active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
-       {s_('communities|More Popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
+       {s_('communities|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
+       {s_('communities|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
+       {s_('communities|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
@@ -1117,7 +1119,7 @@ module ApplicationHelper
      end
  
     link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
-    link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
+    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
   end
   alias :browse_communities_menu :search_communities_menu
  
@@ -1170,6 +1172,10 @@ module ApplicationHelper
     ], :class => 'limited-text-area')
   end
  
+  def expandable_text_area(object_name, method, text_area_id, options = {})
+    text_area(object_name, method, { :id => text_area_id, :onkeyup => "grow_text_area('#{text_area_id}')" }.merge(options))
+  end
+
   def pluralize_without_count(count, singular, plural = nil)
     count == 1 ? singular : (plural || singular.pluralize)
   end
@@ -1318,4 +1324,70 @@ module ApplicationHelper
       _("Are you sure that you want to remove the item \"#{article.name}\"?")
     end
   end
+
+  def template_options(klass, field_name)
+    return '' if klass.templates.count == 0
+    return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
+
+    counter = 0
+    radios = klass.templates.map do |template|
+      counter += 1
+      content_tag('li', labelled_radio_button(template.name, "#{field_name}[template_id]", template.id, counter==1))
+    end.join("\n")
+
+    content_tag('div', content_tag('span', _('Template:')) +
+      content_tag('ul', radios, :style => 'list-style: none; padding-left: 0; margin-top: 0.5em;'),
+      :id => 'template-options',
+      :style => 'margin-top: 1em'
+    )
+  end
+
+  def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
+    options[:min_chars] ||= 3
+    options[:hint_text] ||= _("Type in a search term")
+    options[:no_results_text] ||= _("No results")
+    options[:searching_text] ||= _("Searching...")
+    options[:search_delay] ||= 1000
+    options[:prevent_duplicates] ||=  true
+    options[:backspace_delete_item] ||= false
+    options[:focus] ||= false
+    options[:avoid_enter] ||= true
+    options[:on_result] ||= 'null'
+    options[:on_add] ||= 'null'
+    options[:on_delete] ||= 'null'
+    options[:on_ready] ||= 'null'
+
+    result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
+    result +=
+    "
+    <script type='text/javascript'>
+      jQuery('##{element_id}')
+      .tokenInput('#{url_for(search_action)}', {
+        minChars: #{options[:min_chars].to_json},
+        prePopulate: #{options[:pre_populate].to_json},
+        hintText: #{options[:hint_text].to_json},
+        noResultsText: #{options[:no_results_text].to_json},
+        searchingText: #{options[:searching_text].to_json},
+        searchDelay: #{options[:serach_delay].to_json},
+        preventDuplicates: #{options[:prevent_duplicates].to_json},
+        backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
+        queryParam: #{name.to_json},
+        tokenLimit: #{options[:token_limit].to_json},
+        onResult: #{options[:on_result]},
+        onAdd: #{options[:on_add]},
+        onDelete: #{options[:on_delete]},
+        onReady: #{options[:on_ready]},
+      })
+    "
+    result += options[:focus] ? ".focus();" : ";"
+    if options[:avoid_enter]
+      result += "jQuery('#token-input-#{element_id}')
+                    .live('keydown', function(event){
+                    if(event.keyCode == '13') return false;
+                  });"
+    end
+    result += "</script>"
+    result
+  end
+
 end
@@ -0,0 +1,21 @@
+module ColorboxHelper
+
+  def colorbox_close_button(text, options = {})
+    button(:close, text, '#', colorbox_options(options, :close))
+  end
+
+  def colorbox_button(type, label, url, options = {})
+    button(type, label, url, colorbox_options(options))
+  end
+
+  # options must be an HTML options hash as passed to link_to etc.
+  #
+  # returns a new hash with colorbox class added. Keeps existing classes.
+  def colorbox_options(options, type=nil)
+    the_class = 'colorbox'
+    the_class += "-#{type.to_s}" unless type.nil?
+    the_class << " #{options[:class]}" if options.has_key?(:class)
+    options.merge(:class => the_class)
+  end
+
+end
@@ -18,7 +18,7 @@ module SearchHelper
  
   SortOptions = {
     :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :more_recent, {:label => _('More Recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
+      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
       :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
       :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
         :solr_opts => {:sort => "geodist() asc",
@@ -45,6 +45,14 @@ module SearchHelper
   # FIXME remove it after search_controler refactored
   include EventsHelper
  
+  def multiple_search?
+    ['index', 'category_index'].include?(params[:action]) or @results.size > 1
+  end
+
+  def map_search?
+    !@query.blank? and !multiple_search? and params[:display] == 'map'
+  end
+
   def search_page_title(title, category = nil)
     title = "<h1>" + title
     title += '<small>' + category.name + '</small>' if category
@@ -58,8 +66,8 @@ module SearchHelper
       :align => 'center', :class => 'search-category-context') if category
   end
  
-  def display_results(use_map = false)
-    if params[:display] == 'map' && use_map
+  def display_results(map_capable = false)
+    if map_capable and map_search?
       partial = 'google_maps'
       klass = 'map'
     else
@@ -34,9 +34,12 @@ class Article &lt; ActiveRecord::Base
   settings_items :display_hits, :type => :boolean, :default => true
   settings_items :author_name, :type => :string, :default => ""
   settings_items :allow_members_to_edit, :type => :boolean, :default => false
+  settings_items :followers, :type => Array, :default => []
  
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
  
+  belongs_to :license
+
   has_many :translations, :class_name => 'Article', :foreign_key => :translation_of_id
   belongs_to :translation_of, :class_name => 'Article', :foreign_key => :translation_of_id
   before_destroy :rotate_translations
@@ -51,6 +54,11 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
+  after_destroy :destroy_activity
+  def destroy_activity
+    self.activity.destroy if self.activity
+  end
+
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
  
   named_scope :in_category, lambda { |category|
@@ -75,11 +75,30 @@ class Comment &lt; ActiveRecord::Base
     article.comments_updated if article.kind_of?(Article)
   end
  
-  after_create do |comment|
-    if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
-      Comment::Notifier.deliver_mail(comment)
+  after_create :new_follower
+  def new_follower
+    if source.kind_of?(Article)
+      article.followers += [author_email]
+      article.followers -= article.profile.notification_emails
+      article.followers.uniq!
+      article.save
+    end
+  end
+
+  after_create :notify_by_mail
+  def notify_by_mail
+    if source.kind_of?(Article) && article.notify_comments?
+      if !article.profile.notification_emails.empty?
+        Comment::Notifier.deliver_mail(self)
+      end
+      emails = article.followers - [author_email]
+      if !emails.empty?
+        Comment::Notifier.deliver_mail_to_followers(self, emails)
+      end
     end
+  end
  
+  after_create do |comment|
     if comment.source.kind_of?(Article)
       comment.article.create_activity if comment.article.activity.nil?
       if comment.article.activity
@@ -138,6 +157,22 @@ class Comment &lt; ActiveRecord::Base
         :environment => profile.environment.name,
         :url => profile.environment.top_url
     end
+    def mail_to_followers(comment, emails)
+      profile = comment.article.profile
+      bcc emails
+      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
+      body :recipient => profile.nickname || profile.name,
+        :sender => comment.author_name,
+        :sender_link => comment.author_link,
+        :article_title => comment.article.name,
+        :comment_url => comment.url,
+        :unsubscribe_url => comment.article.view_url.merge({:unfollow => true}),
+        :comment_title => comment.title,
+        :comment_body => comment.body,
+        :environment => profile.environment.name,
+        :url => profile.environment.top_url
+    end
   end
  
   def rejected?
@@ -61,10 +61,10 @@ class Community &lt; Organization
  
   def name=(value)
     super(value)
-    self.identifier = value.to_slug
+    self.identifier ||= value.to_slug
   end
  
-  def template
+  def default_template
     environment.community_template
   end
  
@@ -88,7 +88,7 @@ class Community &lt; Organization
   end
  
   def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} UNION SELECT at.id, at.updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} at INNER JOIN articles a ON at.target_id = a.id WHERE a.profile_id = #{self.id} AND at.target_type = 'Article' ORDER BY updated_at DESC")
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} and action_tracker.verb != 'join_community' and action_tracker.verb != 'leave_scrap' UNION SELECT at.id, at.updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} at INNER JOIN articles a ON at.target_id = a.id WHERE a.profile_id = #{self.id} AND at.target_type = 'Article' ORDER BY updated_at DESC")
   end
  
 end
@@ -154,13 +154,14 @@ class Enterprise &lt; Organization
     true
   end
  
-  def template
-    if enabled?
-      environment.enterprise_template
-    else
-      environment.inactive_enterprise_template
-    end
+  def default_template
+    environment.enterprise_template
+  end
+
+  def template_with_inactive_enterprise
+    !enabled? ? environment.inactive_enterprise_template : template_without_inactive_enterprise
   end
+  alias_method_chain :template, :inactive_enterprise
  
   def control_panel_settings_button
     {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
@@ -24,6 +24,8 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_roles' => N_('Manage environment roles'),
     'manage_environment_validators' => N_('Manage environment validators'),
     'manage_environment_users' => N_('Manage environment users'),
+    'manage_environment_templates' => N_('Manage environment templates'),
+    'manage_environment_licenses' => N_('Manage environment licenses'),
   }
  
   module Roles
@@ -158,6 +160,7 @@ class Environment &lt; ActiveRecord::Base
   has_many :products, :through => :enterprises
   has_many :people
   has_many :communities
+  has_many :licenses
  
   has_many :categories
   has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
@@ -719,12 +722,12 @@ class Environment &lt; ActiveRecord::Base
  
   def create_templates
     pre = self.name.to_slug + '_'
-    ent_id = Enterprise.create!(:name => 'Enterprise template', :identifier => pre + 'enterprise_template', :environment => self, :visible => false).id
-    inactive_enterprise_tmpl = Enterprise.create!(:name => 'Inactive Enterprise template', :identifier => pre + 'inactive_enterprise_template', :environment => self, :visible => false)
-    com_id = Community.create!(:name => 'Community template', :identifier => pre + 'community_template', :environment => self, :visible => false).id
+    ent_id = Enterprise.create!(:name => 'Enterprise template', :identifier => pre + 'enterprise_template', :environment => self, :visible => false, :is_template => true).id
+    inactive_enterprise_tmpl = Enterprise.create!(:name => 'Inactive Enterprise template', :identifier => pre + 'inactive_enterprise_template', :environment => self, :visible => false, :is_template => true)
+    com_id = Community.create!(:name => 'Community template', :identifier => pre + 'community_template', :environment => self, :visible => false, :is_template => true).id
     pass = Digest::MD5.hexdigest rand.to_s
     user = User.create!(:login => (pre + 'person_template'), :email => (pre + 'template@template.noo'), :password => pass, :password_confirmation => pass, :environment => self).person
-    user.update_attributes(:visible => false, :name => "Person template")
+    user.update_attributes(:visible => false, :name => "Person template", :is_template => true)
     usr_id = user.id
     self.settings[:enterprise_template_id] = ent_id
     self.inactive_enterprise_template = inactive_enterprise_tmpl
@@ -740,6 +743,18 @@ class Environment &lt; ActiveRecord::Base
     end
   end
  
+  after_create :create_default_licenses
+  def create_default_licenses
+    License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nd)', :url => 'http://creativecommons.org/licenses/by-nd/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-sa)', :url => 'http://creativecommons.org/licenses/by-sa/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nc)', :url => 'http://creativecommons.org/licenses/by-nc/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nc-nd)', :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nc-sa)', :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', :environment => self)
+    License.create!(:name => 'Free Art', :url => 'http://artlibre.org/licence/lal/en', :environment => self)
+    License.create!(:name => 'GNU FDL', :url => 'http://www.gnu.org/licenses/fdl-1.3.txt', :environment => self)
+  end
+
   def highlighted_products_with_image(options = {})
     Product.find(:all, {:conditions => {:highlighted => true, :enterprise_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
   end
@@ -9,6 +9,8 @@ class Input &lt; ActiveRecord::Base
  
   belongs_to :unit
  
+  named_scope :relevant_to_price, :conditions => { :relevant_to_price => true }
+
   include FloatHelper
  
   def price_per_unit=(value)
@@ -0,0 +1,12 @@
+class License < ActiveRecord::Base
+  belongs_to :environment
+  has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
+
+  validates_presence_of :name, :environment
+  validates_presence_of :slug, :if => lambda {|license| license.name.present?}
+  validates_uniqueness_of :slug, :scope => :environment_id
+
+  before_validation do |license|
+    license.slug ||= license.name.to_slug if license.name.present?
+  end
+end
 class LocationBlock < Block
  
-  settings_items :zoom, :type => :integer , :default => 4
-  settings_items :map_type, :type => :string , :default => 'roadmap'
+  settings_items :zoom, :type => :integer, :default => 4
+  settings_items :map_type, :type => :string, :default => 'roadmap'
  
   def self.description
     _('Location map')
@@ -12,18 +12,10 @@ class LocationBlock &lt; Block
   end
  
   def content(args={})
+    block = self
     profile = self.owner
-    title = self.title
-    if profile.lat
-      block_title(title) +
-      content_tag('div',
-      '<img src="http://maps.google.com/maps/api/staticmap?center=' + profile.lat.to_s() +
-      ',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +
-      '&size=190x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
-      profile.lng.to_s() + ',green' + '&sensor=false"/>',
-      :class => 'the-localization-map' )
-    else
-      content_tag('i', _('This profile has no geographical position registered.'))
+    lambda do
+      render :file => 'blocks/location', :locals => {:block => block, :profile => profile}
     end
   end
  
@@ -9,7 +9,11 @@ class Mailing &lt; ActiveRecord::Base
   xss_terminate :only => [ :subject, :body ], :with => 'white_list', :on => 'validation'
  
   after_create do |mailing|
-    Delayed::Job.enqueue MailingJob.new(mailing.id)
+    mailing.schedule
+  end
+
+  def schedule
+    Delayed::Job.enqueue MailingJob.new(self.id)
   end
  
   def generate_from
@@ -30,8 +34,14 @@ class Mailing &lt; ActiveRecord::Base
  
   def deliver
     each_recipient do |recipient|
-      Mailing::Sender.deliver_mail(self, recipient.email)
-      self.mailing_sents.create(:person => recipient)
+      begin
+        Mailing::Sender.deliver_mail(self, recipient.email)
+        self.mailing_sents.create(:person => recipient)
+      rescue Exception
+        # FIXME should not discard errors silently. An idea is to collect all
+        # errors and generate a task (notification) for the +source+
+        # (environment/organization) listing these errors.
+      end
     end
   end
  
@@ -77,6 +77,7 @@ class Organization &lt; Profile
     state
     country
     tag_list
+    template_id
   ]
  
   def self.fields
@@ -22,7 +22,22 @@ class Person &lt; Profile
     super
   end
  
-  named_scope :members_of, lambda { |resource| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.resource_type = ? AND role_assignments.resource_id = ?', resource.class.base_class.name, resource.id ] } }
+  acts_as_having_hotspots
+
+  named_scope :members_of, lambda { |resources|
+    resources = [resources] if !resources.kind_of?(Array)
+    conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
+  }
+
+  def has_permission_with_plugins?(permission, profile)
+    permissions = [has_permission_without_plugins?(permission, profile)]
+    permissions += enabled_plugins.map do |plugin|
+      plugin.has_permission?(self, permission, profile)
+    end
+    permissions.include?(true)
+  end
+  alias_method_chain :has_permission?, :plugins
  
   def memberships
     Profile.memberships_of(self)
@@ -285,7 +300,7 @@ class Person &lt; Profile
     end
   end
  
-  def template
+  def default_template
     environment.person_template
   end
  
@@ -443,7 +458,7 @@ class Person &lt; Profile
   end
  
   def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} ORDER BY updated_at DESC")
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
   end
  
   protected
@@ -4,9 +4,13 @@ class PriceDetail &lt; ActiveRecord::Base
   validates_presence_of :product_id
  
   belongs_to :production_cost
-  validates_presence_of :production_cost_id
+  validates_presence_of :production_cost
   validates_uniqueness_of :production_cost_id, :scope => :product_id
  
+  def name
+    production_cost.name
+  end
+
   def price
     self[:price] || 0
   end
@@ -158,7 +158,7 @@ class Product &lt; ActiveRecord::Base
  
   def inputs_cost
     return 0 if inputs.empty?
-    inputs.map(&:cost).inject { |sum,price| sum + price }
+    inputs.relevant_to_price.map(&:cost).inject { |sum,price| sum + price }
   end
  
   def total_production_cost
@@ -201,6 +201,7 @@ class Product &lt; ActiveRecord::Base
     self.inputs(true).each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy }
     t_i = 1 if t_i == 0 # avoid division by 0
     p = case (se_i.to_f/t_i)*100
+        when 0 then [0, '']
         when 0..24.999 then [0, _("0%")];
         when 25..49.999 then [25, _("25%")];
         when 50..74.999 then [50, _("50%")];
@@ -5,4 +5,5 @@ class ProductionCost &lt; ActiveRecord::Base
   validates_presence_of :name
   validates_length_of :name, :maximum => 30, :allow_blank => true
   validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]
+
 end
@@ -60,20 +60,33 @@ class Profile &lt; ActiveRecord::Base
   }
  
   acts_as_accessible
+  acts_as_having_hotspots
  
   named_scope :memberships_of, lambda { |person| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
   #FIXME: these will work only if the subclass is already loaded
   named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
+  named_scope :templates, :conditions => {:is_template => true}
  
   def members
-    Person.members_of(self)
+    scopes = dispatch_scopes(:organization_members, self)
+    scopes << Person.members_of(self)
+    scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
   end
  
   def members_count
-    members.count('DISTINCT(profiles.id)')
+    members.count
   end
  
+  class << self
+    def count_with_distinct(*args)
+      options = args.last || {}
+      count_without_distinct(:id, {:distinct => true}.merge(options))
+    end
+    alias_method_chain :count, :distinct
+  end
+
+
   def members_by_role(role)
     Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
   end
@@ -98,6 +111,7 @@ class Profile &lt; ActiveRecord::Base
   has_many :action_tracker_notifications, :foreign_key => 'profile_id'
   has_many :tracked_notifications, :through => :action_tracker_notifications, :source => :action_tracker, :order => 'updated_at DESC'
   has_many :scraps_received, :class_name => 'Scrap', :foreign_key => :receiver_id, :order => "updated_at DESC", :dependent => :destroy
+  belongs_to :template, :class_name => 'Profile', :foreign_key => 'template_id'
  
   # FIXME ugly workaround
   def self.human_attribute_name(attrib)
@@ -204,7 +218,7 @@ class Profile &lt; ActiveRecord::Base
   end
  
   belongs_to :region
-  
+
   def location(separator = ' - ')
     myregion = self.region
     if myregion
@@ -274,8 +288,14 @@ class Profile &lt; ActiveRecord::Base
   validates_format_of :identifier, :with => IDENTIFIER_FORMAT, :if => lambda { |profile| !profile.identifier.blank? }
   validates_exclusion_of :identifier, :in => RESERVED_IDENTIFIERS
   validates_uniqueness_of :identifier, :scope => :environment_id
-
   validates_length_of :nickname, :maximum => 16, :allow_nil => true
+  validate :valid_template
+
+  def valid_template
+    if template_id.present? and !template.is_template
+      errors.add(:template, _('is not a template.'))
+    end
+  end
  
   before_create :set_default_environment
   def set_default_environment
@@ -285,12 +305,12 @@ class Profile &lt; ActiveRecord::Base
     true
   end
  
-  # registar callback for creating boxes after the object is created. 
+  # registar callback for creating boxes after the object is created.
   after_create :create_default_set_of_boxes
  
   # creates the initial set of boxes when the profile is created. Can be
   # overriden for each subclass to create a custom set of boxes for its
-  # instances.    
+  # instances.
   def create_default_set_of_boxes
     if template
       apply_template(template, :copy_articles => false)
@@ -322,10 +342,15 @@ class Profile &lt; ActiveRecord::Base
   end
  
   # this method should be overwritten to provide the correct template
-  def template
+  def default_template
     nil
   end
  
+  def template_with_default
+    template_without_default || default_template
+  end
+  alias_method_chain :template, :default
+
   def apply_template(template, options = {:copy_articles => true})
     copy_blocks_from(template)
     copy_articles_from(template) if options[:copy_articles]
@@ -405,7 +430,7 @@ class Profile &lt; ActiveRecord::Base
  
   # returns +false+
   def person?
-    self.kind_of?(Person) 
+    self.kind_of?(Person)
   end
  
   def enterprise?
@@ -513,7 +538,7 @@ private :generate_url, :url_options
  
   after_create :insert_default_article_set
   def insert_default_article_set
-    if template 
+    if template
       copy_articles_from template
     else
       default_set_of_articles.each do |article|
@@ -583,7 +608,7 @@ private :generate_url, :url_options
       raise _("%s can't have members") % self.class.name
     end
   end
-  
+
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -880,7 +905,7 @@ private :generate_url, :url_options
  
   def self.f_enabled_proc(enabled)
     enabled = enabled == "true" ? true : false
-    enabled ? _('Enabled') : _('Not enabled')
+    enabled ? s_('facets|Enabled') : s_('facets|Not enabled')
   end
   def f_enabled
     self.enabled
@@ -909,7 +934,7 @@ private :generate_url, :url_options
   acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
       # searched fields
       {:name => {:type => :text, :boost => 2.0}},
-      {:identifier => :text}, {:address => :text}, {:nickname => :text},
+      {:identifier => :text}, {:nickname => :text},
       # filtered fields
       {:public => :boolean}, {:environment_id => :integer},
       {:category_filter => :integer},
@@ -929,7 +954,7 @@ private :generate_url, :url_options
  
   def control_panel_settings_button
     {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
-  end 
+  end
  
   def followed_by?(person)
     person.is_member_of?(self)
@@ -25,7 +25,7 @@ class ProfileListBlock &lt; Block
   end
  
   def profile_count
-    profiles.visible.count('DISTINCT(profiles.id)')
+    profiles.visible.count
   end
  
   # the title of the block. Probably will be overriden in subclasses.
@@ -8,7 +8,7 @@ class UploadedFile &lt; Article
     _('File')
   end
  
-  track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :action_tracker_target
+  track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent
  
   include ShortFilename
  
@@ -144,9 +144,4 @@ class UploadedFile &lt; Article
   def uploaded_file?
     true
   end
-
-  def action_tracker_target
-    self
-  end
-
 end
@@ -21,12 +21,11 @@ class User &lt; ActiveRecord::Base
     end
   end
  
-  before_create :make_activation_code
-
   before_create do |user|
     if user.environment.nil?
       user.environment = Environment.default
     end
+    user.send(:make_activation_code) unless user.environment.enabled?('skip_new_user_email_confirmation')
   end
  
   after_create do |user|
@@ -35,7 +34,7 @@ class User &lt; ActiveRecord::Base
     user.person.name ||= user.login
     user.person.visible = false unless user.activated?
     user.person.save!
-    if user.environment && user.environment.enabled?('skip_new_user_email_confirmation')
+    if user.environment.enabled?('skip_new_user_email_confirmation')
       user.activate
     end
   end
@@ -114,10 +113,11 @@ class User &lt; ActiveRecord::Base
  
   # Activates the user in the database.
   def activate
+    return false unless self.person
     self.activated_at = Time.now.utc
     self.activation_code = nil
     self.person.visible = true
-    self.person.save! && self.save
+    self.person.save! && self.save!
   end
  
   def activated?
@@ -69,6 +69,8 @@
  
 <div id="signup-form-profile">
  
+  <%= template_options(Person, 'profile_data') %>
+
   <% labelled_fields_for :profile_data, @person do |f| %>
     <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
   <% end %>
@@ -1,10 +0,0 @@
-<h1><%= _('Edit Templates') %></h1>
-
-<ul>
-<% [[_('Edit Person Template'), environment.person_template],
-    [_('Edit Community Template'), environment.community_template],
-    [__('Edit Enterprise Template'), environment.enterprise_template],
-    [__('Edit Inactive Enterprise Template'), environment.inactive_enterprise_template]].select{|i| i[1]}.each do |row| %>
-<li><%= link_to row[0], :controller => 'profile_editor', :profile => row[1].identifier %></li>
-<% end %>
-</ul>
@@ -12,9 +12,10 @@
   <tr><td><%= link_to _('Manage User roles'), :controller => 'role' %></td></tr>
   <tr><td><%= link_to _('Manage users'), :controller => 'users' %></td></tr>
   <tr><td><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></td></tr>
-  <tr><td><%= link_to _('Edit Templates'), :action => 'edit_templates' %></td></tr>
+  <tr><td><%= link_to _('Edit Templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
   <tr><td><%= link_to _('Set Portal'), :action => 'set_portal_community' %></td></tr>
+  <tr><td><%= link_to _('Manage Licenses'), :controller =>'licenses' %></td></tr>
   <% @plugins.dispatch(:admin_panel_links).each do |link| %>
     <tr><td><%= link_to link[:title], link[:url] %></td></tr>
   <% end %>
@@ -0,0 +1,9 @@
+<% if profile.lat %>
+  <%= block_title block.title %>
+  <div class='the-localization-map'>
+    <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+  </div>
+</div>
+<% else %>
+  <i><%= _('This profile has no geographical position registered.') %></i>
+<% end %>
@@ -56,7 +56,7 @@
             <div>
               <div class="arrow"></div>
               <div class="content" id="product-price-composition">
-                <% product.inputs.each do |i| %>
+                <% product.inputs.relevant_to_price.each do |i| %>
                   <div class="search-product-input-dots-to-price">
                     <div class="search-product-input-name"><%= i.product_category.name %></div>
                     <%= price_span i.cost, :class => 'search-product-input-price' %>
@@ -6,6 +6,8 @@
  
 <%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
  
+<%= render :partial => 'general_fields' %>
+
 <script type="text/javascript">
   function submit_button(index) {
      return $("article_slug").form.select("input.submit")[index];
@@ -5,6 +5,7 @@
  
 <%= required f.text_field('name', :size => '64') %>
  
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
  
 <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
 <%= required_fields_message %>
  
 <%= required f.text_field('name', :size => '64') %>
+<%= render :partial => 'general_fields' %>
  
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
@@ -6,6 +6,8 @@
  
 <%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
  
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
  
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
@@ -2,4 +2,6 @@
  
 <%= required f.text_field('name', :size => '64') %>
  
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
@@ -0,0 +1 @@
+<%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
 <%= f.text_field 'name', :size => '64' %>
+<%= render :partial => 'general_fields' %>
  
 <p><%= _('This is a republication of "%s", by %s.') % [link_to(h(@article.reference_article.name), @article.reference_article.url), @article.reference_article.profile.name] %></p>
@@ -2,5 +2,6 @@
  
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
  
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
@@ -2,6 +2,8 @@
  
 <%= required f.text_field(:name) %>
  
+<%= render :partial => 'general_fields' %>
+
 <%= required labelled_form_field(_('Limit of articles'), text_field(:article, :limit)) %>
  
 <%= labelled_form_field(_('Include in RSS Feed only posts from language:'), f.select(:language, [[_('All'),  nil ]] + Noosfero.locales.map { |k,v| [v, k]})) %>
@@ -4,5 +4,6 @@
  
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
  
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
@@ -5,6 +5,7 @@
 <div>
   <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
  
+  <%= render :partial => 'general_fields' %>
   <%= render :partial => 'translatable' %>
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
 </div>
@@ -13,4 +13,4 @@
 </ul>
 <br style="clear:both" />
  
-<%= lightbox_close_button(_('Cancel')) %>
+<%= colorbox_close_button(_('Cancel')) %>
@@ -5,7 +5,7 @@
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
  
-  <%= lightbox_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>
+  <%= colorbox_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>
   <%= button(:back, _('Back to control panel'), :controller => 'profile_editor', :action => "index") %>
 <% end %>
  
@@ -0,0 +1,22 @@
+<%= _('Hi!') %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) if @comment_title %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Click on the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _('Click on the address below to cancel the notification of new comments:') %>
+<%= url_for @unsubscribe_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -33,7 +33,7 @@
                                   :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
                                   :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
           :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
-      <%= lightbox_remote_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
+      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
     <% end %>
  
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
@@ -0,0 +1,13 @@
+<% if @unfollow_form %>
+<div class='unfollow-article'>
+  <h1><%= _('Cancel notification of new comments') %></h1>
+  <p><%= _("Fill in the following field with your e-mail if you don't want to be notified when this content receives new comments anymore.") %></p>
+  <% form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %>
+    <%= hidden_field_tag(:unfollow, 'commit') %>
+    <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %>
+    <% button_bar do %>
+      <%= submit_button(:ok, _('Cancel notifications for e-mail above') ) %>
+    <% end %>
+  <% end %>
+</div>
+<% end %>
@@ -6,12 +6,30 @@
  
 <div id="article" class="<%= @page.css_class_name %>">
  
+<%= render :partial => 'confirm_unfollow' %>
+
 <div id="article-toolbar"></div>
  
 <script type="text/javascript">
-  <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }), :complete => "$$('#article-toolbar .remote-lbOn').each(function(link) { new lightbox(link); }); jQuery('#article-toolbar .simplemenu-trigger').click(function(e) { e.stopPropagation(); })" %>
+  <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }) %>
 </script>
  
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
 <% if !@page.tags.empty? %>
   <div id="article-tags">
     <%= _("This article's tags:") %>
@@ -19,12 +37,6 @@
   </div>
 <% end %>
  
-<% if @page.display_hits? %>
-  <div id="article-hits">
-    <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-  </div>
-<% end %>
-
 <% if @page.parent && !@page.parent.path.blank? %>
 <div id="article-parent">
   <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
@@ -1,14 +0,0 @@
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-
@@ -28,6 +28,14 @@
       <%= hidden_field_tag  'create_enterprise[target_id]', environment.id %>
     <% end %>
  
+    <% @plugins.dispatch(:enterprise_registration_hidden_fields).each do |field| %>
+      <% field.each do |key, value| %>
+        <%= f.hidden_field(key, :value => value) %>
+      <% end %>
+    <% end %>
+
+    <%= template_options(Enterprise, 'create_enterprise')%>
+
     <% button_bar do %>
       <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
     <% end %>
@@ -0,0 +1,12 @@
+<%= error_messages_for :license %>
+
+<% form_for :license, @license do |f| %>
+  <%= hidden_field_tag(:license_id, params[:license_id]) %>
+  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
+  <%= labelled_form_field(_('License url'), f.text_field(:url)) %>
+
+ <% button_bar do %>
+   <%= submit_button('save', _('Save'))%>
+   <%= button('cancel', _('Cancel'), {:action => 'index'})%>
+  <% end %>
+<% end %>
@@ -0,0 +1,2 @@
+<h1><%= _('New license') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,2 @@
+<h1><%= _('Edit license') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,22 @@
+<h1><%= _('Manage licenses') %></h1>
+<table style='overflow: hidden;'>
+  <tr>
+    <th style='width: 25%'><%= _('Name') %></th>
+    <th style='width: 60%'><%= _('Url reference') %></th>
+    <th style='width: 15%'><%= _('Actions') %></th>
+  </tr>
+  <% @licenses.each do |license| %>
+    <tr>
+      <td title="<%= license.name%>"><%= truncate(license.name, :length => 19) %></td>
+      <td title="<%= license.url %>"><%= license.url.present? ? link_to(truncate(license.url, :length => 60), license.url, :target => '_blank') : '' %></td>
+      <td style='white-space: nowrap;'>
+        <%= button_without_text :edit, _('Edit'), :action => 'edit', :license_id => license.id %>
+        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :license_id => license.id}, :method => 'post', :confirm => _('Are you sure you want to remove this license?') %></td>
+    </tr>
+  <% end %>
+</table>
+
+<% button_bar do %>
+  <%= button(:add, _('Add a new license'), :action => 'create')%>
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
@@ -5,27 +5,113 @@ var marker;
 var center;
 var move = true;
 var previousCenter;
+var mapZoom = 15;
+var delay_autocomplete = 500;
  
-function getAddress(latlng) {
+function pointToAddress(latlng) {
   $('location-fields').addClassName("loading");
  
-   if (latlng != null) {
-    geocoder.geocode( {'latLng': latlng}, showAddress);
-   }
+  if (latlng == null)
+    return;
+
+  geocoder.geocode( {'latLng': latlng}, function(results, status) {
+    if (status != google.maps.GeocoderStatus.OK) {
+      alert("<%=_("Address not found, reason:")%>" + statusErrorMessage(status));
+      return;
+    }
+
+    var place = results[0];
+
+    $('location-fields').removeClassName("loading");
+
+    var position = marker.getPosition();
+    $('profile_data_lat').value = position.lat();
+    $('profile_data_lng').value = position.lng();
+
+    form = jQuery('#location-form')[0];
+    form.lat = marker.getPosition().lat();
+    form.lng = marker.getPosition().lng();
+
+    var components_len = place.address_components.size();
+    if (components_len < 2)
+      return;
+
+    var country_code = "";
+    var state = "";
+    var city = "";
+    var zip_code = "";
+    var route = "";
+    var number = "";
+    var sublocality = "";
+    var address = "";
+
+    var i;
+    var has_postal_code = false;
+    for (i=0; i < components_len; i++) {
+      type = place.address_components[i].types[0];
+      if (type == 'postal_code')
+        has_postal_code = true;
+    }
+
+    for (i=0; i < components_len; i++) {
+      type = place.address_components[i].types[0];
+      value = place.address_components[i];
+
+      if (type == 'country')
+        country_code = value.short_name;
+      else if (type == 'administrative_area_level_1')
+        state = value.long_name;
+      else if (type == 'locality')
+        city = value.long_name;
+      else if (type == 'postal_code')
+        zip_code = value.short_name;
+      if (has_postal_code) {
+        if (type == "route")
+          route = value.long_name;
+        else if (type == "street_number")
+          number = value.short_name;
+        else if (type == 'sublocality')
+          sublocality = value.long_name;
+      }
+    }
+
+    // build address
+    if (route) {
+      address = route;
+      if (number)
+       address = address + ', ' + number;
+      if (sublocality && sublocality != city)
+       address = address + ', ' + sublocality;
+    }
+
+    if (country_code)
+      $('profile_data_country').value = country_code;
+    if (state)
+      $('profile_data_state').value = state;
+    if (city)
+      $('profile_data_city').value = city;
+    if (zip_code)
+      $('profile_data_zip_code').value = zip_code;
+    if (address)
+      $('profile_data_address').value = address;
+
+    map.setCenter(marker.getPosition());
+  });
 }
  
-function codeAddress() {
+function addressToPoint() {
   $('location-fields').addClassName("loading");
  
   var country_option = $('profile_data_country').value;
-  var address = $('profile_data_address').value + "-" + $('profile_data_zip_code').value + "," + $('profile_data_city').value+ "-" + $('profile_data_state').value + "," + country_option;
+  var address = $('profile_data_address').value + ", " + $('profile_data_zip_code').value + ", "
+    + $('profile_data_city').value+ ", " + $('profile_data_state').value + ", " + country_option;
  
   if (geocoder) {
-   geocoder.geocode( { 'address': address}, function(results, status) {
+   geocoder.geocode({ 'address': address}, function(results, status) {
      if (status == google.maps.GeocoderStatus.OK) {
        map.setCenter(results[0].geometry.location);
        marker.setPosition(results[0].geometry.location);
-       getAddress(marker.getPosition());
+       pointToAddress(marker.getPosition());
  
        $('profile_data_lat').value = results[0].geometry.location.lat();
        $('profile_data_lng').value = results[0].geometry.location.lng();
@@ -33,17 +119,15 @@ function codeAddress() {
        enable_save();
      } else {
        $('location-fields').removeClassName("loading");
-       alert('<%=_("Address not found, reason:")%>' + translate_status(status));
+       alert('<%=_("Address not found, reason:")%>' + statusErrorMessage(status));
      }
    });
   }
  
-  map.setZoom(11);
-
   return false;
 }
  
-function translate_status(status)
+function statusErrorMessage(status)
 {
   var translated_status = '';
  
@@ -59,136 +143,42 @@ function translate_status(status)
   return translated_status;
 }
  
-function getAddressData() {
-  var text = '';
-  var fields = [
-    'profile_data_country',
-    'profile_data_state',
-    'profile_data_city',
-    'profile_data_address',
-    'profile_data_zip_code'
-  ];
-  for (var i = 0; i < fields.length; i++) {
-    var field = fields[i];
-    if ($(field)) {
-      text += $(field).value + " ";
-    }
-  }
-  return text;
-}
-
-function showAddress(results, status) {
-
-  if (status == google.maps.GeocoderStatus.OK) {
-    map.setCenter(results[0].geometry.location);
-    updateFields(results[0]);
-
-  } else {
-    alert("<%=_("Address not found, reason:")%>" + translate_status(status));
-  }
-
-}
-
-function updateFields(place) {
-  var position = marker.getPosition();
-  $('profile_data_lat').value = position.lat();
-  $('profile_data_lng').value = position.lng();
-  $('location-fields').removeClassName("loading");
-
-  form = jQuery('#location-form')[0];
-  form.lat = marker.getPosition().lat();
-  form.lng = marker.getPosition().lng();
-
-  var components_len = place.address_components.size();
-
-  if(components_len <  2)
-  {
-    return false;
-  }
-
-  var components = place.address_components;
-  var address = "";
-  var zip_code = "";
-  var city = "";
-  var state = "";
-  var country_code = "";
-  var i = 0;
-
-  for( i =0 ; i < components_len; i ++)
-  {
-
-      if (components[i].types[0] == 'country')
-        country_code = components[i].short_name;
-      else if (components[i].types[0] == 'administrative_area_level_1')
-        state = components[i].long_name;
-      else if (components[i].types[0] == 'locality')
-        city  = components[i].long_name;
-      else if (components[i].types[0] == 'sublocality')
-        address  = components[i].long_name  + "-" + address;
-      else if (components[i].types[0] == "route")
-        address = components[i].long_name + address;
-      else if (components[i].types[0] == "street_number")
-        address =  address + "," + components[i].short_name ;
-      else if (components[i].types[0] == 'postal_code')
-        zip_code = components[i].short_name;
-  }
-
-  $('profile_data_country').value = country_code;
-  $('profile_data_state').value = state;
-  $('profile_data_address').value = address;
-  $('profile_data_city').value = city;
-  $('profile_data_zip_code').value = zip_code;
-}
-
-
-function initialize_map() {
+function initializeMap() {
   geocoder = new google.maps.Geocoder();
  
   var lat = <%= profile.lat || 'false' %>;
   var lng = <%= profile.lng || 'false' %>;
-
   if ( !(lat && lng) ) {
     lat = -15.7605361485013;
     lng = -47.933349609375;
   }
  
-  var latlng = new google.maps.LatLng(lat,lng);
-
-  var myOptions = {
-    zoom: 8,
-    center: latlng,
-    mapTypeId: google.maps.MapTypeId.ROADMAP
-  }
-
-  center = latlng;
-
-  map = new google.maps.Map(document.getElementById("location-map"), myOptions);
-
-  continueLoadMapV3()
-}
-
-function continueLoadMapV3() {
+  var center = new google.maps.LatLng(lat,lng);;
+  map = new google.maps.Map(document.getElementById("location-map"), {
+    zoom: mapZoom,
+    center: center,
+    mapTypeId: google.maps.MapTypeId.HYBRID
+  });
  
-   marker = new google.maps.Marker({
-            position: center,
-            map: map,
-            draggable: true
-    });
+  marker = new google.maps.Marker({
+    position: center,
+    map: map,
+    draggable: true
+  });
  
-    google.maps.event.addListener(marker, "dragend", function() {
-      move = false;
-      getAddress(marker.getPosition());
-      enable_save();
-    });
+  google.maps.event.addListener(marker, "dragend", function() {
+    move = false;
+    pointToAddress(marker.getPosition());
+    map.setCenter(marker.getPosition());
+    enable_save();
+  });
  
 }
  
-window.onload = initialize_map;
-
-var delay_autocomplete = 500;
-
 jQuery.noConflict();
-jQuery(document).ready(function (){
+jQuery(document).ready(function () {
+
+  initializeMap();
  
   jQuery.widget( "custom.catcomplete",jQuery.ui.autocomplete, {
     _renderMenu: function( ul, items ) {
@@ -204,7 +194,6 @@ jQuery(document).ready(function (){
     }
   });
  
-
   jQuery("#profile_data_city").catcomplete({
     source: "../maps/search_city",
     minLength: 3,
@@ -219,21 +208,13 @@ jQuery(document).ready(function (){
   });
  
   jQuery("#profile_data_city").keyup(function(){
-
     disable_save();
-
   });
-
   jQuery("#profile_data_state").keyup(function(){
-
     disable_save();
-
   });
-
   jQuery("#profile_data_country").change(function(){
-
     disable_save();
-
   });
  
 });
@@ -12,7 +12,7 @@
     <%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
     <%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
     <% button_bar do %>
-      <%= button_to_function :search, _('Locate in the map'), "codeAddress()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
+      <%= button_to_function :search, _('Locate in the map'), "addressToPoint()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
       <%= submit_button 'save', _('Save') %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <% end %>
@@ -8,30 +8,6 @@
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
  
-<ul>
-<% for membership in @memberships %>
-  <li>
-    <div class='common-profile-list-block'>
-      <%= profile_image_link(membership, :portrait, 'div') %>
-    </div>
-    <span class='profile-details'>
-      <strong><%= membership.name %></strong><br/>
-      <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
-      <%= _('Type: %s') % getterm(membership.class.identification) %> <br/>
-      <%= _('Description: %s') % membership.description  + '<br/>' if membership.community? %>
-      <%= _('Members: %s') % membership.members_count.to_s %> <br/>
-      <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
-      <% button_bar do %>
-        <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
-        <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %>
-        <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
-          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %>
-        <% end %>
-      <% end %>
-    </span>
-    <br class="may-clear" />
-  </li>
-<% end %>
-</ul>
+<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
  
 </div>
@@ -16,6 +16,12 @@
  
   <%= required f.text_field(:name) %>
  
+  <% @plugins.dispatch(:new_community_hidden_fields).each do |field| %>
+    <% field.each do |key, value| %>
+      <%= f.hidden_field(key, :value => value) %>
+    <% end %>
+  <% end %>
+
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
  
   <% f.fields_for :image_builder, @community.image do |i| %>
@@ -38,6 +44,8 @@
     </div>
   </div>
  
+  <%= template_options(Community, 'community')%>
+
   <% button_bar do %>
     <%= submit_button(:save, _('Create')) %>
     <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -3,15 +3,17 @@
     <p class='profile-wall-reply'>
       <% update_area = tab_action == 'wall' ? 'profile_activities' : 'network-activities' %>
       <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity', :tab_action => tab_action}, :html => { :class => 'profile-wall-reply-form', 'data-update' => update_area } do %>
-        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}",
-                                        :cols => 50,
-                                        :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?),
-                                        :value => _('Leave your comment'),
-                                        :style => 'color: #ccc' } %>
+        <%= expandable_text_area :comment,
+                                 :body,
+                                 "reply_content_#{activity.id}",
+                                 :cols => 50,
+                                 :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?),
+                                 :value => _('Leave your comment'),
+                                 :style => 'color: #ccc' %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
       <% end %>
     </p>
@@ -2,15 +2,16 @@
   <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'>
     <p class='profile-wall-reply'>
       <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form'} do %>
-        <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}",
-                                          :cols => 50,
-                                          :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?),
-                                        :value => _('Leave your comment')
-                                        } %>
+        <%= expandable_text_area :scrap,
+                                 :content,
+                                 "reply_content_#{scrap.id}",
+                                 :cols => 50,
+                                 :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?),
+                                 :value => _('Leave your comment') %>
         <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
         <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
       <% end %>
@@ -6,15 +6,9 @@
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
     <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
     <div class='profile-wall-actions'>
-      <%= link_to(s_('profile|Comment'), '#', { :class => 'focus-on-comment'}) unless activity.get_view_url.size == 1 %>
       <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
     </div>
   </div>
 </div>
 <div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
-
-<% if activity.get_view_url.size == 1 %>
-  <%= render :partial => 'profile_comments', :locals => { :activity => activity, :tab_action => tab_action } %>
-<% end %>
-
 <br/>
@@ -29,7 +29,6 @@
           <% if logged_in? && current_person.follows?(@profile) %>
             <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
           <% end %>
-          <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
         <% elsif @profile.person? %>
           <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
           <% if logged_in? && current_person.follows?(@profile) %>
@@ -4,6 +4,12 @@
  
 <% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
  
+  <% if user.has_permission?('manage_environment_templates', profile.environment) %>
+    <div id="profile-is-template">
+      <%= labelled_check_box(_('This profile is a template'), 'profile_data[is_template]', true, @profile.is_template) %>
+    </div>
+  <% end %>
+
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
  
   <% unless @profile.person? && @environment.active_person_fields.include?('image') %>
-<div id="search-results" class="<%= @results.size == 1 ? 'only-one-result-box' : 'multiple-results-boxes' %>">
+<div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
   <% @order.each do |name| %>
     <% results = @results[name] %>
     <% empty = results.nil? || results.empty? %>
@@ -7,7 +7,7 @@
       <% if not empty %>
         <% partial = partial_for_class(results.first.class.class_name.constantize) %>
  
-        <% if @results.size > 1 %>
+        <% if multiple_search? %>
           <h3><%= @names[name] %></h3>
           <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
             <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
@@ -22,9 +22,10 @@
           </ul>
         </div>
       <% else %>
-        <% if @results.size > 1 %>
+        <% if multiple_search? %>
           <h3><%= @names[name] %></h3>
         <% end %>
+
         <div class="search-results-innerbox search-results-type-empty">
           <div> <%= _('None') %> </div>
         </div>
@@ -27,9 +27,9 @@
           <% end %>
  
           <% if product.price_described? %>
-            <% title = (product.inputs + product.price_details).map{ |i|
+            <% title = (product.inputs.relevant_to_price + product.price_details).map{ |i|
               '<div class="search-product-input-dots-to-price">' +
-                '<div class="search-product-input-name">' + i.product_category.name + '</div>' +
+                '<div class="search-product-input-name">' + i.name + '</div>' +
                 price_span(i.price, :class => 'search-product-input-price') +
               '</div>' }.join('') %>
             <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
 <li class="search-profile-item">
-<% if @empty_query or @results.size > 1 or !profile.enterprise?  %>
+<% if @empty_query or multiple_search? or !profile.enterprise?  %>
   <%= profile_image_link profile, :portrait, 'div',
     @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
 <% else %>
@@ -0,0 +1,26 @@
+<ul id="groups-list">
+<% for group in groups %>
+  <li>
+    <div class='common-profile-list-block'>
+      <%= profile_image_link(group, :portrait, 'div') %>
+    </div>
+    <span class='profile-details'>
+      <strong><%= group.name %></strong><br/>
+      <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
+      <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
+      <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
+      <%= _('Members: %s') % group.members_count.to_s %> <br/>
+      <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
+      <% button_bar do %>
+        <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
+        <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
+          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
+        <% end %>
+      <% end %>
+    </span>
+    <br class="may-clear" />
+  </li>
+<% end %>
+</ul>
+
@@ -7,7 +7,7 @@
   <ul>
     <% @tasks.each do |item| %>
       <li>
-        <strong><%= item.information %></strong> <br/>
+        <strong><%= task_information(item) %></strong> <br/>
         <small>
           <%= _('Created:')   +' '+ show_date(item.created_at) %>
           &nbsp; &#151; &nbsp;
@@ -0,0 +1,19 @@
+<% if @error %>
+  <div class="errorExplanation" id="errorExplanation">
+    <h2><%= _('The template could not be saved') %></h2>
+    <p><%= _('There were problems with the following fields:') %> </p>
+    <ul>
+      <li><%= @error %></li>
+    </ul>
+  </div>
+<% end %>
+
+<% form_tag do %>
+  <%= labelled_text_field(_('Name')+': ', :name)%>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'))%>
+    <%= button('cancel', _('Cancel'), {:action => 'index'})%>
+  <% end %>
+<% end %>
+
@@ -0,0 +1,12 @@
+<% title = case @kind
+  when 'person'
+
+  when 'community'
+
+  when 'enterprise'
+    _('Create enterprise template')
+end %>
+
+<h1><%= _('Create community template') %></h1>
+
+<%= render :partial => 'create_template_form' %>
@@ -0,0 +1,3 @@
+<h1><%= _('Create enterprise template') %></h1>
+
+<%= render :partial => 'create_template_form' %>
@@ -0,0 +1,12 @@
+<% title = case @kind
+  when 'person'
+
+  when 'community'
+    _('Create community template')
+  when 'enterprise'
+    _('Create enterprise template')
+end %>
+
+<h1><%= _('Create person template') %></h1>
+
+<%= render :partial => 'create_template_form' %>
@@ -0,0 +1,26 @@
+<h1><%= _('Edit Templates') %></h1>
+
+<%= _('Manage the templates used on creation of profiles') %>
+
+<% list_of_templates = [[_('Person')    , Person.templates    , 'person'    ],
+                        [_('Community') , Community.templates , 'community' ],
+                        [_('Enterprise'), Enterprise.templates, 'enterprise']] %>
+
+<% list_of_templates.each do |title, templates, kind|%>
+  <div class='template-kind'>
+    <h2><%= title %></h2>
+    <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
+    <ul>
+      <% templates.each do |template| %>
+        <li>
+          <%= image_tag "icons-app/#{kind}-icon.png" %>
+          <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
@@ -23,7 +23,28 @@ ActionTrackerConfig.verbs = {
   },
  
   :upload_image => { 
-    :description => lambda { n_('uploaded 1 image<br />%{thumbnails}<br style="clear: both;" />', 'uploaded %{num} images<br />%{thumbnails}<br style="clear: both;" />', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, link_to(image_tag(t), ta.get_view_url[i]))}.last(3).join}}' } },
+    :description => lambda do
+      total = get_view_url.size
+      n_('uploaded 1 image', 'uploaded %d images', total) % total +
+      '<br />{{'+
+      'ta.collect_group_with_index(:thumbnail_path) { |t,i|' +
+      "  if ( #{total} == 1 );" +
+      '    link_to( image_tag(t), ta.get_view_url[i], :class => \'upimg\' );' +
+      '   else;' +
+      "    pos = #{total}-i;" +
+      '    morethen2 = pos>2 ? \'morethen2\' : \'\';' +
+      '    morethen5 = pos>5 ? \'morethen5\' : \'\';' +
+      '    t = t.gsub(/(.*)(display)(.*)/, \'\\1thumb\\3\');' +
+      '    link_to( \'&nbsp;\', ta.get_view_url[i],' +
+      '      :style => "background-image:url(#{t})",' +
+      '      :class => "upimg pos#{pos} #{morethen2} #{morethen5}" );' +
+      '  end' +
+      '}.reverse.join}}' +
+      ( total > 5 ?
+        '<span class="more" onclick="this.parentNode.className+=\' show-all\'">' +
+        '&hellip;</span>' : '' ) +
+      '<br style="clear: both;" />'
+    end,
     :type => :groupable
   },
  
 require 'noosfero/plugin'
+require 'noosfero/plugin/acts_as_having_hotspots'
 require 'noosfero/plugin/manager'
 require 'noosfero/plugin/context'
 require 'noosfero/plugin/active_record'
@@ -0,0 +1,11 @@
+class AddTemplateAndIsTemplateFields < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :is_template, :boolean, :default => false
+    add_column :profiles, :template_id, :integer
+  end
+
+  def self.down
+    remove_column :profiles, :is_template
+    remove_column :profiles, :template_id
+  end
+end
@@ -0,0 +1,9 @@
+class FillIsTemplateFieldOnBasicTemplates < ActiveRecord::Migration
+  def self.up
+    update("update profiles set is_template = (1=1) where identifier like '%_template'")
+  end
+
+  def self.down
+    say('This migration can\'t be reverted.')
+  end
+end
@@ -0,0 +1,14 @@
+class CreateLicenses < ActiveRecord::Migration
+  def self.up
+    create_table :licenses do |t|
+      t.string      :name, :null => false
+      t.string      :slug, :null => false
+      t.string      :url
+      t.references  :environment, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :licenses
+  end
+end
@@ -0,0 +1,11 @@
+class AddLicenseToArticle < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :license_id, :integer
+    add_column :article_versions, :license_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :license_id
+    remove_column :article_versions, :license_id
+  end
+end
@@ -0,0 +1,17 @@
+class AddManageEnvironmentLicenseToAdminRole < ActiveRecord::Migration
+  def self.up
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions << 'manage_environment_licenses'
+      role.save!
+    end
+  end
+
+  def self.down
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions -= ['manage_environment_licenses']
+      role.save!
+    end
+  end
+end
@@ -0,0 +1,17 @@
+class AddManageEnvironmentTemplatesToAdminRole < ActiveRecord::Migration
+  def self.up
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions << 'manage_environment_templates'
+      role.save!
+    end
+  end
+
+  def self.down
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions -= ['manage_environment_templates']
+      role.save!
+    end
+  end
+end
@@ -0,0 +1,27 @@
+class CreateDefaultLicenses < ActiveRecord::Migration
+  def self.up
+    Environment.all.each do |environment|
+      License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nd)', :url => 'http://creativecommons.org/licenses/by-nd/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-sa)', :url => 'http://creativecommons.org/licenses/by-sa/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nc)', :url => 'http://creativecommons.org/licenses/by-nc/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nc-nd)', :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nc-sa)', :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'Free Art', :url => 'http://artlibre.org/licence/lal/en', :environment => environment)
+      License.create!(:name => 'GNU FDL', :url => 'http://www.gnu.org/licenses/fdl-1.3.txt', :environment => environment)
+    end
+  end
+
+  def self.down
+    licenses = []
+    licenses += License.find(:all, :conditions => {:name => 'CC (by)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nd)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-sa)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc-nd)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc-sa)'})
+    licenses += License.find(:all, :conditions => {:name => 'Free Art'})
+    licenses += License.find(:all, :conditions => {:name => 'GNU FDL'})
+    licenses.compact.map(&:destroy)
+  end
+end
@@ -0,0 +1,9 @@
+class SetActivationCodeToNilIfAlreadyActivated < ActiveRecord::Migration
+  def self.up
+    update("UPDATE users SET activation_code = null WHERE activated_at IS NOT NULL")
+  end
+
+  def self.down
+    say('Can not be reverted.')
+  end
+end
@@ -0,0 +1,14 @@
+class RemoveActionTrackerWithTargetNil < ActiveRecord::Migration
+  def self.up
+    select_all("SELECT id FROM action_tracker").each do |tracker|
+      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      if activity && activity.target.nil?
+        activity.destroy
+      end
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20120411132751) do
+ActiveRecord::Schema.define(:version => 20120818030329) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -85,6 +85,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
+    t.integer  "license_id"
   end
  
   create_table "articles", :force => true do |t|
@@ -125,6 +126,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
+    t.integer  "license_id"
   end
  
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
@@ -314,6 +316,13 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
   add_index "inputs", ["product_category_id"], :name => "index_inputs_on_product_category_id"
   add_index "inputs", ["product_id"], :name => "index_inputs_on_product_id"
  
+  create_table "licenses", :force => true do |t|
+    t.string  "name",           :null => false
+    t.string  "slug",           :null => false
+    t.string  "url"
+    t.integer "environment_id", :null => false
+  end
+
   create_table "mailing_sents", :force => true do |t|
     t.integer  "mailing_id"
     t.integer  "person_id"
@@ -425,6 +434,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.boolean  "validated",                          :default => true
     t.string   "cnpj"
     t.string   "national_region_code"
+    t.boolean  "is_template",                        :default => false
+    t.integer  "template_id"
   end
  
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+noosfero (0.38.2) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Wed, 05 Sep 2012 10:07:58 -0300
+
+noosfero (0.38.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Sat, 18 Aug 2012 07:49:59 -0300
+
+noosfero (0.38.0) unstable; urgency=low
+
+  * Features version release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Tue, 31 Jul 2012 19:51:43 -0300
+
 noosfero (0.37.0) unstable; urgency=low
  
   * Features version release
@@ -47,11 +47,12 @@ Depends:
  memcached,
  debconf,
  dbconfig-common,
- postgresql,
  adduser,
  exim4 | mail-transport-agent,
  ${misc:Depends}
-Recommends: postgresql-client
+Recommends:
+ postgresql,
+ postgresql-client
 Description: free web-based platform for social networks
  Noosfero is a web platform for social and solidarity economy networks with
  blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
@@ -61,8 +62,7 @@ Description: free web-based platform for social networks
  
 Package: noosfero-apache
 Architecture: all
-Depends: apache2, debconf
-Suggests: noosfero
+Depends: apache2, debconf, noosfero
 Description: free web-based platform for social networks (apache frontend)
  Noosfero is a web platform for social and solidarity economy networks with
  blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
@@ -2,7 +2,7 @@
 pid: tmp/pids/thin.pid
 address: 127.0.0.1
 user: noosfero
-timeout: 30
+timeout: 0
 port: 50000
 log: log/thin.log
 max_conns: 1024
-/var/log/noosfero/*.log /home/noosfero/current/log/*.log {
+/var/log/noosfero/*.log {
         daily
         missingok
         rotate 30
 sub vcl_recv {
+  if (req.request == "GET" || req.request == "HEAD") {
     if (req.http.Cookie) {
-        # We only care about the "_noosfero_session.*" cookie, used for
-        # authentication.
-        if (req.http.Cookie ~ "_noosfero_session.*" ) {
-             return (pass);
-        }
-        # Else strip all cookies
+      # We only care about the "_noosfero_session.*" cookie, used for
+      # authentication.
+      if (req.http.Cookie !~ "_noosfero_session.*" ) {
+        # strip all cookies
         unset req.http.Cookie;
+      }
     }
+  }
 }
  
 sub vcl_error {
 Feature: edit environment templates
   As an administrator
-  I want edit templates
+  I want to edit templates
  
   Background:
     Given that the default environment have all profile templates
@@ -9,37 +9,37 @@ Feature: edit environment templates
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    Then I should see "Edit Person Template" link
-    And I should see "Edit Community Template" link
-    And I should see "Edit Enterprise Template" link
-    And I should see "Edit Inactive Enterprise Template" link
+    Then I should see "Person template" link
+    And I should see "Community template" link
+    And I should see "Enterprise template" link
+    And I should see "Inactive Enterprise template" link
  
   Scenario: Go to control panel of person template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Person Template"
+    And I follow "Person template"
     Then I should be on Person template's control panel
  
   Scenario: Go to control panel of enterprise template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Enterprise Template"
+    And I follow "Enterprise template"
     Then I should be on Enterprise template's control panel
  
   Scenario: Go to control panel of inactive enterprise template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Inactive Enterprise Template"
+    And I follow "Inactive enterprise template"
     Then I should be on Inactive Enterprise template's control panel
  
   Scenario: Go to control panel of community template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Community Template"
+    And I follow "Community template"
     Then I should be on Community template's control panel
  
   Scenario: Not see link to edit an unexistent template
@@ -47,7 +47,7 @@ Feature: edit environment templates
     And I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    Then I should see "Edit Person Template" link
-    And I should see "Edit Community Template" link
-    And I should see "Edit Enterprise Template" link
-    And I should not see "Edit Inactive Enterprise Template" link
+    Then I should see "Person template" link
+    And I should see "Community template" link
+    And I should see "Enterprise template" link
+    And I should not see "Inactive enterprise template" link
@@ -30,16 +30,6 @@ Feature: private profiles
     When I go to shygirl's homepage
     Then I should not see "Add friend"
  
-  Scenario: viewing a private community profile shouldn't show the news if not logged or not a member
-    Given I am on Safernet's homepage
-    Then I should not see "What's new"
-    And I am logged in as "joao"
-    When I am on Safernet's homepage
-    Then I should not see "What's new"
-    And "joao" is a member of "Safernet"
-    When I am on Safernet's homepage
-    Then I should see "What's new"
-
   Scenario: person private profiles should not display sensible information
     Given I am logged in as "joao"
     When I go to shygirl's homepage
@@ -0,0 +1,14 @@
+Then /^I directly delete content with name "([^\"]*)" for testing purposes$/ do |content_name|
+  Article.find_by_name(content_name).destroy
+end
+
+Then /^I should be at the url "([^\"]*)"$/ do |url|
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    URI.parse(response.selenium.get_location).path.should == url
+  else
+    URI.parse(current_url).path.should == url
+  end
+end
+
+Then /^I don't fill anything$/ do
+end
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.37.0'
+  VERSION = '0.38.2'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -256,4 +256,29 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Extends organization list of members
+  # returns = An instance of ActiveRecord::NamedScope::Scope retrieved through
+  # Person.members_of method.
+  def organization_members(organization)
+    nil
+  end
+
+  # -> Extends person permission access
+  # returns = boolean
+  def has_permission?(person, permission, target)
+    nil
+  end
+
+  # -> Adds hidden_fields to the new community view
+  # returns = {key => value}
+  def new_community_hidden_fields
+    nil
+  end
+
+  # -> Adds hidden_fields to the enterprise registration view
+  # returns = {key => value}
+  def enterprise_registration_hidden_fields
+    nil
+  end
+
 end
@@ -0,0 +1,44 @@
+module ActsAsHavingHotspots
+  module ClassMethods
+    # Adding this feature to a class demands that it defines an instance method
+    # 'environment' that returns the environment associated with the instance.
+    def acts_as_having_hotspots
+      send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+      # Dispatches +event+ to each enabled plugin and collect the results.
+      #
+      # Returns an Array containing the objects returned by the event method in
+      # each plugin. This array is compacted (i.e. nils are removed) and flattened
+      # (i.e. elements of arrays are added to the resulting array). For example, if
+      # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
+      # return [1,0,1,2,3]
+      #
+      def dispatch(event, *args)
+        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact.flatten
+      end
+
+      # Dispatch without flatten since scopes are executed if you run flatten on them
+      def dispatch_scopes(event, *args)
+        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact
+      end
+
+      def enabled_plugins
+        Thread.current[:enabled_plugins] ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
+          plugin = plugin_name.constantize.new
+          plugin.context = context
+          plugin
+        end
+      end
+
+      if !method_defined?(:context)
+        define_method(:context) do
+          Noosfero::Plugin::Context.new
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:extend, ActsAsHavingHotspots::ClassMethods)
@@ -2,7 +2,7 @@
 # controller that can be accessed by plugins
 class Noosfero::Plugin::Context
  
-  def initialize(controller)
+  def initialize(controller = ApplicationController.new)
     @controller = controller
   end
  
 class Noosfero::Plugin::Manager
  
-  attr_reader :context
+  extend ActsAsHavingHotspots::ClassMethods
+  acts_as_having_hotspots
  
-  def initialize(controller)
-    @context = Noosfero::Plugin::Context.new(controller)
-  end
+  attr_reader :context
  
+  delegate :environment, :to => :context
   delegate :each, :to => :enabled_plugins
   include Enumerable
  
-  # Dispatches +event+ to each enabled plugin and collect the results.
-  #
-  # Returns an Array containing the objects returned by the event method in
-  # each plugin. This array is compacted (i.e. nils are removed) and flattened
-  # (i.e. elements of arrays are added to the resulting array). For example, if
-  # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
-  # return [1,0,1,2,3]
-  #
-  def dispatch(event, *args)
-    map { |plugin| plugin.send(event, *args) }.compact.flatten
-  end
-
-  def enabled_plugins
-    @enabled_plugins ||= (Noosfero::Plugin.all & context.environment.enabled_plugins).map do |plugin|
-      p = plugin.constantize.new
-      p.context = context
-      p
+  def initialize(controller)
+    @context = Noosfero::Plugin::Context.new(controller)
+    Thread.current[:enabled_plugins] = (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
+      plugin = plugin_name.constantize.new
+      plugin.context = context
+      plugin
     end
   end
...	...	@@ -22,6 +22,7 @@ Diego Araújo <diegoamc90@gmail.com>
22	22	Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
23	23	Fernanda Lopes <nanda.listas+psl@gmail.com>
24	24	Grazieno Pellegrino <grazieno@gmail.com>
	25	+Isaac Canan <isaac@intelletto.com.br>
25	26	Italo Valcy <italo@dcc.ufba.br>
26	27	João da Silva <jaodsilv@linux.ime.usp.br>
27	28	João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
...	...
...	...	@@ -15,6 +15,10 @@ Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
15	15	should, unless Debian already released Squeeze by now), make sure you install
16	16	varnish from the lenny-backports suite.
17	17
	18	+Install the RPAF apache module (or skip this step if not using apache):
	19	+
	20	+ # apt-get install libapache2-mod-rpaf
	21	+
18	22	3) Enable varnish logging:
19	23
20	24	3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
...	...
...	...	@@ -0,0 +1,50 @@
	1	+class LicensesController < AdminController
	2	+ protect 'manage_environment_licenses', :environment
	3	+
	4	+ def index
	5	+ @licenses = environment.licenses
	6	+ end
	7	+
	8	+ def create
	9	+ @license = License.new(params[:license])
	10	+ if request.post?
	11	+ begin
	12	+ @license.environment = environment
	13	+ @license.save!
	14	+ session[:notice] = _('License created')
	15	+ redirect_to :action => 'index'
	16	+ rescue
	17	+ session[:notice] = _('License could not be created')
	18	+ end
	19	+ end
	20	+ end
	21	+
	22	+ def edit
	23	+ @license = environment.licenses.find(params[:license_id])
	24	+ if request.post?
	25	+ begin
	26	+ @license.update_attributes!(params[:license])
	27	+ session[:notice] = _('License updated')
	28	+ redirect_to :action => 'index'
	29	+ rescue
	30	+ session[:notice] = _('License could not be updated')
	31	+ end
	32	+ end
	33	+ end
	34	+
	35	+ def remove
	36	+ @license = environment.licenses.find(params[:license_id])
	37	+ if request.post?
	38	+ begin
	39	+ @license.destroy
	40	+ session[:notice] = _('License removed')
	41	+ rescue
	42	+ session[:notice] = _('License could not be removed')
	43	+ end
	44	+ else
	45	+ session[:notice] = _('License could not be removed')
	46	+ end
	47	+ redirect_to :action => 'index'
	48	+ end
	49	+
	50	+end
...	...
...	...	@@ -0,0 +1,52 @@
	1	+class TemplatesController < AdminController
	2	+ protect 'manage_environment_templates', :environment
	3	+
	4	+ def create_person_template
	5	+ if request.post?
	6	+ begin
	7	+ identifier = params[:name].to_slug
	8	+ password = Digest::MD5.hexdigest(rand.to_s)
	9	+ template = User.new(:login => identifier, :email => identifier+'@templates.noo', :password => password, :password_confirmation => password, :person_data => {:name => params[:name], :is_template => true})
	10	+ template.save!
	11	+ session[:notice] = _('New template created')
	12	+ redirect_to :action => 'index'
	13	+ rescue
	14	+ @error = _('Name has already been taken')
	15	+ end
	16	+ end
	17	+ end
	18	+
	19	+ def create_community_template
	20	+ if request.post?
	21	+ begin
	22	+ create_organization_template(Community)
	23	+ session[:notice] = _('New template created')
	24	+ redirect_to :action => 'index'
	25	+ rescue
	26	+ @error = _('Name has already been taken')
	27	+ end
	28	+ end
	29	+ end
	30	+
	31	+ def create_enterprise_template
	32	+ if request.post?
	33	+ begin
	34	+ create_organization_template(Enterprise)
	35	+ session[:notice] = _('New template created')
	36	+ redirect_to :action => 'index'
	37	+ rescue
	38	+ @error = _('Name has already been taken')
	39	+ end
	40	+ end
	41	+ end
	42	+
	43	+ private
	44	+
	45	+ def create_organization_template(klass)
	46	+ identifier = params[:name].to_slug
	47	+ template = klass.new(:name => params[:name], :identifier => identifier, :is_template => true)
	48	+ template.save!
	49	+ end
	50	+
	51	+end
	52	+
...	...
1	1	class ApplicationController < ActionController::Base
2	2
3	3	before_filter :setup_multitenancy
	4	+ before_filter :detect_stuff_by_domain
	5	+ before_filter :init_noosfero_plugins
4	6
5	7	include ApplicationHelper
6	8	layout :get_layout
...	...	@@ -51,8 +53,6 @@ class ApplicationController < ActionController::Base
51	53
52	54	include NeedsProfile
53	55
54		- before_filter :detect_stuff_by_domain
55		- before_filter :init_noosfero_plugins
56	56	attr_reader :environment
57	57
58	58	before_filter :load_terminology
...	...
...	...	@@ -19,7 +19,7 @@ class ContentViewerController < ApplicationController
19	19	unless @page
20	20	page_from_old_path = profile.articles.find_by_old_path(path)
21	21	if page_from_old_path
22		- redirect_to :profile => profile.identifier, :page => page_from_old_path.explode_path
	22	+ redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
23	23	return
24	24	end
25	25	end
...	...	@@ -99,6 +99,14 @@ class ContentViewerController < ApplicationController
99	99	@images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
100	100	end
101	101
	102	+ @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
	103	+ if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
	104	+ @page.followers -= [params[:email]]
	105	+ if @page.save
	106	+ session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
	107	+ end
	108	+ end
	109	+
102	110	@comments = @page.comments(true).as_thread
103	111	@comments_count = @page.comments.count
104	112	if params[:slideshow]
...	...
...	...	@@ -4,10 +4,17 @@ class SearchController < PublicController
4	4	include SearchHelper
5	5	include ActionView::Helpers::NumberHelper
6	6
	7	+ before_filter :redirect_asset_param, :except => [:facets_browse, :assets]
7	8	before_filter :load_category
8	9	before_filter :load_search_assets
9	10	before_filter :load_query
10	11
	12	+ # Backwards compatibility with old URLs
	13	+ def redirect_asset_param
	14	+ return unless params.has_key?(:asset)
	15	+ redirect_to params.merge(:action => params.delete(:asset))
	16	+ end
	17	+
11	18	no_design_blocks
12	19
13	20	def facets_browse
...	...	@@ -243,17 +250,16 @@ class SearchController < PublicController
243	250	@searching = {}
244	251	@titles = {}
245	252	@enabled_searches.each do \|key, name\|
246		- @titles[key] = name
	253	+ @titles[key] = _(name)
247	254	@searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s
248	255	end
249	256	@names = @titles if @names.nil?
250	257	end
251	258
252	259	def limit
253		- searching = @searching.values.select{ \|v\| v }
254		- if params[:display] == 'map'
	260	+ if map_search?
255	261	MAP_SEARCH_LIMIT
256		- elsif searching.size <= 1
	262	+ elsif !multiple_search?
257	263	if [:people, :communities].include? @asset
258	264	BLOCKS_SEARCH_LIMIT
259	265	elsif @asset == :enterprises and @empty_query
...	...	@@ -267,31 +273,34 @@ class SearchController < PublicController
267	273	end
268	274
269	275	def paginate_options(page = params[:page])
	276	+ page = 1 if multiple_search? or params[:display] == 'map'
270	277	{ :per_page => limit, :page => page }
271	278	end
272	279
273	280	def full_text_search(filters = [], options = {})
274	281	paginate_options = paginate_options(params[:page])
275	282	asset_class = asset_class(@asset)
276		-
277	283	solr_options = options
278		- if !@results_only and asset_class.respond_to? :facets
279		- solr_options.merge! asset_class.facets_find_options(params[:facet])
280		- solr_options[:all_facets] = true
281		- solr_options[:limit] = 0 if @facets_only
282		- end
283		- solr_options[:filter_queries] \|\|= []
284		- solr_options[:filter_queries] += filters
285		- solr_options[:filter_queries] << "environment_id:#{environment.id}"
286		- solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
287		-
288		- solr_options[:boost_functions] \|\|= []
289		- params[:order_by] = nil if params[:order_by] == 'none'
290		- if params[:order_by]
291		- order = SortOptions[@asset][params[:order_by].to_sym]
292		- raise "Unknown order by" if order.nil?
293		- order[:solr_opts].each do \|opt, value\|
294		- solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
	284	+ pg_options = paginate_options(params[:page])
	285	+
	286	+ if !multiple_search?
	287	+ if !@results_only and asset_class.respond_to? :facets
	288	+ solr_options.merge! asset_class.facets_find_options(params[:facet])
	289	+ solr_options[:all_facets] = true
	290	+ end
	291	+ solr_options[:filter_queries] \|\|= []
	292	+ solr_options[:filter_queries] += filters
	293	+ solr_options[:filter_queries] << "environment_id:#{environment.id}"
	294	+ solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
	295	+
	296	+ solr_options[:boost_functions] \|\|= []
	297	+ params[:order_by] = nil if params[:order_by] == 'none'
	298	+ if params[:order_by]
	299	+ order = SortOptions[@asset][params[:order_by].to_sym]
	300	+ raise "Unknown order by" if order.nil?
	301	+ order[:solr_opts].each do \|opt, value\|
	302	+ solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
	303	+ end
295	304	end
296	305	end
297	306
...	...
...	...	@@ -10,6 +10,8 @@ module ApplicationHelper
10	10
11	11	include ThickboxHelper
12	12
	13	+ include ColorboxHelper
	14	+
13	15	include BoxesHelper
14	16
15	17	include FormsHelper
...	...	@@ -1076,24 +1078,24 @@ module ApplicationHelper
1076	1078
1077	1079	def search_contents_menu
1078	1080	links = [
1079		- {s_('contents\|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
1080		- {s_('contents\|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
1081		- {s_('contents\|Most Commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
	1081	+ {s_('contents\|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
	1082	+ {s_('contents\|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
	1083	+ {s_('contents\|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
1082	1084	]
1083	1085	if logged_in?
1084		- links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
	1086	+ links.push(_('New content') => colorbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
1085	1087	end
1086	1088
1087	1089	link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
1088		- link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
	1090	+ link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
1089	1091	end
1090	1092	alias :browse_contents_menu :search_contents_menu
1091	1093
1092	1094	def search_people_menu
1093	1095	links = [
1094		- {s_('people\|More Recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
1095		- {s_('people\|More Active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
1096		- {s_('people\|More Popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
	1096	+ {s_('people\|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
	1097	+ {s_('people\|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
	1098	+ {s_('people\|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
1097	1099	]
1098	1100	if logged_in?
1099	1101	links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
...	...	@@ -1101,15 +1103,15 @@ module ApplicationHelper
1101	1103	end
1102	1104
1103	1105	link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
1104		- link_to(content_tag(:span, _('People Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
	1106	+ link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
1105	1107	end
1106	1108	alias :browse_people_menu :search_people_menu
1107	1109
1108	1110	def search_communities_menu
1109	1111	links = [
1110		- {s_('communities\|More Recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
1111		- {s_('communities\|More Active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
1112		- {s_('communities\|More Popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
	1112	+ {s_('communities\|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
	1113	+ {s_('communities\|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
	1114	+ {s_('communities\|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
1113	1115	]
1114	1116	if logged_in?
1115	1117	links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
...	...	@@ -1117,7 +1119,7 @@ module ApplicationHelper
1117	1119	end
1118	1120
1119	1121	link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
1120		- link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
	1122	+ link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1121	1123	end
1122	1124	alias :browse_communities_menu :search_communities_menu
1123	1125
...	...	@@ -1170,6 +1172,10 @@ module ApplicationHelper
1170	1172	], :class => 'limited-text-area')
1171	1173	end
1172	1174
	1175	+ def expandable_text_area(object_name, method, text_area_id, options = {})
	1176	+ text_area(object_name, method, { :id => text_area_id, :onkeyup => "grow_text_area('#{text_area_id}')" }.merge(options))
	1177	+ end
	1178	+
1173	1179	def pluralize_without_count(count, singular, plural = nil)
1174	1180	count == 1 ? singular : (plural \|\| singular.pluralize)
1175	1181	end
...	...	@@ -1318,4 +1324,70 @@ module ApplicationHelper
1318	1324	_("Are you sure that you want to remove the item \"#{article.name}\"?")
1319	1325	end
1320	1326	end
	1327	+
	1328	+ def template_options(klass, field_name)
	1329	+ return '' if klass.templates.count == 0
	1330	+ return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
	1331	+
	1332	+ counter = 0
	1333	+ radios = klass.templates.map do \|template\|
	1334	+ counter += 1
	1335	+ content_tag('li', labelled_radio_button(template.name, "#{field_name}[template_id]", template.id, counter==1))
	1336	+ end.join("\n")
	1337	+
	1338	+ content_tag('div', content_tag('span', _('Template:')) +
	1339	+ content_tag('ul', radios, :style => 'list-style: none; padding-left: 0; margin-top: 0.5em;'),
	1340	+ :id => 'template-options',
	1341	+ :style => 'margin-top: 1em'
	1342	+ )
	1343	+ end
	1344	+
	1345	+ def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
	1346	+ options[:min_chars] \|\|= 3
	1347	+ options[:hint_text] \|\|= _("Type in a search term")
	1348	+ options[:no_results_text] \|\|= _("No results")
	1349	+ options[:searching_text] \|\|= _("Searching...")
	1350	+ options[:search_delay] \|\|= 1000
	1351	+ options[:prevent_duplicates] \|\|= true
	1352	+ options[:backspace_delete_item] \|\|= false
	1353	+ options[:focus] \|\|= false
	1354	+ options[:avoid_enter] \|\|= true
	1355	+ options[:on_result] \|\|= 'null'
	1356	+ options[:on_add] \|\|= 'null'
	1357	+ options[:on_delete] \|\|= 'null'
	1358	+ options[:on_ready] \|\|= 'null'
	1359	+
	1360	+ result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
	1361	+ result +=
	1362	+ "
	1363	+ <script type='text/javascript'>
	1364	+ jQuery('##{element_id}')
	1365	+ .tokenInput('#{url_for(search_action)}', {
	1366	+ minChars: #{options[:min_chars].to_json},
	1367	+ prePopulate: #{options[:pre_populate].to_json},
	1368	+ hintText: #{options[:hint_text].to_json},
	1369	+ noResultsText: #{options[:no_results_text].to_json},
	1370	+ searchingText: #{options[:searching_text].to_json},
	1371	+ searchDelay: #{options[:serach_delay].to_json},
	1372	+ preventDuplicates: #{options[:prevent_duplicates].to_json},
	1373	+ backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
	1374	+ queryParam: #{name.to_json},
	1375	+ tokenLimit: #{options[:token_limit].to_json},
	1376	+ onResult: #{options[:on_result]},
	1377	+ onAdd: #{options[:on_add]},
	1378	+ onDelete: #{options[:on_delete]},
	1379	+ onReady: #{options[:on_ready]},
	1380	+ })
	1381	+ "
	1382	+ result += options[:focus] ? ".focus();" : ";"
	1383	+ if options[:avoid_enter]
	1384	+ result += "jQuery('#token-input-#{element_id}')
	1385	+ .live('keydown', function(event){
	1386	+ if(event.keyCode == '13') return false;
	1387	+ });"
	1388	+ end
	1389	+ result += "</script>"
	1390	+ result
	1391	+ end
	1392	+
1321	1393	end
...	...
...	...	@@ -0,0 +1,21 @@
	1	+module ColorboxHelper
	2	+
	3	+ def colorbox_close_button(text, options = {})
	4	+ button(:close, text, '#', colorbox_options(options, :close))
	5	+ end
	6	+
	7	+ def colorbox_button(type, label, url, options = {})
	8	+ button(type, label, url, colorbox_options(options))
	9	+ end
	10	+
	11	+ # options must be an HTML options hash as passed to link_to etc.
	12	+ #
	13	+ # returns a new hash with colorbox class added. Keeps existing classes.
	14	+ def colorbox_options(options, type=nil)
	15	+ the_class = 'colorbox'
	16	+ the_class += "-#{type.to_s}" unless type.nil?
	17	+ the_class << " #{options[:class]}" if options.has_key?(:class)
	18	+ options.merge(:class => the_class)
	19	+ end
	20	+
	21	+end
...	...
...	...	@@ -18,7 +18,7 @@ module SearchHelper
18	18
19	19	SortOptions = {
20	20	:products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
21		- :more_recent, {:label => _('More Recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
	21	+ :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
22	22	:name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
23	23	:closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
24	24	:solr_opts => {:sort => "geodist() asc",
...	...	@@ -45,6 +45,14 @@ module SearchHelper
45	45	# FIXME remove it after search_controler refactored
46	46	include EventsHelper
47	47
	48	+ def multiple_search?
	49	+ ['index', 'category_index'].include?(params[:action]) or @results.size > 1
	50	+ end
	51	+
	52	+ def map_search?
	53	+ !@query.blank? and !multiple_search? and params[:display] == 'map'
	54	+ end
	55	+
48	56	def search_page_title(title, category = nil)
49	57	title = "<h1>" + title
50	58	title += '<small>' + category.name + '</small>' if category
...	...	@@ -58,8 +66,8 @@ module SearchHelper
58	66	:align => 'center', :class => 'search-category-context') if category
59	67	end
60	68
61		- def display_results(use_map = false)
62		- if params[:display] == 'map' && use_map
	69	+ def display_results(map_capable = false)
	70	+ if map_capable and map_search?
63	71	partial = 'google_maps'
64	72	klass = 'map'
65	73	else
...	...