@@ -72,18 +72,18 | |||||
72 | @gantt.zoom.times { zoom = zoom * 2 } |
|
72 | @gantt.zoom.times { zoom = zoom * 2 } | |
73 |
|
73 | |||
74 | subject_width = 330 |
|
74 | subject_width = 330 | |
75 |
header_heig |
|
75 | header_height = 18 | |
76 |
|
76 | |||
77 |
headers_height = header_heig |
|
77 | headers_height = header_height | |
78 | show_weeks = false |
|
78 | show_weeks = false | |
79 | show_days = false |
|
79 | show_days = false | |
80 |
|
80 | |||
81 | if @gantt.zoom > 1 |
|
81 | if @gantt.zoom > 1 | |
82 | show_weeks = true |
|
82 | show_weeks = true | |
83 |
headers_height = 2 * header_heig |
|
83 | headers_height = 2 * header_height | |
84 | if @gantt.zoom > 2 |
|
84 | if @gantt.zoom > 2 | |
85 | show_days = true |
|
85 | show_days = true | |
86 |
headers_height = 3 * header_heig |
|
86 | headers_height = 3 * header_height | |
87 | end |
|
87 | end | |
88 | end |
|
88 | end | |
89 |
|
89 | |||
@@ -148,7 +148,7 | |||||
148 | <% |
|
148 | <% | |
149 | month_f = @gantt.date_from |
|
149 | month_f = @gantt.date_from | |
150 | left = 0 |
|
150 | left = 0 | |
151 |
height = (show_weeks ? header_heig |
|
151 | height = (show_weeks ? header_height : header_height + g_height) | |
152 | %> |
|
152 | %> | |
153 | <% @gantt.months.times do %> |
|
153 | <% @gantt.months.times do %> | |
154 | <% |
|
154 | <% | |
@@ -173,7 +173,7 | |||||
173 | <% if show_weeks %> |
|
173 | <% if show_weeks %> | |
174 | <% |
|
174 | <% | |
175 | left = 0 |
|
175 | left = 0 | |
176 |
height = (show_days ? header_heig |
|
176 | height = (show_days ? header_height - 1 : header_height - 1 + g_height) | |
177 | %> |
|
177 | %> | |
178 | <% if @gantt.date_from.cwday == 1 %> |
|
178 | <% if @gantt.date_from.cwday == 1 %> | |
179 | <% |
|
179 | <% | |
@@ -222,7 +222,7 | |||||
222 | <% if show_days %> |
|
222 | <% if show_days %> | |
223 | <% |
|
223 | <% | |
224 | left = 0 |
|
224 | left = 0 | |
225 |
height = g_height + header_heig |
|
225 | height = g_height + header_height - 1 | |
226 | wday = @gantt.date_from.cwday |
|
226 | wday = @gantt.date_from.cwday | |
227 | %> |
|
227 | %> | |
228 | <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %> |
|
228 | <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %> |
General Comments 0
You need to be logged in to leave comments.
Login now