From a7dfb5fb385f159d0276b236c6cba4dd25aa57e0 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Sat, 7 Dec 2013 10:00:02 -0300 Subject: [PATCH] Show status description at steps of a track --- plugins/community_track/lib/community_track_plugin/step_helper.rb | 2 +- plugins/community_track/public/style.css | 10 ++++++++++ plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb | 2 +- plugins/community_track/views/blocks/_track.rhtml | 1 + plugins/community_track/views/content_viewer/_step_item.rhtml | 3 +++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/plugins/community_track/lib/community_track_plugin/step_helper.rb b/plugins/community_track/lib/community_track_plugin/step_helper.rb index f2e2c62..ced6445 100644 --- a/plugins/community_track/lib/community_track_plugin/step_helper.rb +++ b/plugins/community_track/lib/community_track_plugin/step_helper.rb @@ -1,7 +1,7 @@ module CommunityTrackPlugin::StepHelper def self.status_descriptions - [_('Finished'), _('In progress'), _('Waiting')] + [_('Closed'), _('Join!'), _('Soon')] end def self.status_classes diff --git a/plugins/community_track/public/style.css b/plugins/community_track/public/style.css index 1b4153f..be4a124 100644 --- a/plugins/community_track/public/style.css +++ b/plugins/community_track/public/style.css @@ -140,6 +140,7 @@ #track .step .name { font-weight: bold; color: #333; + clear: both; } #track .step .name a:hover { @@ -149,6 +150,7 @@ #track .step .date { font-size: 12px; color: #AAA; + float: left; } #track .step .lead { @@ -255,3 +257,11 @@ #article .step_list .step .step_actions .button:hover { color: #444; } + +.step .content { + width: 80%; +} + +.step .legend { + float: right; +} diff --git a/plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb b/plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb index ea92be9..74e2b42 100644 --- a/plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb +++ b/plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb @@ -28,7 +28,7 @@ class StepHelperTest < ActiveSupport::TestCase should 'return a description for status' do @step.stubs(:waiting?).returns(true) - assert_equal _('Waiting'), status_description(@step) + assert_equal _('Soon'), status_description(@step) end should 'return nil at custom_options_for_article' do diff --git a/plugins/community_track/views/blocks/_track.rhtml b/plugins/community_track/views/blocks/_track.rhtml index 53a1062..1eca751 100644 --- a/plugins/community_track/views/blocks/_track.rhtml +++ b/plugins/community_track/views/blocks/_track.rhtml @@ -14,6 +14,7 @@ <% link_to_step_tool(step) do %> <%= step.position %> + <%= status_description(step) %> <%= step.name %> diff --git a/plugins/community_track/views/content_viewer/_step_item.rhtml b/plugins/community_track/views/content_viewer/_step_item.rhtml index 7c890f9..960b0fe 100644 --- a/plugins/community_track/views/content_viewer/_step_item.rhtml +++ b/plugins/community_track/views/content_viewer/_step_item.rhtml @@ -6,6 +6,9 @@
<%= show_period(step_item.start_date, step_item.end_date) %>
+
+ <%= status_description(step_item) %> +
<%= step_item.name %>
<%= step_item.body %>
-- libgit2 0.21.2