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

gantt: use content_tag instead of html tag at gantt weeks headers 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10316 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-09-07 23:03:16 +00:00
parent 2af4bb6a86
commit 3483938185
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,19 +134,35 @@ height = (show_weeks ? header_heigth : header_heigth + g_height)
%> %>
<% else %> <% else %>
<% <%
# find next monday after @date_from # find next monday after @date_from
week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1) week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
width = (7 - @gantt.date_from.cwday + 1) * zoom - 1 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
style = ""
style += "left: #{left}px;"
style += "top: 19px;"
style += "width: #{width}px;"
style += "height: #{height}px;"
%> %>
<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" <%= content_tag(:div, '&nbsp;'.html_safe,
class="gantt_hdr">&nbsp;</div> :style => style, :class => "gantt_hdr") %>
<% left = left + width + 1 %> <% left = left + width + 1 %>
<% end %> <% end %>
<% while week_f <= @gantt.date_to %> <% while week_f <= @gantt.date_to %>
<% width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i %> <%
<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> width = ((week_f + 6 <= @gantt.date_to) ?
<small><%= week_f.cweek if width >= 16 %></small> 7 * zoom - 1 :
</div> (@gantt.date_to - week_f + 1) * zoom - 1).to_i
style = ""
style += "left: #{left}px;"
style += "top: 19px;"
style += "width: #{width}px;"
style += "height: #{height}px;"
%>
<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
<%= content_tag(:small) do %>
<%= week_f.cweek if width >= 16 %>
<% end %>
<% end %>
<% <%
left = left + width + 1 left = left + width + 1
week_f = week_f + 7 week_f = week_f + 7