kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display non working days on gantt according to settings (#2161). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10750 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-10-29 10:21:00 +00:00
parent 5fe4aae7ba
commit 1f55907f83
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,9 +201,10 @@
style += "width: #{width}px;" style += "width: #{width}px;"
style += "height: #{height}px;" style += "height: #{height}px;"
style += "font-size:0.7em;" style += "font-size:0.7em;"
style += 'background:#f1f1f1;' if wday > 5 clss = "gantt_hdr"
clss << " nwday" if @gantt.non_working_week_days.include?(wday)
%> %>
<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %> <%= content_tag(:div, :style => style, :class => clss) do %>
<%= day_letter(wday) %> <%= day_letter(wday) %>
<% end %> <% end %>
<% <%

1
lib/redmine/helpers/gantt.rb
View File

@ -21,6 +21,7 @@ module Redmine
class Gantt class Gantt
include ERB::Util include ERB::Util
include Redmine::I18n include Redmine::I18n
include Redmine::Utils::DateCalculation
# :nodoc: # :nodoc:
# Some utility methods for the PDF export # Some utility methods for the PDF export

2
public/stylesheets/application.css
View File

@ -879,6 +879,8 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');}
overflow: hidden; overflow: hidden;
} }
.gantt_hdr.nwday {background-color:#f1f1f1;}
.gantt_subjects { font-size: 0.8em; } .gantt_subjects { font-size: 0.8em; }
.gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; } .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }