@@ -25,8 +25,10 | |||||
25 | <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %> |
|
25 | <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %> | |
26 | <%= hidden_field_tag 'zoom', @gantt.zoom %> |
|
26 | <%= hidden_field_tag 'zoom', @gantt.zoom %> | |
27 |
|
27 | |||
28 |
<%= link_to_function l(:button_apply), '$("#query_form").submit()', |
|
28 | <%= link_to_function l(:button_apply), '$("#query_form").submit()', | |
29 | <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %> |
|
29 | :class => 'icon icon-checked' %> | |
|
30 | <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, | |||
|
31 | :class => 'icon icon-reload' %> | |||
30 | </p> |
|
32 | </p> | |
31 | <% end %> |
|
33 | <% end %> | |
32 |
|
34 | |||
@@ -72,7 +74,8 t_height = g_height + headers_height | |||||
72 |
|
74 | |||
73 | <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;"> |
|
75 | <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;"> | |
74 | <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div> |
|
76 | <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div> | |
75 |
<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" |
|
77 | <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" | |
|
78 | class="gantt_hdr"></div> | |||
76 |
|
79 | |||
77 | <div class="gantt_subjects"> |
|
80 | <div class="gantt_subjects"> | |
78 | <%= @gantt.subjects.html_safe %> |
|
81 | <%= @gantt.subjects.html_safe %> | |
@@ -83,7 +86,8 t_height = g_height + headers_height | |||||
83 | <td> |
|
86 | <td> | |
84 |
|
87 | |||
85 | <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;"> |
|
88 | <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;"> | |
86 |
<div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;" |
|
89 | <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;" | |
|
90 | class="gantt_hdr"> </div> | |||
87 | <% |
|
91 | <% | |
88 | # |
|
92 | # | |
89 | # Months headers |
|
93 | # Months headers | |
@@ -95,7 +99,9 height = (show_weeks ? header_heigth : header_heigth + g_height) | |||||
95 | width = (((month_f >> 1) - month_f) * zoom - 1).to_i |
|
99 | width = (((month_f >> 1) - month_f) * zoom - 1).to_i | |
96 | %> |
|
100 | %> | |
97 | <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> |
|
101 | <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> | |
98 | <%= link_to h("#{month_f.year}-#{month_f.month}"), @gantt.params.merge(:year => month_f.year, :month => month_f.month), :title => "#{month_name(month_f.month)} #{month_f.year}"%> |
|
102 | <%= link_to h("#{month_f.year}-#{month_f.month}"), | |
|
103 | @gantt.params.merge(:year => month_f.year, :month => month_f.month), | |||
|
104 | :title => "#{month_name(month_f.month)} #{month_f.year}" %> | |||
99 | </div> |
|
105 | </div> | |
100 | <% |
|
106 | <% | |
101 | left = left + width + 1 |
|
107 | left = left + width + 1 | |
@@ -117,7 +123,8 if show_weeks | |||||
117 | week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1) |
|
123 | week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1) | |
118 | width = (7 - @gantt.date_from.cwday + 1) * zoom - 1 |
|
124 | width = (7 - @gantt.date_from.cwday + 1) * zoom - 1 | |
119 | %> |
|
125 | %> | |
120 |
<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" |
|
126 | <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" | |
|
127 | class="gantt_hdr"> </div> | |||
121 | <% |
|
128 | <% | |
122 | left = left + width + 1 |
|
129 | left = left + width + 1 | |
123 | end %> |
|
130 | end %> | |
@@ -145,7 +152,8 if show_days | |||||
145 | (@gantt.date_to - @gantt.date_from + 1).to_i.times do |
|
152 | (@gantt.date_to - @gantt.date_from + 1).to_i.times do | |
146 | width = zoom - 1 |
|
153 | width = zoom - 1 | |
147 | %> |
|
154 | %> | |
148 |
<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" |
|
155 | <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" | |
|
156 | class="gantt_hdr"> | |||
149 | <%= day_letter(wday) %> |
|
157 | <%= day_letter(wday) %> | |
150 | </div> |
|
158 | </div> | |
151 | <% |
|
159 | <% |
General Comments 0
You need to be logged in to leave comments.
Login now