Merge branch 'master' into move-article-folder

Conflicts: app/helpers/forms_helper.rb

Merge branch 'master' into move-article-folder
Conflicts: app/helpers/forms_helper.rb
Rodrigo Souto
2 parents febc53cd f1e0dc83
Showing 159 changed files with 5612 additions and 622 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/helpers/cms_helper.rb
app/helpers/colorbox_helper.rb
app/helpers/forms_helper.rb
app/models/box.rb
app/models/comment.rb
app/models/person.rb
app/models/task.rb
app/models/user.rb
app/views/account/login.rhtml
app/views/account/login_block.rhtml
app/views/box_organizer/_block_types.rhtml
app/views/box_organizer/_highlights_block.rhtml
app/views/box_organizer/_link_list_block.rhtml
@@ -114,7 +114,9 @@ class ApplicationController &lt; ActionController::Base
   # plugin to the current controller being initialized.
   def init_noosfero_plugins_controller_filters
     plugins.each do |plugin|
-      plugin.send(self.class.name.underscore + '_filters').each do |plugin_filter|
+      filters = plugin.send(self.class.name.underscore + '_filters')
+      filters = [filters] if !filters.kind_of?(Array)
+      filters.each do |plugin_filter|
         self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
         self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
       end
@@ -68,7 +68,8 @@ class BoxOrganizerController &lt; ApplicationController
         raise ArgumentError.new("Type %s is not allowed. Go away." % type)
       end
     else
-      @block_types = available_blocks
+      @center_block_types = Box.acceptable_center_blocks & available_blocks
+      @side_block_types = Box.acceptable_side_blocks & available_blocks
       @boxes = boxes_holder.boxes
       render :action => 'add_block', :layout => false
     end
@@ -5,7 +5,7 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
  
   def available_blocks
-    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
+    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
  
     # blocks exclusive for organizations
     if profile.has_members?
@@ -25,11 +25,13 @@ class AccountController &lt; ApplicationController
  
   # action to perform login to the application
   def login
-    @user = User.new
-    @person = @user.build_person
     store_location(request.referer) unless session[:return_to]
     return unless request.post?
-    self.current_user = User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
+
+    self.current_user = plugins_alternative_authentication
+
+    self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
+
     if logged_in?
       if params[:remember_me] == "1"
         self.current_user.remember_me
@@ -41,7 +43,6 @@ class AccountController &lt; ApplicationController
       end
     else
       session[:notice] = _('Incorrect username or password') if redirect?
-      redirect_to :back if redirect?
     end
   end
  
@@ -56,6 +57,11 @@ class AccountController &lt; ApplicationController
  
   # action to register an user to the application
   def signup
+    if @plugins.dispatch(:allow_user_registration).include?(false)
+      redirect_back_or_default(:controller => 'home')
+      session[:notice] = _("This environment doesn't allow user registration.")
+    end
+
     @invitation_code = params[:invitation_code]
     begin
       if params[:user]
@@ -125,6 +131,10 @@ class AccountController &lt; ApplicationController
   #
   # Posts back.
   def forgot_password
+    if @plugins.dispatch(:allow_password_recovery).include?(false)
+      redirect_back_or_default(:controller => 'home')
+      session[:notice] = _("This environment doesn't allow password recovery.")
+    end
     @change_password = ChangePassword.new(params[:change_password])
  
     if request.post?
@@ -316,4 +326,13 @@ class AccountController &lt; ApplicationController
     end
   end
  
+  def plugins_alternative_authentication
+    user = nil
+    @plugins.each do |plugin|
+      user = plugin.alternative_authentication
+      break unless user.nil?
+    end
+    user
+  end
+
 end
@@ -2,6 +2,8 @@ class ContentViewerController &lt; ApplicationController
  
   needs_profile
  
+  before_filter :comment_author, :only => :edit_comment
+
   helper ProfileHelper
   helper TagsHelper
  
@@ -121,6 +123,27 @@ class ContentViewerController &lt; ApplicationController
     end
   end
  
+  def edit_comment
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    @form_div = 'opened'
+    @comment = @page.comments.find_by_id(params[:id])
+    if @comment
+      if request.post?
+        begin
+          @comment.update_attributes(params[:comment])
+          session[:notice] = _('Comment succesfully updated')
+          redirect_to :action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path
+        rescue
+          session[:notice] = _('Comment could not be updated')
+        end
+      end
+    else
+      redirect_to @page.view_url
+      session[:notice] = _('Could not find the comment in the article')
+    end
+  end
+
   protected
  
   def add_comment
@@ -198,4 +221,13 @@ class ContentViewerController &lt; ApplicationController
     end
   end
  
+  def comment_author
+    comment = Comment.find_by_id(params[:id])
+    if comment
+      render_access_denied if comment.author.blank? || comment.author != user
+    else
+      render_not_found
+    end
+  end
+
 end
@@ -265,9 +265,9 @@ module ApplicationHelper
  
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
  
-  def partial_for_class_in_view_path(klass, view_path)
+  def partial_for_class_in_view_path(klass, view_path, suffix = nil)
     return nil if klass.nil?
-    name = klass.name.underscore
+    name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
  
     search_name = String.new(name)
     if search_name.include?("/")
@@ -285,28 +285,17 @@ module ApplicationHelper
     partial_for_class_in_view_path(klass.superclass, view_path)
   end
  
-  def partial_for_class(klass)
+  def partial_for_class(klass, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
     @controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path)
+      partial = partial_for_class_in_view_path(klass, view_path, suffix)
       return partial if partial
     end
  
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
  
-  def partial_for_task_class(klass, action)
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
-
-    name = "#{klass.name.underscore}_#{action.to_s}"
-    VIEW_EXTENSIONS.each do |ext|
-      return name if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], '_'+name+ext))
-    end
-
-    partial_for_task_class(klass.superclass, action)
-  end
-
   def view_for_profile_actions(klass)
     raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
  
@@ -1323,6 +1312,19 @@ module ApplicationHelper
     end
   end
  
+  def expirable_link_to(expired, content, url, options = {})
+    if expired
+      options[:class] = (options[:class] || '') + ' disabled'
+      content_tag('a', '&nbsp;'+content_tag('span', content), options)
+    else
+      link_to content, url, options
+    end
+  end
+
+  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
@@ -1388,4 +1390,19 @@ module ApplicationHelper
     result
   end
  
+  def expirable_content_reference(content, action, text, url, options = {})
+    reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
+    options[:title] = reason
+    expirable_link_to reason.present?, text, url, options
+  end
+
+  def expirable_button(content, action, text, url, options = {})
+    options[:class] = "button with-text icon-#{action.to_s}"
+    expirable_content_reference content, action, text, url, options
+  end
+
+  def expirable_comment_link(content, action, text, url, options = {})
+    options[:class] = "comment-footer comment-footer-link comment-footer-hide"
+    expirable_content_reference content, action, text, url, options
+  end
 end
@@ -162,9 +162,6 @@ module BoxesHelper
   #
   # +box+ is always needed
   def block_target(box, block = nil)
-    # FIXME hardcoded
-    return '' if box.position == 1
-
     id =
       if block.nil?
         "end-of-box-#{box.id}"
@@ -172,14 +169,11 @@ module BoxesHelper
         "before-block-#{block.id}"
       end
  
-    content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => 'block', :hoverclass => 'block-target-hover')
+    content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
   end
  
   # makes the given block draggable so it can be moved away.
   def block_handle(block)
-    # FIXME hardcoded
-    return '' if block.box.position == 1
-
     draggable_element("block-#{block.id}", :revert => true)
   end
  
@@ -211,7 +205,7 @@ module BoxesHelper
     end
  
     if block.editable?
-      buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+      buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
     end
  
     if !block.main?
@@ -42,13 +42,25 @@ module CmsHelper
  
   def display_spread_button(profile, article)
     if profile.person?
-      button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
+      expirable_button article, :spread, _('Spread this'), :action => 'publish', :id => article.id
     elsif profile.community? && environment.portal_community
-      button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
+      expirable_button article, :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
     end
   end
  
   def display_delete_button(article)
-    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+    expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+  end
+
+  def expirable_button(content, action, title, url, options = {})
+    reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
+    if reason.present?
+      options[:class] = (options[:class] || '') + ' disabled'
+      options[:disabled] = 'disabled'
+      options.delete(:confirm)
+      options.delete(:method)
+      title = reason
+    end
+    button_without_text action.to_sym, title, url, options
   end
 end
@@ -8,6 +8,10 @@ module ColorboxHelper
     button(type, label, url, colorbox_options(options))
   end
  
+  def colorbox_icon_button(type, label, url, options = {})
+    icon_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.
@@ -155,6 +155,119 @@ module FormsHelper
     return result
   end
  
+  def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+    datepicker_options[:disabled] ||= false
+    datepicker_options[:alt_field] ||= ''
+    datepicker_options[:alt_format] ||= ''
+    datepicker_options[:append_text] ||= ''
+    datepicker_options[:auto_size] ||= false
+    datepicker_options[:button_image] ||= ''
+    datepicker_options[:button_image_only] ||=  false
+    datepicker_options[:button_text] ||= '...'
+    datepicker_options[:calculate_week] ||= 'jQuery.datepicker.iso8601Week'
+    datepicker_options[:change_month] ||= false
+    datepicker_options[:change_year] ||= false
+    datepicker_options[:close_text] ||= _('Done')
+    datepicker_options[:constrain_input] ||= true
+    datepicker_options[:current_text] ||= _('Today')
+    datepicker_options[:date_format] ||= 'mm/dd/yy'
+    datepicker_options[:day_names] ||= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
+    datepicker_options[:day_names_min] ||= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
+    datepicker_options[:day_names_short] ||= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
+    datepicker_options[:default_date] ||= nil
+    datepicker_options[:duration] ||= 'normal'
+    datepicker_options[:first_day] ||= 0
+    datepicker_options[:goto_current] ||= false
+    datepicker_options[:hide_if_no_prev_next] ||= false
+    datepicker_options[:is_rtl] ||= false
+    datepicker_options[:max_date] ||= nil
+    datepicker_options[:min_date] ||= nil
+    datepicker_options[:month_names] ||= [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')]
+    datepicker_options[:month_names_short] ||= [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')]
+    datepicker_options[:navigation_as_date_format] ||= false
+    datepicker_options[:next_text] ||= _('Next')
+    datepicker_options[:number_of_months] ||= 1
+    datepicker_options[:prev_text] ||= _('Prev')
+    datepicker_options[:select_other_months] ||= false
+    datepicker_options[:short_year_cutoff] ||= '+10'
+    datepicker_options[:show_button_panel] ||= false
+    datepicker_options[:show_current_at_pos] ||= 0
+    datepicker_options[:show_month_after_year] ||= false
+    datepicker_options[:show_on] ||= 'focus'
+    datepicker_options[:show_options] ||= {}
+    datepicker_options[:show_other_months] ||= false
+    datepicker_options[:show_week] ||= false
+    datepicker_options[:step_months] ||= 1
+    datepicker_options[:week_header] ||= _('Wk')
+    datepicker_options[:year_range] ||= 'c-10:c+10'
+    datepicker_options[:year_suffix] ||= ''
+
+    element_id = html_options[:id] || 'datepicker-date'
+    value = value.strftime(format) if value.present?
+    method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
+    result = text_field_tag(name, value, html_options)
+    result +=
+    "
+    <script type='text/javascript'>
+      jQuery('##{element_id}').#{method}({
+        disabled: #{datepicker_options[:disabled].to_json},
+        altField: #{datepicker_options[:alt_field].to_json},
+        altFormat: #{datepicker_options[:alt_format].to_json},
+        appendText: #{datepicker_options[:append_text].to_json},
+        autoSize: #{datepicker_options[:auto_size].to_json},
+        buttonImage: #{datepicker_options[:button_image].to_json},
+        buttonImageOnly: #{datepicker_options[:button_image_only].to_json},
+        buttonText: #{datepicker_options[:button_text].to_json},
+        calculateWeek: #{datepicker_options[:calculate_week].to_json},
+        changeMonth: #{datepicker_options[:change_month].to_json},
+        changeYear: #{datepicker_options[:change_year].to_json},
+        closeText: #{datepicker_options[:close_text].to_json},
+        constrainInput: #{datepicker_options[:constrain_input].to_json},
+        currentText: #{datepicker_options[:current_text].to_json},
+        dateFormat: #{datepicker_options[:date_format].to_json},
+        dayNames: #{datepicker_options[:day_names].to_json},
+        dayNamesMin: #{datepicker_options[:day_names_min].to_json},
+        dayNamesShort: #{datepicker_options[:day_names_short].to_json},
+        defaultDate: #{datepicker_options[:default_date].to_json},
+        duration: #{datepicker_options[:duration].to_json},
+        firstDay: #{datepicker_options[:first_day].to_json},
+        gotoCurrent: #{datepicker_options[:goto_current].to_json},
+        hideIfNoPrevNext: #{datepicker_options[:hide_if_no_prev_next].to_json},
+        isRTL: #{datepicker_options[:is_rtl].to_json},
+        maxDate: #{datepicker_options[:max_date].to_json},
+        minDate: #{datepicker_options[:min_date].to_json},
+        monthNames: #{datepicker_options[:month_names].to_json},
+        monthNamesShort: #{datepicker_options[:month_names_short].to_json},
+        navigationAsDateFormat: #{datepicker_options[:navigation_as_date_format].to_json},
+        nextText: #{datepicker_options[:next_text].to_json},
+        numberOfMonths: #{datepicker_options[:number_of_months].to_json},
+        prevText: #{datepicker_options[:prev_text].to_json},
+        selectOtherMonths: #{datepicker_options[:select_other_months].to_json},
+        shortYearCutoff: #{datepicker_options[:short_year_cutoff].to_json},
+        showButtonPanel: #{datepicker_options[:show_button_panel].to_json},
+        showCurrentAtPos: #{datepicker_options[:show_current_at_pos].to_json},
+        showMonthAfterYear: #{datepicker_options[:show_month_after_year].to_json},
+        showOn: #{datepicker_options[:show_on].to_json},
+        showOptions: #{datepicker_options[:show_options].to_json},
+        showOtherMonths: #{datepicker_options[:show_other_months].to_json},
+        showWeek: #{datepicker_options[:show_week].to_json},
+        stepMonths: #{datepicker_options[:step_months].to_json},
+        weekHeader: #{datepicker_options[:week_header].to_json},
+        yearRange: #{datepicker_options[:year_range].to_json},
+        yearSuffix: #{datepicker_options[:year_suffix].to_json}
+      })
+    </script>
+    "
+    result
+  end
+
+  def date_range_field(from_name, to_name, from_value, to_value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+    from_id = html_options[:from_id] || 'datepicker-from-date'
+    to_id = html_options[:to_id] || 'datepicker-to-date'
+    return _('From') +' '+ date_field(from_name, from_value, format, datepicker_options, html_options.merge({:id => from_id})) +
+    ' ' + _('until') +' '+ date_field(to_name, to_value, format, datepicker_options, html_options.merge({:id => to_id}))
+  end
+
 protected
   def self.next_id_number
     if defined? @@id_num
@@ -2,4 +2,76 @@ class Box &lt; ActiveRecord::Base
   belongs_to :owner, :polymorphic => true
   acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
   has_many :blocks, :dependent => :destroy, :order => 'position'
+
+  def acceptable_blocks
+    to_css_class_name central?  ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
+  end
+
+  def central?
+    position == 1
+  end
+
+  def self.acceptable_center_blocks
+    [ ArticleBlock,
+      BlogArchivesBlock,
+      CategoriesBlock,
+      CommunitiesBlock,
+      EnterprisesBlock,
+      EnvironmentStatisticsBlock,
+      FansBlock,
+      FavoriteEnterprisesBlock,
+      FeedReaderBlock,
+      FriendsBlock,
+      HighlightsBlock,
+      LinkListBlock,
+      LoginBlock,
+      MainBlock,
+      MembersBlock,
+      MyNetworkBlock,
+      PeopleBlock,
+      ProfileImageBlock,
+      RawHTMLBlock,
+      RecentDocumentsBlock,
+      SellersSearchBlock,
+      TagsBlock ]
+  end
+
+  def self.acceptable_side_blocks
+    [ ArticleBlock,
+      BlogArchivesBlock,
+      CategoriesBlock,
+      CommunitiesBlock,
+      DisabledEnterpriseMessageBlock,
+      EnterprisesBlock,
+      EnvironmentStatisticsBlock,
+      FansBlock,
+      FavoriteEnterprisesBlock,
+      FeaturedProductsBlock,
+      FeedReaderBlock,
+      FriendsBlock,
+      HighlightsBlock,
+      LinkListBlock,
+      LocationBlock,
+      LoginBlock,
+      MembersBlock,
+      MyNetworkBlock,
+      PeopleBlock,
+      ProductsBlock,
+      ProfileImageBlock,
+      ProfileInfoBlock,
+      ProfileSearchBlock,
+      RawHTMLBlock,
+      RecentDocumentsBlock,
+      SellersSearchBlock,
+      SlideshowBlock,
+      TagsBlock
+    ]
+  end
+
+  private
+
+  def to_css_class_name(blocks)
+    blocks.map{ |block| block.to_s.underscore.tr('_', '-') }
+  end
+
 end
@@ -28,6 +28,8 @@ class Comment &lt; ActiveRecord::Base
  
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
  
+  delegate :environment, :to => :source
+
   def action_tracker_target
     self.article.profile
   end
@@ -71,10 +71,7 @@ class Person &lt; Profile
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
   end
  
-  after_destroy :destroy_user
-  def destroy_user
-    self.user.destroy if self.user
-  end
+  belongs_to :user, :dependent => :delete
  
   def can_control_scrap?(scrap)
     begin
@@ -31,7 +31,7 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
-  belongs_to :requestor, :class_name => 'Person', :foreign_key => :requestor_id
+  belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
  
   validates_uniqueness_of :code, :on => :create
@@ -30,7 +30,7 @@ class User &lt; ActiveRecord::Base
  
   after_create do |user|
     user.person ||= Person.new
-    user.person.attributes = user.person_data.merge(:identifier => user.login, :user_id => user.id, :environment_id => user.environment_id)
+    user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
     user.person.name ||= user.login
     user.person.visible = false unless user.activated?
     user.person.save!
@@ -88,13 +88,13 @@ class User &lt; ActiveRecord::Base
   attr_protected :activated_at
  
   # Virtual attribute for the unencrypted password
-  attr_accessor :password
+  attr_accessor :password, :name
  
   validates_presence_of     :login, :email
   validates_format_of       :login, :with => Profile::IDENTIFIER_FORMAT, :if => (lambda {|user| !user.login.blank?})
   validates_presence_of     :password,                   :if => :password_required?
-  validates_presence_of     :password_confirmation,      :if => :password_required?, :if => (lambda {|user| !user.password.blank?})
-  validates_length_of       :password, :within => 4..40, :if => :password_required?, :if => (lambda {|user| !user.password.blank?})
+  validates_presence_of     :password_confirmation,      :if => :password_required?
+  validates_length_of       :password, :within => 4..40, :if => :password_required?
   validates_confirmation_of :password,                   :if => :password_required?
   validates_length_of       :login,    :within => 2..40, :if => (lambda {|user| !user.login.blank?})
   validates_length_of       :email,    :within => 3..100, :if => (lambda {|user| !user.email.blank?})
@@ -228,7 +228,12 @@ class User &lt; ActiveRecord::Base
   end
  
   def name
-    person ? person.name : login
+    name = (self[:name] || login)
+    person.nil? ? name : (person.name || name)
+  end
+
+  def name= name
+   self[:name] = name
   end
  
   def enable_email!
@@ -274,6 +279,11 @@ class User &lt; ActiveRecord::Base
     15 # in minutes
   end
  
+
+  def not_require_password!
+    @is_password_required = false
+  end
+
   protected
     # before filter 
     def encrypt_password
@@ -282,9 +292,13 @@ class User &lt; ActiveRecord::Base
       self.password_type ||= User.system_encryption_method.to_s
       self.crypted_password = encrypt(password)
     end
-    
+
     def password_required?
-      crypted_password.blank? || !password.blank?
+      (crypted_password.blank? || !password.blank?) && is_password_required?
+    end
+
+    def is_password_required?
+      @is_password_required.nil? ? true : @is_password_required
     end
  
     def make_activation_code
@@ -292,6 +306,7 @@ class User &lt; ActiveRecord::Base
     end
  
     def deliver_activation_code
+      return if person.is_template?
       User::Mailer.deliver_activation_code(self) unless self.activation_code.blank?
     end
  
@@ -13,6 +13,8 @@
  
      <%= f.password_field :password %>
  
+     <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+
      <% button_bar do %>
        <%= submit_button( 'login', _('Log in') )%>
        <% if is_thickbox %>
@@ -23,8 +25,13 @@
 <% end %>
  
 <% button_bar do %>
-  <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
-  <%= button :help, _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+  <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+    <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
+  <% end %>
+
+  <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
+    <%= button :help, _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+  <% end %>
 <% end %>
  
 </div><!-- end class="login-box" -->
@@ -9,25 +9,30 @@
   @user ||= User.new
 %>
  
-    <% labelled_form_for :user, @user,
-       :url => login_url do |f| %>
+    <% labelled_form_for :user, @user, :url => login_url do |f| %>
  
-         <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
+      <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
  
-         <%= f.password_field :password %>
+      <%= f.password_field :password %>
+
+      <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
  
       <% button_bar do %>
         <%= submit_button( 'login', _('Log in') )%>
-        <%= link_to content_tag( 'span', _('New user') ),
-            { :controller => 'account', :action => 'signup' },
-            :class => 'button with-text icon-add' %>
+        <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+          <%= link_to content_tag( 'span', _('New user') ),
+              { :controller => 'account', :action => 'signup' },
+              :class => 'button with-text icon-add' %>
+        <% end %>
       <% end %>
  
     <% end %>
  
-    <p class="forgot-passwd">
-      <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
-    </p>
+    <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
+      <p class="forgot-passwd">
+        <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+      </p>
+    <% end %>
  
     </div>
  
@@ -0,0 +1,10 @@
+<% block_types.in_groups_of(2) do |block1, block2| %>
+  <div style='float: left; width: 48%; padding-top: 2px;'>
+    <%= labelled_radio_button(block1.description, :type, block1.name) %>
+  </div>
+  <% if block2 %>
+    <div style='float: left; width: 48%; padding-top: 2px;'>
+      <%= labelled_radio_button(block2.description, :type, block2.name) %>
+    </div>
+  <% end %>
+<% end %>
 <strong><%= _('Highlights') %></strong>
-<div id='edit-highlights-block'>
+<div id='edit-highlights-block' style='width:450px'>
 <table id='highlights' class='noborder'>
   <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>
   <% for image in @block.images do %>
 <strong><%= _('Links') %></strong>
-<div id='edit-link-list-block'>
+<div id='edit-link-list-block' style='width:450px'>
 <table id='links' class='noborder'>
   <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
   <% for link in @block.links do %>
-<%= labelled_form_field(_('HTML code'), text_area(:block, :html, :style => 'width: 100%', :rows => 15)) %>
+<%= labelled_form_field(_('HTML code'), text_area(:block, :html, :style => 'width: 90%', :rows => 15)) %>
-<% form_tag do %>
-
-  <p><%= _('In what area do you want to put your new block?') %></p>
-
-  <%# FIXME hardcoded stuff %>
-  <%= select_tag('box_id', options_for_select(@boxes.select { |item| item.position != 1 }.map {|item| [ _("Area %d") % item.position, item.id]})) %>
-  
-  <p><%= _('Select the type of block you want to add to your page.') %></p>
-  
-  <% @block_types.in_groups_of(2) do |block1, block2| %>
-    <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= radio_button_tag('type', block1.name) %>
-      <%= label_tag "type_#{block1.name.downcase}", block1.description %>
+<div style='height:350px'>
+  <% form_tag do %>
+
+    <p><%= _('In what area do you want to put your new block?') %></p>
+
+    <% @boxes.each do |box| %>
+      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+    <% end %>
+
+    <script type="text/javascript">
+      (function ($) {
+        $(document).ready(function () {
+          $(".box-position").live('change', function () {
+            if ($(this).attr('data-position') == '1') {
+              $('#center-block-types').show();
+              $('#side-block-types').hide();
+            } else {
+              $('#center-block-types').hide();
+              $('#side-block-types').show();
+            };
+          });
+      })})(jQuery);
+    </script>
+
+    <p><%= _('Select the type of block you want to add to your page.') %></p>
+
+    <div id='center-block-types'>
+      <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
     </div>
-    <% if block2 %>
-      <div style='float: left; width: 48%; padding-top: 2px;'>
-        <%= radio_button_tag('type', block2.name) %>
-        <%= label_tag "type_#{block2.name.downcase}", block2.description %>
-      </div>
+
+    <div id='side-block-types' style='display:none'>
+      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    </div>
+
+    <br style='clear: both'/>
+
+    <% button_bar do %>
+      <%= submit_button(:add, _("Add")) %>
+      <%= colorbox_close_button(_('Close')) %>
     <% end %>
-  <% end %>
-  <br style='clear: both'/>
-  
-  <% button_bar do %>
-    <%= submit_button(:add, _("Add")) %>
-    <%= lightbox_close_button(_('Close')) %>
-  <% end %>
  
-<% end %>
+  <% end %>
+</div>
-<h2><%= _('Editing block') %></h2>
+<div style='width: 500px;'>
+  <h2><%= _('Editing block') %></h2>
  
-<% form_tag(:action => 'save', :id => @block.id) do %>
+  <% form_tag(:action => 'save', :id => @block.id) do %>
  
-  <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
+    <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
  
-  <%= render :partial => partial_for_class(@block.class) %>
+    <%= render :partial => partial_for_class(@block.class) %>
  
-  <%= labelled_form_field _('Display this block:'), '' %>
-  <div style='margin-left: 10px'>
-    <%= radio_button(:block, :display, 'always') %>
-    <%= label_tag('block_display_always', _('In all pages')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'home_page_only') %>
-    <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'except_home_page') %>
-    <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'never') %>
-    <%= label_tag('block_display_never', _("Don't display")) %>
-  </div>
+    <%= labelled_form_field _('Display this block:'), '' %>
+    <div style='margin-left: 10px'>
+      <%= radio_button(:block, :display, 'always') %>
+      <%= label_tag('block_display_always', _('In all pages')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'home_page_only') %>
+      <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'except_home_page') %>
+      <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'never') %>
+      <%= label_tag('block_display_never', _("Don't display")) %>
+    </div>
  
-  <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + Noosfero.locales.map {|key, value| [value, key]} )) %>
+    <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + Noosfero.locales.map {|key, value| [value, key]} )) %>
  
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save')) %>
-    <%= lightbox_close_button(_('Cancel')) %>
-  <% end %>
+    <% button_bar do %>
+      <%= submit_button(:save, _('Save')) %>
+      <%= colorbox_close_button(_('Cancel')) %>
+    <% end %>
  
-<% end %>
+  <% end %>
+</div>
 <h1><%= _('Editing sideboxes')%></h1>
  
 <% button_bar do %>
-  <%= lightbox_button('add', _('Add a block'), { :action => 'add_block' }) %> 
+  <%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
@@ -49,13 +49,13 @@
         <%= article.class.short_description %>
       </td>
       <td class="article-controls">
-        <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
+        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(profile, article) unless article.folder? %>
-        <% if !environment.enabled?('cant_change_homepage') %>
-          <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+        <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
+        <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
+          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
         <% end %>
-        <%= display_delete_button(article) %>
+        <%= display_delete_button(article) if !remove_content_button(:delete) %>
       </td>
     </tr>
   <% end %>
 <div<%= user && " class='logged-in'" %>>
   <div id="article-actions">
  
-    <% if @page.allow_edit?(user) %>
-      <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
-          profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
-          :class => 'button with-text icon-edit' %>
+
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+      <% content = content_tag('span', label_for_edit_article(@page)) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
+      <%= expirable_button @page, :edit, content, url %>
     <% end %>
  
-    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) %>
-      <%= link_to content_tag( 'span', _('Delete') ),
-        profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}),
-        :method => :post,
-        :class => 'button with-text icon-delete',
-        :confirm => delete_article_message(@page) %>
+    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete)%>
+      <% content = content_tag( 'span', _('Delete') ) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
+      <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
+      <%= expirable_button @page, :delete, content, url, options %>
     <% end %>
  
-    <% if !@page.folder? && @page.allow_spread?(user) %>
+    <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
+      <% content = content_tag( 'span', _('Spread this') ) %>
+      <% url = nil %>
       <% if profile.kind_of?(Person) %>
-        <%= link_to content_tag( 'span', _('Spread this') ),
-            profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
-            :class => 'button with-text icon-spread' %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
       <% elsif profile.kind_of?(Community) && environment.portal_community %>
-        <%= link_to content_tag( 'span', _('Spread this') ),
-            profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
-            :class => 'button with-text icon-spread' %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
       <% end %>
+      <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
  
     <% if !@page.gallery? && @page.allow_create?(user) %>
-      <%= link_to _('Add translation'),
-          profile.admin_url.merge(:controller => 'cms', :action => 'new',
-                                  :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
-                                  :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
-          :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
+      <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
+        <% content = _('Add translation') %>
+        <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
+        <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
+        <%= expirable_button @page, :locale, content, url %>
+      <% end %>
+
       <%= 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 %>
  
@@ -40,8 +41,11 @@
       <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
     <% end %>
  
-    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
-      <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
+    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
+      <% content = content_tag( 'span', _('Suggest an article') ) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
+      <% options = {:id => 'suggest-article-link'} %>
+      <%= expirable_button @page, :suggest, content, url, options %>
     <% end %>
  
     <%= report_abuse(profile, :link, @page) %>
@@ -63,6 +63,11 @@
         <% end %>
       <% end %>
  
+      <% if comment.author && comment.author == user %>
+        &nbsp;
+        <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
+      <% end %>
+
       <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
         &nbsp;
         <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => params[:profile], :remove_comment => comment.id, :view => params[:view]).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
