Show status description at steps of a track

Victor Costa
1 parent 8a3ed72f
Showing 5 changed files with 16 additions and 2 deletions Show diff stats
plugins/community_track/lib/community_track_plugin/step_helper.rb
plugins/community_track/public/style.css
plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb
plugins/community_track/views/blocks/_track.rhtml
plugins/community_track/views/content_viewer/_step_item.rhtml
 module CommunityTrackPlugin::StepHelper
   def self.status_descriptions
-    [_('Finished'), _('In progress'), _('Waiting')]
+    [_('Closed'), _('Join!'), _('Soon')]
   end
   def self.status_classes
@@ -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;
+}
@@ -28,7 +28,7 @@ class StepHelperTest &lt; 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
@@ -14,6 +14,7 @@
         <% link_to_step_tool(step) do %>
           <span class="step <%= block.status_class(step) %>">
             <span class="position"><%= step.position %></span>
+            <span class="legend"><%= status_description(step) %></span>
             <span class="tool_icon button with-text icon-new icon-new<%= step.tool_class.icon_name if step.tool_class %>"></span>
             <span class="name"><%= step.name %></span>
           </span>
@@ -6,6 +6,9 @@
       <div class="date">
         <%= show_period(step_item.start_date, step_item.end_date) %>
       </div>
+      <div class="legend">
+        <%= status_description(step_item) %>
+      </div>
       <div class="name"><span class="tool_icon button with-text icon-new icon-new<%= step_item.tool_class.icon_name if step_item.tool_class %>"></span>  <%= step_item.name %></div>
       <div class="lead"><%= step_item.body %></div>
       <div class="tools">
1	module CommunityTrackPlugin::StepHelper	1	module CommunityTrackPlugin::StepHelper
2		2
3	def self.status_descriptions	3	def self.status_descriptions
4	- [_('Finished'), _('In progress'), _('Waiting')]	4	+ [_('Closed'), _('Join!'), _('Soon')]
5	end	5	end
6		6
7	def self.status_classes	7	def self.status_classes
	@@ -28,7 +28,7 @@ class StepHelperTest < ActiveSupport::TestCase		@@ -28,7 +28,7 @@ class StepHelperTest < ActiveSupport::TestCase
28		28
29	should 'return a description for status' do	29	should 'return a description for status' do
30	@step.stubs(:waiting?).returns(true)	30	@step.stubs(:waiting?).returns(true)
31	- assert_equal _('Waiting'), status_description(@step)	31	+ assert_equal _('Soon'), status_description(@step)
32	end	32	end
33		33
34	should 'return nil at custom_options_for_article' do	34	should 'return nil at custom_options_for_article' do