Merge branch 'master' into tolerance-time

Conflicts: app/helpers/application_helper.rb app/views/content_viewer/_article_toolbar.rhtml test/functional/content_viewer_controller_test.rb

Merge branch 'master' into tolerance-time
Conflicts: app/helpers/application_helper.rb app/views/content_viewer/_article_toolbar.rhtml test/functional/content_viewer_controller_test.rb
Rodrigo Souto
2 parents 718c0f56 a1ac0fb5
Showing 289 changed files with 12957 additions and 8050 deletions Show diff stats
AUTHORS
app/controllers/admin/licenses_controller.rb
app/controllers/admin/templates_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
app/models/person.rb
app/models/price_detail.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>
@@ -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
+
@@ -101,6 +101,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]
@@ -243,7 +243,7 @@ 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?
@@ -10,6 +10,8 @@ module ApplicationHelper
   include ThickboxHelper
+  include ColorboxHelper
+
   include BoxesHelper
   include FormsHelper
@@ -1087,24 +1089,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'})})
@@ -1112,15 +1114,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'})})
@@ -1128,7 +1130,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
@@ -1181,6 +1183,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
@@ -1342,4 +1348,21 @@ module ApplicationHelper
   def remove_content_button(action)
     @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
   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
 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",
@@ -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|
@@ -77,11 +77,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
@@ -140,6 +159,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
@@ -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
@@ -285,7 +285,7 @@ class Person &lt; Profile
     end
   end
-  def template
+  def default_template
     environment.person_template
   end
@@ -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
@@ -65,6 +65,7 @@ class Profile &lt; ActiveRecord::Base
   #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)
@@ -98,6 +99,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 +206,7 @@ class Profile &lt; ActiveRecord::Base
   end
   belongs_to :region
-  
+
   def location(separator = ' - ')
     myregion = self.region
     if myregion
@@ -274,8 +276,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 +293,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 +330,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 +418,7 @@ class Profile &lt; ActiveRecord::Base
   # returns +false+
   def person?
-    self.kind_of?(Person) 
+    self.kind_of?(Person)
   end
   def enterprise?
@@ -513,7 +526,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 +596,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 +893,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 +922,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 +942,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)
@@ -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 %>
@@ -34,7 +34,7 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
-      <%= 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,8 @@
       <%= hidden_field_tag  'create_enterprise[target_id]', environment.id %>
     <% 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 %>
@@ -38,6 +38,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') %>
@@ -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" %>
@@ -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 %>
@@ -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.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
@@ -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
 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.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
-KALIBRO PLUGIN AUTHORS
-=====================
+Mezuro Authors
+==============
-Copyright 2010-2011
-        Almir Alves Pereira (almir.sne at gmail.com)
-        Andre Casimiro (ah.casimiro at gmail.com)
-        Carlos Morais (carlos88morais at gmail.com)
-        Everton Santos (everton2x4 at gmail.com)
-        Paulo Meirelles (paulo at softwarelivre.org)
-        Rafael Messias (rmmartins at gmail.com)
+Copyright 2010-2012
+-------------------
-Collaborators:
-- Ana Paula Oliveira dos Santos (ana at ime.usp.br)
-- Lucianna Almeida (lucianna.th at gmail.com)
-- Joao Machini (joao.machini at gmail.com)
-- Rodrigo Souto (rodrigo@colivre.coop.br)
-- Thiago Colucci (ticolucci at gmail.com)
-- Vinicius Daros (vinicius.k.daros at gmail.com)
-- Viviane Almeida Santos (viviane.almeida at gmail.com)
+ Almir Alves Pereira (almir.sne at gmail.com)
+ Alessandro Palmeira (alessandro.palmeira at gmail.com)
+ Andre Casimiro (ah.casimiro at gmail.com)
+ Antonio Terceiro (terceiro at colivre.coop.br)
+ Caio Salgado (caio.csalgado at gmail.com)
+ Carlos Morais (carlos88morais at gmail.com)
+ Diego Araújo (diegoamc90 at gmail.com)
+ Everton Santos (everton2x4 at gmail.com)
+ Jefferson Fernandes (jeffs.fernandes at gmail.com) 
+ Joao Machini (joao.machini at gmail.com)
+ João da Silva (jaodsilv@linux.ime.usp.br)
+ Paulo Meirelles (paulo at softwarelivre.org)
+ Rafael Manso (rr.manzo at gmail.com)
+ Rafael Messias (rmmartins at gmail.com)
+ Renan Teruo (renanteruoc at gmail.com)
+ Rodrigo Souto (rodrigo at colivre.coop.br)
+
+Collaborators (from USP Lab XP course 2010 on another code)
+-----------------------------------------------------------
+
+ Ana Paula Oliveira dos Santos (anapaulao.santos at gmail.com)
+ Lucianna Almeida (lucianna.th at gmail.com)
+ Thiago Colucci (ticolucci at gmail.com)
+ Vinicius Daros (vinicius.k.daros at gmail.com)
+ Viviane Almeida Santos (viviane.almeida at gmail.com)
+
+Advisors
+--------
+
+ Fabio Kon (fabio.kon at ime.usp.br)
+ Alfredo Goldman (gold at ime.usp.br)
-README - Mezuro (Kalibro Plugin)
+README - Mezuro (Mezuro Plugin)
 ================================