@@ -32,15 +32,17 @@ function submit_comment_form(button) {
  
 <div class="post_comment_box <%= @form_div %>">
  
-<h4 onclick="var d = jQuery(this).parent('.post_comment_box');
-             if (d.hasClass('closed')) {
-               d.removeClass('closed');
-               d.addClass('opened');
-               d.find('input[name=comment[title]], textarea').val('');
-               d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
-             }">
-  <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
-</h4>
+<% if display_link %>
+  <h4 onclick="var d = jQuery(this).parent('.post_comment_box');
+               if (d.hasClass('closed')) {
+                 d.removeClass('closed');
+                 d.addClass('opened');
+                 d.find('input[name=comment[title]], textarea').val('');
+                 d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
+               }">
+    <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
+  </h4>
+<% end %>
  
 <% unless pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
@@ -59,7 +61,7 @@ function submit_comment_form(button) {
   </script>
 <% end %>
  
-<% form_tag( url_for(@page.view_url.merge({:only_path => true})), { :class => 'comment_form' } ) do %>
+<% form_tag( url, { :class => 'comment_form' } ) do %>
   <%= hidden_field_tag(:confirm, 'false') %>
  
   <%= required_fields_message %>
@@ -84,7 +86,11 @@ function submit_comment_form(button) {
  
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
-    <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
+    <% if cancel_triggers_hide %>
+      <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
+    <% else %>
+      <%= button('cancel', _('Cancel'), {:action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path})%>
+    <% end %>
   <% end %>
 <% end %>
  
@@ -0,0 +1,3 @@
+<h1><%= _('Edit comment') %></h1>
+
+<%= render :partial => 'comment_form', :locals => {:url => {:action => 'edit_comment', :profile => profile.identifier}, :display_link => false, :cancel_triggers_hide => false} %>
@@ -98,7 +98,7 @@
   </ul>
  
   <% if @page.accept_comments? %>
-    <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
+    <div id="page-comment-form"><%= render :partial => 'comment_form', :locals => {:url => url_for(@page.view_url.merge({:only_path => true})), :display_link => true, :cancel_triggers_hide => true}%></div>
   <% end %>
 </div><!-- end class="comments" -->
  
@@ -2,7 +2,8 @@
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>
+'add-and-join', 'report-abuse', 'catalog', 'manage-products',
+'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
  
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -56,10 +56,18 @@
             <%= usermenu_logged_in %>
           </span>
           <span class='not-logged-in' style='display: none'>
-              <%= _("<span class='login'>%s</span> <span class='or'>or</span> <span class='signup'>%s</span>") % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup') ] %>
+
+              <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+              <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
+
               <div id='inlineLoginBox' style='display: none;'>
                 <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
               </div>
+
+              <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+              <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+              <% end %>
+
           </span>
           <form action="/search" class="search_form" method="get" class="clean">
             <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
@@ -62,6 +62,10 @@
       </script>
     <% end %>
     <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
+    <% if comment.author && comment.author == user %>
+      <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
+      <%= content_tag('span', ' | ', :class => 'comment-footer comment-footer-hide') %>
+    <% end %>
     <%= link_to_function _('Reply'),
         "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
         :class => 'comment-footer comment-footer-link comment-footer-hide',
@@ -50,13 +50,13 @@
   <% fields_for "tasks[#{task.id}][task]", task do |f| %>
     <% if task.accept_details %>
       <div id="on-accept-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_task_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
  
     <% if task.reject_details %>
       <div id="on-reject-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_task_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
   <% end %>
@@ -19,6 +19,7 @@ ActionController::Routing::Routes.draw do |map|
  
   # -- just remember to delete public/index.html.
   # You can have the root of your site routed by hooking up ''
+  map.root :controller => "home", :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
   map.connect '', :controller => "home", :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
   map.home 'site/:action', :controller => 'home'
  
@@ -121,9 +122,12 @@ ActionController::Routing::Routes.draw do |map|
   # cache stuff - hack
   map.cache 'public/:action/:id', :controller => 'public'
  
+  map.connect ':profile/edit_comment/:id/*page', :controller => 'content_viewer', :action => 'edit_comment', :profile => /#{Noosfero.identifier_format}/
+
   # match requests for profiles that don't have a custom domain
   map.homepage ':profile/*page', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
  
+
   # match requests for content in domains hosted for profiles
   map.connect '*page', :controller => 'content_viewer', :action => 'view_page'
  
@@ -2,4 +2,7 @@
  
 set -e
  
-cd /usr/share/noosfero && su noosfero -c "./script/console production"
+environment="$1"
+test -z "$environment" && environment=production
+
+cd /usr/share/noosfero && su noosfero -c "./script/console $environment"
@@ -12,7 +12,11 @@ class Noosfero::Plugin
     end
  
     def init_system
-      Dir.glob(File.join(Rails.root, 'config', 'plugins', '*')).select do |entry|
+      enabled_plugins = Dir.glob(File.join(Rails.root, 'config', 'plugins', '*'))
+      if Rails.env.test? && !enabled_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
+        enabled_plugins << File.join(Rails.root, 'plugins', 'foo')
+      end
+      enabled_plugins.select do |entry|
         File.directory?(entry)
       end.each do |dir|
         plugin_name = File.basename(dir)
@@ -31,6 +35,11 @@ class Noosfero::Plugin
         if plugin_dependencies_ok
           Rails.configuration.controller_paths << File.join(dir, 'controllers')
           ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers')
+          controllers_folders = %w[public profile myprofile admin]
+          controllers_folders.each do |folder|
+            Rails.configuration.controller_paths << File.join(dir, 'controllers', folder)
+            ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers', folder)
+          end
           [ ActiveSupport::Dependencies.load_paths, $:].each do |path|
             path << File.join(dir, 'models')
             path << File.join(dir, 'lib')
@@ -211,28 +220,6 @@ class Noosfero::Plugin
     nil
   end
  
-  # This is a generic hotspot for all controllers on Noosfero.
-  # If any plugin wants to define filters to run on any controller, the name of
-  # the hotspot must be in the following form: <underscored_controller_name>_filters.
-  # Example: for ProfileController the hotspot is profile_controller_filters
-  #
-  # -> Adds a filter to a controller
-  # returns = { :type => type,
-  #             :method_name => method_name,
-  #             :options => {:opt1 => opt1, :opt2 => opt2},
-  #             :block => Proc or lambda block}
-  #   type = 'before_filter' or 'after_filter'
-  #   method_name = The name of the filter
-  #   option = Filter options, like :only or :except
-  #   block = Block that the filter will call
-  def method_missing(method, *args, &block)
-    if method.to_s =~ /^(.+)_controller_filters$/
-      []
-    else
-      super
-    end
-  end
-
   # This method will be called just before a comment is saved to the database.
   #
   # It can modify the comment in several ways. In special, a plugin can call
@@ -333,4 +320,71 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Add an alternative authentication method.
+  # Your plugin have to make the access control and return the logged user.
+  # returns = User
+  def alternative_authentication
+    nil
+  end
+
+  # -> Adds adicional link to make the user authentication
+  # returns = lambda block that creates html code
+  def alternative_authentication_link
+    nil
+  end
+
+  # -> Allow or not user registration
+  # returns = boolean
+  def allow_user_registration
+    true
+  end
+
+  # -> Allow or not password recovery by users
+  # returns = boolean
+  def allow_password_recovery
+    true
+  end
+
+  # -> Adds fields to the login form
+  # returns = lambda block that creates html code
+  def login_extra_contents
+    nil
+  end
+
+  def method_missing(method, *args, &block)
+    # This is a generic hotspot for all controllers on Noosfero.
+    # If any plugin wants to define filters to run on any controller, the name of
+    # the hotspot must be in the following form: <underscored_controller_name>_filters.
+    # Example: for ProfileController the hotspot is profile_controller_filters
+    #
+    # -> Adds a filter to a controller
+    # returns = { :type => type,
+    #             :method_name => method_name,
+    #             :options => {:opt1 => opt1, :opt2 => opt2},
+    #             :block => Proc or lambda block}
+    #   type = 'before_filter' or 'after_filter'
+    #   method_name = The name of the filter
+    #   option = Filter options, like :only or :except
+    #   block = Block that the filter will call
+    if method.to_s =~ /^(.+)_controller_filters$/
+      []
+    # -> Removes the action button from the content
+    # returns = boolean
+    elsif method.to_s =~ /^content_remove_(#{content_actions.join('|')})$/
+      nil
+    # -> Expire the action button from the content
+    # returns = string with reason of expiration
+    elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
+      nil
+    else
+      super
+    end
+  end
+
+  private
+
+  def content_actions
+    %w[edit delete spread locale suggest home]
+  end
+
 end
-Dir.glob(File.join(Rails.root, 'config', 'plugins', '*', 'controllers')) do |dir|
-  plugin_name = File.basename(File.dirname(dir))
+plugins_root = Rails.env.test? ? 'plugins' : File.join('config', 'plugins')
+
+Dir.glob(File.join(Rails.root, plugins_root, '*', 'controllers')) do |controllers_dir|
+  prefixes_by_folder = {'public' => 'plugin',
+                        'profile' => 'profile/:profile/plugin',
+                        'myprofile' => 'myprofile/:profile/plugin',
+                        'admin' => 'admin/plugin'}
+
+  controllers_by_folder = prefixes_by_folder.keys.inject({}) do |hash, folder|
+    hash.merge!({folder => Dir.glob(File.join(controllers_dir, folder, '*')).map {|full_names| File.basename(full_names).gsub(/_controller.rb$/,'')}})
+  end
+
+  plugin_name = File.basename(File.dirname(controllers_dir))
+
+  controllers_by_folder.each do |folder, controllers|
+    controllers.each do |controller|
+      controller_name = controller.gsub("#{plugin_name}_plugin_",'')
+      map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller
+    end
+  end
+
   map.connect 'plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin'
-  map.connect 'profile/:profile/plugins/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile'
+  map.connect 'profile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile'
   map.connect 'myprofile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_myprofile'
   map.connect 'admin/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_admin'
 end
-
@@ -0,0 +1,147 @@
+class CustomFormsPluginMyprofileController < MyProfileController
+
+  protect 'post_content', :profile
+  def index
+    @forms = CustomFormsPlugin::Form.from(profile)
+  end
+
+  def create
+    @form = CustomFormsPlugin::Form.new(:profile => profile)
+    @fields = []
+    @empty_field = CustomFormsPlugin::Field.new
+    if request.post?
+      begin
+        @form.update_attributes!(params[:form])
+        params[:fields] = format_kind(params[:fields])
+        params[:fields] = format_choices(params[:fields])
+        params[:fields] = set_form_id(params[:fields], @form.id)
+        create_fields(new_fields(params))
+        session['notice'] = _('Form created')
+        redirect_to :action => 'index'
+      rescue Exception => exception
+        logger.error(exception.to_s)
+        session['notice'] = _('Form could not be created')
+      end
+    end
+  end
+
+  def edit
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @fields = @form.fields
+    @empty_field = CustomFormsPlugin::TextField.new
+    if request.post?
+      begin
+        @form.update_attributes!(params[:form])
+        params[:fields] = format_kind(params[:fields])
+        params[:fields] = format_choices(params[:fields])
+        remove_fields(params, @form)
+        create_fields(new_fields(params))
+        update_fields(edited_fields(params))
+        session['notice'] = _('Form updated')
+        redirect_to :action => 'index'
+      rescue Exception => exception
+        logger.error(exception.to_s)
+        session['notice'] = _('Form could not be updated')
+      end
+    end
+  end
+
+  def remove
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    begin
+      @form.destroy
+      session[:notice] = _('Form removed')
+    rescue
+      session[:notice] = _('Form could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+  def submissions
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @submissions = @form.submissions
+  end
+
+  def show_submission
+    @submission = CustomFormsPlugin::Submission.find(params[:id])
+    @form = @submission.form
+  end
+
+  private
+
+  def new_fields(params)
+    result = params[:fields].map {|id, hash| hash.has_key?(:real_id) ? nil : hash}.compact
+    result.delete_if {|field| field[:name].blank?}
+    result
+  end
+
+  def edited_fields(params)
+    params[:fields].map {|id, hash| hash.has_key?(:real_id) ? hash : nil}.compact
+  end
+
+  def create_fields(fields)
+    fields.each do |field|
+      case field[:type]
+      when 'text_field'
+        CustomFormsPlugin::TextField.create!(field)
+      when 'select_field'
+        CustomFormsPlugin::SelectField.create!(field)
+      else
+        CustomFormsPlugin::Field.create!(field)
+      end
+    end
+  end
+
+  def update_fields(fields)
+    fields.each do |field_attrs|
+      field = CustomFormsPlugin::Field.find(field_attrs.delete(:real_id))
+      field.attributes = field_attrs
+      field.save! if field.changed?
+    end
+  end
+
+  def format_kind(fields)
+    fields.each do |id, field|
+      next if field[:kind].blank?
+      kind = field.delete(:kind)
+      case kind
+      when 'radio'
+        field[:list] = false
+        field[:multiple] = false
+      when 'check_box'
+        field[:list] = false
+        field[:multiple] = true
+      when 'select'
+        field[:list] = true
+        field[:multiple] = false
+      when 'multiple_select'
+        field[:list] = true
+        field[:multiple] = true
+      end
+    end
+    fields
+  end
+
+  def format_choices(fields)
+    fields.each do |id, field|
+      next if !field.has_key?(:choices)
+      field[:choices] = field[:choices].map {|key, value| value}.inject({}) do |result, choice| 
+        hash = (choice[:name].blank? || choice[:value].blank?) ? {} : {choice[:name] => choice[:value]}
+        result.merge!(hash)
+      end
+    end
+    fields
+  end
+
+  def remove_fields(params, form)
+    present_fields = params[:fields].map{|id, value| value}.collect {|field| field[:real_id]}.compact
+    form.fields.each {|field| field.destroy if !present_fields.include?(field.id.to_s) }
+  end
+
+  def set_form_id(fields, form_id)
+    fields.each do |id, field|
+      field[:form_id] = form_id
+    end
+    fields
+  end
+end
@@ -0,0 +1,45 @@
+class CustomFormsPluginProfileController < ProfileController
+
+  before_filter :has_access, :show
+
+  def show
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    if user
+      @submission ||= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
+      @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id)
+    else
+      @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id)
+    end
+    if request.post?
+      begin
+        extend(CustomFormsPlugin::Helper)
+        answers = build_answers(params[:submission], @form)
+        failed_answers = answers.select {|answer| !answer.valid? }
+        if failed_answers.empty?
+          if !user
+            @submission.author_name = params[:author_name]
+            @submission.author_email = params[:author_email]
+          end
+          @submission.save!
+          answers.map {|answer| answer.submission = @submission; answer.save!}
+        else
+          @submission.valid?
+          failed_answers.each do |answer|
+            @submission.errors.add(answer.field.name.to_sym, answer.errors[answer.field.slug.to_sym])
+          end
+        end
+        session[:notice] = _('Submission saved')
+        redirect_to :action => 'show'
+      rescue
+        session[:notice] = _('Submission could not be saved')
+      end
+    end
+  end
+
+  private
+
+  def has_access
+    form = CustomFormsPlugin::Form.find(params[:id])
+    render_access_denied if !form.accessible_to(user)
+  end
+end
@@ -0,0 +1,20 @@
+class CreateCustomFormsPluginForms < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_forms do |t|
+      t.string :name
+      t.string :slug
+      t.text :description
+      t.references :profile
+      t.datetime :begining
+      t.datetime :ending
+      t.boolean :report_submissions, :default => false
+      t.boolean :on_membership, :default => false
+      t.string :access
+      t.timestamps
+    end 
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_forms
+  end
+end
@@ -0,0 +1,21 @@
+class CreateCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_fields do |t|
+      t.string :name
+      t.string :slug
+      t.string :type
+      t.string :default_value
+      t.string :choices
+      t.float  :minimum
+      t.float  :maximum
+      t.references :form
+      t.boolean :mandatory, :default => false
+      t.boolean :multiple
+      t.boolean :list
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_fields
+  end
+end
@@ -0,0 +1,13 @@
+class CreateCustomFormsPluginAnswers < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_answers do |t|
+      t.text :value
+      t.references :field
+      t.references :submission
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_answers
+  end
+end
@@ -0,0 +1,15 @@
+class CreateCustomFormsPluginSubmissions < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_submissions do |t|
+      t.string :author_name
+      t.string :author_email
+      t.references :profile
+      t.references :form
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_submissions
+  end
+end
@@ -0,0 +1,21 @@
+require 'ext/role_assignment_trigger'
+
+class CustomFormsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Custom Forms"
+  end
+
+  def self.plugin_description
+    _("Enables the creation of forms.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def control_panel_buttons
+    {:title => _('Manage Forms'), :icon => 'custom-forms', :url => {:controller => 'custom_forms_plugin_myprofile'}}
+  end
+
+end
@@ -0,0 +1,14 @@
+class CustomFormsPlugin::Answer < Noosfero::Plugin::ActiveRecord
+  belongs_to :field, :class_name => 'CustomFormsPlugin::Field'
+  belongs_to :submission, :class_name => 'CustomFormsPlugin::Submission'
+
+  validates_presence_of :field
+  validate :value_mandatory, :if => 'field.present?'
+
+  def value_mandatory
+    if field.mandatory && value.blank?
+      errors.add(field.slug.to_sym, _("is mandatory.").fix_i18n)
+    end
+  end
+end
+
@@ -0,0 +1,16 @@
+class CustomFormsPlugin::Field < ActiveRecord::Base
+  set_table_name :custom_forms_plugin_fields
+
+  validates_presence_of :form, :name
+  validates_uniqueness_of :slug, :scope => :form_id
+
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
+
+  serialize :choices, Hash
+
+  before_validation do |field|
+    field.slug = field.name.to_slug if field.name.present?
+  end
+end
+
@@ -0,0 +1,70 @@
+class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
+  belongs_to :profile
+
+  has_many :fields, :class_name => 'CustomFormsPlugin::Field'
+  has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
+
+  serialize :access
+
+  validates_presence_of :profile, :name
+  validates_uniqueness_of :slug, :scope => :profile_id
+  validate :access_format
+
+  before_validation do |form|
+    form.slug = form.name.to_slug if form.name.present?
+    form.access = nil if form.access.blank?
+  end
+
+  named_scope :from, lambda {|profile| {:conditions => {:profile_id => profile.id}}}
+  named_scope :on_memberships, {:conditions => {:on_membership => true}}
+=begin
+  named_scope :accessible_to lambda do |profile| 
+    #TODO should verify is profile is associated with the form owner
+    profile_associated = ???
+    {:conditions => ["
+      access IS NULL OR
+      (access='logged' AND :profile_present) OR
+      (access='associated' AND :profile_associated) OR
+      :profile_id in access
+    ", {:profile_present => profile.present?, :profile_associated => ???, :profile_id => profile.id}]}
+  end
+=end
+
+  def expired?
+    (begining.present? && Time.now < begining) || (ending.present? && Time.now > ending)
+  end
+
+  def accessible_to(target)
+    return true if access.nil? || target == profile
+    return false if target.nil?
+    return true if access == 'logged'
+    return true if access == 'associated' && ((profile.organization? && profile.members.include?(target)) || (profile.person? && profile.friends.include?(target)))
+    return true if access.kind_of?(Integer) && target.id == access
+    return true if access.kind_of?(Array) && access.include?(target.id)
+  end
+
+  private
+
+  def access_format
+    if access.present?
+      if access.kind_of?(String)
+        if access != 'logged' && access != 'associated'
+          errors.add(:access, _('Invalid string format of access.'))
+        end
+      elsif access.kind_of?(Integer)
+        if !Profile.exists?(access)
+          errors.add(:access, _('There is no profile with the provided id.'))
+        end
+      elsif access.kind_of?(Array)
+        access.each do |value|
+          if !value.kind_of?(Integer) || !Profile.exists?(value)
+            errors.add(:access, _('There is no profile with the provided id.')) 
+            break
+          end
+        end
+      else
+        errors.add(:access, _('Invalid type format of access.'))
+      end
+    end
+  end
+end
@@ -0,0 +1,119 @@
+module CustomFormsPlugin::Helper
+  def access_text(form)
+    return _('Public') if form.access.nil?
+    return _('Logged users') if form.access == 'logged'
+    if form.access == 'associated'
+      return _('Members') if form.profile.organization? 
+      return _('Friends') if form.profile.person?
+    end
+    return _('Custom')
+  end
+
+  def period_range(form)
+    if form.begining.blank? && form.ending.blank?
+      _('Always')
+    elsif form.begining.present? && form.ending.blank?
+      ('From %s') % time_format(form.begining)
+    elsif form.begining.blank? && form.ending.present?
+      _('Until %s') % time_format(form.ending)
+    elsif form.begining.present? && form.ending.present?
+      _('From %s until %s') % [time_format(form.begining), time_format(form.ending)]
+    end
+  end
+
+  def time_format(time)
+    minutes = (time.min == 0) ? '' : ':%M'
+    hour = (time.hour == 0 && minutes.blank?) ? '' : ' %H'
+    h = hour.blank? ? '' : 'h'
+    time.strftime("%Y-%m-%d#{hour+minutes+h}")
+  end
+
+  # TODO add the custom option that should offer the user the hability to
+  # choose the profiles one by one, using something like tokeninput
+  def access_options(profile)
+    associated = profile.organization? ? _('Members') : _('Friends')
+    [
+      [_('Public'), nil         ],
+      [_('Logged users'), 'logged'    ],
+      [ associated, 'associated'],
+    ]
+  end
+
+  def type_options
+    [
+      [_('Text'),   'text_field'  ],
+      [_('Select'), 'select_field']
+    ]
+  end
+
+  def type_to_label(type)
+    map = {
+      'text_field' => _('Text'),
+      'select_field' => _('Select')
+    }
+    map[type_for_options(type)]
+  end
+
+  def type_for_options(type)
+    type.to_s.split(':').last.underscore
+  end
+
+  def display_custom_field(field, submission, form)
+    answer = submission.answers.select{|answer| answer.field == field}.first
+    field_tag = send("display_#{type_for_options(field.class)}",field, answer, form)
+    if field.mandatory? && !radio_button?(field) && !check_box?(field) && submission.id.nil?
+      required(labelled_form_field(field.name, field_tag))
+    else 
+      labelled_form_field(field.name, field_tag)
+    end
+  end
+
+  def display_text_field(field, answer, form)
+    value = answer.present? ? answer.value : field.default_value
+    text_field(form, field.name.to_slug, :value => value, :disabled => answer.present?)
+  end
+
+  def display_select_field(field, answer, form)
+    if field.list && field.multiple
+      selected = answer.present? ? answer.value.split(',') : []
+      select_tag "#{form}[#{field.name.to_slug}]", options_for_select(field.choices.to_a, selected), :multiple => true, :size => field.choices.size, :disabled => answer.present?
+    elsif !field.list && field.multiple
+      field.choices.map do |name, value|
+        default = answer.present? ? answer.value.split(',').include?(value) : false
+        labelled_check_box name, "#{form}[#{field.name.to_slug}][#{value}]", '1', default, :disabled => answer.present?
+      end.join("\n")
+    elsif field.list && !field.multiple
+      selected = answer.present? ? answer.value.split(',') : []
+      select_tag "#{form}[#{field.name.to_slug}]", options_for_select([['','']] + field.choices.to_a, selected), :disabled => answer.present?
+    elsif !field.list && !field.multiple
+      field.choices.map do |name, value|
+        default = answer.present? ? answer.value == value : true
+        labelled_radio_button name, "#{form}[#{field.name.to_slug}]", value, default, :disabled => answer.present?
+      end.join("\n")
+    end
+  end
+
+  def radio_button?(field)
+    type_for_options(field.class) == 'select_field' && !field.list && !field.multiple
+  end
+
+  def check_box?(field)
+    type_for_options(field.class) == 'select_field' && !field.list && field.multiple
+  end
+
+  def build_answers(submission, form)
+    answers = []
+    submission.each do |slug, value|
+      field = form.fields.select {|field| field.slug==slug}.first
+      if value.kind_of?(String)
+        final_value = value
+      elsif value.kind_of?(Array)
+        final_value = value.join(',')
+      elsif value.kind_of?(Hash)
+        final_value = value.map {|option, present| present == '1' ? option : nil}.compact.join(',')
+      end
+      answers << CustomFormsPlugin::Answer.new(:field => field, :value => final_value)
+    end
+    answers
+  end
+end
@@ -0,0 +1,47 @@
+class CustomFormsPlugin::MembershipSurvey < Task
+
+  settings_items :form_id, :submission
+  validates_presence_of :form_id
+
+  include CustomFormsPlugin::Helper
+
+  def perform
+    form = CustomFormsPlugin::Form.find(form_id)
+    answers = build_answers(submission, form)
+    s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)
+    answers.map {|answer| answer.submission = s; answer.save!}
+  end
+
+  def title
+    _("Membership survey")
+  end
+
+  def subject
+    nil
+  end
+
+  def linked_subject
+    nil
+  end
+
+  def information
+    {:message => _('%{requestor} wants you to fill in some information.')}
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
+  def target_notification_message
+    _('After joining %{requestor}, the administrators of this organization
+      wants you to fill in some further information.') % {:requestor => requestor.name}
+  end
+
+  def target_notification_description
+    _('%{requestor} wants to fill in some further information.') % {:requestor => requestor.name}
+  end
+end
@@ -0,0 +1,4 @@
+class CustomFormsPlugin::Numeric < CustomFormsPlugin::Field
+  set_table_name :custom_forms_plugin_fields
+end
+
@@ -0,0 +1,4 @@
+class CustomFormsPlugin::SelectField < CustomFormsPlugin::Field
+  set_table_name :custom_forms_plugin_fields
+  validates_presence_of :choices
+end
@@ -0,0 +1,12 @@
+class CustomFormsPlugin::Submission < Noosfero::Plugin::ActiveRecord
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
+  belongs_to :profile
+
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
+
+  validates_presence_of :form
+  validates_presence_of :author_name, :author_email, :if => lambda {|submission| submission.profile.nil?}
+  validates_uniqueness_of :author_email, :scope => :form_id, :allow_nil => true
+  validates_format_of :author_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|submission| !submission.author_email.blank?})
+end
+
@@ -0,0 +1,3 @@
+class CustomFormsPlugin::TextField < CustomFormsPlugin::Field
+  set_table_name :custom_forms_plugin_fields
+end
@@ -0,0 +1,30 @@
+module RoleAssignmentTrigger
+  def self.included(base)
+    base.class_eval do
+      before_create do |ra|
+        profile = ra.resource
+        person = ra.accessor
+        ok = !profile.nil? && !person.nil? && profile.environment.present?
+        if ok && profile.environment.plugin_enabled?(CustomFormsPlugin) && !person.is_member_of?(profile)
+          CustomFormsPlugin::Form.from(profile).on_memberships.each do |form|
+            CustomFormsPlugin::MembershipSurvey.create!(:requestor => profile, :target => person, :form_id => form.id)
+          end
+        end
+      end
+  
+      after_destroy do |ra|
+        profile = ra.resource
+        person = ra.accessor
+        ok = !profile.nil? && !person.nil? && profile.environment.present?
+        if ok && profile.environment.plugin_enabled?(CustomFormsPlugin) && !person.is_member_of?(profile)
+          CustomFormsPlugin::Form.from(profile).on_memberships.each do |form|
+            task = person.tasks.pending.select {|task| task.kind_of?(CustomFormsPlugin::MembershipSurvey) && task.form_id == form.id}.first
+            task.cancel if task
+          end
+        end
+      end
+    end
+  end
+end
+
+RoleAssignment.send :include, RoleAssignmentTrigger
@@ -0,0 +1,141 @@
+jQuery('.icon-edit').live('click', function() {
+  elem = this;
+  jQuery.fn.colorbox({
+    overlayClose: false,
+    escKey: false,
+    inline: true,
+    href: function(){
+      id = jQuery(elem).attr('field_id');
+      type = jQuery('#fields_'+id+'_type').val().split('_')[0];
+      selector = '#edit-'+type+'-'+id
+      jQuery(selector).show();
+      return selector
+    }
+  });
+  return false;
+});
+
+jQuery('.remove-field').live('click', function(){
+  id = jQuery(this).attr('field_id');
+  jQuery('#field-'+id).slideDown(function(){
+    jQuery('#field-'+id).remove();
+  });
+  return false
+});
+
+jQuery('.remove-option').live('click', function(){
+  field_id = jQuery(this).attr('field_id');
+  option_id = jQuery(this).attr('option_id');
+  selector = '#field-'+field_id+'-option-'+option_id
+  jQuery(selector).slideDown(function(){
+    jQuery(selector).remove();
+    jQuery.colorbox.resize();
+  });
+  return false
+});
+
+function updateEditText(id){
+  new_id = id+1
+  jQuery('#edit-text-'+id).attr('id', 'edit-text-'+new_id);
+  input = jQuery('#edit-text-'+new_id+' input');
+  jQuery('#edit-text-'+new_id+' .colorbox-ok-button').attr('div_id', 'edit-text-'+new_id);
+  input.attr('id', input.attr('id').replace(id,new_id));
+  input.attr('name', input.attr('name').replace(id,new_id));
+  label = jQuery('#edit-text-'+new_id+' label');
+  label.attr('for', label.attr('for').replace(id,new_id));
+}
+
+function updateEditSelect(id){
+  new_id = id+1
+  jQuery('#edit-select-'+id).attr('id', 'edit-select-'+new_id);
+  jQuery('#edit-select-'+new_id+' .colorbox-ok-button').attr('div_id', 'edit-select-'+new_id);
+  jQuery('tr[id^=field-'+id+'-option').each(function(id, element){
+    jQuery(element).attr('id', jQuery(element).attr('id').replace('field-'+id,'field-'+new_id));
+  });
+  jQuery('#edit-select-'+new_id+' label').each(function(index, element){
+    label = jQuery(element);
+    label.attr('for', label.attr('for').replace(id,new_id));
+  });
+  jQuery('#edit-select-'+new_id+' input').each(function(index, element){
+    input = jQuery(element);
+    input.attr('id', input.attr('id').replace(id,new_id));
+    input.attr('name', input.attr('name').replace(id,new_id));
+  });
+  jQuery('#edit-select-'+new_id+' .remove-option').each(function(index, element){
+    jQuery(element).attr('field_id',new_id);
+  });
+  jQuery('#edit-select-'+new_id+' .new-option').attr('field_id',new_id);
+  jQuery('#edit-select-'+new_id+' #empty-option-'+id).attr('id','empty-option-'+new_id);
+}
+
+function updateEmptyField(id){
+  id = parseInt(id);
+  empty_field = jQuery('#empty-field');
+  empty_field.attr('last_id', (id + 1).toString());
+  jQuery('#empty-field input').each(function(index, element){
+    new_id = jQuery(element).attr('id').replace(id,id+1);
+    jQuery(element).attr('id', new_id);
+    new_name = jQuery(element).attr('name').replace(id,id+1);
+    jQuery(element).attr('name', new_name);
+  });
+  jQuery('#empty-field select').each(function(index, element){
+    new_id = jQuery(element).attr('id').replace(id,id+1);
+    jQuery(element).attr('id', new_id);
+    new_name = jQuery(element).attr('name').replace(id,id+1);
+    jQuery(element).attr('name', new_name);
+  });
+  jQuery('#empty-field a').each(function(index, element){
+    jQuery(element).attr('field_id', id+1);
+  });
+  updateEditText(id);
+  updateEditSelect(id);
+}
+
+function updateEmptyOption(field_id, option_id){
+  field_id = parseInt(field_id);
+  option_id = parseInt(option_id);
+  new_option_id = option_id+1;
+  empty_option = jQuery('#empty-option-'+field_id);
+  empty_option.attr('option_id',new_option_id);
+  jQuery('#empty-option-'+field_id+' .remove-option').attr('option_id', new_option_id);
+
+  name_id = ' #fields_'+field_id+'_choices_'+option_id+'_name';
+  jQuery('#empty-option-'+field_id+name_id).attr('name', 'fields['+field_id+'][choices]['+new_option_id+'][name]');
+  jQuery('#empty-option-'+field_id+name_id).attr('id', 'fields_'+field_id+'_choices_'+new_option_id+'_name');
+
+  value_id = ' #fields_'+field_id+'_choices_'+option_id+'_value';
+  jQuery('#empty-option-'+field_id+value_id).attr('name', 'fields['+field_id+'][choices]['+new_option_id+'][value]');
+  jQuery('#empty-option-'+field_id+value_id).attr('id', 'fields_'+field_id+'_choices_'+new_option_id+'_value');
+}
+
+jQuery('#new-field').live('click', function(){
+  empty_field = jQuery('#empty-field');
+  id = empty_field.attr('last_id');
+  edit_text = jQuery('#edit-text-'+id);
+  edit_select = jQuery('#edit-select-'+id);
+  new_field = empty_field.clone();
+  new_field.attr('id','field-'+id);
+  new_field.insertBefore(empty_field).slideDown();
+  edit_text.clone().insertAfter(edit_text);
+  edit_select.clone().insertAfter(edit_select);
+  updateEmptyField(id);
+  return false
+});
+
+jQuery('.new-option').live('click', function(){
+  field_id = jQuery(this).attr('field_id');
+  empty_option = jQuery('#empty-option-'+field_id);
+  option_id = empty_option.attr('option_id');
+  new_option = empty_option.clone();
+  new_option.attr('id','field-'+field_id+'-option-'+option_id);
+  new_option.insertBefore(empty_option).slideDown();
+  jQuery.colorbox.resize();
+  updateEmptyOption(field_id, option_id);
+  return false
+});
+
+jQuery('.colorbox-ok-button').live('click', function(){
+  jQuery('#'+jQuery(this).attr('div_id')).hide();
+  jQuery.colorbox.close();
+  return false
+});
@@ -0,0 +1,30 @@
+.controller-profile_editor a.control-panel-custom-forms,
+.controller-profile_editor .msie6 a.control-panel-custom-forms {
+  background-image: url(/plugins/custom_forms/icons/custom-forms.png)
+}
+
+.action-table {
+  width: 100%; 
+  overflow: hidden;
+}
+
+.action-table th,
+.action-table td{
+  text-align: center;
+}
+
+.action-table td{
+  cursor: move;
+}
+
+.action-table .actions{
+  white-space: nowrap;
+}
+
+.action-table .new-item{
+  background-color: #EEE;
+}
+
+.edit-information {
+  display: none;
+}
@@ -0,0 +1,114 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_myprofile_controller'
+
+# Re-raise errors caught by the controller.
+class CustomFormsPluginMyprofileController; def rescue_action(e) raise e end; end
+
+class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
+  def setup
+    @controller = CustomFormsPluginMyprofileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('profile').person
+    login_as(@profile.identifier)
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+  end
+
+  attr_reader :profile
+
+  should 'list forms associated with profile' do
+    another_profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    f2 = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Open Source')
+    f3 = CustomFormsPlugin::Form.create!(:profile => another_profile, :name => 'Open Source')
+
+    get :index, :profile => profile.identifier
+
+    assert_includes assigns(:forms), f1
+    assert_includes assigns(:forms), f2
+    assert_not_includes assigns(:forms), f3
+  end
+
+  should 'destroy form' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    assert CustomFormsPlugin::Form.exists?(form.id)
+    post :remove, :profile => profile.identifier, :id => form.id
+    assert !CustomFormsPlugin::Form.exists?(form.id)
+  end
+
+  should 'create a form' do
+    format = '%Y-%m-%d %H:%M'
+    begining = Time.now.strftime(format)
+    ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')
+    assert_difference CustomFormsPlugin::Form, :count, 1 do
+      post :create, :profile => profile.identifier,
+        :form => {
+          :name => 'My Form',
+          :access => 'logged',
+          :begining => begining,
+          :ending => ending,
+          :description => 'Cool form'},
+        :fields => {
+          1 => {
+            :name => 'Name',
+            :default_value => 'Jack',
+            :type => 'text_field'
+          },
+          2 => {
+            :name => 'Color',
+            :list => '1',
+            :type => 'select_field',
+            :choices => {
+              1 => {:name => 'Red', :value => 'red'},
+              2 => {:name => 'Blue', :value => 'blue'},
+              3 => {:name => 'Black', :value => 'black'}
+            }
+          }
+        }
+    end
+
+    form = CustomFormsPlugin::Form.find_by_name('My Form')
+    assert_equal 'logged', form.access
+    assert_equal begining, form.begining.strftime(format)
+    assert_equal ending, form.ending.strftime(format)
+    assert_equal 'Cool form', form.description
+    assert_equal 2, form.fields.count
+
+    f1 = form.fields.first
+    f2 = form.fields.last
+
+    assert_equal 'Name', f1.name
+    assert_equal 'Jack', f1.default_value
+    assert f1.kind_of?(CustomFormsPlugin::TextField)
+
+    assert_equal 'Color', f2.name
+    assert_equal 'red', f2.choices['Red']
+    assert_equal 'blue', f2.choices['Blue']
+    assert_equal 'black', f2.choices['Black']
+    assert f2.list
+    assert f2.kind_of?(CustomFormsPlugin::SelectField)
+  end
+
+  should 'edit a form' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create!(:form => form, :name => 'License')
+    format = '%Y-%m-%d %H:%M'
+    begining = Time.now.strftime(format)
+    ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')
+
+    post :edit, :profile => profile.identifier, :id => form.id,
+      :form => {:name => 'My Form', :access => 'logged', :begining => begining, :ending => ending, :description => 'Cool form'},
+      :fields => {1 => {:real_id => field.id.to_s, :name => 'Source'}}
+
+    form.reload
+    field.reload
+
+    assert_equal 'logged', form.access
+    assert_equal begining, form.begining.strftime(format)
+    assert_equal ending, form.ending.strftime(format)
+    assert_equal 'Cool form', form.description
+    assert_equal 'Source', field.name
+  end
+end
+
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::AnswerTest < ActiveSupport::TestCase
+  should 'validates presence of field' do
+    answer = CustomFormsPlugin::Answer.new
+    answer.valid?
+    assert answer.errors.invalid?(:field)
+
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    answer.field = field
+    answer.valid?
+    assert !answer.errors.invalid?(:field)
+  end
+
+  should 'belong to a submission' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    answer = CustomFormsPlugin::Answer.new
+    answer.submission = submission
+
+    assert_equal submission, answer.submission
+  end
+
+  should 'require presence of value if field is mandatory' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form, :mandatory => true)
+    answer = CustomFormsPlugin::Answer.new(:field => field)
+    answer.valid?
+    assert answer.errors.invalid?(field.slug.to_sym)
+
+    answer.value = "GPL"
+    answer.valid?
+    assert !answer.errors.invalid?(field.slug.to_sym)
+  end
+
+end
+
@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase
+  should 'validate presence of form' do
+    field = CustomFormsPlugin::Field.new
+    field.valid?
+    assert field.errors.invalid?(:form)
+    assert field.errors.invalid?(:name)
+
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field.form = form
+    field.name = 'License'
+    field.valid?
+    assert !field.errors.invalid?(:form)
+    assert !field.errors.invalid?(:name)
+  end
+
+  should 'set slug before validation based on name' do
+    field = CustomFormsPlugin::Field.new(:name => 'Name')
+    field.valid?
+    assert_equal field.name.to_slug, field.slug
+  end
+
+  should 'validate uniqueness of slug scoped on the form' do
+    form1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    form2 = CustomFormsPlugin::Form.create!(:name => 'Open Source', :profile => fast_create(Profile))
+    f1 = CustomFormsPlugin::Field.create!(:name => 'License', :form => form1)
+    f2 = CustomFormsPlugin::Field.new(:name => 'License', :form => form1)
+    f3 = CustomFormsPlugin::Field.new(:name => 'License', :form => form2)
+
+    f2.valid?
+    f3.valid?
+
+    assert f2.errors.invalid?(:slug)
+    assert !f3.errors.invalid?(:slug)
+  end
+
+  should 'set mandatory field as false by default' do
+    field = CustomFormsPlugin::Field.new
+    assert !field.mandatory
+  end
+
+  should 'have answers' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    a1 = CustomFormsPlugin::Answer.create!(:field => field)
+    a2 = CustomFormsPlugin::Answer.create!(:field => field)
+
+    assert_includes field.answers, a1
+    assert_includes field.answers, a2
+  end
+
+  should 'serialize choices into a hash' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    field.choices = {'First' => 1, 'Second' => 2, 'Third' => 3}
+    field.save!
+
+    assert_equal 1, field.choices['First']
+    assert_equal 2, field.choices['Second']
+    assert_equal 3, field.choices['Third']
+  end
+end
+
@@ -0,0 +1,172 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::FormTest < ActiveSupport::TestCase
+  should 'validates presence of a profile and a name' do
+    form = CustomFormsPlugin::Form.new
+    form.valid?
+    assert form.errors.invalid?(:profile)
+    assert form.errors.invalid?(:name)
+
+    form.profile = fast_create(Profile)
+    form.name = 'Free Software'
+    form.valid?
+    assert !form.errors.invalid?(:profile)
+    assert !form.errors.invalid?(:name)
+  end
+
+  should 'have many fields including fields subclasses' do
+    form = CustomFormsPlugin::Form.create!(:profile => fast_create(Profile), :name => 'Free Software')
+    f1 = CustomFormsPlugin::Field.create!(:form => form, :name => 'License')
+    f2 = CustomFormsPlugin::Field.create!(:form => form, :name => 'Code')
+    f3 = CustomFormsPlugin::TextField.create!(:form => form, :name => 'Developer')
+
+    assert_includes form.fields, f1
+    assert_includes form.fields, f2
+    assert_includes form.fields, f3
+  end
+
+  should 'have many submissions' do
+    form = CustomFormsPlugin::Form.create!(:profile => fast_create(Profile), :name => 'Free Software')
+    s1 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    s2 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+
+    assert_includes form.submissions, s1
+    assert_includes form.submissions, s2
+  end
+
+  should 'set slug before validation based on name' do
+    form = CustomFormsPlugin::Form.new(:name => 'Name')
+    form.valid?
+    assert_equal form.name.to_slug, form.slug
+  end
+
+  should 'validates uniqueness of slug scoped on profile' do
+    profile = fast_create(Profile)
+    another_profile = fast_create(Profile)
+    CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    form = CustomFormsPlugin::Form.new(:profile => profile, :name => 'Free Software')
+    form.valid?
+    assert form.errors.invalid?(:slug)
+
+    form.profile = another_profile
+    form.valid?
+    assert !form.errors.invalid?(:slug)
+  end
+
+  should 'define form expiration' do
+    form = CustomFormsPlugin::Form.new
+    assert !form.expired?
+
+    form.begining = Time.now + 1.day
+    assert form.expired?
+
+    form.begining = Time.now - 1.day
+    assert !form.expired?
+
+    form.begining = nil
+    form.ending = Time.now + 1.day
+    assert !form.expired?
+
+    form.ending = Time.now - 1.day
+    assert form.expired?
+
+    form.begining = Time.now - 1.day
+    form.ending = Time.now + 1.day
+    assert !form.expired?
+  end
+
+  should 'validates format of access' do
+    form = CustomFormsPlugin::Form.new
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    form.access = 'bli'
+    form.valid?
+    assert form.errors.invalid?(:access)
+
+    form.access = 'logged'
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    form.access = 'associated'
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    form.access = {:bli => 1}
+    form.valid?
+    assert form.errors.invalid?(:access)
+
+    form.access = 999
+    form.valid?
+    assert form.errors.invalid?(:access)
+
+    p1 = fast_create(Profile)
+    form.access = p1.id
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    p2 = fast_create(Profile)
+    p3 = fast_create(Profile)
+    form.access = [p1,p2,p3].map(&:id)
+    form.valid?
+    assert !form.errors.invalid?(:access)
+  end
+
+  should 'defines who is able to access the form' do
+    owner = fast_create(Community)
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => owner)
+    assert form.accessible_to(nil)
+
+    form.access = 'logged'
+    assert !form.accessible_to(nil)
+    person = fast_create(Person)
+    assert form.accessible_to(person)
+
+    form.access = 'associated'
+    assert !form.accessible_to(person)
+    owner.add_member(person)
+    assert form.accessible_to(person)
+
+    p1 = fast_create(Profile)
+    form.access = p1.id
+    assert !form.accessible_to(person)
+    assert form.accessible_to(p1)
+
+    p2 = fast_create(Profile)
+    form.access = [person.id, p1.id]
+    assert form.accessible_to(person)
+    assert form.accessible_to(p1)
+    assert !form.accessible_to(p2)
+    form.access << p2.id
+    assert form.accessible_to(p2)
+
+    assert form.accessible_to(owner)
+  end
+
+  should 'have a named_scope that retrieve forms from a profile' do
+    profile = fast_create(Profile)
+    another_profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
+    f2 = CustomFormsPlugin::Form.create!(:name => 'Open Source', :profile => profile)
+    f3 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => another_profile)
+    scope = CustomFormsPlugin::Form.from(profile)
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, f1
+    assert_includes scope, f2
+    assert_not_includes scope, f3
+  end
+
+  should 'have a named_scope that retrieves all forms that are triggered on membership' do
+    profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:name => 'On membership 1', :profile => profile, :on_membership => true)
+    f2 = CustomFormsPlugin::Form.create!(:name => 'On membership 2', :profile => profile, :on_membership => true)
+    f3 = CustomFormsPlugin::Form.create!(:name => 'Not on memberhsip', :profile => profile, :on_membership => false)
+    scope = CustomFormsPlugin::Form.from(profile).on_memberships
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, f1
+    assert_includes scope, f2
+    assert_not_includes scope, f3
+  end
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::MembershipSurveyTest < ActiveSupport::TestCase
+  should 'validates presence of form_id' do
+    task = CustomFormsPlugin::MembershipSurvey.new
+    task.valid?
+    assert task.errors.invalid?(:form_id)
+
+    task.form_id = 1
+    task.valid?
+    assert !task.errors.invalid?(:form_id)
+  end
+
+  should 'create submission with answers on perform' do
+    profile = fast_create(Profile)
+    person = fast_create(Person)
+    form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
+    field = CustomFormsPlugin::Field.create!(:name => 'Name', :form => form)
+    task = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :submission => {'name' => 'Jack'}, :target => person, :requestor => profile)
+
+    assert_difference CustomFormsPlugin::Submission, :count, 1 do
+      task.finish
+    end
+
+    submission = CustomFormsPlugin::Submission.last
+    assert_equal submission.answers.count, 1 
+
+    answer = submission.answers.first
+    assert_equal answer.value, 'Jack'
+  end
+end
@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::SelectFieldTest < ActiveSupport::TestCase
+  should 'validate presence of choices, multiple and list' do
+    select = CustomFormsPlugin::SelectField.new
+    select.valid?
+    assert select.errors.invalid?(:choices)
+
+    select.choices = {'label' => 'value'}
+    select.valid?
+    assert !select.errors.invalid?(:choices)
+  end
+end
@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::SubmissionTest < ActiveSupport::TestCase
+  should 'validates presence of form' do
+    submission = CustomFormsPlugin::Submission.new
+    submission.valid?
+    assert submission.errors.invalid?(:form)
+
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    submission.form = form
+    submission.valid?
+    assert !submission.errors.invalid?(:form)
+  end
+
+  should 'belong to a profile' do
+    profile = fast_create(Profile)
+    submission = CustomFormsPlugin::Submission.new
+    submission.profile = profile
+    assert_equal profile, submission.profile
+  end
+
+  should 'require presence of author name and email if profile is nil' do
+    submission = CustomFormsPlugin::Submission.new
+    submission.valid?
+    assert submission.errors.invalid?(:author_name)
+    assert submission.errors.invalid?(:author_email)
+
+    submission.author_name = 'Jack Sparrow'
+    submission.author_email = 'jack@black-pearl.com'
+    submission.valid?
+    assert !submission.errors.invalid?(:author_name)
+    assert !submission.errors.invalid?(:author_email)
+  end
+
+  should 'have answers' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    a1 = CustomFormsPlugin::Answer.create!(:field => field, :submission => submission)
+    a2 = CustomFormsPlugin::Answer.create!(:field => field, :submission => submission)
+
+    assert_includes submission.answers, a1
+    assert_includes submission.answers, a2
+  end
+end
+
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class RoleAssignmentsTest < ActiveSupport::TestCase
+  should 'create membership_surveys on membership creation' do
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+    organization = fast_create(Organization)
+    person = fast_create(Person)
+    f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
+    f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :on_membership => true)
+    f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :on_membership => false)
+
+    assert_difference CustomFormsPlugin::MembershipSurvey, :count, 2 do
+      organization.add_member(person)
+    end
+  end
+
+  should 'create membership_survey on membership creation with form accessible to members only' do
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+    organization = fast_create(Organization)
+    person = fast_create(Person)
+    form = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form', :on_membership => true, :access => 'associated')
+
+    assert_difference CustomFormsPlugin::MembershipSurvey, :count, 1 do
+      organization.add_member(person)
+    end
+  end
+
+  should 'cancel membership_surveys if membership is undone and task is active' do
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+    organization = fast_create(Organization)
+    person = fast_create(Person)
+    form = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form', :on_membership => true)
+    organization.add_member(person)
+
+    assert_difference CustomFormsPlugin::MembershipSurvey.pending, :count, -1 do
+      organization.remove_member(person)
+    end
+
+    organization.add_member(person)
+    task = CustomFormsPlugin::MembershipSurvey.last
+    task.status = Task::Status::FINISHED
+    task.save!
+    assert_no_difference CustomFormsPlugin::MembershipSurvey.finished, :count do
+      organization.remove_member(person)
+    end
+  end
+end
+
@@ -0,0 +1,33 @@
+<% elem_id = "edit-select-#{counter}" %>
+<div id=<%= elem_id %> class='edit-information'>
+  <h2><%= _('Options') %></h2>
+  <table class='action-table' style='width: 420px'>
+    <tr>
+      <th style='width: 40%'><%= _('Name') %></th>
+      <th style='width: 40%'><%= _('Value') %></th>
+      <th style='width: 20%'><%= _('Actions') %></th>
+    </tr>
+    <% option_counter = 1 %>
+    <% (field.choices || {}).each do |name, value| %>
+      <%= render :partial => 'option', :locals => {:name => name, :value => value, :counter => counter, :option_counter => option_counter} %>
+      <% option_counter += 1 %>
+    <% end %>
+    <%= render :partial => 'empty_option', :locals => {:counter => counter, :option_counter => option_counter} %>
+    <tr class='new-item'>
+      <td colspan='3'>
+        <%= button(:add, _('Add a new option'), '#', :class => 'new-option', :field_id => counter)%>
+      </td>
+    </tr>
+  </table>
+
+  <h3><%= _('Type') %></h3>
+  <%= labelled_radio_button 'Radio', "fields[#{counter}][kind]", 'radio', !field.multiple && !field.list %><br />
+  <%= labelled_radio_button 'Checkbox', "fields[#{counter}][kind]", 'check_box', field.multiple && !field.list %><br />
+  <%= labelled_radio_button 'Select', "fields[#{counter}][kind]", 'select', !field.multiple && field.list %><br />
+  <%= labelled_radio_button 'Multiple Select', "fields[#{counter}][kind]", 'multiple_select', field.multiple && field.list %><br />
+
+  <% button_bar do %>
+    <%= button :ok, _('Ok'), '#', :class => 'colorbox-ok-button', :div_id => elem_id %>
+  <% end %>
+</div>
+
@@ -0,0 +1,10 @@
+<% elem_id = "edit-text-#{counter}" %>
+<div id=<%= elem_id %> class='edit-information'>
+  <h2><%= _('Default value') %></h2>
+  <%= labelled_form_field _('Default value'), text_field("fields[#{counter}]", :default_value, :value => field.default_value) %>
+
+  <% button_bar do %>
+    <%= button :ok, _('Ok'), '#', :class => 'colorbox-ok-button', :div_id => elem_id %>
+  <% end %>
+</div>
+
@@ -0,0 +1,10 @@
+<tr id="empty-field" style='display: none' last_id=<%= counter %>>
+  <td style="text-align: left"><%= text_field "fields[#{counter}]", :name, :size => 25 %></td>
+  <td><%= select "fields[#{counter}]", :type, type_options, :selected => type_for_options(field.class) %></td>
+  <td><%= check_box "fields[#{counter}]", :mandatory %></td>
+  <%= hidden_field "fields[#{counter}]", :form_id, :value => @form.id %>
+  <td class='actions'>
+    <%= button_without_text :edit, _('Edit'), '', :field_id => counter %>
+    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-field', :field_id => counter,  :confirm => _('Are you sure you want to remove this field?') %>
+  </td>
+</tr>
@@ -0,0 +1,8 @@
+<tr id=<%= "empty-option-#{counter}" %> option_id=<%= option_counter %> style="display: none;">
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]") %></td>
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]", nil, :size => 15) %></td>
+  <td class='actions'>
+    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-option', :field_id => counter, :option_id => option_counter,  :confirm => _('Are you sure you want to remove this option?') %>
+  </td>
+</tr>
+
@@ -0,0 +1,12 @@
+<tr id=<%= "field-#{counter}" %>>
+  <td style="text-align: left"><%= text_field "fields[#{counter}]", :name, :value => field.name, :size => 25 %></td>
+  <td><%= type_to_label(field.type) %></td>
+  <%= hidden_field "fields[#{counter}]", :type, :value => type_for_options(field.class) %>
+  <td><%= check_box "fields[#{counter}]", :mandatory, :checked => field.mandatory %></td>
+  <%= hidden_field "fields[#{counter}]", :real_id, :value => field.id %>
+  <%= hidden_field "fields[#{counter}]", :form_id, :value => @form.id %>
+  <td class='actions'>
+    <%= button_without_text :edit, _('Edit'), '#', :field_id => counter %>
+    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-field', :field_id => counter,  :confirm => _('Are you sure you want to remove this field?') %>
+  </td>
+</tr>
@@ -0,0 +1,56 @@
+<% self.extend(CustomFormsPlugin::Helper) %>
+
+<%= error_messages_for :form %>
+
+<% form_for :form, @form do |f| %>
+  <%= required labelled_form_field _('Name'), f.text_field(:name) %>
+  <%= labelled_form_field(_('Período'), (
+    date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending, 
+                     '%Y-%m-%d %H:%M', 
+                     { :time => true, :change_month => true, :change_year => true,
+                       :date_format => 'yy-mm-dd', :time_format => 'hh:mm' },
+                     { :size => 14 })
+  )) %>
+  <%= labelled_form_field _('Access'), f.select(:access, access_options(profile))%>
+  <% if profile.organization? %>
+    <%= labelled_form_field _('Triggered on membership'), f.check_box(:on_membership) %>
+  <% end %>
+  <%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%') %>
+
+  <h2><%= _('Fields') %></h2>
+  <table class="action-table" id='fields-table'>
+    <tr>
+      <th style='width: 40%'><%= _('Name') %></th>
+      <th style='width: 30%'><%= _('Type') %></th>
+      <th style='width: 10%'><%= _('Mandatory') %></th>
+      <th style='width: 20%'><%= _('Actions') %></th>
+    </tr>
+    <% counter = 1 %>
+    <% @fields.each do |field| %>
+      <%= render :partial => 'field', :locals => {:field => field, :counter => counter} %>
+      <% counter += 1 %>
+    <% end %>
+    <%= render :partial => 'empty_field', :locals => {:field => @empty_field, :counter => counter} %>
+    <tr class='new-item'>
+      <td colspan='5'>
+        <%= button(:add, _('Add a new field'), '#', :id => 'new-field')%>
+      </td>
+    </tr>
+  </table>
+
+  <% counter = 1 %>
+  <% @fields.each do |field| %>
+    <%= render :partial => 'edit_text', :locals => {:field => field, :counter => counter} %>
+    <%= render :partial => 'edit_select', :locals => {:field => field, :counter => counter} %>
+    <% counter += 1 %>
+  <% end %>
+
+  <%= render :partial => 'edit_text', :locals => {:field => @empty_field, :counter => counter} %>
+  <%= render :partial => 'edit_select', :locals => {:field => @empty_field, :counter => counter} %>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save'), :cancel => {:action => 'index'}%>
+  <% end %>
+<% end %>
+
+<%= javascript_include_tag '../plugins/custom_forms/field' %>
@@ -0,0 +1,7 @@
+<tr id=<%= "field-#{counter}-option-#{option_counter}" %> style="display: auto;">
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]", name) %></td>
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]", value) %></td>
+  <td class='actions'>
+    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-option', :field_id => counter, :option_id => option_counter,  :confirm => _('Are you sure you want to remove this option?') %>
+  </td>
+</tr>
@@ -0,0 +1,2 @@
+<h1><%= _('New form') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,2 @@
+<h1><%= _('Edit form') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,28 @@
+<% self.extend CustomFormsPlugin::Helper %>
+
+<h1><%= _('Manage forms') %></h1>
+<table class="action-table">
+  <tr>
+    <th style='width: 40%'><%= _('Name') %></th>
+    <th style='width: 30%'><%= _('Period') %></th>
+    <th style='width: 10%'><%= _('Submissions') %></th>
+    <th style='width: 10%'><%= _('Access') %></th>
+    <th style='width: 10%'><%= _('Actions') %></th>
+  </tr>
+  <% @forms.each do |form| %>
+    <tr>
+      <td><%= link_to form.name, {:controller => 'custom_forms_plugin_profile', :action => 'show', :id => form.id} %></td>
+      <td><%= period_range(form) %></td>
+      <td><%= form.submissions.count > 0 ? link_to(form.submissions.count, {:action => 'submissions', :id => form.id}) : 0 %></td>
+      <td><%= access_text(form) %></td>
+      <td class="actions">
+        <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => form.id %>
+        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :id => form.id}, :confirm => _('Are you sure you want to remove this form?') %></td>
+    </tr>
+  <% end %>
+  <tr id="new-item">
+    <td colspan='5'>
+      <%= button(:add, _('Add a new form'), :action => 'create')%>
+   </td>
+  </tr>
+</table>
@@ -0,0 +1,10 @@
+<h1><%= @form.name %></h1>
+<p><%= @form.description %></p>
+
+<% fields_for :submission, @submission do |f| %>
+  <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to submissions'), :action => 'submissions', :id => @form.id %>
+<% end %>
@@ -0,0 +1,25 @@
+<% self.extend CustomFormsPlugin::Helper %>
+
+<h1><%= _('Submissions for %s') % @form.name %></h1>
+
+<% if @form.submissions.empty? %>
+  <%= _('There are no submissions for this form.') %>
+<% else %>
+  <table class="action-table">
+    <tr>
+      <th style='width: 50%'><%= _('Author') %></th>
+      <th style='width: 50%'><%= _('Time') %></th>
+    </tr>
+    <% @submissions.each do |submission| %>
+      <tr>
+        <% author = submission.profile.present? ? submission.profile.name : submission.author_name %>
+        <td><%= link_to(author, {:action => 'show_submission', :id => submission.id}) %></td>
+        <td><%= time_format(submission.created_at) %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to forms'), :action => 'index' %>
+<% end %>
@@ -0,0 +1,23 @@
+<h1><%= @form.name %></h1>
+<p><%= @form.description %></p>
+
+<% if @submission.id.nil? %>
+  <%= error_messages_for :submission %>
+
+  <% form_for :submission, @submission do |f| %>
+    <% if !user %>
+      <%= required labelled_form_field _('Author name'), text_field_tag(:author_name, @submission.author_name) %>
+      <%= required labelled_form_field _('Author email'), text_field_tag(:author_email, @submission.author_email) %>
+    <% end %>
+
+    <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
+
+    <% button_bar do %>
+      <%= submit_button :save, _('Save'), :cancel => {:action => 'index'} %>
+    <% end %>
+  <% end %>
+<% else %>
+  <% fields_for :submission, @submission do |f| %>
+    <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
+  <% end %>
+<% end %>
@@ -0,0 +1,5 @@
+<% self.extend(CustomFormsPlugin::Helper) %>
+
+<% @form.fields.each do |field| %>
+  <%= display_custom_field(field, @submission, f.object_name) %>
+<% end %>
@@ -0,0 +1 @@
+<%= f.object_name.to_s %>
@@ -0,0 +1,10 @@
+<% @form = CustomFormsPlugin::Form.find(task.form_id) %>
+<% @submission = CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id) %>
+
+<h2><%= @form.name %></h2>
+<p><%= @form.description %></p>
+
+<% f.fields_for :submission do |fi| %>
+  <%#= fi.error_messages_for :submission %>
+  <%= render :partial => 'shared/form_submission', :locals => {:f => fi} %>
+<% end %>
@@ -0,0 +1,3 @@
+class FooPluginAdminBarController < AdminController
+end
+
@@ -0,0 +1,3 @@
+class FooPluginMyprofileBarController < MyProfileController
+end
+
@@ -0,0 +1,3 @@
+class FooPluginProfileBarController < ProfileController
+end
+
@@ -0,0 +1,2 @@
+class FooPluginPublicBarController < PublicController
+end
@@ -2,7 +2,15 @@ class MezuroPluginMyprofileController &lt; ProfileController
  
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
  
