Show version status as badge in rodmap#index and roadmap#show (#29391).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@18053 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index eeb9f3f061b61ecb1aad638e9ac16a28346d38d1..429bc5b92176caec5758acb073a3f4f5c3ada65f 100644 (file)
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -18,6 +18,7 @@
     <% end %>
     <header>
       <h3 class="icon icon-package version"><%= link_to_version version, :name => version_anchor(version) %></h3>
+      <span class="badge badge-status-<%= version.status %>"><%= l("version_status_#{version.status}") %></span>
     </header>
     <%= render :partial => 'versions/overview', :locals => {:version => version} %>
     <%= render(:partial => "wiki/content",

diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index 677cc1410d2dbd0a8cb8476da13b60a1a311e2cf..ad3ed25210397e2fb2ce0857656138e1c1f1bf5d 100644 (file)
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -5,9 +5,10 @@
 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>
 
-<h2><%= @version.name %></h2>
-
 <div id="roadmap" class="<%= @version.css_classes %>">
+  <h2><%= @version.name %></h2>
+  <span class="badge badge-status-<%= @version.status %>"><%= l("version_status_#{@version.status}") %></span>
+
 <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
 <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
 

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5d6c62cf2fecbf1a2a1e616879ec5b5823944c02..0e718c37e4287e8a482960e6833dc1ea85bd73f1 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -559,6 +559,7 @@ div#roadmap .related-issues td.checkbox { display: none; }
 div#roadmap .wiki h1:first-child { display: none; }
 div#roadmap .wiki h1 { font-size: 120%; }
 div#roadmap .wiki h2 { font-size: 110%; }
+div#roadmap h2, div#roadmap h3 { display: inline; padding-right: 0;}
 body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
 
 div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
@@ -1288,6 +1289,7 @@ div.wiki img {vertical-align:middle; max-width:100%;}
   bottom: 2px;
   padding: 0px 2px 0px 2px;
   margin-right: 2px;
+  margin-left: 2px;
   border-radius: 2px;
   text-transform: uppercase;
   text-decoration: none;
@@ -1300,6 +1302,18 @@ div.wiki img {vertical-align:middle; max-width:100%;}
   color: #fff;
   background:#9DB9D5;
 }
+.badge-status-open {
+  color: #205D86;
+  border: 1px solid #205D86;
+}
+.badge-status-locked {
+  color: #696969;
+  border: 1px solid #696969;
+}
+.badge-status-closed {
+  color: #1D781D;
+  border: 1px solid #1D781D;
+}
 /***** Icons *****/
 .icon {
   background-position: 0% 50%;

diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index fc9e2ac60eb27da53b557343a6a557448272ad80..b827a1fd3b084ec0fdf20632e1e2fb08a4573ebb 100644 (file)
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -36,7 +36,9 @@ class VersionsControllerTest < Redmine::ControllerTest
     assert_response :success
 
     # Version with no date set appears
-    assert_select 'h3', :text => Version.find(3).name
+    assert_select 'h3', :text => "#{Version.find(3).name}"
+    assert_select 'span[class=?]', 'badge badge-status-open', :text => 'open'
+
     # Completed version doesn't appear
     assert_select 'h3', :text => Version.find(1).name, :count => 0
 
@@ -101,6 +103,7 @@ class VersionsControllerTest < Redmine::ControllerTest
     assert_response :success
 
     assert_select 'h2', :text => /1.0/
+    assert_select 'span[class=?]', 'badge badge-status-locked', :text => 'locked'
   end
 
   def test_show_issue_calculations_should_take_into_account_only_visible_issues