diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-09-07 11:59:34 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-09-07 11:59:34 +0000 |
| commit | 0486ce99762d17962734f399dce8df8333114cea (patch) | |
| tree | 2a16cf181f6152ebfc4e80a68828bd84517c34db /app/views | |
| parent | 621b15c923a7ffa3139514f165e88d87092b7a3a (diff) | |
| download | redmine-0486ce99762d17962734f399dce8df8333114cea.tar.gz redmine-0486ce99762d17962734f399dce8df8333114cea.zip | |
code layout cleanup gantt weeks headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10312 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/gantts/show.html.erb | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 076b6c761..5675ed8e1 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -115,34 +115,38 @@ height = (show_weeks ? header_heigth : header_heigth + g_height) # # Weeks headers # -if show_weeks +%> +<% if show_weeks %> + <% left = 0 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height) - if @gantt.date_from.cwday == 1 + %> + <% if @gantt.date_from.cwday == 1 %> + <% # @date_from is monday week_f = @gantt.date_from - else + %> + <% else %> + <% # find next monday after @date_from week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1) width = (7 - @gantt.date_from.cwday + 1) * zoom - 1 %> <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> </div> - <% - left = left + width + 1 - end %> - <% - 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"> - <small><%= week_f.cweek if width >= 16 %></small> - </div> + <% left = left + width + 1 %> + <% end %> + <% 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"> + <small><%= week_f.cweek if width >= 16 %></small> + </div> <% left = left + width + 1 week_f = week_f + 7 - end -end %> + %> + <% end %> +<% end %> <% # |