- 
+  rescue_from Exception do |exception|
+    message = URI.escape(CGI.escape(exception.message),'.')
+    redirect_to_error_page message
+  end
+
+  def error_page
+    @message = params[:message]
+  end
+
   def choose_base_tool
     @configuration_content = profile.articles.find(params[:id])
     @base_tools = Kalibro::BaseTool.all_names
@@ -11,19 +19,23 @@ class MezuroPluginMyprofileController &lt; ProfileController
   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
+    base_tool = Kalibro::BaseTool.find_by_name(@base_tool)
+    @supported_metrics = base_tool.nil? ? [] : 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
+    if configuration_content_has_errors?
+      redirect_to_error_page @configuration_content.errors[:base]
+    end
   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])
@@ -36,19 +48,29 @@ class MezuroPluginMyprofileController &lt; ProfileController
     @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/, '+')}"
+    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
+    metric_configuration.save
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    end
   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/, '+')}"
+    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
+    metric_configuration.save
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    end
   end
  
   def update_metric_configuration
@@ -56,7 +78,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     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}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    end
   end
  
   def update_compound_metric_configuration
@@ -64,7 +90,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     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}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    end
   end
  
   def remove_metric_configuration
@@ -72,32 +102,41 @@ class MezuroPluginMyprofileController &lt; ProfileController
     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}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+    end
   end
-  
+
   def new_range
     @configuration_content = profile.articles.find(params[:id])
     @metric_name = params[:metric_name]
     @range = Kalibro::Range.new
+    @range_color = "#000000"
   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" }
+    @range_color = "#" + @range.color.to_s.gsub(/^ff/, "")
   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 = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
     metric_configuration.add_range(@range)
     metric_configuration.save
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    end
   end
-  
+
   def update_range
     configuration_content = profile.articles.find(params[:id])
     metric_name = params[:metric_name]
@@ -106,8 +145,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     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
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    end
   end
-  
+
   def remove_range
     configuration_content = profile.articles.find(params[:id])
     metric_name = params[:metric_name]
@@ -115,12 +157,31 @@ class MezuroPluginMyprofileController &lt; ProfileController
     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}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
     else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+      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
  
+  private
+
+  def redirect_to_error_page(message)
+    message = URI.escape(CGI.escape(message),'.')
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
+  end
+
+  def configuration_content_has_errors?
+    not @configuration_content.errors[:base].nil?
+  end
+
+  def metric_configuration_has_errors? metric_configuration
+    not metric_configuration.errors.empty?
+  end
+
 end
 class MezuroPluginProfileController < ProfileController
  
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  
+
+  def error_page
+    @message = params[:message]
+  end
+
   def project_state
     @content = profile.articles.find(params[:id])
     project = @content.project
-    state = project.error.nil? ? project.state : "ERROR"
-    render :text => state
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      state = project.kalibro_error.nil? ? project.state : "ERROR"
+      render :text => state
+    end
   end
  
   def project_error
     @content = profile.articles.find(params[:id])
     @project = @content.project
-    render :partial => 'content_viewer/project_error'
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      render :partial => 'content_viewer/project_error'
+    end
   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 	
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      render :partial => 'content_viewer/project_result'
+    end
+  end
  
   def module_result
     @content = profile.articles.find(params[:id])
     @module_result = @content.module_result(params)
-    render :partial => 'content_viewer/module_result'
+    @module = @module_result.module
+    @module_label = "#{@module.name} (#{@module.granularity})"
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      render :partial => 'content_viewer/module_result'
+    end
   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'
+    @project_name = @content.project.name if not @content.project.nil?
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      @source_tree = project_result.node(params[:module_name])
+      render :partial =>'content_viewer/source_tree'
+    end
   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'
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      @score_history = filtering_metric_history(metric_name, module_history)
+      render :partial => 'content_viewer/score_history'
+    end
   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'
+    if project_content_has_errors?
+      redirect_to_error_page(@content.errors[:base])
+    else
+      @score_history = modules_results.map do |module_result|
+        [module_result.grade, format_date_to_simple_form(module_result.date)]
+      end
+      render :partial => 'content_viewer/score_history'
+    end
   end
-  
+
   private
-  
+
   def filtering_metric_history(metric_name, module_history)
     metrics_history = module_history.map do |module_result|
-      module_result.metric_results
+      [module_result.metric_results, format_date_to_simple_form(module_result.date)]
     end
-    metric_history =  metrics_history.map do |array_of_metric_result|
-      (array_of_metric_result.select do |metric_result|
+    metric_history =  metrics_history.map do |metric_results_with_date|
+      [(metric_results_with_date.first.select do |metric_result|
         metric_result.metric.name.delete("() ") == metric_name
-      end).first
+      end).first, metric_results_with_date.last]
     end
-    metric_history.map do |metric_result|
-      metric_result.value
+    metric_history.map do |metric_result_with_date|
+      [metric_result_with_date.first.value, metric_result_with_date.last]
     end
   end