-Mezuro is source code tracking network based on Noosfero Platform with Kalibro Plugin to access Kalibro Web Service.
+Mezuro is a source code tracking platform based on Noosfero social networking
+platform with Mezuro Plugin actived to access Kalibro Web Service.
+
 INSTALL
 =======
-See the Noosfero install file and include Ruby gem Savon:
+Dependences
+-----------
+
+See the Noosfero install file. After install Noosfero, install Mezuro dependences:
-gem install savon
+$ gem install nokogiri -v 1.5.0
+$ gem install savon -v 0.9.7
+$ gem install googlecharts
-Also, you need to enable Mezuro Plugin in the Noosfero:
+Enable Plugin
+-------------
+
+Also, you need to enable Mezuro Plugin at you Noosfero:
 cd <your_noosfero_dir>
 ./script/noosfero-plugins enable mezuro
-To run Mezuro (kalibro Plugin) and its acceptance tests, you need to install the Kalibro Service. 
+
+Install Service
+---------------
+
+To run Mezuro (Noosfero with Mezuro Plugin), you need to install the Kalibro
+Service. 
+
 For that, access https://gitorious.org/kalibro/kalibro/blobs/master/INSTALL
-SOURCE CODE
+Configure Service Address
+-------------------------
+
+Finally, copy service.yaml.example to service.yaml and define your Kalibro
+Service address:
+
+$ cd <your_noosfero_dir>/plugin/mezuro
+$ cp service.yaml.example service.yaml
+
+If you install Kalibro Service at localhost, just keep the default
+adress:
+
+http://localhost:8080/KalibroService/
+
+Applying Mezuro Theme
+---------------------
+
+$ cd public/designs/themes && rm -f default
+$ git clone git://gitorious.org/mezuro/mezuro-theme.git
+$ ln -s mezuro-theme/ default && cd ../../../
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Mezuro Plugin" check-box
+
+
+DEVELOPMENT
 ===========
-To get the Mezuro (Noosfero with Kalibro Plugin) development repository:
+Get the Mezuro (Noosfero with Mezuro Plugin) development repository:
-git clone https://gitorious.org/+mezuro/noosfero/mezuro-noosfero-plugin
-cd mezuro-noosfero-plugin
-git checkout mezuro
+$ git clone https://gitorious.org/+mezuro/noosfero/mezuro
+$ cd mezuro
+$ git checkout mezuro
-AUTHORS
-=======
+Running Mezuro tests
+--------------------
-Please see the file AUTHORS.
+$ rake test:noosfero_plugins:mezuro
-BUGS
-====
-If you found any bug, please report at mezuro@listas.softwarelivre.org
-(http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/mezuro)
+Get Involved
+============
+
+If you found any bug and/or want to collaborate, please send an e-mail to
+paulo@softwarelivre.org
+
 LICENSE
 =======
-Copyright (c) The Authors developers.
+
+Copyright (c) The Author developers.
 See Noosfero license.
+AUTHORS
+=======
+
+Please, see the Mezuro AUTHORS file.
+
+
 ACKNOWLEDGMENTS
 ===============
 The authors have been supported by organizations:
+University of São Paulo (USP)
+FLOSS Competence Center
+http://ccsl.ime.usp.br
+
 Brazilian National Research Council (CNPQ)
 http://www.cnpq.br/
