##// END OF EJS Templates
gantt: use content_tag instead of html tag at gantt header outline...
Toshi MARUYAMA -
r10140:c25d1756233c
parent child
Show More
@@ -1,257 +1,262
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 style = ""
75 style = ""
76 style += "position:relative;"
76 style += "position:relative;"
77 style += "height: #{t_height + 24}px;"
77 style += "height: #{t_height + 24}px;"
78 style += "width: #{subject_width + 1}px;"
78 style += "width: #{subject_width + 1}px;"
79 %>
79 %>
80 <%= content_tag(:div, :style => style) do %>
80 <%= content_tag(:div, :style => style) do %>
81 <%
81 <%
82 style = ""
82 style = ""
83 style += "right:-2px;"
83 style += "right:-2px;"
84 style += "width: #{subject_width}px;"
84 style += "width: #{subject_width}px;"
85 style += "height: #{headers_height}px;"
85 style += "height: #{headers_height}px;"
86 style += 'background: #eee;'
86 style += 'background: #eee;'
87 %>
87 %>
88 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
88 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
89 <%
89 <%
90 style = ""
90 style = ""
91 style += "right:-2px;"
91 style += "right:-2px;"
92 style += "width: #{subject_width}px;"
92 style += "width: #{subject_width}px;"
93 style += "height: #{t_height}px;"
93 style += "height: #{t_height}px;"
94 style += 'border-left: 1px solid #c0c0c0;'
94 style += 'border-left: 1px solid #c0c0c0;'
95 style += 'overflow: hidden;'
95 style += 'overflow: hidden;'
96 %>
96 %>
97 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
97 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
98 <%= content_tag(:div, :class => "gantt_subjects") do %>
98 <%= content_tag(:div, :class => "gantt_subjects") do %>
99 <%= @gantt.subjects.html_safe %>
99 <%= @gantt.subjects.html_safe %>
100 <% end %>
100 <% end %>
101 <% end %>
101 <% end %>
102 </td>
102 </td>
103 <td>
104
103
104 <td>
105 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
105 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
106 <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;"
106 <%
107 class="gantt_hdr">&nbsp;</div>
107 style = ""
108 style += "width: #{g_width - 1}px;"
109 style += "height: #{headers_height}px;"
110 style += 'background: #eee;'
111 %>
112 <%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :class => "gantt_hdr") %>
108
113
109 <% ###### Months headers ###### %>
114 <% ###### Months headers ###### %>
110 <%
115 <%
111 month_f = @gantt.date_from
116 month_f = @gantt.date_from
112 left = 0
117 left = 0
113 height = (show_weeks ? header_heigth : header_heigth + g_height)
118 height = (show_weeks ? header_heigth : header_heigth + g_height)
114 %>
119 %>
115 <% @gantt.months.times do %>
120 <% @gantt.months.times do %>
116 <%
121 <%
117 width = (((month_f >> 1) - month_f) * zoom - 1).to_i
122 width = (((month_f >> 1) - month_f) * zoom - 1).to_i
118 style = ""
123 style = ""
119 style += "left: #{left}px;"
124 style += "left: #{left}px;"
120 style += "width: #{width}px;"
125 style += "width: #{width}px;"
121 style += "height: #{height}px;"
126 style += "height: #{height}px;"
122 %>
127 %>
123 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
128 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
124 <%= link_to h("#{month_f.year}-#{month_f.month}"),
129 <%= link_to h("#{month_f.year}-#{month_f.month}"),
125 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
130 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
126 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
131 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
127 <% end %>
132 <% end %>
128 <%
133 <%
129 left = left + width + 1
134 left = left + width + 1
130 month_f = month_f >> 1
135 month_f = month_f >> 1
131 %>
136 %>
132 <% end %>
137 <% end %>
133
138
134 <%
139 <%
135 #
140 #
136 # Weeks headers
141 # Weeks headers
137 #
142 #
138 %>
143 %>
139 <% if show_weeks %>
144 <% if show_weeks %>
140 <%
145 <%
141 left = 0
146 left = 0
142 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
147 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
143 %>
148 %>
144 <% if @gantt.date_from.cwday == 1 %>
149 <% if @gantt.date_from.cwday == 1 %>
145 <%
150 <%
146 # @date_from is monday
151 # @date_from is monday
147 week_f = @gantt.date_from
152 week_f = @gantt.date_from
148 %>
153 %>
149 <% else %>
154 <% else %>
150 <%
155 <%
151 # find next monday after @date_from
156 # find next monday after @date_from
152 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
157 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
153 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
158 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
154 style = ""
159 style = ""
155 style += "left: #{left}px;"
160 style += "left: #{left}px;"
156 style += "top: 19px;"
161 style += "top: 19px;"
157 style += "width: #{width}px;"
162 style += "width: #{width}px;"
158 style += "height: #{height}px;"
163 style += "height: #{height}px;"
159 %>
164 %>
160 <%= content_tag(:div, '&nbsp;'.html_safe,
165 <%= content_tag(:div, '&nbsp;'.html_safe,
161 :style => style, :class => "gantt_hdr") %>
166 :style => style, :class => "gantt_hdr") %>
162 <% left = left + width + 1 %>
167 <% left = left + width + 1 %>
163 <% end %>
168 <% end %>
164 <% while week_f <= @gantt.date_to %>
169 <% while week_f <= @gantt.date_to %>
165 <%
170 <%
166 width = ((week_f + 6 <= @gantt.date_to) ?
171 width = ((week_f + 6 <= @gantt.date_to) ?
167 7 * zoom - 1 :
172 7 * zoom - 1 :
168 (@gantt.date_to - week_f + 1) * zoom - 1).to_i
173 (@gantt.date_to - week_f + 1) * zoom - 1).to_i
169 style = ""
174 style = ""
170 style += "left: #{left}px;"
175 style += "left: #{left}px;"
171 style += "top: 19px;"
176 style += "top: 19px;"
172 style += "width: #{width}px;"
177 style += "width: #{width}px;"
173 style += "height: #{height}px;"
178 style += "height: #{height}px;"
174 %>
179 %>
175 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
180 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
176 <%= content_tag(:small) do %>
181 <%= content_tag(:small) do %>
177 <%= week_f.cweek if width >= 16 %>
182 <%= week_f.cweek if width >= 16 %>
178 <% end %>
183 <% end %>
179 <% end %>
184 <% end %>
180 <%
185 <%
181 left = left + width + 1
186 left = left + width + 1
182 week_f = week_f + 7
187 week_f = week_f + 7
183 %>
188 %>
184 <% end %>
189 <% end %>
185 <% end %>
190 <% end %>
186
191
187 <%
192 <%
188 #
193 #
189 # Days headers
194 # Days headers
190 #
195 #
191 %>
196 %>
192 <% if show_days %>
197 <% if show_days %>
193 <%
198 <%
194 left = 0
199 left = 0
195 height = g_height + header_heigth - 1
200 height = g_height + header_heigth - 1
196 wday = @gantt.date_from.cwday
201 wday = @gantt.date_from.cwday
197 %>
202 %>
198 <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
203 <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
199 <% width = zoom - 1 %>
204 <% width = zoom - 1 %>
200 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
205 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
201 class="gantt_hdr">
206 class="gantt_hdr">
202 <%= day_letter(wday) %>
207 <%= day_letter(wday) %>
203 </div>
208 </div>
204 <%
209 <%
205 left = left + width + 1
210 left = left + width + 1
206 wday = wday + 1
211 wday = wday + 1
207 wday = 1 if wday > 7
212 wday = 1 if wday > 7
208 %>
213 %>
209 <% end %>
214 <% end %>
210 <% end %>
215 <% end %>
211
216
212 <%= @gantt.lines.html_safe %>
217 <%= @gantt.lines.html_safe %>
213
218
214 <% ###### Today red line (excluded from cache) ###### %>
219 <% ###### Today red line (excluded from cache) ###### %>
215 <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
220 <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
216 <%
221 <%
217 today_left = (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i
222 today_left = (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i
218 style = ""
223 style = ""
219 style += "position: absolute;"
224 style += "position: absolute;"
220 style += "height: #{g_height}px;"
225 style += "height: #{g_height}px;"
221 style += "top: #{headers_height + 1}px;"
226 style += "top: #{headers_height + 1}px;"
222 style += "left: #{today_left}px;"
227 style += "left: #{today_left}px;"
223 style += "width:10px;"
228 style += "width:10px;"
224 style += "border-left: 1px dashed red;"
229 style += "border-left: 1px dashed red;"
225 %>
230 %>
226 <%= content_tag(:div, '&nbsp;'.html_safe, :style => style) %>
231 <%= content_tag(:div, '&nbsp;'.html_safe, :style => style) %>
227 <% end %>
232 <% end %>
228
233
229 </div>
234 </div>
230 </td>
235 </td>
231 </tr>
236 </tr>
232 </table>
237 </table>
233
238
234 <table style="width:100%">
239 <table style="width:100%">
235 <tr>
240 <tr>
236 <td align="left">
241 <td align="left">
237 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
242 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
238 params.merge(@gantt.params_previous)) %>
243 params.merge(@gantt.params_previous)) %>
239 </td>
244 </td>
240 <td align="right">
245 <td align="right">
241 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
246 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
242 params.merge(@gantt.params_next)) %>
247 params.merge(@gantt.params_next)) %>
243 </td>
248 </td>
244 </tr>
249 </tr>
245 </table>
250 </table>
246
251
247 <% other_formats_links do |f| %>
252 <% other_formats_links do |f| %>
248 <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
253 <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
249 <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
254 <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
250 <% end %>
255 <% end %>
251 <% end # query.valid? %>
256 <% end # query.valid? %>
252
257
253 <% content_for :sidebar do %>
258 <% content_for :sidebar do %>
254 <%= render :partial => 'issues/sidebar' %>
259 <%= render :partial => 'issues/sidebar' %>
255 <% end %>
260 <% end %>
256
261
257 <% html_title(l(:label_gantt)) -%>
262 <% html_title(l(:label_gantt)) -%>
General Comments 0
You need to be logged in to leave comments. Login now