+
+  def redirect_to_error_page(message)
+    message = URI.escape(CGI.escape(message),'.')
+    redirect_to "/profile/#{profile.identifier}/plugins/mezuro/error_page?message=#{message}"
+  end
+
+  def project_content_has_errors?
+    not @content.errors[:base].nil?
+  end
+
+  def format_date_to_simple_form date
+    date.to_s[0..9]
+  end
+
 end
@@ -7,11 +7,7 @@ class Kalibro::Configuration &lt; Kalibro::Model
   end
  
   def metric_configurations
-    if @metric_configuration != nil
-      @metric_configuration
-    else
-      []
-    end
+    @metric_configuration.nil? ? [] : @metric_configuration
   end
  
   def metric_configurations=(metric_configurations)
@@ -19,19 +15,11 @@ class Kalibro::Configuration &lt; Kalibro::Model
   end
  
   def self.find_by_name(configuration_name)
-    begin
-      new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
-    rescue Exception => error
-      nil
-    end
+    new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
   end
  
   def self.all_names
-    begin
-      request("Configuration", :get_configuration_names)[:configuration_name]
-    rescue Exception
-      []
-    end
+    request("Configuration", :get_configuration_names)[:configuration_name]
   end
  
   def update_attributes(attributes={})
@@ -49,10 +49,14 @@ class Kalibro::MetricConfiguration &lt; Kalibro::Model
   end
  
   def destroy