-
-USP FLOSS Competence Center
-http://ccsl.ime.usp.br/
@@ -0,0 +1,73 @@
+README/TODO do branch cucumber_tests
+
+Tarefas:
+- Escrever uma história (procurar uma já escrita) para isso
+- Descobrir o porquê dos erros nos testes do mezuro (repository_url)
+- Dar rebase com o mezuro-dev (os tais testes passam no mezuro-dev)
+- Fazer mais testes
+- Ver como/quando o selenium pode ser integrado ao projeto (conversar com noosfero/ talvez até tentar implementar alguma coisa??)
+
+
+Testes de aceitação a serem feitos: (* já feito)
+
+Projetos:
+  Criar
+    * correto
+    * errado
+    duplicado
+  Editar
+    correto
+    errado
+  Deletar(não precisa fazer - problema do noosfero)
+
+Configurações:
+  criar
+    *correta
+    *errado (sem titulo)
+    *duplicada
+  editar - verificar se mantem as metricas
+    correto
+    não é possível mudar o titulo
+  deletar (não precisa fazer - problema do noosfero)
+  metricas:
+    criar
+      nativa:
+        *correta
+        *errada
+        duplicada (é pra funcionar?)
+      composta:
+        *correta
+        errada
+        duplicada
+    editar
+      para metrica correta
+      para metrica errada
+    *deletar
+    ranges:
+      criar
+        *range correto
+        range errado
+          todos os casos
+      editar
+        para range correto
+        para range errado
+      deletar
+      
+Testes falhando:
+
+Arquivo adding_metric_configuration.feature:
+  Scenario: adding a native metric configuration without code
+    Precisa do selenium para ver em qual página está.
+  Scenario: adding a compound metric configuration
+  Scenario: adding a compound metric configuration with invalid script
+    As métricas compostas não estão salvando direito.
+  
+
+Arquivo creating_project.feature:
+  Scenario: I create a Kalibro project with valid attributes
+    ás vezes falha por erro de já existir na Kalibro. Esse erro teóricamente já havia sido resolvido. 
+
+
+Arquivo adding_ranges.feature:
+  Scenario: adding a range to a metric configuration
+    Precisa do selenium para esperar a página carregar.
@@ -0,0 +1,126 @@
+class MezuroPluginMyprofileController < ProfileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+ 
+  def choose_base_tool
+    @configuration_content = profile.articles.find(params[:id])
+    @base_tools = Kalibro::BaseTool.all_names
+  end
+
+  def choose_metric
+    @configuration_content = profile.articles.find(params[:id])
+    @base_tool = params[:base_tool]
+    @supported_metrics = Kalibro::BaseTool.find_by_name(@base_tool).supported_metrics
+  end
+  
+  def new_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric = Kalibro::BaseTool.find_by_name(params[:base_tool]).metric params[:metric_name]
+  end
+  
+  def new_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configurations = @configuration_content.metric_configurations
+  end
+  
+  def edit_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
+    @metric = @metric_configuration.metric
+  end
+
+  def edit_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
+    @metric_configurations = @configuration_content.metric_configurations
+    @metric = @metric_configuration.metric
+  end
+  
+  def create_metric_configuration
+    id = params[:id]
+    metric_name = params[:metric_configuration][:metric][:name]
+    (Kalibro::MetricConfiguration.new(params[:metric_configuration])).save
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+  end
+  
+  def create_compound_metric_configuration
+    id = params[:id]
+    metric_name = params[:metric_configuration][:metric][:name]
+    Kalibro::MetricConfiguration.new(params[:metric_configuration]).save
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+  end
+
+  def update_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
+    metric_configuration.update_attributes params[:metric_configuration]
+    redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+  end
+
+  def update_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
+    metric_configuration.update_attributes params[:metric_configuration]
+    redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+  end
+
+  def remove_metric_configuration
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    metric_configuration.destroy
+    redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+  end
+  
+  def new_range
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_name = params[:metric_name]
+    @range = Kalibro::Range.new
+  end
+  
+  def edit_range
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_name = params[:metric_name]
+    @beginning_id = params[:beginning_id]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name)
+    @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" }
+  end
+
+  def create_range
+    @configuration_content = profile.articles.find(params[:id])
+    @range = Kalibro::Range.new params[:range]
+    metric_name = params[:metric_name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)   
+    metric_configuration.add_range(@range)
+    metric_configuration.save
+  end
+  
+  def update_range
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    beginning_id = params[:beginning_id]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
+    metric_configuration.ranges[index] = Kalibro::Range.new params[:range]
+    metric_configuration.save
+  end
+  
+  def remove_range
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    beginning_id = params[:beginning_id]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
+    metric_configuration.save
+    formatted_metric_name = metric_name.gsub(/\s/, '+')
+    if metric_configuration.metric.class == Kalibro::CompoundMetric
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+    else
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+    end
+  end
+
+end
 class MezuroPluginProfileController < ProfileController
