Merge commit 'refs/merge-requests/229' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/229

Merge commit 'refs/merge-requests/229' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/229
Daniela Feitosa
2 parents 90e56099 fa1b55b8
Showing 38 changed files with 1033 additions and 382 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/lib/kalibro/configuration.rb
plugins/mezuro/lib/kalibro/metric_configuration.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/kalibro/project.rb
plugins/mezuro/lib/kalibro/project_result.rb
plugins/mezuro/lib/kalibro/range.rb
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/licenses.yaml.example
plugins/mezuro/public/colorPicker.css
plugins/mezuro/public/javascripts/colorPicker/LICENSE
plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.js
plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.min.js
plugins/mezuro/public/javascripts/project_content.js
plugins/mezuro/public/javascripts/validations.js
plugins/mezuro/public/style.css
plugins/mezuro/test/fixtures/project_fixtures.rb
@@ -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 %>
	@@ -34,4 +34,12 @@ class Kalibro::Range < Kalibro::Model		@@ -34,4 +34,12 @@ class Kalibro::Range < Kalibro::Model
34	@grade = value.to_f	34	@grade = value.to_f
35	end	35	end
36		36
		37	+ def mezuro_color
		38	+ @color.nil? ? "#e4ca2d" : @color.gsub(/^ff/, "#")
		39	+ end
		40	+
		41	+ def color=(new_color)
		42	+ @color = new_color.gsub(/^#/, "ff")
		43	+ end
		44	+
37	end	45	end
1	class MezuroPlugin::Helpers::ContentViewerHelper	1	class MezuroPlugin::Helpers::ContentViewerHelper
		2	+
		3	+ MAX_NUMBER_OF_LABELS = 5
		4	+
2	def self.format_grade(grade)	5	def self.format_grade(grade)
3	sprintf("%.2f", grade.to_f)	6	sprintf("%.2f", grade.to_f)
4	end	7	end
	@@ -6,15 +9,31 @@ class MezuroPlugin::Helpers::ContentViewerHelper		@@ -6,15 +9,31 @@ class MezuroPlugin::Helpers::ContentViewerHelper
6	def self.create_periodicity_options	9	def self.create_periodicity_options
7	[["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]	10	[["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]
8	end	11	end
9	-
10	- def self.generate_chart(values)
11	- Gchart.line(	12	+
		13	+ def self.create_license_options
		14	+ options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")
		15	+ options = options.split(";")
		16	+ formated_options = []
		17	+ options.each { \|option\| formated_options << [option, option] }
		18	+ formated_options
		19	+ end
		20	+
		21	+ def self.generate_chart(score_history)
		22	+ values = []
		23	+ labels = []
		24	+ score_history.each do \|score_data\|
		25	+ values << score_data.first
		26	+ labels << score_data.last
		27	+ end
		28	+ labels = discretize_array labels
		29	+ Gchart.line(
12	:title_color => 'FF0000',	30	:title_color => 'FF0000',
13	:size => '600x180',	31	:size => '600x180',
14	:bg => {:color => 'efefef', :type => 'stripes'},	32	:bg => {:color => 'efefef', :type => 'stripes'},
15	:line_colors => 'c4a000',	33	:line_colors => 'c4a000',
16	:data => values,	34	:data => values,
17	- :axis_with_labels => 'y',	35	+ :labels => labels,
		36	+ :axis_with_labels => ['y','x'],
18	:max_value => values.max,	37	:max_value => values.max,
19	:min_value => values.min	38	:min_value => values.min
20	)	39	)
	@@ -25,8 +44,33 @@ class MezuroPlugin::Helpers::ContentViewerHelper		@@ -25,8 +44,33 @@ class MezuroPlugin::Helpers::ContentViewerHelper
25	selected_option = options.find { \|option\| option.last == index.to_i }	44	selected_option = options.find { \|option\| option.last == index.to_i }
26	selected_option.first	45	selected_option.first
27	end	46	end
28	-	47	+
29	def self.format_name(metric_result)	48	def self.format_name(metric_result)
30	metric_result.metric.name.delete("() ")	49	metric_result.metric.name.delete("() ")
31	end	50	end
		51	+
		52	+ def self.get_license_option(selected)
		53	+ options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml")
		54	+ options.split(";")
		55	+ selected_option = options.find { \|license\| license == selected }
		56	+ end
		57	+
		58	+ private
		59	+
		60	+ def self.discretize_array(array)
		61	+ if array.size > MAX_NUMBER_OF_LABELS
		62	+ range_array.map { \|i\| discrete_element(array, i)}
		63	+ else
		64	+ array
		65	+ end
		66	+ end
		67	+
		68	+ def self.range_array
		69	+ (0..(MAX_NUMBER_OF_LABELS - 1)).to_a
		70	+ end
		71	+
		72	+ def self.discrete_element(array, i)
		73	+ array[(i*(array.size - 1))/(MAX_NUMBER_OF_LABELS - 1)]
		74	+ end
		75	+
32	end	76	end
@@ -0,0 +1,69 @@		@@ -0,0 +1,69 @@
	1	+Academic Free License 3.0 (AFL-3.0);
	2	+Affero GNU Public License (AGPL-3.0);
	3	+Adaptive Public License (APL-1.0);
	4	+Apache License 2.0 (Apache-2.0);
	5	+Apple Public Source License (APSL-2.0);
	6	+Artistic license 2.0 (Artistic-2.0);
	7	+Attribution Assurance Licenses (AAL);
	8	+BSD 3-Clause "New" or "Revised" License (BSD-3-Clause);
	9	+BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause);
	10	+Boost Software License (BSL-1.0);
	11	+Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1);
	12	+Common Development and Distribution License 1.0 (CDDL-1.0);
	13	+Common Public Attribution License 1.0 (CPAL-1.0);
	14	+CUA Office Public License Version 1.0 (CUA-OPL-1.0);
	15	+EU DataGrid Software License (EUDatagrid);
	16	+Eclipse Public License 1.0 (EPL-1.0);
	17	+Educational Community License, Version 2.0 (ECL-2.0);
	18	+Eiffel Forum License V2.0 (EFL-2.0);
	19	+Entessa Public License (Entessa);
	20	+European Union Public License, Version 1.1 (EUPL-1.1);
	21	+Fair License (FAIR);
	22	+Frameworx License (Frameworx-1.0);
	23	+GNU Affero General Public License v3 (AGPL-3.0);
	24	+GNU General Public License version 2.0 (GPL-2.0);
	25	+GNU General Public License version 3.0 (GPL-3.0);
	26	+GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1);
	27	+GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0);
	28	+Historical Permission Notice and Disclaimer (HPND);
	29	+IBM Public License 1.0 (IPL-1.0);
	30	+IPA Font License (IPA);
	31	+ISC License (ISC);
	32	+LaTeX Project Public License 1.3c (LPPL-1.3c);
	33	+Lucent Public License Version 1.02 (LPL-1.02);
	34	+MirOS Licence (MirOS);
	35	+Microsoft Public License (Ms-PL);
	36	+Microsoft Reciprocal License (Ms-RL);
	37	+MIT license (MIT);
	38	+Motosoto License (Motosoto);
	39	+Mozilla Public License 2.0 (MPL-2.0);
	40	+Multics License (Multics);
	41	+NASA Open Source Agreement 1.3 (NASA 1.3);
	42	+NTP License (NTP);
	43	+Naumen Public License (Naumen);
	44	+Nethack General Public License (NGPL);
	45	+Nokia Open Source License (Nokia);
	46	+Non-Profit Open Software License 3.0 (NPOSL-3.0);
	47	+OCLC Research Public License 2.0 (OCLC-2.0);
	48	+Open Font License 1.1 (OFL 1.1);
	49	+Open Group Test Suite License (OGTSL);
	50	+Open Software License 3.0 (OSL-3.0);
	51	+PHP License 3.0 (PHP-3.0);
	52	+The PostgreSQL License (PostgreSQL);
	53	+Python License (Python-2.0);
	54	+CNRI Python license (CNRI-Python);
	55	+Q Public License (QPL-1.0);
	56	+RealNetworks Public Source License V1.0 (RPSL-1.0);
	57	+Reciprocal Public License 1.5 (RPL-1.5);
	58	+Ricoh Source Code Public License (RSCPL);
	59	+Simple Public License 2.0 (SimPL-2.0);
	60	+Sleepycat License (Sleepycat);
	61	+Sun Public License 1.0 (SPL-1.0);
	62	+Sybase Open Watcom Public License 1.0 (Watcom-1.0);
	63	+University of Illinois/NCSA Open Source License (NCSA);
	64	+Vovida Software License v. 1.0 (VSL-1.0);
	65	+W3C License (W3C);
	66	+wxWindows Library License (WXwindows);
	67	+X.Net License (Xnet);
	68	+Zope Public License 2.0 (ZPL-2.0);
	69	+zlib/libpng license (Zlib);
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+div.colorPicker-picker {
	2	+ height: 16px;
	3	+ width: 16px;
	4	+ padding: 0 !important;
	5	+ border: 1px solid #ccc;
	6	+ background: url(arrow.gif) no-repeat top right;
	7	+ cursor: pointer;
	8	+ line-height: 16px;
	9	+}
	10	+
	11	+div.colorPicker-palette {
	12	+ width: 110px;
	13	+ position: absolute;
	14	+ border: 1px solid #598FEF;
	15	+ background-color: #EFEFEF;
	16	+ padding: 2px;
	17	+ z-index: 9999;
	18	+}
	19	+ div.colorPicker_hexWrap {width: 100%; float:left }
	20	+ div.colorPicker_hexWrap label {font-size: 95%; color: #2F2F2F; margin: 5px 2px; width: 25%}
	21	+ div.colorPicker_hexWrap input {margin: 5px 2px; padding: 0; font-size: 95%; border: 1px solid #000; width: 65%; }
	22	+
	23	+div.colorPicker-swatch {
	24	+ height: 12px;
	25	+ width: 12px;
	26	+ border: 1px solid #000;
	27	+ margin: 2px;
	28	+ float: left;
	29	+ cursor: pointer;
	30	+ line-height: 12px;
	31	+}
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+Copyright (c) 2012 Lakshan Perera
	2	+
	3	+Permission is hereby granted, free of charge, to any person
	4	+obtaining a copy of this software and associated documentation
	5	+files (the "Software"), to deal in the Software without
	6	+restriction, including without limitation the rights to use,
	7	+copy, modify, merge, publish, distribute, sublicense, and/or sell
	8	+copies of the Software, and to permit persons to whom the
	9	+Software is furnished to do so, subject to the following
	10	+conditions:
	11	+
	12	+The above copyright notice and this permission notice shall be
	13	+included in all copies or substantial portions of the Software.
	14	+
	15	+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	16	+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
	17	+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	18	+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
	19	+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
	20	+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	21	+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	22	+OTHER DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,328 @@		@@ -0,0 +1,328 @@
	1	+/**
	2	+ * Really Simple Color Picker in jQuery
	3	+ *
	4	+ * Licensed under the MIT (MIT-LICENSE.txt) licenses.
	5	+ *
	6	+ * Copyright (c) 2008-2012
	7	+ * Lakshan Perera (www.laktek.com) & Daniel Lacy (daniellacy.com)
	8	+ *
	9	+ * Permission is hereby granted, free of charge, to any person obtaining a copy
	10	+ * of this software and associated documentation files (the "Software"), to
	11	+ * deal in the Software without restriction, including without limitation the
	12	+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
	13	+ * sell copies of the Software, and to permit persons to whom the Software is
	14	+ * furnished to do so, subject to the following conditions:
	15	+ *
	16	+ * The above copyright notice and this permission notice shall be included in
	17	+ * all copies or substantial portions of the Software.
	18	+ *
	19	+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	20	+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	21	+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	22	+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
	23	+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	24	+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
	25	+ * IN THE SOFTWARE.
	26	+ */
	27	+
	28	+(function ($) {
	29	+ /**
	30	+ * Create a couple private variables.
	31	+ **/
	32	+ var selectorOwner,
	33	+ activePalette,
	34	+ cItterate = 0,
	35	+ templates = {
	36	+ control : $('<div class="colorPicker-picker"> </div>'),
	37	+ palette : $('<div id="colorPicker_palette" class="colorPicker-palette" />'),
	38	+ swatch : $('<div class="colorPicker-swatch"> </div>'),
	39	+ hexLabel: $('<label for="colorPicker_hex">Hex</label>'),
	40	+ hexField: $('<input type="text" id="colorPicker_hex" />')
	41	+ },
	42	+ transparent = "transparent",
	43	+ lastColor;
	44	+
	45	+ /**
	46	+ * Create our colorPicker function
	47	+ **/
	48	+ $.fn.colorPicker = function (options) {
	49	+
	50	+ return this.each(function () {
	51	+ // Setup time. Clone new elements from our templates, set some IDs, make shortcuts, jazzercise.
	52	+ var element = $(this),
	53	+ opts = $.extend({}, $.fn.colorPicker.defaults, options),
	54	+ defaultColor = $.fn.colorPicker.toHex(
	55	+ (element.val().length > 0) ? element.val() : opts.pickerDefault
	56	+ ),
	57	+ newControl = templates.control.clone(),
	58	+ newPalette = templates.palette.clone().attr('id', 'colorPicker_palette-' + cItterate),
	59	+ newHexLabel = templates.hexLabel.clone(),
	60	+ newHexField = templates.hexField.clone(),
	61	+ paletteId = newPalette[0].id,
	62	+ swatch;
	63	+
	64	+
	65	+ /**
	66	+ * Build a color palette.
	67	+ **/
	68	+ $.each(opts.colors, function (i) {
	69	+ swatch = templates.swatch.clone();
	70	+
	71	+ if (opts.colors[i] === transparent) {
	72	+ swatch.addClass(transparent).text('X');
	73	+ $.fn.colorPicker.bindPalette(newHexField, swatch, transparent);
	74	+ } else {
	75	+ swatch.css("background-color", "#" + this);
	76	+ $.fn.colorPicker.bindPalette(newHexField, swatch);
	77	+ }
	78	+ swatch.appendTo(newPalette);
	79	+ });
	80	+
	81	+ newHexLabel.attr('for', 'colorPicker_hex-' + cItterate);
	82	+
	83	+ newHexField.attr({
	84	+ 'id' : 'colorPicker_hex-' + cItterate,
	85	+ 'value' : defaultColor
	86	+ });
	87	+
	88	+ newHexField.bind("keydown", function (event) {
	89	+ if (event.keyCode === 13) {
	90	+ var hexColor = $.fn.colorPicker.toHex($(this).val());
	91	+ $.fn.colorPicker.changeColor(hexColor ? hexColor : element.val());
	92	+ }
	93	+ if (event.keyCode === 27) {
	94	+ $.fn.colorPicker.hidePalette();
	95	+ }
	96	+ });
	97	+
	98	+ newHexField.bind("keyup", function (event) {
	99	+ var hexColor = $.fn.colorPicker.toHex($(event.target).val());
	100	+ $.fn.colorPicker.previewColor(hexColor ? hexColor : element.val());
	101	+ });
	102	+
	103	+ $('<div class="colorPicker_hexWrap" />').append(newHexLabel).appendTo(newPalette);
	104	+
	105	+ newPalette.find('.colorPicker_hexWrap').append(newHexField);
	106	+
	107	+ $("body").append(newPalette);
	108	+
	109	+ newPalette.hide();
	110	+
	111	+
	112	+ /**
	113	+ * Build replacement interface for original color input.
	114	+ **/
	115	+ newControl.css("background-color", defaultColor);
	116	+
	117	+ newControl.bind("click", function () {
	118	+ $.fn.colorPicker.togglePalette($('#' + paletteId), $(this));
	119	+ });
	120	+
	121	+ if( options && options.onColorChange ) {
	122	+ newControl.data('onColorChange', options.onColorChange);
	123	+ } else {
	124	+ newControl.data('onColorChange', function() {} );
	125	+ }
	126	+ element.after(newControl);
	127	+
	128	+ element.bind("change", function () {
	129	+ element.next(".colorPicker-picker").css(
	130	+ "background-color", $.fn.colorPicker.toHex($(this).val())
	131	+ );
	132	+ });
	133	+
	134	+ // Hide the original input.
	135	+ element.val(defaultColor).hide();
	136	+
	137	+ cItterate++;
	138	+ });
	139	+ };
	140	+
	141	+ /**
	142	+ * Extend colorPicker with... all our functionality.
	143	+ **/
	144	+ $.extend(true, $.fn.colorPicker, {
	145	+ /**
	146	+ * Return a Hex color, convert an RGB value and return Hex, or return false.
	147	+ *
	148	+ * Inspired by http://code.google.com/p/jquery-color-utils
	149	+ **/
	150	+ toHex : function (color) {
	151	+ // If we have a standard or shorthand Hex color, return that value.
	152	+ if (color.match(/[0-9A-F]{6}\|[0-9A-F]{3}$/i)) {
	153	+ return (color.charAt(0) === "#") ? color : ("#" + color);
	154	+
	155	+ // Alternatively, check for RGB color, then convert and return it as Hex.
	156	+ } else if (color.match(/^rgb\(\s(\d{1,3})\s,\s(\d{1,3})\s,\s(\d{1,3})\s\)$/)) {
	157	+ var c = ([parseInt(RegExp.$1, 10), parseInt(RegExp.$2, 10), parseInt(RegExp.$3, 10)]),
	158	+ pad = function (str) {
	159	+ if (str.length < 2) {
	160	+ for (var i = 0, len = 2 - str.length; i < len; i++) {
	161	+ str = '0' + str;
	162	+ }
	163	+ }
	164	+
	165	+ return str;
	166	+ };
	167	+
	168	+ if (c.length === 3) {
	169	+ var r = pad(c[0].toString(16)),
	170	+ g = pad(c[1].toString(16)),
	171	+ b = pad(c[2].toString(16));
	172	+
	173	+ return '#' + r + g + b;
	174	+ }
	175	+
	176	+ // Otherwise we wont do anything.
	177	+ } else {
	178	+ return false;
	179	+
	180	+ }
	181	+ },
	182	+
	183	+ /**
	184	+ * Check whether user clicked on the selector or owner.
	185	+ **/
	186	+ checkMouse : function (event, paletteId) {
	187	+ var selector = activePalette,
	188	+ selectorParent = $(event.target).parents("#" + selector.attr('id')).length;
	189	+
	190	+ if (event.target === $(selector)[0] \|\| event.target === selectorOwner[0] \|\| selectorParent > 0) {
	191	+ return;
	192	+ }
	193	+
	194	+ $.fn.colorPicker.hidePalette();
	195	+ },
	196	+
	197	+ /**
	198	+ * Hide the color palette modal.
	199	+ **/
	200	+ hidePalette : function () {
	201	+ $(document).unbind("mousedown", $.fn.colorPicker.checkMouse);
	202	+
	203	+ $('.colorPicker-palette').hide();
	204	+ },
	205	+
	206	+ /**
	207	+ * Show the color palette modal.
	208	+ **/
	209	+ showPalette : function (palette) {
	210	+ var hexColor = selectorOwner.prev("input").val();
	211	+
	212	+ palette.css({
	213	+ top: selectorOwner.offset().top + (selectorOwner.outerHeight()),
	214	+ left: selectorOwner.offset().left
	215	+ });
	216	+
	217	+ $("#color_value").val(hexColor);
	218	+
	219	+ palette.show();
	220	+
	221	+ $(document).bind("mousedown", $.fn.colorPicker.checkMouse);
	222	+ },
	223	+
	224	+ /**
	225	+ * Toggle visibility of the colorPicker palette.
	226	+ **/
	227	+ togglePalette : function (palette, origin) {
	228	+ // selectorOwner is the clicked .colorPicker-picker.
	229	+ if (origin) {
	230	+ selectorOwner = origin;
	231	+ }
	232	+
	233	+ activePalette = palette;
	234	+
	235	+ if (activePalette.is(':visible')) {
	236	+ $.fn.colorPicker.hidePalette();
	237	+
	238	+ } else {
	239	+ $.fn.colorPicker.showPalette(palette);
	240	+
	241	+ }
	242	+ },
	243	+
	244	+ /**
	245	+ * Update the input with a newly selected color.
	246	+ **/
	247	+ changeColor : function (value) {
	248	+ selectorOwner.css("background-color", value);
	249	+ selectorOwner.prev("input").val(value).change();
	250	+
	251	+ $.fn.colorPicker.hidePalette();
	252	+
	253	+ selectorOwner.data('onColorChange').call(selectorOwner, $(selectorOwner).prev("input").attr("id"), value);
	254	+ },
	255	+
	256	+
	257	+ /**
	258	+ * Preview the input with a newly selected color.
	259	+ **/
	260	+ previewColor : function (value) {
	261	+ selectorOwner.css("background-color", value);
	262	+ },
	263	+
	264	+ /**
	265	+ * Bind events to the color palette swatches.
	266	+ */
	267	+ bindPalette : function (paletteInput, element, color) {
	268	+ color = color ? color : $.fn.colorPicker.toHex(element.css("background-color"));
	269	+
	270	+ element.bind({
	271	+ click : function (ev) {
	272	+ lastColor = color;
	273	+
	274	+ $.fn.colorPicker.changeColor(color);
	275	+ },
	276	+ mouseover : function (ev) {
	277	+ lastColor = paletteInput.val();
	278	+
	279	+ $(this).css("border-color", "#598FEF");
	280	+
	281	+ paletteInput.val(color);
	282	+
	283	+ $.fn.colorPicker.previewColor(color);
	284	+ },
	285	+ mouseout : function (ev) {
	286	+ $(this).css("border-color", "#000");
	287	+
	288	+ paletteInput.val(selectorOwner.css("background-color"));
	289	+
	290	+ paletteInput.val(lastColor);
	291	+
	292	+ $.fn.colorPicker.previewColor(lastColor);
	293	+ }
	294	+ });
	295	+ }
	296	+ });
	297	+
	298	+ /**
	299	+ * Default colorPicker options.
	300	+ *
	301	+ * These are publibly available for global modification using a setting such as:
	302	+ *
	303	+ * $.fn.colorPicker.defaults.colors = ['151337', '111111']
	304	+ *
	305	+ * They can also be applied on a per-bound element basis like so:
	306	+ *
	307	+ * $('#element1').colorPicker({pickerDefault: 'efefef', transparency: true});
	308	+ * $('#element2').colorPicker({pickerDefault: '333333', colors: ['333333', '111111']});
	309	+ *
	310	+ **/
	311	+ $.fn.colorPicker.defaults = {
	312	+ // colorPicker default selected color.
	313	+ pickerDefault : "FFFFFF",
	314	+
	315	+ // Default color set.
	316	+ colors : [
	317	+ '000000', '993300', '333300', '000080', '333399', '333333', '800000', 'FF6600',
	318	+ '808000', '008000', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900',
	319	+ '99CC00', '339966', '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00',
	320	+ 'FFFF00', '00FF00', '00FFFF', '00CCFF', '993366', 'C0C0C0', 'FF99CC', 'FFCC99',
	321	+ 'FFFF99', 'CCFFFF', '99CCFF', 'FFFFFF'
	322	+ ],
	323	+
	324	+ // If we want to simply add more colors to the default set, use addColors.
	325	+ addColors : []
	326	+ };
	327	+
	328	+})(jQuery);
	@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
		1	+/**
		2	+ * Really Simple Color Picker in jQuery
		3	+ *
		4	+ * Licensed under the MIT (MIT-LICENSE.txt) licenses.
		5	+ *
		6	+ * Copyright (c) 2008-2012
		7	+ * Lakshan Perera (www.laktek.com) & Daniel Lacy (daniellacy.com)
		8	+ *
		9	+ * Permission is hereby granted, free of charge, to any person obtaining a copy
		10	+ * of this software and associated documentation files (the "Software"), to
		11	+ * deal in the Software without restriction, including without limitation the
		12	+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
		13	+ * sell copies of the Software, and to permit persons to whom the Software is
		14	+ * furnished to do so, subject to the following conditions:
		15	+ *
		16	+ * The above copyright notice and this permission notice shall be included in
		17	+ * all copies or substantial portions of the Software.
		18	+ *
		19	+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		20	+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		21	+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
		22	+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		23	+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		24	+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		25	+ * IN THE SOFTWARE.
		26	+ /(function(a){var b,c,d=0,e={control:a('<div class="colorPicker-picker"> </div>'),palette:a('<div id="colorPicker_palette" class="colorPicker-palette" />'),swatch:a('<div class="colorPicker-swatch"> </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)
0	\ No newline at end of file	27	\ No newline at end of file
		1	+@import url('colorPicker.css');
		2	+
1	.link {	3	.link {
2	cursor: pointer;	4	cursor: pointer;
3	}	5	}
	@@ -28,7 +28,7 @@ class ProjectFixtures		@@ -28,7 +28,7 @@ class ProjectFixtures
28	def self.project_content	28	def self.project_content
29	content = MezuroPlugin::ProjectContent.new	29	content = MezuroPlugin::ProjectContent.new
30	content.name = 'Qt-Calculator'	30	content.name = 'Qt-Calculator'
31	- content.license = 'GPL'	31	+ content.project_license = 'GPL'
32	content.description = 'Calculator for Qt'	32	content.description = 'Calculator for Qt'
33	content.repository_type = RepositoryFixtures.repository_hash[:type]	33	content.repository_type = RepositoryFixtures.repository_hash[:type]
34	content.repository_url = RepositoryFixtures.repository_hash[:address]	34	content.repository_url = RepositoryFixtures.repository_hash[:address]
	@@ -27,7 +27,7 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase		@@ -27,7 +27,7 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase
27		27
28	Kalibro::Configuration.expects(:all_names).returns([])	28	Kalibro::Configuration.expects(:all_names).returns([])
29	@content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)	29	@content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)
30	- @content.expects(:send_configuration_to_service).returns(nil)	30	+ @content.expects(:send_kalibro_configuration_to_service).returns(nil)
31	@content.stubs(:solr_save)	31	@content.stubs(:solr_save)
32	@content.save	32	@content.save
33		33
	@@ -39,7 +39,7 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase		@@ -39,7 +39,7 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase
39	@range = RangeFixtures.range_excellent	39	@range = RangeFixtures.range_excellent
40	@range_hash = RangeFixtures.range_excellent_hash	40	@range_hash = RangeFixtures.range_excellent_hash
41	end	41	end
42	-	42	+
43	should 'test choose base tool' do	43	should 'test choose base tool' do
44	Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => @base_tool.name})	44	Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => @base_tool.name})
45	get :choose_base_tool, :profile => @profile.identifier, :id => @content.id	45	get :choose_base_tool, :profile => @profile.identifier, :id => @content.id