-    self.class.request("MetricConfiguration", :remove_metric_configuration, {
+    begin
+      self.class.request("MetricConfiguration", :remove_metric_configuration, {
         :configuration_name => configuration_name,
         :metric_name=> metric.name
       })
+    rescue Exception => exception
+      add_error exception
+    end
   end
  
   def to_hash
 class Kalibro::Model
  
+  attr_accessor :errors
+
   def initialize(attributes={})
     attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
+    @errors = []
   end
  
   def to_hash(options={})
     hash = Hash.new
     excepts = !options[:except].nil? ? options[:except] : []
+    excepts << :errors
     fields.each do |field|
       if(!excepts.include?(field))
         field_value = send(field)
@@ -46,15 +50,17 @@ class Kalibro::Model
     begin
       self.class.request(save_endpoint, save_action, save_params)
 	    true
-	  rescue Exception => error
-		  false
+	  rescue Exception => exception
+	    add_error exception
+	    false
 	  end
   end
  
   def destroy
     begin
       self.class.request(destroy_endpoint, destroy_action, destroy_params)
-    rescue Exception
+    rescue Exception => exception
+	    add_error exception
     end
   end
  
@@ -123,4 +129,9 @@ class Kalibro::Model
     {"#{class_name.underscore}_name".to_sym => self.name}
   end
  
+  def add_error(exception)
+    @errors << exception
+  end
+
 end
+
 class Kalibro::Project < Kalibro::Model
  
-  attr_accessor :name, :license, :description, :repository, :configuration_name, :state, :error
+  attr_accessor :name, :license, :description, :repository, :configuration_name, :state, :kalibro_error
  
   def self.all_names
     request("Project", :get_project_names)[:project_name]
@@ -15,23 +15,35 @@ class Kalibro::Project &lt; Kalibro::Model
   end
  
   def error=(value)
-    @error = Kalibro::Error.to_object value
+    @kalibro_error = Kalibro::Error.to_object value
   end
  
   def process_project(days = '0')
-    if days.to_i.zero?
-      self.class.request("Kalibro", :process_project, {:project_name => name})
-  	else
-      self.class.request("Kalibro", :process_periodically, {:project_name => name, :period_in_days => days})
-  	end
+    begin
+      if days.to_i.zero?
+        self.class.request("Kalibro", :process_project, {:project_name => name})
+    	else
+        self.class.request("Kalibro", :process_periodically, {:project_name => name, :period_in_days => days})
+    	end
+    rescue Exception => exception
+      add_error exception
+    end
   end
  
 	def process_period
-    self.class.request("Kalibro", :get_process_period, {:project_name => name})[:period]
+	  begin
+      self.class.request("Kalibro", :get_process_period, {:project_name => name})[:period]
+    rescue Exception => exception
+      add_error exception
+    end
   end
  
 	def cancel_periodic_process
-    self.class.request("Kalibro", :cancel_periodic_process, {:project_name => name})
+	  begin
+      self.class.request("Kalibro", :cancel_periodic_process, {:project_name => name})
+    rescue Exception => exception
+      add_error exception
+    end
   end
  
 end
@@ -75,21 +75,17 @@ class Kalibro::ProjectResult &lt; Kalibro::Model
     ('%2d' % amount).sub(/\s/, '0')
   end
  
-  def node_of(module_name)
+  def node(module_name)
     if module_name.nil? or module_name == project.name
       node = source_tree
     else
-      node = get_node(module_name)
-    end
-  end
-
-  def get_node(module_name)
-    path = Kalibro::Module.parent_names(module_name)
-    parent = @source_tree
-    path.each do |node_name|
-      parent = get_leaf_from(parent, node_name)
-    end
-    return parent
+		path = Kalibro::Module.parent_names(module_name)
+		parent = @source_tree
+		path.each do |node_name|
+		  parent = get_leaf_from(parent, node_name)
+		end
+		parent
+	end
   end
  
   private
@@ -34,4 +34,12 @@ class Kalibro::Range &lt; Kalibro::Model
     @grade = value.to_f
   end
  
+	def mezuro_color
+		@color.nil? ? "#e4ca2d" : @color.gsub(/^ff/, "#")
+	end
+	
+	def color=(new_color)
+		@color = new_color.gsub(/^#/, "ff")
+	end
+	
 end
@@ -3,8 +3,8 @@ class MezuroPlugin::ConfigurationContent &lt; Article
  
   settings_items :description, :configuration_to_clone_name
  
-  after_save :send_configuration_to_service
-  after_destroy :remove_configuration_from_service
+  after_save :send_kalibro_configuration_to_service
+  after_destroy :remove_kalibro_configuration_from_service
  
   def self.short_description
     'Kalibro configuration'
@@ -21,54 +21,60 @@ class MezuroPlugin::ConfigurationContent &lt; Article
     end
   end
  
-  def configuration
-    @configuration ||= Kalibro::Configuration.find_by_name(self.name)
-    if @configuration.nil? 
-      errors.add_to_base("Kalibro Configuration not found")
+  def kalibro_configuration
+    begin
+      @kalibro_configuration ||= Kalibro::Configuration.find_by_name(self.name)
+    rescue Exception => exception 
+      errors.add_to_base(exception.message)
     end
-    @configuration
+    @kalibro_configuration
   end
  
   def metric_configurations
-    configuration.metric_configurations
+    kalibro_configuration.metric_configurations
   end
  
-  def configuration_names
-    ["None"] + Kalibro::Configuration.all_names.sort
+  def kalibro_configuration_names
+    begin
+      ["None"] + Kalibro::Configuration.all_names.sort
+    rescue Exception => exception
+      errors.add_to_base(exception.message)
+      ["None"]
+    end
   end
  
   private
  
   def validate_kalibro_configuration_name
-    existing = configuration_names.map { |a| a.downcase}
+    existing = kalibro_configuration_names.map { |a| a.downcase}
  
     if existing.include?(name.downcase)
       errors.add_to_base("Configuration name already exists in Kalibro")
     end
   end
  
-  def send_configuration_to_service
-    if editing_configuration?
-      configuration.update_attributes({:description => description})
+  def send_kalibro_configuration_to_service
+    if editing_kalibro_configuration?
+      kalibro_configuration.update_attributes({:description => description})
     else
       create_kalibro_configuration
     end
   end
  
-  def remove_configuration_from_service
-    configuration.destroy
+  def remove_kalibro_configuration_from_service
+    kalibro_configuration.destroy unless kalibro_configuration.nil?
   end
  
   def create_kalibro_configuration
     attributes = {:name => name, :description => description}
-    if cloning_configuration?
+    if cloning_kalibro_configuration?
       attributes[:metric_configuration] = configuration_to_clone.metric_configurations_hash
     end
     Kalibro::Configuration.create attributes
   end
  
-  def editing_configuration?
-    configuration.present?
+  def editing_kalibro_configuration?
+    kalibro_configuration.present?
   end
  
   def configuration_to_clone
@@ -76,10 +82,10 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   end
  
   def find_configuration_to_clone
-    configuration_to_clone_name.nil? ? nil : Kalibro::Configuration.find_by_name(configuration_to_clone_name)
+    (configuration_to_clone_name == "None") ? nil : Kalibro::Configuration.find_by_name(configuration_to_clone_name)
   end
  
-  def cloning_configuration?
+  def cloning_kalibro_configuration?
     configuration_to_clone.present?
   end
  
 class MezuroPlugin::Helpers::ContentViewerHelper
+
+  MAX_NUMBER_OF_LABELS = 5
+
   def self.format_grade(grade)
     sprintf("%.2f", grade.to_f)
   end
@@ -6,15 +9,31 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   def self.create_periodicity_options
    [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]
   end
-  
-  def self.generate_chart(values)
-    Gchart.line(  
+
+  def self.create_license_options
+   options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")
+   options = options.split(";")
+   formated_options = []
+   options.each { |option| formated_options << [option, option] }
+   formated_options
+  end
+
+  def self.generate_chart(score_history)
+    values = []
+    labels = []
+    score_history.each do |score_data|
+      values << score_data.first
+      labels << score_data.last
+    end
+    labels = discretize_array labels
+    Gchart.line(
                 :title_color => 'FF0000',
                 :size => '600x180', 
                 :bg => {:color => 'efefef', :type => 'stripes'},
                 :line_colors => 'c4a000',
                 :data => values,
-                :axis_with_labels => 'y',
+                :labels => labels,
+                :axis_with_labels => ['y','x'],
                 :max_value => values.max,
                 :min_value => values.min
                 )
@@ -25,8 +44,33 @@ class MezuroPlugin::Helpers::ContentViewerHelper
     selected_option = options.find { |option| option.last == index.to_i }
     selected_option.first
   end
-  
+
   def self.format_name(metric_result)
     metric_result.metric.name.delete("() ")
   end
+
+  def self.get_license_option(selected)
+    options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")
+    options.split(";")
+    selected_option = options.find { |license| license == selected }
+  end
+
+  private
+
+  def self.discretize_array(array)
+    if array.size > MAX_NUMBER_OF_LABELS
+      range_array.map { |i| discrete_element(array, i)}
+    else
+      array
+    end
+  end
+
+  def self.range_array
+    (0..(MAX_NUMBER_OF_LABELS - 1)).to_a
+  end
+
+  def self.discrete_element(array, i)
+    array[(i*(array.size - 1))/(MAX_NUMBER_OF_LABELS - 1)]
+  end
+
 end
 class MezuroPlugin::ProjectContent < Article
   include ActionView::Helpers::TagHelper
  
-  settings_items :license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days
+  settings_items :project_license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days
  
   validate_on_create :validate_kalibro_project_name 
   validate_on_create :validate_repository_url
@@ -26,6 +26,7 @@ class MezuroPlugin::ProjectContent &lt; Article
     rescue Exception => error
       errors.add_to_base(error.message)
     end
+    @project
   end
  
   def project_result
@@ -34,6 +35,7 @@ class MezuroPlugin::ProjectContent &lt; Article
     rescue Exception => error
       errors.add_to_base(error.message)
     end
+    @project_result
   end
  
   def project_result_with_date(date)
@@ -43,6 +45,7 @@ Kalibro::ProjectResult.first_result_after(name, date)
     rescue Exception => error
       errors.add_to_base(error.message)
     end
+    @project_result
   end
  
   def module_result(attributes)
@@ -53,6 +56,7 @@ Kalibro::ProjectResult.first_result_after(name, date)
     rescue Exception => error
       errors.add_to_base(error.message)
     end
+    @module_result
   end
  
   def result_history(module_name)
@@ -73,6 +77,7 @@ Kalibro::ProjectResult.first_result_after(name, date)
       existing = Kalibro::Project.all_names
     rescue Exception => error
       errors.add_to_base(error.message)
+      existing = []
     end
  
     if existing.any?{|existing_name| existing_name.casecmp(name)==0} # existing.include?(name) + case insensitive
@@ -94,7 +99,7 @@ Kalibro::ProjectResult.first_result_after(name, date)
   def create_kalibro_project
    Kalibro::Project.create(
       :name => name,
-      :license => license,
+      :license => project_license,
       :description => description,
       :repository => {
         :type => repository_type,
@@ -105,7 +110,7 @@ Kalibro::ProjectResult.first_result_after(name, date)
   end
  
   def destroy_project_from_service
-    project.destroy
+    project.destroy unless project.nil?
   end
  
 end
@@ -0,0 +1,69 @@
+Academic Free License 3.0 (AFL-3.0);
+Affero GNU Public License (AGPL-3.0);
+Adaptive Public License (APL-1.0);
+Apache License 2.0 (Apache-2.0);
+Apple Public Source License (APSL-2.0);
+Artistic license 2.0 (Artistic-2.0);
+Attribution Assurance Licenses (AAL);
+BSD 3-Clause "New" or "Revised" License (BSD-3-Clause);
+BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause);
+Boost Software License (BSL-1.0);
+Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1);
+Common Development and Distribution License 1.0 (CDDL-1.0);
+Common Public Attribution License 1.0 (CPAL-1.0);
+CUA Office Public License Version 1.0 (CUA-OPL-1.0);
+EU DataGrid Software License (EUDatagrid);
+Eclipse Public License 1.0 (EPL-1.0);
+Educational Community License, Version 2.0 (ECL-2.0);
+Eiffel Forum License V2.0 (EFL-2.0);
+Entessa Public License (Entessa);
+European Union Public License, Version 1.1 (EUPL-1.1);
+Fair License (FAIR);
+Frameworx License (Frameworx-1.0);
+GNU Affero General Public License v3 (AGPL-3.0);
+GNU General Public License version 2.0 (GPL-2.0);
+GNU General Public License version 3.0 (GPL-3.0);
+GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1);
+GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0);
+Historical Permission Notice and Disclaimer (HPND);
+IBM Public License 1.0 (IPL-1.0);
+IPA Font License (IPA);
+ISC License (ISC);
+LaTeX Project Public License 1.3c (LPPL-1.3c);
+Lucent Public License Version 1.02 (LPL-1.02);
+MirOS Licence (MirOS);
+Microsoft Public License (Ms-PL);
+Microsoft Reciprocal License (Ms-RL);
+MIT license (MIT);
+Motosoto License (Motosoto);
+Mozilla Public License 2.0 (MPL-2.0);
+Multics License (Multics);
+NASA Open Source Agreement 1.3 (NASA 1.3);
+NTP License (NTP);
+Naumen Public License (Naumen);
+Nethack General Public License (NGPL);
+Nokia Open Source License (Nokia);
+Non-Profit Open Software License 3.0 (NPOSL-3.0);
+OCLC Research Public License 2.0 (OCLC-2.0);
+Open Font License 1.1 (OFL 1.1);
+Open Group Test Suite License (OGTSL);
+Open Software License 3.0 (OSL-3.0);
+PHP License 3.0 (PHP-3.0);
+The PostgreSQL License (PostgreSQL);
+Python License (Python-2.0);
+CNRI Python license (CNRI-Python);
+Q Public License (QPL-1.0);
+RealNetworks Public Source License V1.0 (RPSL-1.0);
+Reciprocal Public License 1.5 (RPL-1.5);
+Ricoh Source Code Public License (RSCPL);
+Simple Public License 2.0 (SimPL-2.0);
+Sleepycat License (Sleepycat);
+Sun Public License 1.0 (SPL-1.0);
+Sybase Open Watcom Public License 1.0 (Watcom-1.0);
+University of Illinois/NCSA Open Source License (NCSA);
+Vovida Software License v. 1.0 (VSL-1.0);
+W3C License (W3C);
+wxWindows Library License (WXwindows);
+X.Net License (Xnet);
+Zope Public License 2.0 (ZPL-2.0);
+zlib/libpng license (Zlib);
@@ -0,0 +1,31 @@
+div.colorPicker-picker {
+  height: 16px;
+  width: 16px;
+  padding: 0 !important;
+  border: 1px solid #ccc;
+  background: url(arrow.gif) no-repeat top right;
+  cursor: pointer;
+  line-height: 16px;
+}
+
+div.colorPicker-palette {
+  width: 110px;
+  position: absolute;
+  border: 1px solid #598FEF;
+  background-color: #EFEFEF;
+  padding: 2px;
+  z-index: 9999;
+}
+  div.colorPicker_hexWrap {width: 100%; float:left }
+  div.colorPicker_hexWrap label {font-size: 95%; color: #2F2F2F; margin: 5px 2px; width: 25%}
+  div.colorPicker_hexWrap input {margin: 5px 2px; padding: 0; font-size: 95%; border: 1px solid #000; width: 65%; }
+
+div.colorPicker-swatch {
+  height: 12px;
+  width: 12px;
+  border: 1px solid #000;
+  margin: 2px;
+  float: left;
+  cursor: pointer;
+  line-height: 12px;
+}
@@ -0,0 +1,22 @@
+Copyright (c) 2012 Lakshan Perera
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,328 @@
+/**
+ * Really Simple Color Picker in jQuery
+ *
+ * Licensed under the MIT (MIT-LICENSE.txt) licenses.
+ *
+ * Copyright (c) 2008-2012
+ * Lakshan Perera (www.laktek.com) & Daniel Lacy (daniellacy.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+(function ($) {
+    /**
+     * Create a couple private variables.
+    **/
+    var selectorOwner,
+        activePalette,
+        cItterate       = 0,
+        templates       = {
+            control : $('<div class="colorPicker-picker">&nbsp;</div>'),
+            palette : $('<div id="colorPicker_palette" class="colorPicker-palette" />'),
+            swatch  : $('<div class="colorPicker-swatch">&nbsp;</div>'),
+            hexLabel: $('<label for="colorPicker_hex">Hex</label>'),
+            hexField: $('<input type="text" id="colorPicker_hex" />')
+        },
+        transparent     = "transparent",
+        lastColor;
+
+    /**
+     * Create our colorPicker function
+    **/
+    $.fn.colorPicker = function (options) {
+
+        return this.each(function () {
+            // Setup time. Clone new elements from our templates, set some IDs, make shortcuts, jazzercise.
+            var element      = $(this),
+                opts         = $.extend({}, $.fn.colorPicker.defaults, options),
+                defaultColor = $.fn.colorPicker.toHex(
+                        (element.val().length > 0) ? element.val() : opts.pickerDefault
+                    ),
+                newControl   = templates.control.clone(),
+                newPalette   = templates.palette.clone().attr('id', 'colorPicker_palette-' + cItterate),
+                newHexLabel  = templates.hexLabel.clone(),
+                newHexField  = templates.hexField.clone(),
+                paletteId    = newPalette[0].id,
+                swatch;
+
+
+            /**
+             * Build a color palette.
+            **/
+            $.each(opts.colors, function (i) {
+                swatch = templates.swatch.clone();
+
+                if (opts.colors[i] === transparent) {
+                    swatch.addClass(transparent).text('X');
+                    $.fn.colorPicker.bindPalette(newHexField, swatch, transparent);
+                } else {
+                    swatch.css("background-color", "#" + this);
+                    $.fn.colorPicker.bindPalette(newHexField, swatch);
+                }
+                swatch.appendTo(newPalette);
+            });
+
+            newHexLabel.attr('for', 'colorPicker_hex-' + cItterate);
+
+            newHexField.attr({
+                'id'    : 'colorPicker_hex-' + cItterate,
+                'value' : defaultColor
+            });
+
+            newHexField.bind("keydown", function (event) {
+                if (event.keyCode === 13) {
+                    var hexColor = $.fn.colorPicker.toHex($(this).val());
+                    $.fn.colorPicker.changeColor(hexColor ? hexColor : element.val());
+                }
+                if (event.keyCode === 27) {
+                    $.fn.colorPicker.hidePalette();
+                }
+            });
+
+            newHexField.bind("keyup", function (event) {
+              var hexColor = $.fn.colorPicker.toHex($(event.target).val());
+              $.fn.colorPicker.previewColor(hexColor ? hexColor : element.val());
+            });
+
+            $('<div class="colorPicker_hexWrap" />').append(newHexLabel).appendTo(newPalette);
+
+            newPalette.find('.colorPicker_hexWrap').append(newHexField);
+
+            $("body").append(newPalette);
+
+            newPalette.hide();
+
+
+            /**
+             * Build replacement interface for original color input.
+            **/
+            newControl.css("background-color", defaultColor);
+
+            newControl.bind("click", function () {
+                $.fn.colorPicker.togglePalette($('#' + paletteId), $(this));
+            });
+
+            if( options && options.onColorChange ) {
+              newControl.data('onColorChange', options.onColorChange);
+            } else {
+              newControl.data('onColorChange', function() {} );
+            }
+            element.after(newControl);
+
+            element.bind("change", function () {
+                element.next(".colorPicker-picker").css(
+                    "background-color", $.fn.colorPicker.toHex($(this).val())
+                );
+            });
+
+            // Hide the original input.
+            element.val(defaultColor).hide();
+
+            cItterate++;
+        });
+    };
+
+    /**
+     * Extend colorPicker with... all our functionality.
+    **/
+    $.extend(true, $.fn.colorPicker, {
+        /**
+         * Return a Hex color, convert an RGB value and return Hex, or return false.
+         *
+         * Inspired by http://code.google.com/p/jquery-color-utils
+        **/
+        toHex : function (color) {
+            // If we have a standard or shorthand Hex color, return that value.
+            if (color.match(/[0-9A-F]{6}|[0-9A-F]{3}$/i)) {
+                return (color.charAt(0) === "#") ? color : ("#" + color);
+
+            // Alternatively, check for RGB color, then convert and return it as Hex.
+            } else if (color.match(/^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/)) {
+                var c = ([parseInt(RegExp.$1, 10), parseInt(RegExp.$2, 10), parseInt(RegExp.$3, 10)]),
+                    pad = function (str) {
+                        if (str.length < 2) {
+                            for (var i = 0, len = 2 - str.length; i < len; i++) {
+                                str = '0' + str;
+                            }
+                        }
+
+                        return str;
+                    };
+
+                if (c.length === 3) {
+                    var r = pad(c[0].toString(16)),
+                        g = pad(c[1].toString(16)),
+                        b = pad(c[2].toString(16));
+
+                    return '#' + r + g + b;
+                }
+
+            // Otherwise we wont do anything.
+            } else {
+                return false;
+
+            }
+        },
+
+        /**
+         * Check whether user clicked on the selector or owner.
+        **/
+        checkMouse : function (event, paletteId) {
+            var selector = activePalette,
+                selectorParent = $(event.target).parents("#" + selector.attr('id')).length;
+
+            if (event.target === $(selector)[0] || event.target === selectorOwner[0] || selectorParent > 0) {
+                return;
+            }
+
+            $.fn.colorPicker.hidePalette();
+        },
+
+        /**
+         * Hide the color palette modal.
+        **/
+        hidePalette : function () {
+            $(document).unbind("mousedown", $.fn.colorPicker.checkMouse);
+
+            $('.colorPicker-palette').hide();
+        },
+
+        /**
+         * Show the color palette modal.
+        **/
+        showPalette : function (palette) {
+            var hexColor = selectorOwner.prev("input").val();
+
+            palette.css({
+                top: selectorOwner.offset().top + (selectorOwner.outerHeight()),
+                left: selectorOwner.offset().left
+            });
+
+            $("#color_value").val(hexColor);
+
+            palette.show();
+
+            $(document).bind("mousedown", $.fn.colorPicker.checkMouse);
+        },
+
+        /**
+         * Toggle visibility of the colorPicker palette.
+        **/
+        togglePalette : function (palette, origin) {
+            // selectorOwner is the clicked .colorPicker-picker.
+            if (origin) {
+                selectorOwner = origin;
+            }
+
+            activePalette = palette;
+
+            if (activePalette.is(':visible')) {
+                $.fn.colorPicker.hidePalette();
+
+            } else {
+                $.fn.colorPicker.showPalette(palette);
+
+            }
+        },
+
+        /**
+         * Update the input with a newly selected color.
+        **/
+        changeColor : function (value) {
+            selectorOwner.css("background-color", value);
+            selectorOwner.prev("input").val(value).change();
+
+            $.fn.colorPicker.hidePalette();
+
+            selectorOwner.data('onColorChange').call(selectorOwner, $(selectorOwner).prev("input").attr("id"), value);
+        },
+
+
+        /**
+         * Preview the input with a newly selected color.
+        **/
+        previewColor : function (value) {
+            selectorOwner.css("background-color", value);
+        },
+
+        /**
+         * Bind events to the color palette swatches.
+        */
+        bindPalette : function (paletteInput, element, color) {
+            color = color ? color : $.fn.colorPicker.toHex(element.css("background-color"));
+
+            element.bind({
+                click : function (ev) {
+                    lastColor = color;
+
+                    $.fn.colorPicker.changeColor(color);
+                },
+                mouseover : function (ev) {
+                    lastColor = paletteInput.val();
+
+                    $(this).css("border-color", "#598FEF");
+
+                    paletteInput.val(color);
+
+                    $.fn.colorPicker.previewColor(color);
+                },
+                mouseout : function (ev) {
+                    $(this).css("border-color", "#000");
+
+                    paletteInput.val(selectorOwner.css("background-color"));
+
+                    paletteInput.val(lastColor);
+
+                    $.fn.colorPicker.previewColor(lastColor);
+                }
+            });
+        }
+    });
+
+    /**
+     * Default colorPicker options.
+     *
+     * These are publibly available for global modification using a setting such as:
+     *
+     * $.fn.colorPicker.defaults.colors = ['151337', '111111']
+     *
+     * They can also be applied on a per-bound element basis like so:
+     *
+     * $('#element1').colorPicker({pickerDefault: 'efefef', transparency: true});
+     * $('#element2').colorPicker({pickerDefault: '333333', colors: ['333333', '111111']});
+     *
+    **/
+    $.fn.colorPicker.defaults = {
+        // colorPicker default selected color.
+        pickerDefault : "FFFFFF",
+
+        // Default color set.
+        colors : [
+            '000000', '993300', '333300', '000080', '333399', '333333', '800000', 'FF6600',
+            '808000', '008000', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900',
+            '99CC00', '339966', '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00',
+            'FFFF00', '00FF00', '00FFFF', '00CCFF', '993366', 'C0C0C0', 'FF99CC', 'FFCC99',
+            'FFFF99', 'CCFFFF', '99CCFF', 'FFFFFF'
+        ],
+
+        // If we want to simply add more colors to the default set, use addColors.
+        addColors : []
+    };
+
+})(jQuery);
@@ -0,0 +1,26 @@
+/**
+ * Really Simple Color Picker in jQuery
+ * 
+ * Licensed under the MIT (MIT-LICENSE.txt) licenses.
+ *
+ * Copyright (c) 2008-2012 
+ * Lakshan Perera (www.laktek.com) & Daniel Lacy (daniellacy.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */(function(a){var b,c,d=0,e={control:a('<div class="colorPicker-picker">&nbsp;</div>'),palette:a('<div id="colorPicker_palette" class="colorPicker-palette" />'),swatch:a('<div class="colorPicker-swatch">&nbsp;</div>'),hexLabel:a('<label for="colorPicker_hex">Hex</label>'),hexField:a('<input type="text" id="colorPicker_hex" />')},f="transparent",g;a.fn.colorPicker=function(b){return this.each(function(){var c=a(this),g=a.extend({},a.fn.colorPicker.defaults,b),h=a.fn.colorPicker.toHex(c.val().length>0?c.val():g.pickerDefault),i=e.control.clone(),j=e.palette.clone().attr("id","colorPicker_palette-"+d),k=e.hexLabel.clone(),l=e.hexField.clone(),m=j[0].id,n;a.each(g.colors,function(b){n=e.swatch.clone(),g.colors[b]===f?(n.addClass(f).text("X"),a.fn.colorPicker.bindPalette(l,n,f)):(n.css("background-color","#"+this),a.fn.colorPicker.bindPalette(l,n)),n.appendTo(j)}),k.attr("for","colorPicker_hex-"+d),l.attr({id:"colorPicker_hex-"+d,value:h}),l.bind("keydown",function(b){if(b.keyCode===13){var d=a.fn.colorPicker.toHex(a(this).val());a.fn.colorPicker.changeColor(d?d:c.val())}b.keyCode===27&&a.fn.colorPicker.hidePalette()}),l.bind("keyup",function(b){var d=a.fn.colorPicker.toHex(a(b.target).val());a.fn.colorPicker.previewColor(d?d:c.val())}),a('<div class="colorPicker_hexWrap" />').append(k).appendTo(j),j.find(".colorPicker_hexWrap").append(l),a("body").append(j),j.hide(),i.css("background-color",h),i.bind("click",function(){a.fn.colorPicker.togglePalette(a("#"+m),a(this))}),b&&b.onColorChange?i.data("onColorChange",b.onColorChange):i.data("onColorChange",function(){}),c.after(i),c.bind("change",function(){c.next(".colorPicker-picker").css("background-color",a.fn.colorPicker.toHex(a(this).val()))}),c.val(h).hide(),d++})},a.extend(!0,a.fn.colorPicker,{toHex:function(a){if(a.match(/[0-9A-F]{6}|[0-9A-F]{3}$/i))return a.charAt(0)==="#"?a:"#"+a;if(!a.match(/^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/))return!1;var b=[parseInt(RegExp.$1,10),parseInt(RegExp.$2,10),parseInt(RegExp.$3,10)],c=function(a){if(a.length<2)for(var b=0,c=2-a.length;b<c;b++)a="0"+a;return a};if(b.length===3){var d=c(b[0].toString(16)),e=c(b[1].toString(16)),f=c(b[2].toString(16));return"#"+d+e+f}},checkMouse:function(d,e){var f=c,g=a(d.target).parents("#"+f.attr("id")).length;if(d.target===a(f)[0]||d.target===b[0]||g>0)return;a.fn.colorPicker.hidePalette()},hidePalette:function(){a(document).unbind("mousedown",a.fn.colorPicker.checkMouse),a(".colorPicker-palette").hide()},showPalette:function(c){var d=b.prev("input").val();c.css({top:b.offset().top+b.outerHeight(),left:b.offset().left}),a("#color_value").val(d),c.show(),a(document).bind("mousedown",a.fn.colorPicker.checkMouse)},togglePalette:function(d,e){e&&(b=e),c=d,c.is(":visible")?a.fn.colorPicker.hidePalette():a.fn.colorPicker.showPalette(d)},changeColor:function(c){b.css("background-color",c),b.prev("input").val(c).change(),a.fn.colorPicker.hidePalette(),b.data("onColorChange").call(b,a(b).prev("input").attr("id"),c)},previewColor:function(a){b.css("background-color",a)},bindPalette:function(c,d,e){e=e?e:a.fn.colorPicker.toHex(d.css("background-color")),d.bind({click:function(b){g=e,a.fn.colorPicker.changeColor(e)},mouseover:function(b){g=c.val(),a(this).css("border-color","#598FEF"),c.val(e),a.fn.colorPicker.previewColor(e)},mouseout:function(d){a(this).css("border-color","#000"),c.val(b.css("background-color")),c.val(g),a.fn.colorPicker.previewColor(g)}})}}),a.fn.colorPicker.defaults={pickerDefault:"FFFFFF",colors:["000000","993300","333300","000080","333399","333333","800000","FF6600","808000","008000","008080","0000FF","666699","808080","FF0000","FF9900","99CC00","339966","33CCCC","3366FF","800080","999999","FF00FF","FFCC00","FFFF00","00FF00","00FFFF","00CCFF","993366","C0C0C0","FF99CC","FFCC99","FFFF99","CCFFFF","99CCFF","FFFFFF"],addColors:[]}})(jQuery)
 \ No newline at end of file
@@ -2,7 +2,6 @@ var processingTree = false;
 var metricName;
 jQuery(function (){
   jQuery('.source-tree-link').live("click", reloadModule);
-  jQuery('[data-show]').live("click", toggle_mezuro);
   jQuery('[show-metric-history]').live("click", display_metric_history);
   jQuery('[show-grade-history]').live("click", display_grade_history);
   jQuery('#project_date_submit').live("click", reloadProjectWithDate);
@@ -16,7 +15,8 @@ function showProjectContent() {
  
 function display_metric_history() {
   var module_name = jQuery(this).attr('data-module-name');
-  var metric_name = jQuery(this).attr('data-metric-name');
+  var metric_name = jQuery(this).attr('show-metric-history');
+  toggle_mezuro("." + metric_name);
   metricName = metric_name;
   callAction('module_metrics_history', {module_name: module_name, metric_name: metric_name}, show_metrics);
   return false;
@@ -24,6 +24,7 @@ function display_metric_history() {
  
 function display_grade_history() {
   var module_name = jQuery(this).attr('data-module-name');
+  toggle_mezuro("#historical-grade");
   callAction('module_grade_history', {module_name: module_name}, show_grades);
   return false;
 }
@@ -36,8 +37,7 @@ function show_grades(content) {
   jQuery('#historical-grade').html(content);
 }
  
-function toggle_mezuro(){
-  var element = jQuery(this).attr('data-show');
+function toggle_mezuro(element){
   jQuery(element).toggle();
   return false;
 }
@@ -51,23 +51,8 @@ function reloadModule(){
   return false;
 }
  
-function reloadProjectWithDate(){
-	var day = jQuery("#project_date_day").val();
-	var month = jQuery("#project_date_month").val();
-	var year = jQuery("#project_date_year").val();
-
-  if(day.length == 1) 
-    day = "0" + day;
-  if(month.length == 1) 
-    month = "0" + month; 
-	
-	var date = new Date(year + "-" + month + "-" + day + "T00:00:00+00:00");
-	
-	if(isNaN(date)){
-	  alert("Invalid date! " + date);
-	  return false;
-	}
-	reloadProject(date);
+function reloadProjectWithDate(date){
+	reloadProject(date + "T00:00:00+00:00");
   return false;
 }
  
@@ -3,7 +3,9 @@ jQuery(function (){
   jQuery('#metric_configuration_submit').live("click", validate_metric_configuration);
 });
  
-
+function validate_code(code){
+  return true;
+}
  
 function validate_metric_configuration(){
     var code = jQuery('#metric_configuration_code').val();
@@ -37,14 +39,6 @@ function IsNotInfinite(value){
     return true;
 }
  
-function IsNotHexadecimal(value){
-    if(value.match(/^[0-9a-fA-F]{1,8}$/))
-    {
-      return false;
-    }
-    return true;
-}
-
 function validate_new_range_configuration(event){    
     var label = jQuery("#range_label").val();
     var beginning = jQuery("#range_beginning").val();
@@ -54,24 +48,20 @@ function validate_new_range_configuration(event){
  
     if (is_null(label) || is_null(beginning) || is_null(end) || is_null(color) || is_null(grade))
     {
-        alert("Please fill all fields marked with (*)");
+        alert("Please fill all fields marked with (*).");
         return false;
     }
     if ( (IsNotNumeric(beginning) && IsNotInfinite(beginning)) || (IsNotNumeric(end) && IsNotInfinite(end)) || IsNotNumeric(grade))
     {
-        alert("Beginning, End and Grade must be numeric values");
+        alert("Beginning, End and Grade must be numeric values.");
         return false;
     }
     if (parseInt(beginning) > parseInt(end))
     {
         if(IsNotInfinite(beginning) && IsNotInfinite(end)){
-          alert("End must be greater than Beginning");
+          alert("End must be greater than Beginning.");
           return false;
         }
     }
-    if (IsNotHexadecimal(color)){
-        alert("Color must be an hexadecimal value");
-        return false;
-    }
     return true;
 }
+@import url('colorPicker.css');
+
 .link {
     cursor: pointer;
 }
@@ -28,7 +28,7 @@ class ProjectFixtures
   def self.project_content
     content = MezuroPlugin::ProjectContent.new
     content.name = 'Qt-Calculator'
-    content.license = 'GPL'
+    content.project_license = 'GPL'
     content.description = 'Calculator for Qt'
     content.repository_type = RepositoryFixtures.repository_hash[:type]
     content.repository_url = RepositoryFixtures.repository_hash[:address]
@@ -27,7 +27,7 @@ class MezuroPluginMyprofileControllerTest &lt; ActionController::TestCase
  
     Kalibro::Configuration.expects(:all_names).returns([])
     @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)
-    @content.expects(:send_configuration_to_service).returns(nil)
+    @content.expects(:send_kalibro_configuration_to_service).returns(nil)
     @content.stubs(:solr_save)
     @content.save
  
@@ -39,7 +39,7 @@ class MezuroPluginMyprofileControllerTest &lt; ActionController::TestCase
     @range = RangeFixtures.range_excellent
     @range_hash = RangeFixtures.range_excellent_hash
   end
-  
+
   should 'test choose base tool' do
     Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => @base_tool.name})
     get :choose_base_tool, :profile => @profile.identifier, :id => @content.id
@@ -25,14 +25,14 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     @content.save
   end
  
-  should 'test project state without error' do
+  should 'test project state without kalibro_error' do
     Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash})
     get :project_state, :profile => @profile.identifier, :id => @content.id
     assert_response 200
     assert_equal @content, assigns(:content)
   end
  
-  should 'test project state with error' do
+  should 'test project state with kalibro_error' do
     Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash.merge({:error => ErrorFixtures.error_hash})})
     get :project_state, :profile => @profile.identifier, :id => @content.id
     assert_response 200
@@ -126,7 +126,7 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     get :module_metrics_history, :profile => @profile.identifier, :id => @content.id, :module_name => @project.name,
     :metric_name => @module_result.metric_result.first.metric.name.delete("() ")
     assert_equal @content, assigns(:content)
-    assert_equal [@module_result.metric_result[0].value], assigns(:score_history)
+    assert_equal [[@module_result.metric_result[0].value, @module_result.date.to_s[0..9]]], assigns(:score_history)
     assert_response 200
   end
  
@@ -134,7 +134,7 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     Kalibro::ModuleResult.expects(:request).with("ModuleResult", :get_result_history, {:project_name => @project.name, :module_name => @project.name}).returns({:module_result => @module_result})
     get :module_grade_history, :profile => @profile.identifier, :id => @content.id, :module_name => @project.name
     assert_equal @content, assigns(:content)
-    assert_equal [@module_result.grade], assigns(:score_history)
+    assert_equal [[@module_result.grade, @module_result.date.to_s[0..9]]], assigns(:score_history)
     assert_response 200
   end
  
@@ -44,7 +44,9 @@ class ConfigurationTest &lt; ActiveSupport::TestCase
   should 'return nil when configuration doesnt exist' do
     request_body = {:configuration_name => @configuration.name}
     Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, request_body).raises(Exception.new)
-    assert_nil Kalibro::Configuration.find_by_name(@configuration.name)
+    assert_raise Exception do
+      Kalibro::Configuration.find_by_name(@configuration.name)
+    end
   end
  
   should 'destroy configuration by name' do
@@ -69,26 +69,20 @@ class ProjectResultTest &lt; ActiveSupport::TestCase
     assert_equal '00:00:01', @project_result.formatted_analysis_time
   end
  
-  should 'retrieve module node' do
-    node = @project_result.get_node("main")
-    assert_equal @hash[:source_tree][:child][2], node.to_hash
-  end
-
   should 'retrive complex module' do
-    node = @project_result.get_node("org.Window")
-    assert_equal @hash[:source_tree][:child][0][:child].first, node.to_hash
+    assert_equal @hash[:source_tree][:child][0][:child].first, @project_result.node("org.Window").to_hash
   end
  
   should 'return source tree node when nil is given' do
-    assert_equal @hash[:source_tree], @project_result.node_of(nil).to_hash 
+    assert_equal @hash[:source_tree], @project_result.node(nil).to_hash 
   end
  
   should 'return source tree node when project name is given' do
-    assert_equal @hash[:source_tree], @project_result.node_of(@project_result.project.name).to_hash 
+    assert_equal @hash[:source_tree], @project_result.node(@project_result.project.name).to_hash 
   end
  
   should 'return correct node when module name is given' do
-    assert_equal @hash[:source_tree][:child][2], @project_result.node_of("main").to_hash
+    assert_equal @hash[:source_tree][:child][2], @project_result.node("main").to_hash
   end
  
 end
@@ -17,4 +17,16 @@ class RangeTest &lt; ActiveSupport::TestCase
     assert_equal @hash, @range.to_hash
   end
  
+	should 'create a default color for new range' do 
+		assert_equal "#e4ca2d", Kalibro::Range.new.mezuro_color
+	end
+	
+	should "convert color from 'ff' to '#'" do
+		assert_equal "#ff0000", @range.mezuro_color
+	end
+
+	should "convert color from '#' to 'ff' when creating a new range" do
+		assert_equal "ffff0000", Kalibro::Range.new({:color => '#ff0000'}).color
+	end
+	
 end
@@ -6,9 +6,7 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
  
   def setup
     @configuration = ConfigurationFixtures.configuration
-    @content = MezuroPlugin::ConfigurationContent.new
-    @content.name = @configuration.name
-    @content.description = @configuration.description
+    @content = ConfigurationFixtures.configuration_content("None")
   end
  
   should 'be an article' do
@@ -35,19 +33,19 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
  
   should 'get configuration from service' do
     Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(@configuration)
-    assert_equal @configuration, @content.configuration
+    assert_equal @configuration, @content.kalibro_configuration
   end
  
   should 'send configuration to service after saving' do
-    @content.expects :send_configuration_to_service
+    @content.expects :send_kalibro_configuration_to_service
     @content.stubs(:solr_save)
     @content.run_callbacks :after_save
   end
  
   should 'create new configuration' do
     Kalibro::Configuration.expects(:create).with(:name => @content.name, :description => @content.description)
-    Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(nil)
-    @content.send :send_configuration_to_service
+    Kalibro::Configuration.expects(:find_by_name).with(@content.name)
+    @content.send :send_kalibro_configuration_to_service
   end
  
   should 'clone configuration' do
@@ -55,25 +53,25 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
     Kalibro::Configuration.expects(:create).with(:name => @content.name, :description => @content.description, :metric_configuration => @configuration.metric_configurations_hash)
     Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(nil)
     Kalibro::Configuration.expects(:find_by_name).with('clone name').returns(@configuration)
-    @content.send :send_configuration_to_service
+    @content.send :send_kalibro_configuration_to_service
   end
  
   should 'edit configuration' do
     Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(@configuration)
     @configuration.expects(:update_attributes).with(:description => @content.description)
-    @content.send :send_configuration_to_service
+    @content.send :send_kalibro_configuration_to_service
   end
  
   should 'send correct configuration to service but comunication fails' do
     Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(@configuration)
     @configuration.expects(:save).returns(false)
-    @content.send :send_configuration_to_service
+    @content.send :send_kalibro_configuration_to_service
   end
  
   should 'remove configuration from service' do
     Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(@configuration)
     @configuration.expects(:destroy)
-    @content.send :remove_configuration_from_service
+    @content.send :remove_kalibro_configuration_from_service
   end
  
 end
 <h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>
  
 <%
-  begin
-    configuration = @article.title.nil? ? nil : @article.configuration
-  rescue
-    configuration = nil
-  end
+  kalibro_configuration = @article.title.nil? ? nil : @article.kalibro_configuration
+  kalibro_configuration_names = @article.kalibro_configuration_names
 %>
  
 <%= error_messages_for 'kalibro_configuration' %>
@@ -13,20 +10,19 @@
 <%= hidden_field_tag 'kalibro_configuration[profile_id]', profile.id %>
 <%= hidden_field_tag 'id', @article.id %>
  
-<% configuration_names = @article.configuration_names %>
-
-<% selected = (configuration.nil? ? "None" : @article.configuration_to_clone_name) %>
+ 
+<% selected = (kalibro_configuration.nil? ? "None" : @article.configuration_to_clone_name) %>
  
 <%= required_fields_message %>
  
 <%= required labelled_form_field _('Clone Configuration'),
-if !configuration.nil? && !@article.id.nil?
-  f.select(:configuration_to_clone_name, configuration_names, {:selected => selected}, :disabled => 'true')
+if !kalibro_configuration.nil? && !@article.id.nil?
+  f.select(:configuration_to_clone_name, kalibro_configuration_names, {:selected => selected}, :disabled => 'true')
 else
-  f.select(:configuration_to_clone_name, configuration_names, {:selected => selected})
+  f.select(:configuration_to_clone_name, kalibro_configuration_names, {:selected => selected})
 end %>
 <br/>
  
-<%= required f.text_field(:name, :disabled => !(configuration.nil? || @article.id.nil?)) %>
+<%= required f.text_field(:name, :disabled => !(kalibro_configuration.nil? || @article.id.nil?)) %>
  
 <%= f.text_field :description %><br/>
 <h1> <%= _(MezuroPlugin::ProjectContent.short_description) %> </h1>
  
 <%
+  @project = @article.title.nil? ? nil : @article.project
   begin
-    @project = @article.title.nil? ? nil : Kalibro::Project.find_by_name(@article.title)
-  rescue
-    @project = nil
+    @repository_types = Kalibro::Repository.repository_types.sort
+    @configuration_names = Kalibro::Configuration.all_names.sort
+  rescue Exception => exception
+    @article.errors.add_to_base(exception.message)
+    @repository_types = []
+    @configuration_names = []
   end
 %>
  
@@ -20,18 +24,18 @@
   <%= required f.text_field(:name) %>
 <% end %>
  
-<%= f.text_field :license %><br/>
+<% selected = (@project.nil? ? "" : @project.license) %>
+<%= required labelled_form_field _('License'),
+  f.select(:project_license, MezuroPlugin::Helpers::ContentViewerHelper.create_license_options ,{:selected => selected}) %><br/>
  
 <%= f.text_field :description %><br/>
  
-<% @repository_types = Kalibro::Repository.repository_types.sort %>
 <% @selected = (@project.nil? ? @repository_types : @project.repository.type) %>
 <%= required labelled_form_field _('Repository type'),
   f.select(:repository_type, @repository_types, {:selected => @selected}) %><br/>
  
 <%= required f.text_field(:repository_url) %><br/>
  
-<% @configuration_names = Kalibro::Configuration.all_names.sort %>
 <% @selected = (@project.nil? ? @configuration_names[0] : @project.configuration_name) %>
  
 <% if !@project.nil? && !@article.id.nil? %>
-<% unless @content.errors[:base].nil? %>
-  <%= @content.errors[:base] %>
-<% else %>
-  <% the_module = @module_result.module %>
-  <% module_label = "#{the_module.name} (#{the_module.granularity})" %>
+<h5><%= _('Metric results for: ') + @module_label %> </h5>
  
-  <h5><%= _('Metric results for: ') + module_label %> </h5>
-
-  <hr/>
-  <div class="zoomable-image">
-  <table>
-    <thead>
-      <tr>
-        <th>Metric</th>
-        <th>Value</th>
-        <th>Weight</th>
-        <th>Threshold</th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @module_result.metric_results.each do |metric_result|  %>
-        <% range = metric_result.range %>
-        <% if !range.nil? %>
-          <tr>
-            <td><a href="#" data-show=".<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>"><%= metric_result.metric.name %></a></td>
-            <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
-            <td><%= metric_result.weight %></td>
-            <td style="background-color: #<%= range.color[2..-1] %>"><%= range.label %></td>
-          </tr>	  
-          <tr class="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" style="display: none;">
-            <td colspan="3">
-              <div id='historical-<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>'>
-                <a href="#" show-metric-history="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" data-module-name="<%= the_module.name %>" data-metric-name="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>"> <p style="text-indent: 3em;"> Get Historical Values </p> </a>
-              </div>
-            </td>
-            <td align="right">
-              <%= range.comments.nil? ? '' : range.comments %>
-            </td> 
-          </tr>
-        <% end %>
+<hr/>
+<div class="zoomable-image">
+<table>
+  <thead>
+    <tr>
+      <th>Metric</th>
+      <th>Value</th>
+      <th>Weight</th>
+      <th>Threshold</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @module_result.metric_results.each do |metric_result|  %>
+      <% range = metric_result.range %>
+      <% if !range.nil? %>
+        <tr>
+          <td><a href="#" show-metric-history="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" data-module-name="<%= @module.name %>"><%= metric_result.metric.name %></a></td>
+          <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
+          <td><%= metric_result.weight %></td>
+          <td style="background-color: #<%= range.color[2..-1] %>"><%= range.label %></td>
+        </tr>	  
+        <tr class="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" style="display: none;">
+          <td colspan="3">
+            <div id='historical-<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>'>
+            </div>
+          </td>
+          <td align="right">
+            <%= range.comments.nil? ? '' : range.comments %>
+          </td> 
+        </tr>
       <% end %>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td colspan = "3">
-          <div id='historical-grade'></div>
-        </td>
-        <td align = "right">
-          <a href="#" show-grade-history="<%= @module_result.module.name %>" data-module-name="<%= the_module.name%>" >
-            <strong>
-              <%= _('Grade:') %>
-              <%= "%.02f" % @module_result.grade %>
-            </strong>
-          </a>
-        </td>
-      </tr>
-    </tfoot>
-  </table>
-  </div>
-<% end %>
+    <% end %>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td colspan = "3">
+        <div id='historical-grade' style="display: none;"></div>
+      </td>
+      <td align = "right">
+        <a href="#" show-grade-history="<%= @module_result.module.name %>" data-module-name="<%= @module.name%>" >
+          <strong>
+            <%= _('Grade:') %>
+            <%= "%.02f" % @module_result.grade %>
+          </strong>
+        </a>
+      </td>
+    </tr>
+  </tfoot>
+</table>
+</div>
@@ -2,7 +2,7 @@
 <p>
   <%= "State when error ocurred: #{@project.state}" %>
   <br/>
-  <% error = @project.error %>
+  <% error = @project.kalibro_error %>
   <%= error.message %>
 <ul>
   <% error.stack_trace.each do |trace| %>
 <% unless @content.errors[:base].nil? %>
   <%= @content.errors[:base] %>
 <% else %>
-  <% form_for :project_date, :html=>{:id=>"project_history_date"} do |f| %>
-	  <%= f.label :day, "Choose project date:" %>
-	
-  <table>
-	  <tr>
-		  <td>
-			  Day
-		  </td>
-		  <td>
-			  Month
-		  </td>
-		  <td>
-			  Year
-		  </td>
-	  </tr>
-	  <tr>
-		  <td>
-			  <%= f.text_field :day, :size => 1, :maxlength => 2, :placeholder =>"dd" %>
-			  </td>
-		  <td>
-			  <%= f.text_field :month, :size => 1, :maxlength => 2, :placeholder =>"mm"  %>
-		  </td>
-		  <td>
-			  <%= f.text_field :year, :size => 1, :maxlength => 4, :placeholder =>"yyyy"   %>
-		  </td>
-	  </tr>
-  </table>
-    <%= f.submit "Refresh" %>
-  <% end %>
-
+  <p> Choose a date to see specific project results: </p>
+  <div id="datepicker" data-date="<%= @project_result.date %>">
+    <input id="datepicker_field" style="display:none"/> 
+  </div>
  
   <h4><%= _('Last Result') %></h4>
  
@@ -48,4 +22,18 @@
       <td><%= @project_result.formatted_analysis_time %></td>
     </tr>
   </table>
+  
+  
+  <script>
+	  jQuery(document).ready(function($) {
+  	  $("#datepicker").datepicker({ altField: '#datepicker_field', showOn: 'button', dateFormat: "yy-mm-dd",
+  	  															buttonImageOnly: true, buttonImage: '/images/calendar_date_select/calendar.png',
+  	  															onSelect: function(dateText, inst) {
+  	  															reloadProjectWithDate(dateText) } });
+  	  var date = jQuery("#datepicker").attr('data-date').substr(0,10);
+	    $("#datepicker").datepicker( "setDate" , date );
+	    
+		});
+  </script>
+  
 <% end %>
 <% @configuration_content = @page
-@configuration = @page.configuration %>
+@kalibro_configuration = @page.kalibro_configuration %>
+<% unless @page.errors[:base].nil? %>
+  <% if @page.errors[:base] =~ /There is no configuration named/ %>
+    <h3>Warning:</h3>
+    <p>This Configuration doesn't exist on the Web Service. Do you want to <a href="/myprofile/<%= @page.profile.name %>/cms/destroy/<%= @page.id%>">delete</a> or <a href="/myprofile/<%= @page.profile.name %>/cms/edit/<%= @page.id%>">save it again</a>?</p>
+  <% else %>
+    <%= @page.errors[:base] %>
+  <% end %>
+<% else %>
  
-<table id="project_info">
-  <tr>
-    <td><%= _('Name') %></td>
-    <td><%= @configuration.name %></td>
-  </tr>
-  <tr>
-    <td><%= _('Description') %></td>
-    <td><%= @configuration.description %></td>
-  </tr>
-</table>
+  <table id="project_info">
+    <tr>
+      <td><%= _('Name') %></td>
+      <td><%= @kalibro_configuration.name %></td>
+    </tr>
+    <tr>
+      <td><%= _('Description') %></td>
+      <td><%= @kalibro_configuration.description %></td>
+    </tr>
+  </table>
  
-<br/>
+  <br/>
  
-<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_myprofile",
-:action => "choose_base_tool", :params => { :id => @configuration_content.id } %><br/>
+  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_myprofile",
+  :action => "choose_base_tool", :params => { :id => @configuration_content.id } %><br/>
  
-<table>
-  <tr class="titles">
-      <td><h5>Metric Name</h5></td>
-      <td><h5>Collector Name</h5></td>
-      <td><h5>Metric Code</h5></td>
-      <td/><td/>
-  </tr>
-  <% @configuration.metric_configurations.each do |metric_configuration| %>
-    <tr class="metric">
-      <td><%= metric_configuration.metric.name %></td>
-      <% if metric_configuration.metric.instance_of? Kalibro::NativeMetric %>
-        <td>
-          <%= metric_configuration.metric.origin %>
-        </td>
-        <td><%= metric_configuration.code %></td>
-        <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params =>
-          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
-      <% else %>
-        <td>
-          Compound Metric
-        </td>
-        <td><%= metric_configuration.code %></td>
-        <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_compound_metric_configuration", :params =>
-          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
-      <% end %>
-      
-      <td><%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params =>
-        {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+  <table>
+    <tr class="titles">
+        <td><h5>Metric Name</h5></td>
+        <td><h5>Collector Name</h5></td>
+        <td><h5>Metric Code</h5></td>
+        <td/><td/>
     </tr>
-  <% end %>
-</table>
+    <% @kalibro_configuration.metric_configurations.each do |metric_configuration| %>
+      <tr class="metric">
+        <td><%= metric_configuration.metric.name %></td>
+        <% if metric_configuration.metric.instance_of? Kalibro::NativeMetric %>
+          <td>
+            <%= metric_configuration.metric.origin %>
+          </td>
+          <td><%= metric_configuration.code %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params =>
+            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+        <% else %>
+          <td>
+            Compound Metric
+          </td>
+          <td><%= metric_configuration.code %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_compound_metric_configuration", :params =>
+            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+        <% end %>
+        
+        <td><%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params =>
+          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
@@ -2,60 +2,58 @@
  
 <% @project = @page.project %>
 <% unless @page.errors[:base].nil? %>
-  <%= @page.errors[:base] %>
-<% else %>
-
-  <% if (@project==nil) %>
+  <% if @page.errors[:base] =~ /There is no project named/ %>
     <h3>Warning:</h3>
     <p>This project doesn't exist on the Web Service. Do you want to <a href="/myprofile/<%= @page.profile.name %>/cms/destroy/<%= @page.id%>">delete</a> or <a href="/myprofile/<%= @page.profile.name %>/cms/edit/<%= @page.id%>">save it again</a>?</p>
   <% else %>
+    <%= @page.errors[:base] %>
+  <% end %>
+<% else %>
  
+  <table>
+    <tr>
+      <td><%= _('Name') %></td>
+      <td><%= @project.name %></td>
+    </tr>
+    <tr>
+      <td><%= _('License') %></td>
+      <td><%= @project.license %></td>
+    </tr>
+    <tr>
+      <td><%= _('Description') %></td>
+      <td><%= @project.description %></td>
+    </tr>
+    <tr>
+      <td><%= _('Repository type') %></td>
+      <td><%= @project.repository.type %></td>
+    </tr>
+    <tr>
+      <td><%= _('Repository address') %></td>
+      <td><%= @project.repository.address %></td>
+    </tr>
+    <tr>
+      <td><%= _('Configuration') %></td>
+      <td><%= @project.configuration_name %></td>
+    </tr>
+    <tr> 
+      <td><%= _('Periodicity') %></td>
+      <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
+    </tr>
+    <tr>
+      <td><%= _('Status')%></td>
+      <td>
+        <div id="project-state"><%= @project.state %></div>
+        <div id="msg-time"></div> 
+      </td>
+    </tr>
+  </table>
  
-    <table>
-      <tr>
-        <td><%= _('Name') %></td>
-        <td><%= @project.name %></td>
-      </tr>
-      <tr>
-        <td><%= _('License') %></td>
-        <td><%= @project.license %></td>
-      </tr>
-      <tr>
-        <td><%= _('Description') %></td>
-        <td><%= @project.description %></td>
-      </tr>
-      <tr>
-        <td><%= _('Repository type') %></td>
-        <td><%= @project.repository.type %></td>
-      </tr>
-      <tr>
-        <td><%= _('Repository address') %></td>
-        <td><%= @project.repository.address %></td>
-      </tr>
-      <tr>
-        <td><%= _('Configuration') %></td>
-        <td><%= @project.configuration_name %></td>
-      </tr>
-      <tr> 
-        <td><%= _('Periodicity') %></td>
-        <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
-      </tr>
-      <tr>
-        <td><%= _('Status')%></td>
-        <td>
-          <div id="project-state"><%= @project.state %></div>
-          <div id="msg-time"></div> 
-        </td>
-      </tr>
-    </table>
-
-    <br />
+  <br />
  
-    <div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>"
-         data-project-name="<%= @project.name %>">
-    </div>
-    <div id="project-tree"></div>
-    <div id="module-result">
-    </div>
-  <% end %>
+  <div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>"
+       data-project-name="<%= @project.name %>">
+  </div>
+  <div id="project-tree"></div>
+  <div id="module-result">
+  </div>
 <% end %>
@@ -38,7 +38,7 @@
       <%= f.label :color, "(*) Color:" %>
     </td>
     <td>
-      <%= f.text_field :color %>
+      <%= f.text_field(:color, :id => "range_color", :value => @range.mezuro_color) %>
     </td>
   </tr>
   <tr>
@@ -51,3 +51,11 @@
   </tr>
 </table>
 <%= f.submit "Save Range" %>
+
+<script>jQuery(document).ready(function($) {
+    $('#range_color').colorPicker({ 
+   		onColorChange : function(id, newValue) {
+   			jQuery('#range_color').val(newValue);
+   		}
+   	});
+});</script>
+<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.min.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.js" type="text/javascript"></script>
+
 <h2><%= @configuration_content.name %> Configuration</h2>
  
 <% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.min.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.js" type="text/javascript"></script>
  
 <h2><%= @configuration_content.name %> Configuration</h2>
  
@@ -84,3 +86,4 @@
 <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %>
 <div id="range_form" style="display:none"></div>
  
+
@@ -0,0 +1,3 @@
+<h2> An error occured: </h2>
+<%= @message %>
+<!-- The <%=h is for escaping the URL properly --!>
@@ -0,0 +1,2 @@
+<h2> An error occured: </h2>
+<%= @message %>
@@ -0,0 +1,37 @@
+class ToleranceTimePluginMyprofileController < MyProfileController
+  def index
+    @tolerance = ToleranceTimePlugin::Tolerance.find_by_profile_id(profile.id) || ToleranceTimePlugin::Tolerance.create!(:profile => profile)
+    convert_values
+    if request.post?
+      begin
+        convert_params
+        @tolerance.update_attributes!(params[:tolerance])
+        convert_values
+        session[:notice] = _('Tolerance updated')
+      rescue
+        session[:notice] = _('Tolerance could not be updated')
+      end
+    end
+  end
+
+  private
+
+  def convert_params
+    params[:tolerance][:content_tolerance] = params[:tolerance][:content_tolerance].to_i * params[:content_tolerance_unit].to_i if !params[:tolerance][:content_tolerance].blank?
+    params[:tolerance][:comment_tolerance] = params[:tolerance][:comment_tolerance].to_i * params[:comment_tolerance_unit].to_i if !params[:tolerance][:comment_tolerance].blank?
+  end
+
+  def convert_values
+    @content_default_unit = select_unit(@tolerance.content_tolerance)
+    @comment_default_unit = select_unit(@tolerance.comment_tolerance)
+    @tolerance.content_tolerance /= @content_default_unit if !@tolerance.content_tolerance.nil?
+    @tolerance.comment_tolerance /= @comment_default_unit if !@tolerance.comment_tolerance.nil?
+  end
+
+  def select_unit(value)
+    return 1 if value.nil? || value == 0
+    return 3600 if value % 3600 == 0
+    return 60 if value % 60 == 0
+    return 1
+  end
+end
@@ -0,0 +1,13 @@
+class CreateToleranceTimePluginTolerances < ActiveRecord::Migration
+  def self.up
+    create_table :tolerance_time_plugin_tolerances do |t|
+      t.references  :profile
+      t.integer     :content_tolerance
+      t.integer     :comment_tolerance
+    end
+  end
+
+  def self.down
+    drop_table :tolerance_time_plugin_tolerances
+  end
+end
@@ -0,0 +1,12 @@
+class CreateToleranceTimePluginPublications < ActiveRecord::Migration
+  def self.up
+    create_table :tolerance_time_plugin_publications do |t|
+      t.references :target, :polymorphic => true
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :tolerance_time_plugin_publications
+  end
+end
@@ -0,0 +1,23 @@
+require_dependency 'article'
+
+class Article
+  after_create do |article|
+    ToleranceTimePlugin::Publication.create!(:target => article) if article.published
+  end
+
+  before_save do |article|
+    if article.published_changed?
+      if article.published
+        ToleranceTimePlugin::Publication.create!(:target => article)
+      else
+        publication = ToleranceTimePlugin::Publication.find_by_target(article)
+        publication.destroy if publication.present?
+      end
+    end
+  end
+
+  before_destroy do |article|
+    publication = ToleranceTimePlugin::Publication.find_by_target(article)
+    publication.destroy if publication.present?
+  end
+end
@@ -0,0 +1,13 @@
+require_dependency 'comment'
+
+class Comment
+  after_create do |comment|
+    ToleranceTimePlugin::Publication.create!(:target => comment)
+  end
+
+  before_destroy do |comment|
+    publication = ToleranceTimePlugin::Publication.find_by_target(comment)
+    publication.destroy if publication.present?
+  end
+end
+
@@ -0,0 +1,71 @@
+require_dependency 'ext/article'
+require_dependency 'ext/comment'
+
+class ToleranceTimePlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Tolerance Time"
+  end
+
+  def self.plugin_description
+    _("Adds a tolerance time for editing content after its publication")
+  end
+
+  def self.expired?(content)
+    return false if content.kind_of?(Comment) && !content.article.kind_of?(Article)
+
+    expirable = content.kind_of?(Comment) || (!content.folder? && content.published?)
+    publication = ToleranceTimePlugin::Publication.find_by_target(content)
+    publication = ToleranceTimePlugin::Publication.create!(:target => content) if expirable && publication.nil?
+    person_article = content.kind_of?(Article) && content.profile.kind_of?(Person)
+
+    !person_article && expirable && publication.expired?
+  end
+
+  def control_panel_buttons
+    {:title => _('Tolerance Adjustements'), :url => {:controller => 'tolerance_time_plugin_myprofile', :profile => context.profile.identifier}, :icon => 'tolerance-time'  }
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def cms_controller_filters
+    return if !context.environment.plugin_enabled?(ToleranceTimePlugin)
+    block = lambda do
+      content = Article.find(params[:id])
+      if ToleranceTimePlugin.expired?(content)
+        session[:notice] = _("This content can't be edited anymore because it expired the tolerance time")
+        redirect_to content.url
+      end
+    end
+
+    { :type => 'before_filter',
+      :method_name => 'expired_content',
+      :options => {:only => 'edit'},
+      :block => block }
+  end
+
+  def content_viewer_controller_filters
+    return if !context.environment.plugin_enabled?(ToleranceTimePlugin)
+    block = lambda do
+      content = Comment.find(params[:id])
+      if ToleranceTimePlugin.expired?(content)
+        session[:notice] = _("This content can't be edited anymore because it expired the tolerance time")
+        redirect_to content.article.url
+      end
+    end
+
+    { :type => 'before_filter',
+      :method_name => 'expired_content',
+      :options => {:only => 'edit_comment'},
+      :block => block }
+  end
+
+  def content_expire_edit(content)
+    if ToleranceTimePlugin.expired?(content)
+      _('The tolerance time for editing this content is over.')
+    end
+  end
+
+end
@@ -0,0 +1,27 @@
+class ToleranceTimePlugin::Publication < Noosfero::Plugin::ActiveRecord
+  belongs_to :target, :polymorphic => true
+  validates_presence_of :target_id, :target_type
+  validates_uniqueness_of :target_id, :scope => :target_type
+
+  class << self
+    def find_by_target(target)
+      kind = target.kind_of?(Article) ? 'Article' : 'Comment'
+      find_by_target_id_and_target_type(target.id, kind)
+    end
+  end
+
+  def expired?
+    profile = (target.kind_of?(Article) ? target.profile : target.article.profile)
+    profile_tolerance = ToleranceTimePlugin::Tolerance.find_by_profile_id(profile.id)
+    content_tolerance = profile_tolerance ? profile_tolerance.content_tolerance : nil
+    comment_tolerance = profile_tolerance ? profile_tolerance.comment_tolerance : nil
+    if target.kind_of?(Article)
+      tolerance_time = content_tolerance || 1.0/0
+    elsif target.kind_of?(Comment)
+      tolerance_time = comment_tolerance || 1.0/0
+    else
+      tolerance_time = 1.0/0
+    end
+    created_at.to_f.to_i+tolerance_time < Time.now.to_i
+  end
+end
@@ -0,0 +1,7 @@
+class ToleranceTimePlugin::Tolerance < Noosfero::Plugin::ActiveRecord
+  belongs_to :profile
+  validates_presence_of :profile_id
+  validates_uniqueness_of :profile_id
+  validates_numericality_of :content_tolerance, :only_integer => true, :allow_nil => true
+  validates_numericality_of :comment_tolerance, :only_integer => true, :allow_nil => true
+end
@@ -0,0 +1,4 @@
+.controller-profile_editor a.control-panel-tolerance-time,
+.controller-profile_editor .msie6 a.control-panel-tolerance-time {
+  background-image: url(/plugins/tolerance_time/icons/tolerance-time.png)
+}
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+  should 'create a publication after publishing the article' do
+    article = fast_create(Article, :published => false, :profile_id => fast_create(Profile).id)
+    assert_nil ToleranceTimePlugin::Publication.find_by_target(article)
+
+    article.published = true
+    article.save!
+    assert_not_nil ToleranceTimePlugin::Publication.find_by_target(article)
+  end
+
+  should 'destroy publication if the article is destroyed' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article.destroy
+    assert_raise ActiveRecord::RecordNotFound do
+      article_publication.reload
+    end
+  end
+
+  should 'destroy publication if the article is changed to not published' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article.published = false
+    article.save!
+    assert_raise ActiveRecord::RecordNotFound do
+      article_publication.reload
+    end
+  end
+end
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class CommentTest < ActiveSupport::TestCase
+  should 'create a publication after posting a comment' do
+    article = fast_create(Article, :profile_id => fast_create(Person).id)
+    comment = Comment.new(:author_id => fast_create(Person).id, :body => 'Hello There!', :source_id => article.id)
+    assert_difference ToleranceTimePlugin::Publication, :count do
+      comment.save!
+    end
+    assert_not_nil ToleranceTimePlugin::Publication.find_by_target(comment)
+  end
+
+  should 'destroy publication if the comment is destroyed' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :source_id => article.id)
+    comment_publication = ToleranceTimePlugin::Publication.create!(:target => comment)
+    comment.destroy
+    assert_raise ActiveRecord::RecordNotFound do
+      comment_publication.reload
+    end
+  end
+end
+
@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class ToleranceTimePlugin::PublicationTest < ActiveSupport::TestCase
+  should 'validate presence of target' do
+    publication = ToleranceTimePlugin::Publication.new
+    publication.valid?
+    assert publication.errors.invalid?(:target_id)
+    assert publication.errors.invalid?(:target_type)
+
+    publication.target = fast_create(Article)
+    publication.valid?
+    assert !publication.errors.invalid?(:target_id)
+    assert !publication.errors.invalid?(:target_type)
+  end
+
+  should 'validate uniqueness of target' do
+    target = fast_create(Article)
+    p1 = ToleranceTimePlugin::Publication.create!(:target => target)
+    p2 = ToleranceTimePlugin::Publication.new(:target => target)
+    p2.valid?
+
+    assert p2.errors.invalid?(:target_id)
+  end
+
+  should 'be able to find publication by target' do
+    article = fast_create(Article)
+    publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    assert_equal publication, ToleranceTimePlugin::Publication.find_by_target(article)
+  end
+
+  should 'avaliate if the publication is expired' do
+    profile = fast_create(Profile)
+    author = fast_create(Person)
+    a1 = fast_create(Article, :profile_id => profile.id)
+    a2 = fast_create(Article, :profile_id => profile.id)
+    c1 = fast_create(Comment, :source_id => a1.id)
+    c2 = fast_create(Comment, :source_id => a2.id)
+    ToleranceTimePlugin::Tolerance.create!(:profile => profile, :content_tolerance => 10.minutes, :comment_tolerance => 5.minutes)
+    expired_article = ToleranceTimePlugin::Publication.create!(:target => a1)
+    expired_article.created_at = 15.minutes.ago
+    expired_article.save!
+    on_time_article = ToleranceTimePlugin::Publication.create!(:target => a2)
+    on_time_article.created_at = 5.minutes.ago
+    on_time_article.save!
+    expired_comment = ToleranceTimePlugin::Publication.create!(:target => c1)
+    expired_comment.created_at = 8.minutes.ago
+    expired_comment.save!
+    on_time_comment = ToleranceTimePlugin::Publication.create!(:target => c2)
+    on_time_comment.created_at = 2.minutes.ago
+    on_time_comment.save!
+
+    assert expired_article.expired?
+    assert !on_time_article.expired?
+    assert expired_comment.expired?
+    assert !on_time_comment.expired?
+  end
+
+  should 'consider tolerance infinity if not defined' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article_publication.created_at = 1000.years.ago
+    article_publication.save!
+    ToleranceTimePlugin::Tolerance.create!(:profile => profile)
+
+    assert !article_publication.expired?
+  end
+
+  should 'not crash if profile has no tolerance yet defined' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article_publication.created_at = 1000.years.ago
+    article_publication.save!
+
+    assert !article_publication.expired?
+  end
+end
@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class ToleranceTimePlugin::ToleranceTest < ActiveSupport::TestCase
+  should 'validate presence of profile' do
+    tolerance = ToleranceTimePlugin::Tolerance.new
+    tolerance.valid?
+    assert tolerance.errors.invalid?(:profile_id)
+
+    tolerance.profile = fast_create(Profile)
+    tolerance.valid?
+    assert !tolerance.errors.invalid?(:profile_id)
+  end
+
+  should 'validate uniqueness of profile' do
+    profile = fast_create(Profile)
+    t1 = ToleranceTimePlugin::Tolerance.create!(:profile => profile)
+    t2 = ToleranceTimePlugin::Tolerance.new(:profile => profile)
+    t2.valid?
+
+    assert t2.errors.invalid?(:profile_id)
+  end
+
+  should 'validate integer format for comment and content tolerance' do
+    tolerance = ToleranceTimePlugin::Tolerance.new(:profile => fast_create(Profile))
+    assert tolerance.valid?
+
+    tolerance.comment_tolerance = 'sdfa'
+    tolerance.content_tolerance = 4.5
+    tolerance.valid?
+    assert tolerance.errors.invalid?(:comment_tolerance)
+    assert tolerance.errors.invalid?(:content_tolerance)
+
+    tolerance.comment_tolerance = 3
+    tolerance.content_tolerance = 6
+    assert tolerance.valid?
+  end
+end
@@ -0,0 +1,24 @@
+<h1><%= _('Tolerance Adjustments') %></h1>
+
+<%= error_messages_for :tolerance %>
+
+<% form_for :tolerance, @tolerance do |f| %>
+
+  <% time_units = [[_('Seconds'), 1], [_('Minutes'), 60], [_('Hours'), 3600]]%>
+
+  <% if profile.organization? %>
+    <%= labelled_form_field(_('Content edition tolerance time'),
+      f.text_field(:content_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') +
+      select_tag(:content_tolerance_unit, options_for_select(time_units, @content_default_unit) )) %>
+  <% end %>
+  <%= labelled_form_field(_('Comment edition tolerance time'), 
+    f.text_field(:comment_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') + 
+    select_tag(:comment_tolerance_unit, options_for_select(time_units, @comment_default_unit) )) %>
+
+  <%= content_tag( 'small', _('Empty means unlimited and zero means right away.') ) %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'))%>
+    <%= button('back', _('Back'), {:controller => 'profile_editor'})%>
+  <% end %>
+<% end %>
 .msie6 .icon-edit      { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) }
 .msie6 .icon-home      { background-image: url(ie6/Tango/16x16/actions/go-home.gif)          }
-.msie6 .icon-new       { background-image: url(ie6/Tango/16x16/actions/filenew.gif)              }
+.msie6 .icon-new,
+.msie6 .icon-suggest   { background-image: url(ie6/Tango/16x16/actions/filenew.gif)              }
 .msie6 .icon-close     { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
 .msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) }
 .msie6 .icon-save      { background-image: url(ie6/Tango/16x16/actions/filesave.gif)             }
@@ -3,7 +3,8 @@
 /******************SMALL ICONS********************/
 .icon-edit      { background-image: url(Tango/16x16/apps/text-editor.png) }
 .icon-home      { background-image: url(Tango/16x16/actions/go-home.png)          }
-.icon-new       { background-image: url(Tango/16x16/actions/filenew.png)              }
+.icon-new,
+.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png)              }
 .icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
 .icon-folder    { background-image: url(Tango/16x16/places/folder.png) }
@@ -483,6 +483,17 @@ div#notice {
   padding: 0px;
 }
  