-  def metrics
-    project_content = profile.articles.find(params[:id])
-    module_name = params[:module_name]
-    render :partial => 'content_viewer/module_result', :locals => { :module_result => project_content.module_result(module_name) }
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  
+  def project_state
+    @content = profile.articles.find(params[:id])
+    project = @content.project
+    state = project.error.nil? ? project.state : "ERROR"
+    render :text => state
   end
+  def project_error
+    @content = profile.articles.find(params[:id])
+    @project = @content.project
+    render :partial => 'content_viewer/project_error'
+  end
+
+  def project_result
+    @content = profile.articles.find(params[:id])
+    date = params[:date]
+    @project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
+    render :partial => 'content_viewer/project_result'
+  end 	
+
+  def module_result
+    @content = profile.articles.find(params[:id])
+    @module_result = @content.module_result(params)
+    render :partial => 'content_viewer/module_result'
+  end
+
+  def project_tree
+    @content = profile.articles.find(params[:id])
+    date = params[:date]
+    project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
+    @project_name = @content.project.name
+    @source_tree = project_result.node_of(params[:module_name])
+    render :partial =>'content_viewer/source_tree'
+  end
+
+  def module_metrics_history
+    metric_name = params[:metric_name]
+    @content = profile.articles.find(params[:id])
+    module_history = @content.result_history(params[:module_name])
+    @score_history = filtering_metric_history(metric_name, module_history)
+    render :partial => 'content_viewer/score_history'
+  end
+
+  def module_grade_history
+    @content = profile.articles.find(params[:id])
+    modules_results = @content.result_history(params[:module_name])
+    @score_history = modules_results.collect { |module_result| module_result.grade }
+    render :partial => 'content_viewer/score_history'
+  end
+  
+  private
+  
+  def filtering_metric_history(metric_name, module_history)
+    metrics_history = module_history.map do |module_result|
+      module_result.metric_results
+    end
+    metric_history =  metrics_history.map do |array_of_metric_result|
+      (array_of_metric_result.select do |metric_result|
+        metric_result.metric.name.delete("() ") == metric_name
+      end).first
+    end
+    metric_history.map do |metric_result|
+      metric_result.value
+    end
+  end
 end
