diff --git a/plugins/mezuro/lib/kalibro/range.rb b/plugins/mezuro/lib/kalibro/range.rb index 28f6e1d..006c4ea 100644 --- a/plugins/mezuro/lib/kalibro/range.rb +++ b/plugins/mezuro/lib/kalibro/range.rb @@ -35,11 +35,7 @@ class Kalibro::Range < Kalibro::Model end def mezuro_color - @color.nil? ? "#e4ca2d" : @color.gsub(/^ff/, "#") + @color.nil? ? "e4ca2d" : @color.gsub(/^ff/, "") end - - def color=(new_color) - @color = new_color.gsub(/^#/, "ff") - end - + end diff --git a/plugins/mezuro/test/unit/kalibro/range_test.rb b/plugins/mezuro/test/unit/kalibro/range_test.rb index cb63680..84fce0f 100644 --- a/plugins/mezuro/test/unit/kalibro/range_test.rb +++ b/plugins/mezuro/test/unit/kalibro/range_test.rb @@ -18,15 +18,11 @@ class RangeTest < ActiveSupport::TestCase end should 'create a default color for new range' do - assert_equal "#e4ca2d", Kalibro::Range.new.mezuro_color + assert_equal "e4ca2d", Kalibro::Range.new.mezuro_color end should "convert color from 'ff' to '#'" do - assert_equal "#ff0000", @range.mezuro_color + 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 diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb index 411c31c..3c881e9 100644 --- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb @@ -1,6 +1,6 @@ - - + +

<%= @configuration_content.name %> Configuration

diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb index 0609473..d2a6053 100644 --- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb @@ -1,6 +1,6 @@ - - + +

<%= @configuration_content.name %> Configuration

diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb index a6d3b26..3152eea 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb @@ -11,7 +11,7 @@ <%=range.grade%> - + <% if (not user.nil?) && user.id == @profile.id %> <%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb index 452ccf8..b064e02 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb @@ -39,7 +39,7 @@ <%= f.label :color, "(*) Color:" %> - <%= f.text_field(:color, :id => "range_color", :value => @range.mezuro_color) %> + <%= colorpicker_field(:range, :color, :value => @range.mezuro_color) %>Click in the field to change Color @@ -52,11 +52,3 @@ <%= f.submit "Save Range" %> - - -- libgit2 0.21.2