+#content .box-1 .people-block ul,
+#content .box-1 .profile-list-block ul,
+#content .box-1 .enterprises-block ul,
+#content .box-1 .members-block ul,
+#content .box-1 .communities-block ul,
+#content .box-1 .friends-block ul,
+#content .box-1 .fans-block ul {
+  width: auto;
+  display: block;
+}
+
 #content .tags-block .block-footer-content a,
 #content .people-block .block-footer-content a,
 #content .profile-list-block .block-footer-content a,
@@ -588,33 +599,51 @@ div#notice {
   display: none;
 }
  
+#content .box-1 .link-list-block {
+  margin: 0px;
+}
+
 #content .link-list-block li {
   background: #FFF;
   padding: 0px;
   margin: 5px 0px;
 }
  
+#content .box-1 .link-list-block li {
+  display: inline-block;
+}
+
 #content .link-list-block li a {
   font-size: 14px;
   line-height: 24px;
   color: #000;
   background-color: #EEE;
   background-position: 4px 50%;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+
+#content .box-1 .link-list-block li a {
+  padding-left: 25px;
+  padding-right: 10px;
+  margin-right: 5px;
+  background-position: 5px 50%;
 }
  
 #content .link-list-block li a.link-this-page {
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  -webkit-border-radius-topright: 0px;
-  -webkit-border-radius-bottomright: 0px;
+  border-radius-topright: 0px;
+  border-radius-bottomright: 0px;
   background-color: #cecece;
   max-width: 175px;
   width: 200px;
   border-right: 2px solid #555753;
 }
  
+#content .box-1 .link-list-block li a.link-this-page {
+  width: auto;
+  border: none;
+  border-radius: 4px;
+}
+
 #content .link-list-block li a:hover {
   background-color: #555753;
   color: #FFF;
@@ -908,6 +937,16 @@ hr.pre-posts, hr.sep-posts {
 #article-actions a.button:hover {
   color: #555753;
 }