@@ -1,69 +0,0 @@
-Feature: mezuro content
-  As a noosfero user
-  I want to create a Kalibro project
-
-  Background:
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And I am logged in as "joaosilva"
-    And "Mezuro" plugin is enabled
-    And the following community
-      | identifier  | name         |
-      | mycommunity | My Community |
-    And "Joao Silva" is admin of "My Community"
-
-  Scenario: I see Kalibro project as an option to new content
-    Given I am on My Community's cms
-    When I follow "New content"
-    Then I should see "Kalibro project"
-
-  Scenario: I see Kalibro project's input form
-    Given I am on My Community's cms
-    When I follow "New content"
-    And I follow "Kalibro project"
-    Then I should see "Title"
-    And I should see "License"
-    And I should see "Repository type"
-    And I should see "GIT"
-    And I should see "REMOTE_ZIP"
-    And I should see "REMOTE_TARBALL"
-    And I should see "SUBVERSION"
-    And I should see "Repository url"
-    And I should see "Configuration"
-    And I should see "Kalibro for Java"
-
-  Scenario: I create a sample mezuro content
-    Given I am on My Community's cms
-    When I create a content of type "Kalibro project" with the following data
-      | Title           | Sample project          |
-      | License         | BSD                     |
-      | Repository type | GIT                     |
-      | Repository url  | git://example           |
-    Then I should see "Sample project"
-    And I should see "Viewed one time"
-    And I should see "BSD"
-
-  Scenario: I create a real mezuro content
-    Given I am on My Community's cms
-    When I create a content of type "Kalibro project" with the following data
-      | Title           | Qt-Calculator           |
-      | License         | GPL 2.0                 |
-      | Repository type | SUBVERSION              |
-      | Repository url  | https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator |
-    Then I should see "Qt-Calculator"
-
-  Scenario: I see results from a real Kalibro project
-    Given I am on My Community's cms
-    When I create a content of type "Kalibro project" with the following data
-      | Title           | Qt-Calculator           |
-      | License         | GPL                     |
-      | Repository type | SUBVERSION              |
-      | Repository url  | https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator |
-      | Configuration   | Kalibro for Java        |
-   Then I should see "Qt-Calculator"
-   And I should see "GPL"
-   And I should see "SUBVERSION"
-   And I should see "https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator"
-   And I should see "Kalibro for Java"
-   And I should see "Kalibro Service is loading the source code"
@@ -0,0 +1,29 @@
+class Kalibro::BaseTool < Kalibro::Model
+
+  attr_accessor :name, :description, :supported_metric
+
+  def self.all_names
+    request("BaseTool", :get_base_tool_names)[:base_tool_name].to_a
+  end
+
+  def self.find_by_name(base_tool_name)
+    new request("BaseTool", :get_base_tool, {:base_tool_name => base_tool_name})[:base_tool]
+  end
+
+  def supported_metric=(value)
+    @supported_metric = Kalibro::NativeMetric.to_objects_array value
+  end
+
+  def supported_metrics
+    @supported_metric
+  end
+
+  def supported_metrics=(supported_metrics)
+    @supported_metric = supported_metrics
+  end
+
+  def metric(name)
+    supported_metrics.find {|metric| metric.name == name}
+  end
+
+end
@@ -1,16 +0,0 @@
-class Kalibro::Client::BaseToolClient
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('BaseTool')
-  end
-
-  def base_tool_names
-    @port.request(:get_base_tool_names)[:base_tool_name].to_a
-  end
-
-  def base_tool(name)
-    hash = @port.request(:get_base_tool, {:base_tool_name => name})[:base_tool]
-    Kalibro::Entities::BaseTool.from_hash(hash)
-  end
-
-end
 \ No newline at end of file
@@ -1,31 +0,0 @@
-class Kalibro::Client::ConfigurationClient
-
-  def initialize
-    @port = Kalibro::Client::Port.new('Configuration')
-  end
-
-  def save(configuration)
-    @port.request(:save_configuration, {:configuration => configuration.to_hash})
-  end
-
-  def self.save(configuration)
-    new.save(configuration)
-  end
-
-  def configuration_names
-    @port.request(:get_configuration_names)[:configuration_name].to_a
-  end
-
-  def configuration(name)
-    hash = @port.request(:get_configuration, {:configuration_name => name})[:configuration]
-    Kalibro::Entities::Configuration.from_hash(hash)
-  end
-
-  def remove(configuration_name)
-    @port.request(:remove_configuration, {:configuration_name => configuration_name})
-  end
-
-  def self.remove(configuration_name)
-    new.remove(configuration_name)
-  end
-end
@@ -1,19 +0,0 @@
-class Kalibro::Client::KalibroClient
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('Kalibro')
-  end
-
-  def supported_repository_types
-    @port.request(:get_supported_repository_types)[:repository_type].to_a
-  end
-
-  def process_project(project_name)
-    @port.request(:process_project, {:project_name => project_name})
-  end
-
-  def self.process_project(project_name)
-    new.process_project(project_name)
-  end
-
-end
@@ -1,27 +0,0 @@
-class Kalibro::Client::ModuleResultClient
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('ModuleResult')
-  end
-
-  def module_result(project_name, module_name, date)
-    hash = @port.request(:get_module_result,
-      {:project_name => project_name, :module_name => module_name,
-       :date => date_with_milliseconds(date)})[:module_result]
-    Kalibro::Entities::ModuleResult.from_hash(hash)
-  end
-
-  def result_history(project_name, module_name)
-    value = @port.request(:get_result_history,
-      {:project_name => project_name, :module_name => module_name})[:module_result]
-    Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult)
-  end
-
-  private
-
-  def date_with_milliseconds(date)
-    milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
-    date.to_s[0..18] + milliseconds + date.to_s[19..-1]
-  end
-
-end
 \ No newline at end of file
