Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 08:46:01 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18053 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-04-09 14:48:15 +00:00
parent 766452e841
commit d953242e52
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/versions/index.html.erb
View File

@@ -18,6 +18,7 @@
<% end %> <% end %>
<header> <header>
<h3 class="icon icon-package version"><%= link_to_version version, :name => version_anchor(version) %></h3> <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> </header>
<%= render :partial => 'versions/overview', :locals => {:version => version} %> <%= render :partial => 'versions/overview', :locals => {:version => version} %>
<%= render(:partial => "wiki/content", <%= render(:partial => "wiki/content",

5
app/views/versions/show.html.erb
View File

@@ -5,9 +5,10 @@
<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %> <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
</div> </div>
<h2><%= @version.name %></h2>
<div id="roadmap" class="<%= @version.css_classes %>"> <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 => 'versions/overview', :locals => {:version => @version} %>
<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>

14
public/stylesheets/application.css
View File

@@ -559,6 +559,7 @@ div#roadmap .related-issues td.checkbox { display: none; }
div#roadmap .wiki h1:first-child { display: none; } div#roadmap .wiki h1:first-child { display: none; }
div#roadmap .wiki h1 { font-size: 120%; } div#roadmap .wiki h1 { font-size: 120%; }
div#roadmap .wiki h2 { font-size: 110%; } 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%;} 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; } 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; bottom: 2px;
padding: 0px 2px 0px 2px; padding: 0px 2px 0px 2px;
margin-right: 2px; margin-right: 2px;
margin-left: 2px;
border-radius: 2px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
@@ -1300,6 +1302,18 @@ div.wiki img {vertical-align:middle; max-width:100%;}
color: #fff; color: #fff;
background:#9DB9D5; 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 *****/ /***** Icons *****/
.icon { .icon {
background-position: 0% 50%; background-position: 0% 50%;

5
test/functional/versions_controller_test.rb
View File

@@ -36,7 +36,9 @@ class VersionsControllerTest < Redmine::ControllerTest
assert_response :success assert_response :success
# Version with no date set appears # 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 # Completed version doesn't appear
assert_select 'h3', :text => Version.find(1).name, :count => 0 assert_select 'h3', :text => Version.find(1).name, :count => 0
@@ -101,6 +103,7 @@ class VersionsControllerTest < Redmine::ControllerTest
assert_response :success assert_response :success
assert_select 'h2', :text => /1.0/ assert_select 'h2', :text => /1.0/
assert_select 'span[class=?]', 'badge badge-status-locked', :text => 'locked'
end end
def test_show_issue_calculations_should_take_into_account_only_visible_issues def test_show_issue_calculations_should_take_into_account_only_visible_issues