+#content a.disabled,
+#content a.disabled:hover {
+  color: #888;
+  text-decoration: none;
+}
+#content a.button.disabled,
+#content a.button.disabled:hover {
+  background-color: #CCC;
+  border-color: #CCC;
+}
  
 #addThis {
   text-align: right;
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+ <filter id="grayscale">
+  <feColorMatrix type="matrix" values="0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0"/>
+ </filter>
+</svg>
@@ -922,7 +922,7 @@ jQuery(function($) {
   $('.colorbox').live('click', function() {
     $.fn.colorbox({
       href:$(this).attr('href'),
-      maxWidth: '500',
+      maxWidth: '600',
       maxHeight: '550',
       open:true
     });
@@ -0,0 +1,1530 @@
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 1.0.1
+* Last Modified: 07/01/2012
+*
+* Copyright 2012 Trent Richardson
+* You may use this project under MIT or GPL licenses.
+* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+*
+* HERES THE CSS:
+* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+* .ui-timepicker-div dl { text-align: left; }
+* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+* .ui-timepicker-div td { font-size: 90%; }
+* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+*/
+
+/*jslint evil: true, maxlen: 300, white: false, undef: false, nomen: false, onevar: false */
+
+(function($) {
+
+// Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+$.ui.timepicker = $.ui.timepicker || {};
+if ($.ui.timepicker.version) {
+	return;
+}
+
+$.extend($.ui, { timepicker: { version: "1.0.1" } });
+
+/* Time picker manager.
+   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+   Settings for (groups of) time pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Timepicker() {
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		currentText: 'Now',
+		closeText: 'Done',
+		ampm: false,
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		timeFormat: 'hh:mm tt',
+		timeSuffix: '',
+		timeOnlyTitle: 'Choose Time',
+		timeText: 'Time',
+		hourText: 'Hour',
+		minuteText: 'Minute',
+		secondText: 'Second',
+		millisecText: 'Millisecond',
+		timezoneText: 'Time Zone'
+	};
+	this._defaults = { // Global defaults for all the datetime picker instances
+		showButtonPanel: true,
+		timeOnly: false,
+		showHour: true,
+		showMinute: true,
+		showSecond: false,
+		showMillisec: false,
+		showTimezone: false,
+		showTime: true,
+		stepHour: 1,
+		stepMinute: 1,
+		stepSecond: 1,
+		stepMillisec: 1,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		timezone: null,
+		useLocalTimezone: false,
+		defaultTimezone: "+0000",
+		hourMin: 0,
+		minuteMin: 0,
+		secondMin: 0,
+		millisecMin: 0,
+		hourMax: 23,
+		minuteMax: 59,
+		secondMax: 59,
+		millisecMax: 999,
+		minDateTime: null,
+		maxDateTime: null,
+		onSelect: null,
+		hourGrid: 0,
+		minuteGrid: 0,
+		secondGrid: 0,
+		millisecGrid: 0,
+		alwaysSetTime: true,
+		separator: ' ',
+		altFieldTimeOnly: true,
+		showTimepicker: true,
+		timezoneIso8601: false,
+		timezoneList: null,
+		addSliderAccess: false,
+		sliderAccessArgs: null
+	};
+	$.extend(this._defaults, this.regional['']);
+}
+
+$.extend(Timepicker.prototype, {
+	$input: null,
+	$altInput: null,
+	$timeObj: null,
+	inst: null,
+	hour_slider: null,
+	minute_slider: null,
+	second_slider: null,
+	millisec_slider: null,
+	timezone_select: null,
+	hour: 0,
+	minute: 0,
+	second: 0,
+	millisec: 0,
+	timezone: null,
+	defaultTimezone: "+0000",
+	hourMinOriginal: null,
+	minuteMinOriginal: null,
+	secondMinOriginal: null,
+	millisecMinOriginal: null,
+	hourMaxOriginal: null,
+	minuteMaxOriginal: null,
+	secondMaxOriginal: null,
+	millisecMaxOriginal: null,
+	ampm: '',
+	formattedDate: '',
+	formattedTime: '',
+	formattedDateTime: '',
+	timezoneList: null,
+
+	/* Override the default settings for all instances of the time picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	//########################################################################
+	// Create a new Timepicker instance
+	//########################################################################
+	_newInst: function($input, o) {
+		var tp_inst = new Timepicker(),
+			inlineSettings = {};
+
+		for (var attrName in this._defaults) {
+			var attrValue = $input.attr('time:' + attrName);
+			if (attrValue) {
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+			beforeShow: function(input, dp_inst) {
+				if ($.isFunction(o.beforeShow)) {
+					return o.beforeShow(input, dp_inst, tp_inst);
+                }
+			},
+			onChangeMonthYear: function(year, month, dp_inst) {
+				// Update the time as well : this prevents the time from disappearing from the $input field.
+				tp_inst._updateDateTime(dp_inst);
+				if ($.isFunction(o.onChangeMonthYear)) {
+					o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+                }
+			},
+			onClose: function(dateText, dp_inst) {
+				if (tp_inst.timeDefined === true && $input.val() !== '') {
+					tp_inst._updateDateTime(dp_inst);
+                }
+				if ($.isFunction(o.onClose)) {
+					o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+                }
+			},
+			timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+		});
+		tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase(); });
+		tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase(); });
+
+		if (tp_inst._defaults.timezoneList === null) {
+			var timezoneList = [];
+			for (var i = -11; i <= 12; i++) {
+				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
+            }
+			if (tp_inst._defaults.timezoneIso8601) {
+				timezoneList = $.map(timezoneList, function(val) {
+					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+				});
+            }
+			tp_inst._defaults.timezoneList = timezoneList;
+		}
+
+		tp_inst.timezone = tp_inst._defaults.timezone;
+		tp_inst.hour = tp_inst._defaults.hour;
+		tp_inst.minute = tp_inst._defaults.minute;
+		tp_inst.second = tp_inst._defaults.second;
+		tp_inst.millisec = tp_inst._defaults.millisec;
+		tp_inst.ampm = '';
+		tp_inst.$input = $input;
+
+		if (o.altField) {
+			tp_inst.$altInput = $(o.altField)
+				.css({ cursor: 'pointer' })
+				.focus(function(){ $input.trigger("focus"); });
+        }
+
+		if(tp_inst._defaults.minDate===0 || tp_inst._defaults.minDateTime===0)
+		{
+			tp_inst._defaults.minDate=new Date();
+		}
+		if(tp_inst._defaults.maxDate===0 || tp_inst._defaults.maxDateTime===0)
+		{
+			tp_inst._defaults.maxDate=new Date();
+		}
+
+		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+        }
+		if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+			tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+        }
+		if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+			tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+        }
+		if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+			tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+        }
+		return tp_inst;
+	},
+
+	//########################################################################
+	// add our sliders to the calendar
+	//########################################################################
+	_addTimePicker: function(dp_inst) {
+		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
+				this.$input.val() + ' ' + this.$altInput.val() :
+				this.$input.val();
+
+		this.timeDefined = this._parseTime(currDT);
+		this._limitMinMaxDateTime(dp_inst, false);
+		this._injectTimePicker();
+	},
+
+	//########################################################################
+	// parse the time string from input value or _setTime
+	//########################################################################
+	_parseTime: function(timeString, withDate) {
+		if (!this.inst) {
+			this.inst = $.datepicker._getInst(this.$input[0]);
+		}
+		
+		if (withDate || !this._defaults.timeOnly) 
+		{
+			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+			try {
+				var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+				if (!parseRes.timeObj) { return false; }
+				$.extend(this, parseRes.timeObj);
+			} catch (err)
+			{
+				return false;
+			}
+			return true;
+		}
+		else
+		{
+			var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+			if(!timeObj) { return false; }
+			$.extend(this, timeObj);
+			return true;
+		}
+	},
+	
+	//########################################################################
+	// generate and inject html for timepicker into ui datepicker
+	//########################################################################
+	_injectTimePicker: function() {
+		var $dp = this.inst.dpDiv,
+			o = this._defaults,
+			tp_inst = this,
+			// Added by Peter Medeiros:
+			// - Figure out what the hour/minute/second max should be based on the step values.
+			// - Example: if stepMinute is 15, then minMax is 45.
+			hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
+			minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
+			secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
+			millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
+			dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
+
+		// Prevent displaying twice
+		//if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
+		if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
+			var noDisplay = ' style="display:none;"',
+				html =	'<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
+						'<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+						'<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '></dd>' +
+						'<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
+				hourGridSize = 0,
+				minuteGridSize = 0,
+				secondGridSize = 0,
+				millisecGridSize = 0,
+				size = null;
+
+            // Hours
+			html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '></div>';
+			if (o.showHour && o.hourGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
+					hourGridSize++;
+					var tmph = (o.ampm && h > 12) ? h-12 : h;
+					if (tmph < 10) { tmph = '0' + tmph; }
+					if (o.ampm) {
+						if (h === 0) {
+                            tmph = 12 +'a';
+                        } else {
+                            if (h < 12) { tmph += 'a'; }
+						    else { tmph += 'p'; }
+                        }
+					}
+					html += '<td>' + tmph + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Minutes
+			html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
+					((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
+					'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
+							((o.showMinute) ? '' : noDisplay) + '></div>';
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
+					minuteGridSize++;
+					html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Seconds
+			html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
+					((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
+					'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
+							((o.showSecond) ? '' : noDisplay) + '></div>';
+
+			if (o.showSecond && o.secondGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
+					secondGridSize++;
+					html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Milliseconds
+			html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
+					((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
+					'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
+							((o.showMillisec) ? '' : noDisplay) + '></div>';
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
+					millisecGridSize++;
+					html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Timezone
+			html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
+					((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+			html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'	+
+							((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+			html += '</dl></div>';
+			var $tp = $(html);
+
+				// if we only want time picker...
+			if (o.timeOnly === true) {
+				$tp.prepend(
+					'<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
+						'<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
+					'</div>');
+				$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+			}
+
+			this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.hour,
+				min: o.hourMin,
+				max: hourMax,
+				step: o.stepHour,
+				slide: function(event, ui) {
+					tp_inst.hour_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+
+			// Updated by Peter Medeiros:
+			// - Pass in Event and UI instance into slide function
+			this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.minute,
+				min: o.minuteMin,
+				max: minMax,
+				step: o.stepMinute,
+				slide: function(event, ui) {
+					tp_inst.minute_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.second,
+				min: o.secondMin,
+				max: secMax,
+				step: o.stepSecond,
+				slide: function(event, ui) {
+					tp_inst.second_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.millisec,
+				min: o.millisecMin,
+				max: millisecMax,
+				step: o.stepMillisec,
+				slide: function(event, ui) {
+					tp_inst.millisec_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
+			$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function(val, idx) {
+					return $("<option />")
+						.val(typeof val == "object" ? val.value : val)
+						.text(typeof val == "object" ? val.label : val);
+				})
+			);
+			if (typeof(this.timezone) != "undefined" && this.timezone !== null && this.timezone !== "") {
+				var local_date = new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12);
+				var local_timezone = timeZoneString(local_date);
+				if (local_timezone == this.timezone) {
+					selectLocalTimeZone(tp_inst);
+				} else {
+					this.timezone_select.val(this.timezone);
+				}
+			} else {
+				if (typeof(this.hour) != "undefined" && this.hour !== null && this.hour !== "") {
+					this.timezone_select.val(o.defaultTimezone);
+				} else {
+					selectLocalTimeZone(tp_inst);
+				}
+			}
+			this.timezone_select.change(function() {
+				tp_inst._defaults.useLocalTimezone = false;
+				tp_inst._onTimeChange();
+			});
+
+			// Add grid functionality
+			if (o.showHour && o.hourGrid > 0) {
+				size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
+
+				$tp.find(".ui_tpicker_hour table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * hourGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each( function(index) {
+					$(this).click(function() {
+						var h = $(this).html();
+						if(o.ampm)	{
+							var ap = h.substring(2).toLowerCase(),
+								aph = parseInt(h.substring(0,2), 10);
+							if (ap == 'a') {
+								if (aph == 12) { h = 0; }
+								else { h = aph; }
+							} else if (aph == 12) { h = 12; }
+							else { h = aph + 12; }
+						}
+						tp_inst.hour_slider.slider("option", "value", h);
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / hourGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
+				$tp.find(".ui_tpicker_minute table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * minuteGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.minute_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / minuteGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showSecond && o.secondGrid > 0) {
+				$tp.find(".ui_tpicker_second table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * secondGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.second_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / secondGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				$tp.find(".ui_tpicker_millisec table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * millisecGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.millisec_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / millisecGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+			if ($buttonPanel.length) { $buttonPanel.before($tp); }
+			else { $dp.append($tp); }
+
+			this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
+
+			if (this.inst !== null) {
+				var timeDefined = this.timeDefined;
+				this._onTimeChange();
+				this.timeDefined = timeDefined;
+			}
+
+			//Emulate datepicker onSelect behavior. Call on slidestop.
+			var onSelectDelegate = function() {
+				tp_inst._onSelectHandler();
+			};
+			this.hour_slider.bind('slidestop',onSelectDelegate);
+			this.minute_slider.bind('slidestop',onSelectDelegate);
+			this.second_slider.bind('slidestop',onSelectDelegate);
+			this.millisec_slider.bind('slidestop',onSelectDelegate);
+
+			// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+			if (this._defaults.addSliderAccess){
+				var sliderAccessArgs = this._defaults.sliderAccessArgs;
+				setTimeout(function(){ // fix for inline mode
+					if($tp.find('.ui-slider-access').length === 0){
+						$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+						// fix any grids since sliders are shorter
+						var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+						if(sliderAccessWidth){
+							$tp.find('table:visible').each(function(){
+								var $g = $(this),
+									oldWidth = $g.outerWidth(),
+									oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
+									newWidth = oldWidth - sliderAccessWidth,
+									newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
+
+								$g.css({ width: newWidth, marginLeft: newMarginLeft });
+							});
+						}
+					}
+				},0);
+			}
+			// end slideAccess integration
+
+		}
+	},
+
+	//########################################################################
+	// This function tries to limit the ability to go outside the
+	// min/max date range
+	//########################################################################
+	_limitMinMaxDateTime: function(dp_inst, adjustSliders){
+		var o = this._defaults,
+			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+		if(!this._defaults.showTimepicker) { return; } // No time so nothing to check here
+
+		if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
+			var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
+				this.hourMinOriginal = o.hourMin;
+				this.minuteMinOriginal = o.minuteMin;
+				this.secondMinOriginal = o.secondMin;
+				this.millisecMinOriginal = o.millisecMin;
+			}
+
+			if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+				this._defaults.hourMin = minDateTime.getHours();
+				if (this.hour <= this._defaults.hourMin) {
+					this.hour = this._defaults.hourMin;
+					this._defaults.minuteMin = minDateTime.getMinutes();
+					if (this.minute <= this._defaults.minuteMin) {
+						this.minute = this._defaults.minuteMin;
+						this._defaults.secondMin = minDateTime.getSeconds();
+					} else if (this.second <= this._defaults.secondMin){
+						this.second = this._defaults.secondMin;
+						this._defaults.millisecMin = minDateTime.getMilliseconds();
+					} else {
+						if(this.millisec < this._defaults.millisecMin) {
+							this.millisec = this._defaults.millisecMin;
+                        }
+						this._defaults.millisecMin = this.millisecMinOriginal;
+					}
+				} else {
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+				}
+			}else{
+				this._defaults.hourMin = this.hourMinOriginal;
+				this._defaults.minuteMin = this.minuteMinOriginal;
+				this._defaults.secondMin = this.secondMinOriginal;
+				this._defaults.millisecMin = this.millisecMinOriginal;
+			}
+		}
+
+		if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
+			var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+				maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
+				this.hourMaxOriginal = o.hourMax;
+				this.minuteMaxOriginal = o.minuteMax;
+				this.secondMaxOriginal = o.secondMax;
+				this.millisecMaxOriginal = o.millisecMax;
+			}
+
+			if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
+				this._defaults.hourMax = maxDateTime.getHours();
+				if (this.hour >= this._defaults.hourMax) {
+					this.hour = this._defaults.hourMax;
+					this._defaults.minuteMax = maxDateTime.getMinutes();
+					if (this.minute >= this._defaults.minuteMax) {
+						this.minute = this._defaults.minuteMax;
+						this._defaults.secondMax = maxDateTime.getSeconds();
+					} else if (this.second >= this._defaults.secondMax) {
+						this.second = this._defaults.secondMax;
+						this._defaults.millisecMax = maxDateTime.getMilliseconds();
+					} else {
+						if(this.millisec > this._defaults.millisecMax) { this.millisec = this._defaults.millisecMax; }
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+					}
+				} else {
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+				}
+			}else{
+				this._defaults.hourMax = this.hourMaxOriginal;
+				this._defaults.minuteMax = this.minuteMaxOriginal;
+				this._defaults.secondMax = this.secondMaxOriginal;
+				this._defaults.millisecMax = this.millisecMaxOriginal;
+			}
+		}
+
+		if(adjustSliders !== undefined && adjustSliders === true){
+			var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
+                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
+                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
+				millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
+
+			if(this.hour_slider) {
+				this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
+            }
+			if(this.minute_slider) {
+				this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
+            }
+			if(this.second_slider){
+				this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
+            }
+			if(this.millisec_slider) {
+				this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
+            }
+		}
+
+	},
+
+
+	//########################################################################
+	// when a slider moves, set the internal time...
+	// on time change is also called when the time is updated in the text field
+	//########################################################################
+	_onTimeChange: function() {
+		var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
+			minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
+			second = (this.second_slider) ? this.second_slider.slider('value') : false,
+			millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
+			timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+			o = this._defaults;
+
+		if (typeof(hour) == 'object') { hour = false; }
+		if (typeof(minute) == 'object') { minute = false; }
+		if (typeof(second) == 'object') { second = false; }
+		if (typeof(millisec) == 'object') { millisec = false; }
+		if (typeof(timezone) == 'object') { timezone = false; }
+
+		if (hour !== false) { hour = parseInt(hour,10); }
+		if (minute !== false) { minute = parseInt(minute,10); }
+		if (second !== false) { second = parseInt(second,10); }
+		if (millisec !== false) { millisec = parseInt(millisec,10); }
+
+		var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+		// If the update was done in the input field, the input field should not be updated.
+		// If the update was done using the sliders, update the input field.
+		var hasChanged = (hour != this.hour || minute != this.minute ||
+				second != this.second || millisec != this.millisec ||
+				(this.ampm.length > 0 &&
+				    (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
+				timezone != this.timezone);
+
+		if (hasChanged) {
+
+			if (hour !== false) { this.hour = hour; }
+			if (minute !== false) { this.minute = minute; }
+			if (second !== false) { this.second = second; }
+			if (millisec !== false) { this.millisec = millisec; }
+			if (timezone !== false) { this.timezone = timezone; }
+
+			if (!this.inst) { this.inst = $.datepicker._getInst(this.$input[0]); }
+
+			this._limitMinMaxDateTime(this.inst, true);
+		}
+		if (o.ampm) { this.ampm = ampm; }
+
+		//this._formatTime();
+		this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
+		if (this.$timeObj) { this.$timeObj.text(this.formattedTime + o.timeSuffix); }
+		this.timeDefined = true;
+		if (hasChanged) { this._updateDateTime(); }
+	},
+
+	//########################################################################
+	// call custom onSelect.
+	// bind to sliders slidestop, and grid click.
+	//########################################################################
+	_onSelectHandler: function() {
+		var onSelect = this._defaults.onSelect;
+		var inputEl = this.$input ? this.$input[0] : null;
+		if (onSelect && inputEl) {
+			onSelect.apply(inputEl, [this.formattedDateTime, this]);
+		}
+	},
+
+	//########################################################################
+	// left for any backwards compatibility
+	//########################################################################
+	_formatTime: function(time, format) {
+		time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
+		var tmptime = (format || this._defaults.timeFormat).toString();
+
+		tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
+
+		if (arguments.length) { return tmptime; }
+		else { this.formattedTime = tmptime; }
+	},
+
+	//########################################################################
+	// update our input with the new date time..
+	//########################################################################
+	_updateDateTime: function(dp_inst) {
+		dp_inst = this.inst || dp_inst;
+		var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+			dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+			formatCfg = $.datepicker._getFormatConfig(dp_inst),
+			timeAvailable = dt !== null && this.timeDefined;
+		this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+		var formattedDateTime = this.formattedDate;
+		// remove following lines to force every changes in date picker to change the input value
+		// Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
+		// If the user manually empty the value in the input field, the date picker will never change selected value.
+		//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+		//	return;
+        //}
+
+		if (this._defaults.timeOnly === true) {
+			formattedDateTime = this.formattedTime;
+		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+			formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+		}
+
+		this.formattedDateTime = formattedDateTime;
+
+		if(!this._defaults.showTimepicker) {
+			this.$input.val(this.formattedDate);
+		} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+			this.$altInput.val(this.formattedTime);
+			this.$input.val(this.formattedDate);
+		} else if(this.$altInput) {
+			this.$altInput.val(formattedDateTime);
+			this.$input.val(formattedDateTime);
+		} else {
+			this.$input.val(formattedDateTime);
+		}
+
+		this.$input.trigger("change");
+	}
+
+});
+
+$.fn.extend({
+	//########################################################################
+	// shorthand just to use timepicker..
+	//########################################################################
+	timepicker: function(o) {
+		o = o || {};
+		var tmp_args = arguments;
+
+		if (typeof o == 'object') { tmp_args[0] = $.extend(o, { timeOnly: true }); }
+
+		return $(this).each(function() {
+			$.fn.datetimepicker.apply($(this), tmp_args);
+		});
+	},
+
+	//########################################################################
+	// extend timepicker to datepicker
+	//########################################################################
+	datetimepicker: function(o) {
+		o = o || {};
+		var tmp_args = arguments;
+
+		if (typeof(o) == 'string'){
+			if(o == 'getDate') {
+				return $.fn.datepicker.apply($(this[0]), tmp_args);
+            }
+			else {
+				return this.each(function() {
+					var $t = $(this);
+					$t.datepicker.apply($t, tmp_args);
+				});
+            }
+		}
+		else {
+			return this.each(function() {
+				var $t = $(this);
+				$t.datepicker($.timepicker._newInst($t, o)._defaults);
+			});
+        }
+	}
+});
+
+$.datepicker.parseDateTime = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+	var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+	if (parseRes.timeObj)
+	{
+		var t = parseRes.timeObj;
+		parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+	}
+
+	return parseRes.date;
+};
+
+$.datepicker.parseTime = function(timeFormat, timeString, options) {
+	
+	//########################################################################
+	// pattern for standard and localized AM/PM markers
+	//########################################################################
+	var getPatternAmpm = function(amNames, pmNames) {
+		var markers = [];
+		if (amNames) {
+			$.merge(markers, amNames);
+        }
+		if (pmNames) {
+			$.merge(markers, pmNames);
+        }
+		markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&'); });
+		return '(' + markers.join('|') + ')?';
+	};
+   
+	//########################################################################
+	// figure out position of time elements.. cause js cant do named captures
+	//########################################################################
+	var getFormatPositions = function( timeFormat ) {
+		var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
+			orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
+
+		if (finds) {
+			for (var i = 0; i < finds.length; i++) {
+				if (orders[finds[i].toString().charAt(0)] == -1) {
+					orders[finds[i].toString().charAt(0)] = i + 1;
+                }
+            }
+        }
+		return orders;
+	};
+    
+	var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
+    
+	var regstr = '^' + timeFormat.toString()
+			.replace(/h{1,2}/ig, '(\\d?\\d)')
+			.replace(/m{1,2}/ig, '(\\d?\\d)')
+			.replace(/s{1,2}/ig, '(\\d?\\d)')
+			.replace(/l{1}/ig, '(\\d?\\d?\\d)')
+			.replace(/t{1,2}/ig, getPatternAmpm(o.amNames, o.pmNames))
+			.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
+			.replace(/\s/g, '\\s?') + o.timeSuffix + '$',
+		order = getFormatPositions(timeFormat),
+		ampm = '',
+		treg;
+
+	treg = timeString.match(new RegExp(regstr, 'i'));
+
+	var resTime = {hour: 0, minute: 0, second: 0, millisec: 0};
+    
+	if (treg) {
+		if (order.t !== -1) {
+			if (treg[order.t] === undefined || treg[order.t].length === 0) {
+				ampm = '';
+				resTime.ampm = '';
+			} else {
+				ampm = $.inArray(treg[order.t], o.amNames) !== -1 ? 'AM' : 'PM';
+				resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+			}
+		}
+
+		if (order.h !== -1) {
+			if (ampm == 'AM' && treg[order.h] == '12') {
+				resTime.hour = 0; // 12am = 0 hour
+			} else {
+                if (ampm == 'PM' && treg[order.h] != '12') {
+                    resTime.hour = parseInt(treg[order.h],10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+                }
+                else { resTime.hour = Number(treg[order.h]); }
+            }
+		}
+
+		if (order.m !== -1) { resTime.minute = Number(treg[order.m]); }
+		if (order.s !== -1) { resTime.second = Number(treg[order.s]); }
+		if (order.l !== -1) { resTime.millisec = Number(treg[order.l]); }
+		if (order.z !== -1 && treg[order.z] !== undefined) {
+			var tz = treg[order.z].toUpperCase();
+			switch (tz.length) {
+				case 1:	// Z
+					tz = o.timezoneIso8601 ? 'Z' : '+0000';
+					break;
+				case 5:	// +hhmm
+					if (o.timezoneIso8601) {
+						tz = tz.substring(1) == '0000' ?
+							'Z' :
+							tz.substring(0, 3) + ':' + tz.substring(3);
+                    }
+					break;
+				case 6:	// +hh:mm
+					if (!o.timezoneIso8601) {
+						tz = tz == 'Z' || tz.substring(1) == '00:00' ?
+							'+0000' :
+							tz.replace(/:/, '');
+					} else {
+                        if (tz.substring(1) == '00:00') {
+                            tz = 'Z';
+                        }
+                    }
+					break;
+			}
+			resTime.timezone = tz;
+		}
+
+
+		return resTime;
+	}
+
+	return false;
+};
+
+//########################################################################
+// format the time all pretty...
+// format = string format of the time
+// time = a {}, not a Date() for timezones
+// options = essentially the regional[].. amNames, pmNames, ampm
+//########################################################################
+$.datepicker.formatTime = function(format, time, options) {
+	options = options || {};
+	options = $.extend($.timepicker._defaults, options);
+	time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
+
+	var tmptime = format;
+	var ampmName = options.amNames[0];
+
+	var hour = parseInt(time.hour, 10);
+	if (options.ampm) {
+		if (hour > 11){
+			ampmName = options.pmNames[0];
+			if(hour > 12) {
+				hour = hour % 12;
+            }
+		}
+		if (hour === 0) {
+			hour = 12;
+        }
+	}
+	tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
+		switch (match.toLowerCase()) {
+			case 'hh': return ('0' + hour).slice(-2);
+			case 'h':  return hour;
+			case 'mm': return ('0' + time.minute).slice(-2);
+			case 'm':  return time.minute;
+			case 'ss': return ('0' + time.second).slice(-2);
+			case 's':  return time.second;
+			case 'l':  return ('00' + time.millisec).slice(-3);
+			case 'z':  return time.timezone;
+			case 't': case 'tt':
+				if (options.ampm) {
+					if (match.length == 1) {
+						ampmName = ampmName.charAt(0);
+                    }
+					return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
+				}
+				return '';
+		}
+	});
+
+	tmptime = $.trim(tmptime);
+	return tmptime;
+};
+
+//########################################################################
+// the bad hack :/ override datepicker so it doesnt close on select
+// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+//########################################################################
+$.datepicker._base_selectDate = $.datepicker._selectDate;
+$.datepicker._selectDate = function (id, dateStr) {
+	var inst = this._getInst($(id)[0]),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		tp_inst._limitMinMaxDateTime(inst, true);
+		inst.inline = inst.stay_open = true;
+		//This way the onSelect handler called from calendarpicker get the full dateTime
+		this._base_selectDate(id, dateStr);
+		inst.inline = inst.stay_open = false;
+		this._notifyChange(inst);
+		this._updateDatepicker(inst);
+	}
+	else { this._base_selectDate(id, dateStr); }
+};
+
+//#############################################################################################
+// second bad hack :/ override datepicker so it triggers an event when changing the input field
+// and does not redraw the datepicker on every selectDate event
+//#############################################################################################
+$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+$.datepicker._updateDatepicker = function(inst) {
+
+	// don't popup the datepicker if there is another instance already opened
+	var input = inst.input[0];
+	if($.datepicker._curInst &&
+	   $.datepicker._curInst != inst &&
+	   $.datepicker._datepickerShowing &&
+	   $.datepicker._lastInput != input) {
+		return;
+	}
+
+	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+		this._base_updateDatepicker(inst);
+
+		// Reload the time control when changing something in the input text field.
+		var tp_inst = this._get(inst, 'timepicker');
+		if(tp_inst) {
+			tp_inst._addTimePicker(inst);
+
+			if (tp_inst._defaults.useLocalTimezone) { //checks daylight saving with the new date.
+				var date = new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay, 12);
+				selectLocalTimeZone(tp_inst, date);
+				tp_inst._onTimeChange();
+			}
+		}
+	}
+};
+
+//#######################################################################################
+// third bad hack :/ override datepicker so it allows spaces and colon in the input field
+//#######################################################################################
+$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+$.datepicker._doKeyPress = function(event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var ampm = tp_inst._defaults.ampm,
+				dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+				datetimeChars = tp_inst._defaults.timeFormat.toString()
+								.replace(/[hms]/g, '')
+								.replace(/TT/g, ampm ? 'APM' : '')
+								.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+								.replace(/tT/g, ampm ? 'AaPpMm' : '')
+								.replace(/T/g, ampm ? 'AP' : '')
+								.replace(/tt/g, ampm ? 'apm' : '')
+								.replace(/t/g, ampm ? 'ap' : '') +
+								" " +
+								tp_inst._defaults.separator +
+								tp_inst._defaults.timeSuffix +
+								(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+								(tp_inst._defaults.amNames.join('')) +
+								(tp_inst._defaults.pmNames.join('')) +
+								dateChars,
+				chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+		}
+	}
+
+	return $.datepicker._base_doKeyPress(event);
+};
+
+//#######################################################################################
+// Override key up event to sync manual input changes.
+//#######################################################################################
+$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+$.datepicker._doKeyUp = function (event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+			try {
+				$.datepicker._updateDatepicker(inst);
+			}
+			catch (err) {
+				$.datepicker.log(err);
+			}
+		}
+	}
+
+	return $.datepicker._base_doKeyUp(event);
+};
+
+//#######################################################################################
+// override "Today" button to also grab the time.
+//#######################################################################################
+$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+$.datepicker._gotoToday = function(id) {
+	var inst = this._getInst($(id)[0]),
+		$dp = inst.dpDiv;
+	this._base_gotoToday(id);
+	var tp_inst = this._get(inst, 'timepicker');
+	selectLocalTimeZone(tp_inst);
+	var now = new Date();
+	this._setTime(inst, now);
+	$( '.ui-datepicker-today', $dp).click();
+};
+
+//#######################################################################################
+// Disable & enable the Time in the datetimepicker
+//#######################################################################################
+$.datepicker._disableTimepickerDatepicker = function(target) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = false;
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+$.datepicker._enableTimepickerDatepicker = function(target) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = true;
+		tp_inst._addTimePicker(inst); // Could be disabled on page load
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create our own set time function
+//#######################################################################################
+$.datepicker._setTime = function(inst, date) {
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var defaults = tp_inst._defaults,
+			// calling _setTime with no date sets time to defaults
+			hour = date ? date.getHours() : defaults.hour,
+			minute = date ? date.getMinutes() : defaults.minute,
+			second = date ? date.getSeconds() : defaults.second,
+			millisec = date ? date.getMilliseconds() : defaults.millisec;
+		//check if within min/max times..
+		// correct check if within min/max times. 	
+		// Rewritten by Scott A. Woodward
+		var hourEq = hour === defaults.hourMin,
+			minuteEq = minute === defaults.minuteMin,
+			secondEq = second === defaults.secondMin;
+		var reset = false;
+		if(hour < defaults.hourMin || hour > defaults.hourMax)  
+			reset = true;
+		else if( (minute < defaults.minuteMin || minute > defaults.minuteMax) && hourEq)
+			reset = true;
+		else if( (second < defaults.secondMin || second > defaults.secondMax ) && hourEq && minuteEq)
+			reset = true;
+		else if( (millisec < defaults.millisecMin || millisec > defaults.millisecMax) && hourEq && minuteEq && secondEq)
+			reset = true;
+		if(reset) {
+			hour = defaults.hourMin;
+			minute = defaults.minuteMin;
+			second = defaults.secondMin;
+			millisec = defaults.millisecMin;
+		}
+		tp_inst.hour = hour;
+		tp_inst.minute = minute;
+		tp_inst.second = second;
+		tp_inst.millisec = millisec;
+		if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+		if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+		if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+		if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
+
+		tp_inst._onTimeChange();
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create new public method to set only time, callable as $().datepicker('setTime', date)
+//#######################################################################################
+$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+    
+	if (tp_inst) {
+		this._setDateFromField(inst);
+		var tp_date;
+		if (date) {
+			if (typeof date == "string") {
+				tp_inst._parseTime(date, withDate);
+				tp_date = new Date();
+				tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+			}
+			else { tp_date = new Date(date.getTime()); }
+			if (tp_date.toString() == 'Invalid Date') { tp_date = undefined; }
+			this._setTime(inst, tp_date);
+		}
+	}
+
+};
+
+//#######################################################################################
+// override setDate() to allow setting time too within Date object
+//#######################################################################################
+$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+$.datepicker._setDateDatepicker = function(target, date) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+	this._updateDatepicker(inst);
+	this._base_setDateDatepicker.apply(this, arguments);
+	this._setTimeDatepicker(target, tp_date, true);
+};
+
+//#######################################################################################
+// override getDate() to allow getting time too within Date object
+//#######################################################################################
+$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+$.datepicker._getDateDatepicker = function(target, noDefault) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+    var tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		this._setDateFromField(inst, noDefault);
+		var date = this._getDate(inst);
+		if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) { date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec); }
+		return date;
+	}
+	return this._base_getDateDatepicker(target, noDefault);
+};
+
+//#######################################################################################
+// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+// An option in datapicker to ignore extra format characters would be nicer.
+//#######################################################################################
+$.datepicker._base_parseDate = $.datepicker.parseDate;
+$.datepicker.parseDate = function(format, value, settings) {
+    var splitRes = splitDateTime(format, value, settings);
+	return $.datepicker._base_parseDate(format, splitRes[0], settings);
+};
+
+//#######################################################################################
+// override formatDate to set date with time to the input
+//#######################################################################################
+$.datepicker._base_formatDate = $.datepicker._formatDate;
+$.datepicker._formatDate = function(inst, day, month, year){
+	var tp_inst = this._get(inst, 'timepicker');
+	if(tp_inst) {
+		tp_inst._updateDateTime(inst);
+		return tp_inst.$input.val();
+	}
+	return this._base_formatDate(inst);
+};
+
+//#######################################################################################
+// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+//#######################################################################################
+$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+$.datepicker._optionDatepicker = function(target, name, value) {
+	var inst = this._getInst(target);
+    if (!inst) { return null; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var min = null, max = null, onselect = null;
+		if (typeof name == 'string') { // if min/max was set with the string
+			if (name === 'minDate' || name === 'minDateTime' ) {
+				min = value;
+            }
+			else {
+                if (name === 'maxDate' || name === 'maxDateTime') {
+                    max = value;
+                }
+                else {
+                    if (name === 'onSelect') {
+                        onselect = value;
+                    }
+                }
+            }
+		} else {
+            if (typeof name == 'object') { //if min/max was set with the JSON
+                if (name.minDate) {
+                    min = name.minDate;
+                } else {
+                    if (name.minDateTime) {
+                        min = name.minDateTime;
+                    } else {
+                        if (name.maxDate) {
+                            max = name.maxDate;
+                        } else {
+                            if (name.maxDateTime) {
+                                max = name.maxDateTime;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+		if(min) { //if min was set
+			if (min === 0) {
+				min = new Date();
+            } else {
+				min = new Date(min);
+            }
+
+			tp_inst._defaults.minDate = min;
+			tp_inst._defaults.minDateTime = min;
+		} else if (max) { //if max was set
+			if(max===0) {
+				max=new Date();
+            } else {
+				max= new Date(max);
+            }
+			tp_inst._defaults.maxDate = max;
+			tp_inst._defaults.maxDateTime = max;
+		} else if (onselect) {
+			tp_inst._defaults.onSelect = onselect;
+        }
+	}
+	if (value === undefined) {
+		return this._base_optionDatepicker(target, name);
+    }
+	return this._base_optionDatepicker(target, name, value);
+};
+
+//#######################################################################################
+// jQuery extend now ignores nulls!
+//#######################################################################################
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] === null || props[name] === undefined) {
+			target[name] = props[name];
+        }
+    }
+	return target;
+}
+
+//#######################################################################################
+// Splits datetime string into date ans time substrings.
+// Throws exception when date can't be parsed
+// If only date is present, time substring eill be '' 
+//#######################################################################################
+var splitDateTime = function(dateFormat, dateTimeString, dateSettings)
+{
+	try {
+		var date = $.datepicker._base_parseDate(dateFormat, dateTimeString, dateSettings);
+	} catch (err) {
+		if (err.indexOf(":") >= 0) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+            var dateStringLength = dateTimeString.length-(err.length-err.indexOf(':')-2);
+            var timeString = dateTimeString.substring(dateStringLength);
+
+            return [dateTimeString.substring(0, dateStringLength), dateTimeString.substring(dateStringLength)];
+            
+		} else {
+			throw err;
+		}
+	}
+	return [dateTimeString, ''];
+};
+
+//#######################################################################################
+// Internal function to parse datetime interval
+// Returns: {date: Date, timeObj: Object}, where
+//   date - parsed date without time (type Date)
+//   timeObj = {hour: , minute: , second: , millisec: } - parsed time. Optional
+//#######################################################################################
+var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings)
+{
+    var date;
+    var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings);
+	date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
+    if (splitRes[1] !== '')
+    {
+        var timeString = splitRes[1];
+        var separator = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator;            
+        if ( timeString.indexOf(separator) !== 0) {
+            throw 'Missing time separator';
+        }
+        timeString = timeString.substring(separator.length);
+        var parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
+        if (parsedTime === null) {
+            throw 'Wrong time format';
+        }
+        return {date: date, timeObj: parsedTime};
+    } else {
+        return {date: date};
+    }
+};
+
+//#######################################################################################
+// Internal function to set timezone_select to the local timezone
+//#######################################################################################
+var selectLocalTimeZone = function(tp_inst, date)
+{
+	if (tp_inst && tp_inst.timezone_select) {
+		tp_inst._defaults.useLocalTimezone = true;
+		var now = typeof date !== 'undefined' ? date : new Date();
+		var tzoffset = timeZoneString(now);
+		if (tp_inst._defaults.timezoneIso8601) {
+			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+        }
+		tp_inst.timezone_select.val(tzoffset);
+	}
+};
+
+// Input: Date Object
+// Output: String with timezone offset, e.g. '+0100'
+var timeZoneString = function(date)
+{
+	var off = date.getTimezoneOffset() * -10100 / 60;
+	var timezone = (off >= 0 ? '+' : '-') + Math.abs(off).toString().substr(1);
+	return timezone;
+};
+
+$.timepicker = new Timepicker(); // singleton instance
+$.timepicker.version = "1.0.1";
+
+})(jQuery);
@@ -1394,6 +1394,7 @@ a.comment-picture {
   position: relative;
   display: inline;
 }
+#content #boxes .box-1 .article-block img,
 #content #article .article-body img {
   max-width: 100%;
   height: auto;
@@ -1503,7 +1504,13 @@ a.button:hover, body.noosfero a.button:hover, input.button:hover, a.button.with-
 body.noosfero a.button.with-text.icon-none, body.noosfero input.button.with-text.icon-none {
   padding-left: 2px;
 }
-a.button.disabled, input.disabled {
+a.disabled{
+  filter: url(/filters.svg#grayscale); /* Firefox 3.5+ */
+  filter: gray; /* IE6-9 */
+  -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
+  cursor: default;
+}
+input.disabled {
   opacity: 0.5;
   filter-opacity: 50%;
 }
@@ -1766,6 +1773,9 @@ a.button.disabled, input.disabled {
   width: 92px;
   overflow: hidden;
 }
+.box-1 .common-profile-list-block span {
+  width: 102px;
+}
 .common-profile-list-block .profile-image {
   width: 92px;
   display: table-cell;
@@ -3974,7 +3984,7 @@ h1#agenda-title {
 }
 /* * * Profile search block * * * * * * * */
  
-.profile-search-block .formfield input {
+.profile-search-block .search-field .formfield input {
   width: 100%;
 }
 .profile-search-block .button.icon-search {
@@ -4330,6 +4340,14 @@ h1#agenda-title {
   margin: 5px 0;
   padding: 5px;
 }
+
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
 /* Categories block stuff */
  
 .categories-block ul {
@@ -2,12 +2,12 @@
  
 say() {
   msg="$@"
-  printf "\033[33;01m%sm%s\033[m\n" "$msg"33[m\n" "$msg"
+  printf "\033[1;34;49m%sm%s\033[m\n" "$msg"33[m\n" "$msg"
 }
  
 complain() {
   msg="$@"
-  printf "\033[1;31;40m%sm%s\033[m\n" "$msg"33[m\n" "$msg"
+  printf "\033[1;31;49m%sm%s\033[m\n" "$msg"33[m\n" "$msg"
 }
  
 run() {
@@ -442,7 +442,7 @@ module Noosfero::Factory
  
   def defaults_for_comment(params = {})
     name = "comment_#{rand(1000)}"
-    { :title => name, :body => "my own comment", :source_id => 1 }.merge(params)
+    { :title => name, :body => "my own comment", :source_id => 1, :source_type => 'Article' }.merge(params)
   end
  
   ###############################################
@@ -11,6 +11,10 @@ class AccountControllerTest &lt; ActionController::TestCase
  
   all_fixtures
  
+  def teardown
+    Thread.current[:enabled_plugins] = nil
+  end
+
   def setup
     @controller = AccountController.new
     @request    = ActionController::TestRequest.new
@@ -20,24 +24,22 @@ class AccountControllerTest &lt; ActionController::TestCase
   def test_local_files_reference
     assert_local_files_reference
   end
-  
+
   def test_valid_xhtml
     assert_valid_xhtml
   end
-  
+
   def test_should_login_and_redirect
     post :login, :user => {:login => 'johndoe', :password => 'test'}
     assert session[:user]
     assert_response :redirect
   end
  
-  should 'redirect to where user was on login' do
-    @request.env["HTTP_REFERER"] = '/bli'
-    u = new_user
+  should 'display notice message if the login fail' do
     @controller.stubs(:logged_in?).returns(false)
     post :login, :user => {:login => 'quire', :password => 'quire'}
  
-    assert_redirected_to '/bli'
+    assert session[:notice].include?('Incorrect')
   end
  
   should 'authenticate on the current environment' do
@@ -46,23 +48,11 @@ class AccountControllerTest &lt; ActionController::TestCase
     post :login, :user => { :login => 'fake', :password => 'fake' }
   end
  
-  should 'redirect to where was when login on other environment' do
-    e = fast_create(Environment, :name => 'other_environment')
-    e.domains << Domain.new(:name => 'other.environment')
-    e.save!
-    u = create_user('test_user', :environment => e).person
-
-    @request.env["HTTP_REFERER"] = '/bli'
-    post :login, :user => {:login => 'test_user', :password => 'test_user'}
-
-    assert_redirected_to '/bli'
-  end
-
   def test_should_fail_login_and_not_redirect
     @request.env["HTTP_REFERER"] = 'bli'
     post :login, :user => {:login => 'johndoe', :password => 'bad password'}
     assert_nil session[:user]
-    assert_response :redirect
+    assert_response :success
   end
  
   def test_should_allow_signup
@@ -120,7 +110,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
   def test_shoud_save_with_acceptance_of_terms_of_use_on_signup
     assert_difference User, :count do
-      Environment.default.update_attributes(:terms_of_use => 'some terms ...')      
+      Environment.default.update_attributes(:terms_of_use => 'some terms ...')
       new_user(:terms_accepted => '1')
       assert_response :success
       assert_not_nil assigns(:register_pending)
@@ -144,7 +134,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     post :login, :user => {:login => 'johndoe', :password => 'test'}, :remember_me => "0"
     assert_nil @response.cookies["auth_token"]
   end
-  
+
   def test_should_delete_token_on_logout
     login_as :johndoe
     get :logout
@@ -344,7 +334,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     login_as(person.identifier)
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent')
-    
+
     task = mock
     task.expects(:enterprise).returns(ent).at_least_once
     EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
@@ -359,7 +349,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     login_as(person.identifier)
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
-    
+
     task = mock
     task.expects(:enterprise).returns(ent).at_least_once
     EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
@@ -555,7 +545,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     login_as(person.identifier)
  
     env = Environment.default
-    env.terms_of_use = 'some terms' 
+    env.terms_of_use = 'some terms'
     env.save!
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
@@ -697,7 +687,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
     assert_nil session[:user]
-    assert_redirected_to '/bli'
   end
  
   should 'not activate user when activation code is incorrect' do
@@ -707,7 +696,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
     assert_nil session[:user]
-    assert_redirected_to '/bli'
   end
  
   should 'be able to upload an image' do
@@ -777,6 +765,122 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'strong', :content => 'Plugin2 text'
   end
  
+  should 'login with an alternative authentication defined by plugin' do
+    class Plugin1 < Noosfero::Plugin
+      def alternative_authentication
+        User.new(:login => 'testuser')
+      end
+    end
+    Environment.default.enable_plugin(Plugin1.name)
+
+    post :login, :user => {:login => "testuser"}
+
+    assert_equal 'testuser', assigns(:current_user).login
+    assert_response :redirect
+  end
+
+  should "login with the default autentication if the alternative authentication method doesn't login the user" do
+    class Plugin1 < Noosfero::Plugin
+      def alternative_authentication
+        nil
+      end
+    end
+    Environment.default.enable_plugin(Plugin1.name)
+    post :login, :user => {:login => 'johndoe', :password => 'test'}
+    assert session[:user]
+    assert_equal 'johndoe', assigns(:current_user).login
+    assert_response :redirect
+  end
+
+  should "redirect user on signup if a plugin doesn't allow user registration" do
+    class TestRegistrationPlugin < Noosfero::Plugin
+      def allow_user_registration
+        false
+      end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestRegistrationPlugin.new])
+
+    post :signup, :user => { :login => 'testuser', :password => '123456', :password_confirmation => '123456', :email => 'testuser@example.com' }
+    assert_response :redirect
+  end
+
+  should "not display the new user button on login page if not allowed by any plugin" do
+    class Plugin1 < Noosfero::Plugin
+      def allow_user_registration
+        false
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def allow_user_registration
+        true
+      end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
+
+    get :login
+
+    assert_no_tag :tag => 'a', :attributes => {:href => '/account/signup'}
+  end
+
+  should "redirect user on forgot_password action if a plugin doesn't allow user to recover its password" do
+    class TestRegistrationPlugin < Noosfero::Plugin
+      def allow_password_recovery
+        false
+      end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestRegistrationPlugin.new])
+
+    #Redirect on get action
+    get :forgot_password
+    assert_response :redirect
+
+    #Redirect on post action
+    post :forgot_password, :change_password => { :login => 'test', :email => 'test@localhost.localdomain' }
+    assert_response :redirect
+  end
+
+  should "not display the forgot password button on login page if not allowed by any plugin" do
+    class Plugin1 < Noosfero::Plugin
+      def allow_password_recovery
+        false
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def allow_password_recovery
+        true
+      end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
+
+    get :login
+
+    assert_no_tag :tag => 'a', :attributes => {:href => '/account/forgot_password'}
+  end
+
+  should 'add extra content on login form from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def login_extra_contents
+        lambda {"<strong>Plugin1 text</strong>"}
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def login_extra_contents
+        lambda {"<strong>Plugin2 text</strong>"}
+      end
+    end
+
+    Environment.default.enable_plugin(Plugin1.name)
+    Environment.default.enable_plugin(Plugin2.name)
+
+    get :login
+
+    assert_tag :tag => 'strong', :content => 'Plugin1 text'
+    assert_tag :tag => 'strong', :content => 'Plugin2 text'
+  end
+
+
   protected
     def new_user(options = {}, extra_options ={})
       data = {:profile_data => person_data}
@@ -1400,6 +1400,38 @@ end
     end
   end
  
+  should 'not display article actions button if any plugins says so' do
+    class Plugin1 < Noosfero::Plugin
+      def content_remove_edit(content); true; end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def content_remove_edit(content); false; end
+    end
+
+    environment.enable_plugin(Plugin1.name)
+    environment.enable_plugin(Plugin2.name)
+
+    login_as('testinguser')
+    xhr :get, :view_page, :profile => 'testinguser', :page => [], :toolbar => true
+    assert_no_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/cms/edit/#{profile.home_page.id}" } }
+  end
+
+  should 'expire article actions button if any plugins says so' do
+    class Plugin1 < Noosfero::Plugin
+      def content_expire_edit(content); 'This button is expired.'; end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def content_expire_edit(content); nil; end
+    end
+
+    environment.enable_plugin(Plugin1.name)
+    environment.enable_plugin(Plugin2.name)
+
+    login_as('testinguser')
+    xhr :get, :view_page, :profile => 'testinguser', :page => [], :toolbar => true
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :title => 'This button is expired.', :class => 'button with-text icon-edit disabled' } }
+  end
+
   should 'remove email from article followers when unfollow' do
     profile = create_user('testuser').person
     follower_email = 'john@doe.br'
@@ -1432,4 +1464,42 @@ end
     assert spam.spam?
   end
  
+  should 'be able to edit a comment' do
+    login_as profile.identifier
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text', :accept_comments => false)
+    comment = fast_create(Comment, :body => 'Original comment', :author_id => profile.id, :source_id => page.id, :source_type => 'Article')
+
+    post :edit_comment, :id => comment.id, :profile => profile.identifier, :page => [ 'myarticle' ], :comment => { :body => 'Comment edited' }
+    assert_equal 'Comment edited', Comment.find(comment.id).body
+  end
+
+  should 'edit comment from a page' do
+    login_as profile.identifier
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    comment = fast_create(Comment, :body => 'Original comment', :author_id => profile.id, :source_id => page.id, :source_type => 'Article')
+
+    get :edit_comment, :id => comment.id, :profile => profile.identifier, :page => [ 'myarticle' ], :comment => { :body => 'Comment edited' }
+    assert_tag :tag => 'h1', :content => 'Edit comment'
+  end
+
+  should 'not edit comment from other page' do
+    login_as profile.identifier
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    comment = fast_create(Comment, :body => 'Original comment', :author_id => profile.id, :source_id => page.id, :source_type => 'Article')
+
+    other_page = profile.articles.create!(:name => 'my other article', :body => 'the body of the text')
+    comment_on_other_page = fast_create(Comment, :body => 'Comment on other article', :author_id => profile.id, :source_id => other_page.id, :source_type => 'Article')
+
+    get :edit_comment, :id => comment_on_other_page.id, :profile => profile.identifier, :page => [ 'myarticle' ], :comment => { :body => 'Comment edited' }
+    assert_redirected_to page.url
+  end
+
+  should 'not crash on edit comment if comment does not exist' do
+    login_as profile.identifier
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :edit_comment, :id => 1000, :profile => profile.identifier, :page => [ 'myarticle' ], :comment => { :body => 'Comment edited' }
+    assert_response 404
+  end
+
 end
@@ -6,8 +6,11 @@ class HomeController; def rescue_action(e) raise e end; end
  
 class HomeControllerTest < ActionController::TestCase
  
-#  all_fixtures:profiles, :environments, :domains
-all_fixtures
+  def teardown
+    Thread.current[:enabled_plugins] = nil
+  end
+
+  all_fixtures
   def setup
     @controller = HomeController.new
     @request    = ActionController::TestRequest.new
@@ -93,4 +96,44 @@ all_fixtures
     assert_tag :content => /Noosfero terms of use/
   end
  
+  should 'provide a link to make the user authentication' do
+    class Plugin1 < Noosfero::Plugin
+      def alternative_authentication_link
+        lambda {"<a href='plugin1'>Plugin1 link</a>"}
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def alternative_authentication_link
+        lambda {"<a href='plugin2'>Plugin2 link</a>"}
+      end
+    end
+
+    Environment.default.enable_plugin(Plugin1)
+    Environment.default.enable_plugin(Plugin2)
+
+    get :index
+
+    assert_tag :tag => 'a', :content => 'Plugin1 link'
+    assert_tag :tag => 'a', :content => 'Plugin2 link'
+  end
+
+  should "not display the new user button on login page if now allowed by any plugin" do
+    class Plugin1 < Noosfero::Plugin
+      def allow_user_registration
+        false
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def allow_user_registration
+        true
+      end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
+
+    get :index
+
+    assert_no_tag :tag => 'a', :attributes => {:href => '/account/signup'}
+  end
+
 end
@@ -5,12 +5,12 @@ class ProfileDesignController; def rescue_action(e) raise e end; end
  
 class ProfileDesignControllerTest < ActionController::TestCase
  
-  COMMOM_BLOCKS = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
+  COMMOM_BLOCKS = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
   PERSON_BLOCKS = COMMOM_BLOCKS + [FriendsBlock, FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
   PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock]
   PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
  
-  ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, HighlightsBlock, FeaturedProductsBlock, FansBlock]
+  ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, FeaturedProductsBlock, FansBlock]
   ENTERPRISE_BLOCKS_WITH_PRODUCTS_ENABLE = ENTERPRISE_BLOCKS + [ProductsBlock]
  
   attr_reader :holder
@@ -295,17 +295,17 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'offer to create blog archives block only if has blog' do
     holder.articles << Blog.new(:name => 'Blog test', :profile => holder)
     get :add_block, :profile => 'designtestuser'
-    assert_tag :tag => 'input', :attributes => { :id => 'type_blogarchivesblock', :value => 'BlogArchivesBlock' }
+    assert_tag :tag => 'input', :attributes => { :name => 'type', :value => 'BlogArchivesBlock' }
   end
  
   should 'not offer to create blog archives block if user dont have blog' do
     get :add_block, :profile => 'designtestuser'
-    assert_no_tag :tag => 'input', :attributes => { :id => 'type_blogarchivesblock', :value => 'BlogArchivesBlock' }
+    assert_no_tag :tag => 'input', :attributes => { :name => 'type', :value => 'BlogArchivesBlock' }
   end
  
   should 'offer to create feed reader block' do
     get :add_block, :profile => 'designtestuser'
-    assert_tag :tag => 'input', :attributes => { :id => 'type_feedreaderblock', :value => 'FeedReaderBlock' }
+    assert_tag :tag => 'input', :attributes => { :name => 'type', :value => 'FeedReaderBlock' }
   end
  
   should 'be able to edit FeedReaderBlock' do
@@ -421,14 +421,14 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     profile.stubs(:is_admin?).with(profile.environment).returns(true)
     @controller.stubs(:user).returns(profile)
     get :add_block, :profile => 'designtestuser'
-    assert_tag :tag => 'input', :attributes => { :id => 'type_rawhtmlblock', :value => 'RawHTMLBlock' }
+    assert_tag :tag => 'input', :attributes => { :name => 'type', :value => 'RawHTMLBlock' }
   end
  
   should 'not allow normal users to add RawHTMLBlock' do
     profile.stubs(:is_admin?).with(profile.environment).returns(false)
     @controller.stubs(:user).returns(profile)
     get :add_block, :profile => 'designtestuser'
-    assert_no_tag :tag => 'input', :attributes => { :id => 'type_rawhtmlblock', :value => 'RawHTMLBlock' }
+    assert_no_tag :tag => 'input', :attributes => { :name => 'type', :value => 'RawHTMLBlock' }
   end
  
   should 'editing article block displays right selected article' do
@@ -221,4 +221,11 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/chat/avatar/chemical-brothers', :controller => 'chat', :action => 'avatar', :id => 'chemical-brothers')
   end
  
+  def test_plugins_generic_routes
+    assert_routing('/plugin/foo/public_bar/play/1', {:controller => 'foo_plugin_public_bar', :action => 'play', :id => '1'})
+    assert_routing('/profile/test/plugin/foo/profile_bar/play/1', {:controller => 'foo_plugin_profile_bar', :action => 'play', :id => '1', :profile => 'test'})
+    assert_routing('/myprofile/test/plugin/foo/myprofile_bar/play/1', {:controller => 'foo_plugin_myprofile_bar', :action => 'play', :id => '1', :profile => 'test'})
+    assert_routing('/admin/plugin/foo/admin_bar/play/1', {:controller => 'foo_plugin_admin_bar', :action => 'play', :id => '1'})
+  end
+
 end
@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BoxTest < ActiveSupport::TestCase
+
+  should 'list allowed blocks for center box' do
+    blocks = Box.new(:position => 1).acceptable_blocks
+
+    assert !blocks.include?('block')
+    assert !blocks.include?('disabled-enterprise-message-block')
+    assert !blocks.include?('featured-products-block')
+    assert !blocks.include?('products-block')
+    assert !blocks.include?('profile-info-block')
+    assert !blocks.include?('profile-list-block')
+    assert !blocks.include?('profile-search-block')
+    assert !blocks.include?('slideshow-block')
+    assert !blocks.include?('location-block')
+
+    assert blocks.include?('article-block')
+    assert blocks.include?('blog-archives-block')
+    assert blocks.include?('categories-block')
+    assert blocks.include?('communities-block')
+    assert blocks.include?('enterprises-block')
+    assert blocks.include?('environment-statistics-block')
+    assert blocks.include?('fans-block')
+    assert blocks.include?('favorite-enterprises-block')
+    assert blocks.include?('feed-reader-block')
+    assert blocks.include?('friends-block')
+    assert blocks.include?('highlights-block')
+    assert blocks.include?('link-list-block')
+    assert blocks.include?('login-block')
+    assert blocks.include?('main-block')
+    assert blocks.include?('members-block')
+    assert blocks.include?('my-network-block')
+    assert blocks.include?('people-block')
+    assert blocks.include?('profile-image-block')
+    assert blocks.include?('raw-html-block')
+    assert blocks.include?('recent-documents-block')
+    assert blocks.include?('sellers-search-block')
+    assert blocks.include?('tags-block')
+  end
+
+  should 'list allowed blocks for box at position 2' do
+    blocks = Box.new(:position => 2).acceptable_blocks
+
+    assert !blocks.include?('main-block')
+    assert !blocks.include?('block')
+    assert !blocks.include?('profile-list-block')
+
+    assert blocks.include?('article-block')
+    assert blocks.include?('blog-archives-block')
+    assert blocks.include?('categories-block')
+    assert blocks.include?('communities-block')
+    assert blocks.include?('disabled-enterprise-message-block')
+    assert blocks.include?('enterprises-block')
+    assert blocks.include?('environment-statistics-block')
+    assert blocks.include?('fans-block')
+    assert blocks.include?('favorite-enterprises-block')
+    assert blocks.include?('featured-products-block')
+    assert blocks.include?('feed-reader-block')
+    assert blocks.include?('friends-block')
+    assert blocks.include?('highlights-block')
+    assert blocks.include?('link-list-block')
+    assert blocks.include?('location-block')
+    assert blocks.include?('login-block')
+    assert blocks.include?('members-block')
+    assert blocks.include?('my-network-block')
+    assert blocks.include?('people-block')
+    assert blocks.include?('products-block')
+    assert blocks.include?('profile-image-block')
+    assert blocks.include?('profile-info-block')
+    assert blocks.include?('profile-search-block')
+    assert blocks.include?('raw-html-block')
+    assert blocks.include?('recent-documents-block')
+    assert blocks.include?('sellers-search-block')
+    assert blocks.include?('slideshow-block')
+    assert blocks.include?('tags-block')
+  end
+
+end
@@ -5,6 +5,7 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   include CmsHelper
   include BlogHelper
   include ApplicationHelper
+  include ActionView::Helpers::UrlHelper
  
   should 'show default options for article' do
     CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)
@@ -47,14 +48,18 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   end
  
   should 'display spread button when profile is a person' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     profile = fast_create(Person)
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
-    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish', :id => article.id)
+    expects(:link_to).with('Spread this', {:action => 'publish', :id => article.id}, :class => 'button with-text icon-spread', :title => nil)
  
     result = display_spread_button(profile, article)
   end
  
   should 'display spread button when profile is a community and env has portal_community' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     env = fast_create(Environment)
     env.expects(:portal_community).returns(true)
     profile = fast_create(Community, :environment_id => env.id)
@@ -62,12 +67,14 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
  
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
  
-    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id)
+    expects(:link_to).with('Spread this', {:action => 'publish_on_portal_community', :id => article.id}, :class => 'button with-text icon-spread', :title => nil)
  
     result = display_spread_button(profile, article)
   end
  
   should 'not display spread button when profile is a community and env has not portal_community' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     env = fast_create(Environment)
     env.expects(:portal_community).returns(nil)
     profile = fast_create(Community, :environment_id => env.id)
@@ -75,31 +82,37 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
  
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
  
-    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id).never
+    expects(:link_to).with('Spread this', {:action => 'publish_on_portal_community', :id => article.id}, :class => 'button with-text icon-spread', :title => nil).never
  
     result = display_spread_button(profile, article)
   end
  
   should 'display delete_button to folder' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     profile = fast_create(Profile)
     name = 'My folder'
     folder = fast_create(Folder, :name => name, :profile_id => profile.id)
     confirm_message = "Are you sure that you want to remove the folder \"#{name}\"? Note that all the items inside it will also be removed!"
-    expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message)
+    expects(:link_to).with('Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message, :class => 'button with-text icon-delete', :title => nil)
  
     result = display_delete_button(folder)
   end
  
   should 'display delete_button to article' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     profile = fast_create(Profile)
     name = 'My article'
     article = fast_create(TinyMceArticle, :name => name, :profile_id => profile.id)
     confirm_message = "Are you sure that you want to remove the item \"#{name}\"?"
-    expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message)
+    expects(:link_to).with('Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message, :class => 'button with-text icon-delete', :title => nil)
  
     result = display_delete_button(article)
   end
  
+  def link_to(text, *args); puts text; puts args.inspect; text; end
+
 end
  
 module RssFeedHelper
@@ -27,4 +27,10 @@ class ColorboxHelperTest &lt; ActiveSupport::TestCase
     assert_equal '[button]', colorbox_button('type', 'label', { :action => 'popup'})
   end
  
+  should 'provide colorbox_icon_button' do
+    expects(:icon_button).with('type', 'label', { :action => 'popup'}, has_entries({ :class => 'colorbox' })).returns('[button]')
+
+    assert_equal '[button]', colorbox_icon_button('type', 'label', { :action => 'popup'})
+  end
+
 end
@@ -555,6 +555,14 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal 'bar', c.referrer
   end
  
+  should 'delegate environment to article' do
+    profile = fast_create(Profile, :environment_id => Environment.default)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+
+    assert_equal Environment.default, comment.environment
+  end
+
   private
  
   def create_comment(args = {})
@@ -14,7 +14,7 @@ class TaskTest &lt; ActiveSupport::TestCase
       t.requestor = 1
     end
     assert_nothing_raised do
-      t.requestor = Person.new
+      t.requestor = Profile.new
     end
   end
  
@@ -403,12 +403,29 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal 'Test User', user.name
   end
  
-  should 'respond name with login, if there is no person related' do
+  should 'respond name with login, if there is no person related and name defined' do
     user = create_user('testuser')
     user.person = nil
+    user.name = nil
     assert_equal 'testuser', user.name
   end
  
+  should 'respond name with user name attribute' do
+    user = create_user('testuser')
+    user.person = nil
+    user.name = 'Another User'
+    user.login = 'Login User'
+    assert_equal 'Another User', user.name
+  end
+
+  should 'respond name with related person name although user name attribute is defined' do
+    user = create_user('testuser')
+    user.person.name = 'Person Name'
+    user.name = 'Another User'
+    user.login = 'Login User'
+    assert_equal 'Person Name', user.name
+  end
+
   should 'have activation code' do
     user = create_user('testuser')
     assert_respond_to user, :activation_code
@@ -430,6 +447,13 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
   end
  
+  should 'not try to deliver email to template users' do
+    Person.any_instance.stubs(:is_template?).returns(true)
+    assert_no_difference ActionMailer::Base.deliveries, :size do
+      new_user
+    end
+  end
+
   should 'not mass assign activated at' do
     user = User.new :activated_at => 5.days.ago
     assert_nil user.activated_at
@@ -492,6 +516,12 @@ class UserTest &lt; ActiveSupport::TestCase
     assert !user.activate
   end
  
+  should 'be able to skip the password requirement' do
+    user = User.new(:login => 'quire', :email => 'quire@example.com')
+    user.not_require_password!
+    assert user.save!
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
...	...	@@ -114,7 +114,9 @@ class ApplicationController < ActionController::Base
114	114	# plugin to the current controller being initialized.
115	115	def init_noosfero_plugins_controller_filters
116	116	plugins.each do \|plugin\|
117		- plugin.send(self.class.name.underscore + '_filters').each do \|plugin_filter\|
	117	+ filters = plugin.send(self.class.name.underscore + '_filters')
	118	+ filters = [filters] if !filters.kind_of?(Array)
	119	+ filters.each do \|plugin_filter\|
118	120	self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] \|\| {}))
119	121	self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
120	122	end
...	...
...	...	@@ -68,7 +68,8 @@ class BoxOrganizerController < ApplicationController
68	68	raise ArgumentError.new("Type %s is not allowed. Go away." % type)
69	69	end
70	70	else
71		- @block_types = available_blocks
	71	+ @center_block_types = Box.acceptable_center_blocks & available_blocks
	72	+ @side_block_types = Box.acceptable_side_blocks & available_blocks
