From 47e375b271fa3929aabcfc53b7f3789728430cfd Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 8 Sep 2012 02:00:17 +0000 Subject: [PATCH] gantt: code layout cleanup ruby code at head of show.html.erb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10322 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/gantts/show.html.erb | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 603fe6214..2e5c1aa87 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -35,33 +35,33 @@ <%= error_messages_for 'query' %> <% if @query.valid? %> <% -zoom = 1 -@gantt.zoom.times { zoom = zoom * 2 } + zoom = 1 + @gantt.zoom.times { zoom = zoom * 2 } -subject_width = 330 -header_heigth = 18 + subject_width = 330 + header_heigth = 18 -headers_height = header_heigth -show_weeks = false -show_days = false + headers_height = header_heigth + show_weeks = false + show_days = false -if @gantt.zoom > 1 + if @gantt.zoom > 1 show_weeks = true headers_height = 2 * header_heigth if @gantt.zoom > 2 show_days = true headers_height = 3 * header_heigth end -end + end -# Width of the entire chart -g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i -@gantt.render(:top => headers_height + 8, - :zoom => zoom, - :g_width => g_width, - :subject_width => subject_width) -g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max -t_height = g_height + headers_height + # Width of the entire chart + g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i + @gantt.render(:top => headers_height + 8, + :zoom => zoom, + :g_width => g_width, + :subject_width => subject_width) + g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max + t_height = g_height + headers_height %> <% if @gantt.truncated %> -- 2.39.5