##// END OF EJS Templates
gantt: use content_tag instead of html tag at gantt months headers...
Toshi MARUYAMA -
r10132:2af4bb6a868a
parent child
Show More
@@ -1,215 +1,221
1 <% @gantt.view = self %>
1 <% @gantt.view = self %>
2 <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
2 <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
3
3
4 <%= form_tag({:controller => 'gantts', :action => 'show',
4 <%= form_tag({:controller => 'gantts', :action => 'show',
5 :project_id => @project, :month => params[:month],
5 :project_id => @project, :month => params[:month],
6 :year => params[:year], :months => params[:months]},
6 :year => params[:year], :months => params[:months]},
7 :method => :get, :id => 'query_form') do %>
7 :method => :get, :id => 'query_form') do %>
8 <%= hidden_field_tag 'set_filter', '1' %>
8 <%= hidden_field_tag 'set_filter', '1' %>
9 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
9 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
10 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
10 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
11 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
11 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
12 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
12 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
13 </div>
13 </div>
14 </fieldset>
14 </fieldset>
15
15
16 <p class="contextual">
16 <p class="contextual">
17 <%= gantt_zoom_link(@gantt, :in) %>
17 <%= gantt_zoom_link(@gantt, :in) %>
18 <%= gantt_zoom_link(@gantt, :out) %>
18 <%= gantt_zoom_link(@gantt, :out) %>
19 </p>
19 </p>
20
20
21 <p class="buttons">
21 <p class="buttons">
22 <%= text_field_tag 'months', @gantt.months, :size => 2 %>
22 <%= text_field_tag 'months', @gantt.months, :size => 2 %>
23 <%= l(:label_months_from) %>
23 <%= l(:label_months_from) %>
24 <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
24 <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
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 :class => 'icon icon-checked' %>
29 :class => 'icon icon-checked' %>
30 <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
30 <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
31 :class => 'icon icon-reload' %>
31 :class => 'icon icon-reload' %>
32 </p>
32 </p>
33 <% end %>
33 <% end %>
34
34
35 <%= error_messages_for 'query' %>
35 <%= error_messages_for 'query' %>
36 <% if @query.valid? %>
36 <% if @query.valid? %>
37 <%
37 <%
38 zoom = 1
38 zoom = 1
39 @gantt.zoom.times { zoom = zoom * 2 }
39 @gantt.zoom.times { zoom = zoom * 2 }
40
40
41 subject_width = 330
41 subject_width = 330
42 header_heigth = 18
42 header_heigth = 18
43
43
44 headers_height = header_heigth
44 headers_height = header_heigth
45 show_weeks = false
45 show_weeks = false
46 show_days = false
46 show_days = false
47
47
48 if @gantt.zoom > 1
48 if @gantt.zoom > 1
49 show_weeks = true
49 show_weeks = true
50 headers_height = 2 * header_heigth
50 headers_height = 2 * header_heigth
51 if @gantt.zoom > 2
51 if @gantt.zoom > 2
52 show_days = true
52 show_days = true
53 headers_height = 3 * header_heigth
53 headers_height = 3 * header_heigth
54 end
54 end
55 end
55 end
56
56
57 # Width of the entire chart
57 # Width of the entire chart
58 g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
58 g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
59 @gantt.render(:top => headers_height + 8,
59 @gantt.render(:top => headers_height + 8,
60 :zoom => zoom,
60 :zoom => zoom,
61 :g_width => g_width,
61 :g_width => g_width,
62 :subject_width => subject_width)
62 :subject_width => subject_width)
63 g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
63 g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
64 t_height = g_height + headers_height
64 t_height = g_height + headers_height
65 %>
65 %>
66
66
67 <% if @gantt.truncated %>
67 <% if @gantt.truncated %>
68 <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
68 <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
69 <% end %>
69 <% end %>
70
70
71 <table style="width:100%; border:0; border-collapse: collapse;">
71 <table style="width:100%; border:0; border-collapse: collapse;">
72 <tr>
72 <tr>
73 <td style="width:<%= subject_width %>px; padding:0px;">
73 <td style="width:<%= subject_width %>px; padding:0px;">
74
74
75 <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;">
76 <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>
77 <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>
78 class="gantt_hdr"></div>
79
79
80 <div class="gantt_subjects">
80 <div class="gantt_subjects">
81 <%= @gantt.subjects.html_safe %>
81 <%= @gantt.subjects.html_safe %>
82 </div>
82 </div>
83
83
84 </div>
84 </div>
85 </td>
85 </td>
86 <td>
86 <td>
87
87
88 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
88 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
89 <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">&nbsp;</div>
90 class="gantt_hdr">&nbsp;</div>
91 <%
91 <%
92 #
92 #
93 # Months headers
93 # Months headers
94 #
94 #
95 %>
95 %>
96 <%
96 <%
97 month_f = @gantt.date_from
97 month_f = @gantt.date_from
98 left = 0
98 left = 0
99 height = (show_weeks ? header_heigth : header_heigth + g_height)
99 height = (show_weeks ? header_heigth : header_heigth + g_height)
100 %>
100 %>
101 <% @gantt.months.times do %>
101 <% @gantt.months.times do %>
102 <% width = (((month_f >> 1) - month_f) * zoom - 1).to_i %>
102 <%
103 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
103 width = (((month_f >> 1) - month_f) * zoom - 1).to_i
104 style = ""
105 style += "left: #{left}px;"
106 style += "width: #{width}px;"
107 style += "height: #{height}px;"
108 %>
109 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
104 <%= link_to h("#{month_f.year}-#{month_f.month}"),
110 <%= link_to h("#{month_f.year}-#{month_f.month}"),
105 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
111 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
106 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
112 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
107 </div>
113 <% end %>
108 <%
114 <%
109 left = left + width + 1
115 left = left + width + 1
110 month_f = month_f >> 1
116 month_f = month_f >> 1
111 %>
117 %>
112 <% end %>
118 <% end %>
113
119
114 <%
120 <%
115 #
121 #
116 # Weeks headers
122 # Weeks headers
117 #
123 #
118 %>
124 %>
119 <% if show_weeks %>
125 <% if show_weeks %>
120 <%
126 <%
121 left = 0
127 left = 0
122 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
128 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
123 %>
129 %>
124 <% if @gantt.date_from.cwday == 1 %>
130 <% if @gantt.date_from.cwday == 1 %>
125 <%
131 <%
126 # @date_from is monday
132 # @date_from is monday
127 week_f = @gantt.date_from
133 week_f = @gantt.date_from
128 %>
134 %>
129 <% else %>
135 <% else %>
130 <%
136 <%
131 # find next monday after @date_from
137 # find next monday after @date_from
132 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
138 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
133 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
139 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
134 %>
140 %>
135 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;"
141 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;"
136 class="gantt_hdr">&nbsp;</div>
142 class="gantt_hdr">&nbsp;</div>
137 <% left = left + width + 1 %>
143 <% left = left + width + 1 %>
138 <% end %>
144 <% end %>
139 <% while week_f <= @gantt.date_to %>
145 <% while week_f <= @gantt.date_to %>
140 <% width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i %>
146 <% width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i %>
141 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
147 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
142 <small><%= week_f.cweek if width >= 16 %></small>
148 <small><%= week_f.cweek if width >= 16 %></small>
143 </div>
149 </div>
144 <%
150 <%
145 left = left + width + 1
151 left = left + width + 1
146 week_f = week_f + 7
152 week_f = week_f + 7
147 %>
153 %>
148 <% end %>
154 <% end %>
149 <% end %>
155 <% end %>
150
156
151 <%
157 <%
152 #
158 #
153 # Days headers
159 # Days headers
154 #
160 #
155 %>
161 %>
156 <% if show_days %>
162 <% if show_days %>
157 <%
163 <%
158 left = 0
164 left = 0
159 height = g_height + header_heigth - 1
165 height = g_height + header_heigth - 1
160 wday = @gantt.date_from.cwday
166 wday = @gantt.date_from.cwday
161 %>
167 %>
162 <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
168 <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
163 <% width = zoom - 1 %>
169 <% width = zoom - 1 %>
164 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
170 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
165 class="gantt_hdr">
171 class="gantt_hdr">
166 <%= day_letter(wday) %>
172 <%= day_letter(wday) %>
167 </div>
173 </div>
168 <%
174 <%
169 left = left + width + 1
175 left = left + width + 1
170 wday = wday + 1
176 wday = wday + 1
171 wday = 1 if wday > 7
177 wday = 1 if wday > 7
172 %>
178 %>
173 <% end %>
179 <% end %>
174 <% end %>
180 <% end %>
175
181
176 <%= @gantt.lines.html_safe %>
182 <%= @gantt.lines.html_safe %>
177
183
178 <%
184 <%
179 #
185 #
180 # Today red line (excluded from cache)
186 # Today red line (excluded from cache)
181 #
187 #
182 %>
188 %>
183 <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
189 <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
184 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
190 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
185 <% end %>
191 <% end %>
186
192
187 </div>
193 </div>
188 </td>
194 </td>
189 </tr>
195 </tr>
190 </table>
196 </table>
191
197
192 <table style="width:100%">
198 <table style="width:100%">
193 <tr>
199 <tr>
194 <td align="left">
200 <td align="left">
195 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
201 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
196 params.merge(@gantt.params_previous)) %>
202 params.merge(@gantt.params_previous)) %>
197 </td>
203 </td>
198 <td align="right">
204 <td align="right">
199 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
205 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
200 params.merge(@gantt.params_next)) %>
206 params.merge(@gantt.params_next)) %>
201 </td>
207 </td>
202 </tr>
208 </tr>
203 </table>
209 </table>
204
210
205 <% other_formats_links do |f| %>
211 <% other_formats_links do |f| %>
206 <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
212 <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
207 <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
213 <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
208 <% end %>
214 <% end %>
209 <% end # query.valid? %>
215 <% end # query.valid? %>
210
216
211 <% content_for :sidebar do %>
217 <% content_for :sidebar do %>
212 <%= render :partial => 'issues/sidebar' %>
218 <%= render :partial => 'issues/sidebar' %>
213 <% end %>
219 <% end %>
214
220
215 <% html_title(l(:label_gantt)) -%>
221 <% html_title(l(:label_gantt)) -%>
General Comments 0
You need to be logged in to leave comments. Login now