72	73	@boxes = boxes_holder.boxes
73	74	render :action => 'add_block', :layout => false
74	75	end
...	...
...	...	@@ -5,7 +5,7 @@ class ProfileDesignController < BoxOrganizerController
5	5	protect 'edit_profile_design', :profile
6	6
7	7	def available_blocks
8		- blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
	8	+ blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
9	9
10	10	# blocks exclusive for organizations
11	11	if profile.has_members?
...	...
...	...	@@ -25,11 +25,13 @@ class AccountController < ApplicationController
25	25
26	26	# action to perform login to the application
27	27	def login
28		- @user = User.new
29		- @person = @user.build_person
30	28	store_location(request.referer) unless session[:return_to]
31	29	return unless request.post?
32		- self.current_user = User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
	30	+
	31	+ self.current_user = plugins_alternative_authentication
	32	+
	33	+ self.current_user \|\|= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
	34	+
33	35	if logged_in?
34	36	if params[:remember_me] == "1"
35	37	self.current_user.remember_me
...	...	@@ -41,7 +43,6 @@ class AccountController < ApplicationController
41	43	end
42	44	else
43	45	session[:notice] = _('Incorrect username or password') if redirect?
44		- redirect_to :back if redirect?
45	46	end
46	47	end
47	48
...	...	@@ -56,6 +57,11 @@ class AccountController < ApplicationController
56	57
57	58	# action to register an user to the application
58	59	def signup
	60	+ if @plugins.dispatch(:allow_user_registration).include?(false)
	61	+ redirect_back_or_default(:controller => 'home')
	62	+ session[:notice] = _("This environment doesn't allow user registration.")
	63	+ end
	64	+
59	65	@invitation_code = params[:invitation_code]
60	66	begin
61	67	if params[:user]
...	...	@@ -125,6 +131,10 @@ class AccountController < ApplicationController
125	131	#
126	132	# Posts back.
127	133	def forgot_password
	134	+ if @plugins.dispatch(:allow_password_recovery).include?(false)
	135	+ redirect_back_or_default(:controller => 'home')
	136	+ session[:notice] = _("This environment doesn't allow password recovery.")
	137	+ end
128	138	@change_password = ChangePassword.new(params[:change_password])
129	139
130	140	if request.post?
...	...	@@ -316,4 +326,13 @@ class AccountController < ApplicationController
316	326	end
317	327	end
318	328
	329	+ def plugins_alternative_authentication
	330	+ user = nil
	331	+ @plugins.each do \|plugin\|
	332	+ user = plugin.alternative_authentication
	333	+ break unless user.nil?
	334	+ end
	335	+ user
	336	+ end
	337	+
319	338	end
...	...
...	...	@@ -2,6 +2,8 @@ class ContentViewerController < ApplicationController
2	2
3	3	needs_profile
4	4
	5	+ before_filter :comment_author, :only => :edit_comment
	6	+
5	7	helper ProfileHelper
6	8	helper TagsHelper
7	9
...	...	@@ -121,6 +123,27 @@ class ContentViewerController < ApplicationController
121	123	end
122	124	end
123	125
	126	+ def edit_comment
	127	+ path = params[:page].join('/')
	128	+ @page = profile.articles.find_by_path(path)
	129	+ @form_div = 'opened'
	130	+ @comment = @page.comments.find_by_id(params[:id])
	131	+ if @comment
	132	+ if request.post?
	133	+ begin
	134	+ @comment.update_attributes(params[:comment])
	135	+ session[:notice] = _('Comment succesfully updated')
	136	+ redirect_to :action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path
	137	+ rescue
	138	+ session[:notice] = _('Comment could not be updated')
	139	+ end
	140	+ end
	141	+ else
	142	+ redirect_to @page.view_url
	143	+ session[:notice] = _('Could not find the comment in the article')
	144	+ end
	145	+ end
	146	+
124	147	protected
125	148
126	149	def add_comment
...	...	@@ -198,4 +221,13 @@ class ContentViewerController < ApplicationController
198	221	end
199	222	end
200	223
	224	+ def comment_author
	225	+ comment = Comment.find_by_id(params[:id])
	226	+ if comment
	227	+ render_access_denied if comment.author.blank? \|\| comment.author != user
	228	+ else
	229	+ render_not_found
	230	+ end
	231	+ end
	232	+
201	233	end
...	...
...	...	@@ -265,9 +265,9 @@ module ApplicationHelper
265	265
266	266	VIEW_EXTENSIONS = %w[.rhtml .html.erb]
267	267
268		- def partial_for_class_in_view_path(klass, view_path)
	268	+ def partial_for_class_in_view_path(klass, view_path, suffix = nil)
269	269	return nil if klass.nil?
270		- name = klass.name.underscore
	270	+ name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
271	271
272	272	search_name = String.new(name)
273	273	if search_name.include?("/")
...	...	@@ -285,28 +285,17 @@ module ApplicationHelper
285	285	partial_for_class_in_view_path(klass.superclass, view_path)
286	286	end
287	287
288		- def partial_for_class(klass)
	288	+ def partial_for_class(klass, suffix=nil)
289	289	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
290	290	name = klass.name.underscore
291	291	@controller.view_paths.each do \|view_path\|
292		- partial = partial_for_class_in_view_path(klass, view_path)
	292	+ partial = partial_for_class_in_view_path(klass, view_path, suffix)
293	293	return partial if partial
294	294	end
295	295
296	296	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
297	297	end
298	298
299		- def partial_for_task_class(klass, action)
300		- raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
301		-
302		- name = "#{klass.name.underscore}_#{action.to_s}"
303		- VIEW_EXTENSIONS.each do \|ext\|
304		- return name if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], '_'+name+ext))
305		- end
306		-
307		- partial_for_task_class(klass.superclass, action)
308		- end
309		-
310	299	def view_for_profile_actions(klass)
311	300	raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
312	301
...	...	@@ -1323,6 +1312,19 @@ module ApplicationHelper
1323	1312	end
1324	1313	end
1325	1314
	1315	+ def expirable_link_to(expired, content, url, options = {})
	1316	+ if expired
	1317	+ options[:class] = (options[:class] \|\| '') + ' disabled'
	1318	+ content_tag('a', ' '+content_tag('span', content), options)
	1319	+ else
	1320	+ link_to content, url, options
	1321	+ end
	1322	+ end
	1323	+
	1324	+ def remove_content_button(action)
	1325	+ @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
	1326	+ end
	1327	+
1326	1328	def template_options(klass, field_name)
1327	1329	return '' if klass.templates.count == 0
1328	1330	return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
...	...	@@ -1388,4 +1390,19 @@ module ApplicationHelper
1388	1390	result
1389	1391	end
1390	1392
	1393	+ def expirable_content_reference(content, action, text, url, options = {})
	1394	+ reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
	1395	+ options[:title] = reason
	1396	+ expirable_link_to reason.present?, text, url, options
	1397	+ end
	1398	+
	1399	+ def expirable_button(content, action, text, url, options = {})
	1400	+ options[:class] = "button with-text icon-#{action.to_s}"
	1401	+ expirable_content_reference content, action, text, url, options
	1402	+ end
	1403	+
	1404	+ def expirable_comment_link(content, action, text, url, options = {})
	1405	+ options[:class] = "comment-footer comment-footer-link comment-footer-hide"
	1406	+ expirable_content_reference content, action, text, url, options
	1407	+ end
1391	1408	end
...	...
...	...	@@ -162,9 +162,6 @@ module BoxesHelper
162	162	#
163	163	# +box+ is always needed
164	164	def block_target(box, block = nil)
165		- # FIXME hardcoded
166		- return '' if box.position == 1
167		-
168	165	id =
169	166	if block.nil?
170	167	"end-of-box-#{box.id}"
...	...	@@ -172,14 +169,11 @@ module BoxesHelper
172	169	"before-block-#{block.id}"
173	170	end
174	171
175		- content_tag('div', ' ', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => 'block', :hoverclass => 'block-target-hover')
	172	+ content_tag('div', ' ', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
176	173	end
177	174
178	175	# makes the given block draggable so it can be moved away.
179	176	def block_handle(block)
180		- # FIXME hardcoded
181		- return '' if block.box.position == 1
182		-
183	177	draggable_element("block-#{block.id}", :revert => true)
184	178	end
185	179
...	...	@@ -211,7 +205,7 @@ module BoxesHelper
211	205	end
212	206
213	207	if block.editable?
214		- buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
	208	+ buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
215	209	end
216	210
217	211	if !block.main?
...	...
...	...	@@ -42,13 +42,25 @@ module CmsHelper
42	42
43	43	def display_spread_button(profile, article)
44	44	if profile.person?
45		- button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
	45	+ expirable_button article, :spread, _('Spread this'), :action => 'publish', :id => article.id
46	46	elsif profile.community? && environment.portal_community
47		- button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
	47	+ expirable_button article, :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
48	48	end
49	49	end
50	50
51	51	def display_delete_button(article)
52		- button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
	52	+ expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
	53	+ end
	54	+
	55	+ def expirable_button(content, action, title, url, options = {})
	56	+ reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
	57	+ if reason.present?
	58	+ options[:class] = (options[:class] \|\| '') + ' disabled'
	59	+ options[:disabled] = 'disabled'
	60	+ options.delete(:confirm)
	61	+ options.delete(:method)
	62	+ title = reason
	63	+ end
	64	+ button_without_text action.to_sym, title, url, options
53	65	end
54	66	end
...	...
...	...	@@ -8,6 +8,10 @@ module ColorboxHelper
8	8	button(type, label, url, colorbox_options(options))
9	9	end
10	10
	11	+ def colorbox_icon_button(type, label, url, options = {})
	12	+ icon_button(type, label, url, colorbox_options(options))
	13	+ end
	14	+
11	15	# options must be an HTML options hash as passed to link_to etc.
12	16	#
13	17	# returns a new hash with colorbox class added. Keeps existing classes.
...	...
...	...	@@ -155,6 +155,119 @@ module FormsHelper
155	155	return result
156	156	end
157	157
	158	+ def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
	159	+ datepicker_options[:disabled] \|\|= false
	160	+ datepicker_options[:alt_field] \|\|= ''
	161	+ datepicker_options[:alt_format] \|\|= ''
	162	+ datepicker_options[:append_text] \|\|= ''
	163	+ datepicker_options[:auto_size] \|\|= false
	164	+ datepicker_options[:button_image] \|\|= ''
	165	+ datepicker_options[:button_image_only] \|\|= false
	166	+ datepicker_options[:button_text] \|\|= '...'
	167	+ datepicker_options[:calculate_week] \|\|= 'jQuery.datepicker.iso8601Week'
	168	+ datepicker_options[:change_month] \|\|= false
	169	+ datepicker_options[:change_year] \|\|= false
	170	+ datepicker_options[:close_text] \|\|= _('Done')
	171	+ datepicker_options[:constrain_input] \|\|= true
	172	+ datepicker_options[:current_text] \|\|= _('Today')
	173	+ datepicker_options[:date_format] \|\|= 'mm/dd/yy'
	174	+ datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
	175	+ datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
	176	+ datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
	177	+ datepicker_options[:default_date] \|\|= nil
	178	+ datepicker_options[:duration] \|\|= 'normal'
	179	+ datepicker_options[:first_day] \|\|= 0
	180	+ datepicker_options[:goto_current] \|\|= false
	181	+ datepicker_options[:hide_if_no_prev_next] \|\|= false
	182	+ datepicker_options[:is_rtl] \|\|= false
	183	+ datepicker_options[:max_date] \|\|= nil
	184	+ datepicker_options[:min_date] \|\|= nil
	185	+ datepicker_options[:month_names] \|\|= [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')]
	186	+ datepicker_options[:month_names_short] \|\|= [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')]
	187	+ datepicker_options[:navigation_as_date_format] \|\|= false
	188	+ datepicker_options[:next_text] \|\|= _('Next')
	189	+ datepicker_options[:number_of_months] \|\|= 1
	190	+ datepicker_options[:prev_text] \|\|= _('Prev')
	191	+ datepicker_options[:select_other_months] \|\|= false
	192	+ datepicker_options[:short_year_cutoff] \|\|= '+10'
	193	+ datepicker_options[:show_button_panel] \|\|= false
	194	+ datepicker_options[:show_current_at_pos] \|\|= 0
	195	+ datepicker_options[:show_month_after_year] \|\|= false
	196	+ datepicker_options[:show_on] \|\|= 'focus'
	197	+ datepicker_options[:show_options] \|\|= {}
	198	+ datepicker_options[:show_other_months] \|\|= false
	199	+ datepicker_options[:show_week] \|\|= false
	200	+ datepicker_options[:step_months] \|\|= 1
	201	+ datepicker_options[:week_header] \|\|= _('Wk')
	202	+ datepicker_options[:year_range] \|\|= 'c-10:c+10'
	203	+ datepicker_options[:year_suffix] \|\|= ''
	204	+
	205	+ element_id = html_options[:id] \|\| 'datepicker-date'
	206	+ value = value.strftime(format) if value.present?
	207	+ method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
	208	+ result = text_field_tag(name, value, html_options)
	209	+ result +=
	210	+ "
	211	+ <script type='text/javascript'>
	212	+ jQuery('##{element_id}').#{method}({
	213	+ disabled: #{datepicker_options[:disabled].to_json},
	214	+ altField: #{datepicker_options[:alt_field].to_json},
	215	+ altFormat: #{datepicker_options[:alt_format].to_json},
	216	+ appendText: #{datepicker_options[:append_text].to_json},
	217	+ autoSize: #{datepicker_options[:auto_size].to_json},
	218	+ buttonImage: #{datepicker_options[:button_image].to_json},
	219	+ buttonImageOnly: #{datepicker_options[:button_image_only].to_json},
	220	+ buttonText: #{datepicker_options[:button_text].to_json},
	221	+ calculateWeek: #{datepicker_options[:calculate_week].to_json},
	222	+ changeMonth: #{datepicker_options[:change_month].to_json},
	223	+ changeYear: #{datepicker_options[:change_year].to_json},
	224	+ closeText: #{datepicker_options[:close_text].to_json},
	225	+ constrainInput: #{datepicker_options[:constrain_input].to_json},
	226	+ currentText: #{datepicker_options[:current_text].to_json},
	227	+ dateFormat: #{datepicker_options[:date_format].to_json},
	228	+ dayNames: #{datepicker_options[:day_names].to_json},
	229	+ dayNamesMin: #{datepicker_options[:day_names_min].to_json},
	230	+ dayNamesShort: #{datepicker_options[:day_names_short].to_json},
	231	+ defaultDate: #{datepicker_options[:default_date].to_json},
	232	+ duration: #{datepicker_options[:duration].to_json},
	233	+ firstDay: #{datepicker_options[:first_day].to_json},
	234	+ gotoCurrent: #{datepicker_options[:goto_current].to_json},
	235	+ hideIfNoPrevNext: #{datepicker_options[:hide_if_no_prev_next].to_json},
	236	+ isRTL: #{datepicker_options[:is_rtl].to_json},
	237	+ maxDate: #{datepicker_options[:max_date].to_json},
	238	+ minDate: #{datepicker_options[:min_date].to_json},
	239	+ monthNames: #{datepicker_options[:month_names].to_json},
	240	+ monthNamesShort: #{datepicker_options[:month_names_short].to_json},
	241	+ navigationAsDateFormat: #{datepicker_options[:navigation_as_date_format].to_json},
	242	+ nextText: #{datepicker_options[:next_text].to_json},
	243	+ numberOfMonths: #{datepicker_options[:number_of_months].to_json},
	244	+ prevText: #{datepicker_options[:prev_text].to_json},
	245	+ selectOtherMonths: #{datepicker_options[:select_other_months].to_json},
	246	+ shortYearCutoff: #{datepicker_options[:short_year_cutoff].to_json},
	247	+ showButtonPanel: #{datepicker_options[:show_button_panel].to_json},
	248	+ showCurrentAtPos: #{datepicker_options[:show_current_at_pos].to_json},
	249	+ showMonthAfterYear: #{datepicker_options[:show_month_after_year].to_json},
	250	+ showOn: #{datepicker_options[:show_on].to_json},
	251	+ showOptions: #{datepicker_options[:show_options].to_json},
	252	+ showOtherMonths: #{datepicker_options[:show_other_months].to_json},
	253	+ showWeek: #{datepicker_options[:show_week].to_json},
	254	+ stepMonths: #{datepicker_options[:step_months].to_json},
	255	+ weekHeader: #{datepicker_options[:week_header].to_json},
	256	+ yearRange: #{datepicker_options[:year_range].to_json},
	257	+ yearSuffix: #{datepicker_options[:year_suffix].to_json}
	258	+ })
	259	+ </script>
	260	+ "
	261	+ result
	262	+ end
	263	+
	264	+ def date_range_field(from_name, to_name, from_value, to_value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
	265	+ from_id = html_options[:from_id] \|\| 'datepicker-from-date'
	266	+ to_id = html_options[:to_id] \|\| 'datepicker-to-date'
	267	+ return _('From') +' '+ date_field(from_name, from_value, format, datepicker_options, html_options.merge({:id => from_id})) +
	268	+ ' ' + _('until') +' '+ date_field(to_name, to_value, format, datepicker_options, html_options.merge({:id => to_id}))
	269	+ end
	270	+
158	271	protected
159	272	def self.next_id_number
160	273	if defined? @@id_num
...	...