@@ -1,26 +0,0 @@
-require 'savon'
-
-Savon.configure do |config|
-  config.log = HTTPI.log = (RAILS_ENV == 'development')
-end
-
-class Kalibro::Client::Port
-
-  def initialize(endpoint)
-    @client = Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
-  end
-
-  def service_address
-    if @service_address.nil?
-      service_file = "#{RAILS_ROOT}/plugins/mezuro/SERVICE"
-      File.open(service_file).each_line{ | line | @service_address = line }
-    end
-    @service_address
-  end
-
-  def request(action, request_body = nil)
-    response = @client.request(:kalibro, action) { soap.body = request_body }
-    response.to_hash["#{action}_response".to_sym]
-  end
-
-end
@@ -1,31 +0,0 @@
-class Kalibro::Client::ProjectClient
-
-  def initialize
-    @port = Kalibro::Client::Port.new('Project')
-  end
-
-  def save(project)
-    @port.request(:save_project, {:project => project.to_hash})
-  end
-
-  def self.save(project)
-    new.save(project)
-  end
-
-  def project_names
-    @port.request(:get_project_names)[:project_name].to_a
-  end
-
-  def project(name)
-    hash = @port.request(:get_project, {:project_name => name})[:project]
-    Kalibro::Entities::Project.from_hash(hash)
-  end
-
-  def remove(project_name)
-    @port.request(:remove_project, {:project_name => project_name})
-  end
-
-  def self.remove(project_name)
-    new.remove(project_name)
-  end
-end
@@ -1,41 +0,0 @@
-class Kalibro::Client::ProjectResultClient
-
-  def initialize
-    @port = Kalibro::Client::Port.new('ProjectResult')
-  end
-
-  def has_results_for(project_name)
-    @port.request(:has_results_for, {:project_name => project_name})[:has_results]
-  end
-
-  def has_results_before(project_name, date)
-    @port.request(:has_results_before, {:project_name => project_name, :date => date})[:has_results]
-  end
-
-  def has_results_after(project_name, date)
-    @port.request(:has_results_after, {:project_name => project_name, :date => date})[:has_results]
-  end
-
-  def first_result(project_name)
-    hash = @port.request(:get_first_result_of, {:project_name => project_name})[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-  def last_result(project_name)
-    hash = @port.request(:get_last_result_of, {:project_name => project_name})[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-  def first_result_after(project_name, date)
-    request_body = {:project_name => project_name, :date => date}
-    hash = @port.request(:get_first_result_after, request_body)[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-  def last_result_before(project_name, date)
-    request_body = {:project_name => project_name, :date => date}
-    hash = @port.request(:get_last_result_before, request_body)[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-end
 \ No newline at end of file
@@ -0,0 +1,5 @@
+class Kalibro::CompoundMetric < Kalibro::Metric
+
+  attr_accessor :script
+
+end
@@ -0,0 +1,50 @@		@@ -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 @@		@@ -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	+
	@@ -101,6 +101,14 @@ class ContentViewerController < ApplicationController		@@ -101,6 +101,14 @@ class ContentViewerController < ApplicationController
101	@images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]	101	@images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
102	end	102	end
103		103
		104	+ @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
		105	+ if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
		106	+ @page.followers -= [params[:email]]
		107	+ if @page.save
		108	+ session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
		109	+ end
		110	+ end
		111	+
104	@comments = @page.comments(true).as_thread	112	@comments = @page.comments(true).as_thread
105	@comments_count = @page.comments.count	113	@comments_count = @page.comments.count
106	if params[:slideshow]	114	if params[:slideshow]
	@@ -243,7 +243,7 @@ class SearchController < PublicController		@@ -243,7 +243,7 @@ class SearchController < PublicController
243	@searching = {}	243	@searching = {}
244	@titles = {}	244	@titles = {}
245	@enabled_searches.each do \|key, name\|	245	@enabled_searches.each do \|key, name\|
246	- @titles[key] = name	246	+ @titles[key] = _(name)
247	@searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s	247	@searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s
248	end	248	end
249	@names = @titles if @names.nil?	249	@names = @titles if @names.nil?
@@ -0,0 +1,21 @@		@@ -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,7 +18,7 @@ module SearchHelper
18		18
19	SortOptions = {	19	SortOptions = {
20	:products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},	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	:name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},	22	:name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
23	:closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },	23	:closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
24	:solr_opts => {:sort => "geodist() asc",	24	:solr_opts => {:sort => "geodist() asc",
	@@ -77,11 +77,30 @@ class Comment < ActiveRecord::Base		@@ -77,11 +77,30 @@ class Comment < ActiveRecord::Base
77	article.comments_updated if article.kind_of?(Article)	77	article.comments_updated if article.kind_of?(Article)
78	end	78	end
79		79
80	- after_create do \|comment\|
81	- if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
82	- Comment::Notifier.deliver_mail(comment)	80	+ after_create :new_follower
		81	+ def new_follower
		82	+ if source.kind_of?(Article)
		83	+ article.followers += [author_email]
		84	+ article.followers -= article.profile.notification_emails
		85	+ article.followers.uniq!
		86	+ article.save
		87	+ end
		88	+ end
		89	+
		90	+ after_create :notify_by_mail
		91	+ def notify_by_mail
		92	+ if source.kind_of?(Article) && article.notify_comments?
		93	+ if !article.profile.notification_emails.empty?
		94	+ Comment::Notifier.deliver_mail(self)
		95	+ end
		96	+ emails = article.followers - [author_email]
		97	+ if !emails.empty?
		98	+ Comment::Notifier.deliver_mail_to_followers(self, emails)
		99	+ end
83	end	100	end
		101	+ end
84		102
		103	+ after_create do \|comment\|
85	if comment.source.kind_of?(Article)	104	if comment.source.kind_of?(Article)
86	comment.article.create_activity if comment.article.activity.nil?	105	comment.article.create_activity if comment.article.activity.nil?
87	if comment.article.activity	106	if comment.article.activity
	@@ -140,6 +159,22 @@ class Comment < ActiveRecord::Base		@@ -140,6 +159,22 @@ class Comment < ActiveRecord::Base
140	:environment => profile.environment.name,	159	:environment => profile.environment.name,
141	:url => profile.environment.top_url	160	:url => profile.environment.top_url
142	end	161	end
		162	+ def mail_to_followers(comment, emails)
		163	+ profile = comment.article.profile
		164	+ bcc emails
		165	+ from "#{profile.environment.name} <#{profile.environment.contact_email}>"
		166	+ subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
		167	+ body :recipient => profile.nickname \|\| profile.name,
		168	+ :sender => comment.author_name,
		169	+ :sender_link => comment.author_link,
		170	+ :article_title => comment.article.name,
		171	+ :comment_url => comment.url,
		172	+ :unsubscribe_url => comment.article.view_url.merge({:unfollow => true}),
		173	+ :comment_title => comment.title,
		174	+ :comment_body => comment.body,
		175	+ :environment => profile.environment.name,
		176	+ :url => profile.environment.top_url
		177	+ end
143	end	178	end
144		179
145	def rejected?	180	def rejected?
	@@ -61,10 +61,10 @@ class Community < Organization		@@ -61,10 +61,10 @@ class Community < Organization
61		61
62	def name=(value)	62	def name=(value)
63	super(value)	63	super(value)
64	- self.identifier = value.to_slug	64	+ self.identifier \|\|= value.to_slug
65	end	65	end
66		66
67	- def template	67	+ def default_template
68	environment.community_template	68	environment.community_template
69	end	69	end
70		70
	@@ -9,6 +9,8 @@ class Input < ActiveRecord::Base		@@ -9,6 +9,8 @@ class Input < ActiveRecord::Base
9		9
10	belongs_to :unit	10	belongs_to :unit
11		11
		12	+ named_scope :relevant_to_price, :conditions => { :relevant_to_price => true }
		13	+
12	include FloatHelper	14	include FloatHelper
13		15
14	def price_per_unit=(value)	16	def price_per_unit=(value)
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class License < ActiveRecord::Base
	2	+ belongs_to :environment
	3	+ has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
	4	+
	5	+ validates_presence_of :name, :environment
	6	+ validates_presence_of :slug, :if => lambda {\|license\| license.name.present?}
	7	+ validates_uniqueness_of :slug, :scope => :environment_id
	8	+
	9	+ before_validation do \|license\|
	10	+ license.slug \|\|= license.name.to_slug if license.name.present?
	11	+ end
	12	+end