jro_apps/redmine Commit - r10143:ffcf1925e397

1

<% @gantt.view = self %>

1

<% @gantt.view = self %>

2

2

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

9

10

10

11

11

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

16

16

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

21

21

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

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

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

41

subject_width = 330

41

subject_width = 330

42

header_heigth = 18

42

header_heigth = 18

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

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

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

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

71

71

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

104

<td>

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

<%

106

<%

107

style = ""

107

style = ""

108

style += "width: #{g_width - 1}px;"

108

style += "width: #{g_width - 1}px;"

109

style += "height: #{headers_height}px;"

109

style += "height: #{headers_height}px;"

110

style += 'background: #eee;'

110

style += 'background: #eee;'

111

%>

111

%>

112

<%= content_tag(:div, ' '.html_safe, :style => style, :class => "gantt_hdr") %>

112

<%= content_tag(:div, ' '.html_safe, :style => style, :class => "gantt_hdr") %>

113

114

<% ###### Months headers ###### %>

114

<% ###### Months headers ###### %>

115

<%

115

<%

116

month_f = @gantt.date_from

116

month_f = @gantt.date_from

117

left = 0

117

left = 0

118

height = (show_weeks ? header_heigth : header_heigth + g_height)

118

height = (show_weeks ? header_heigth : header_heigth + g_height)

119

%>

119

%>

120

<% @gantt.months.times do %>

120

<% @gantt.months.times do %>

121

<%

121

<%

122

width = (((month_f >> 1) - month_f) * zoom - 1).to_i

122

width = (((month_f >> 1) - month_f) * zoom - 1).to_i

123

style = ""

123

style = ""

124

style += "left: #{left}px;"

124

style += "left: #{left}px;"

125

style += "width: #{width}px;"

125

style += "width: #{width}px;"

126

style += "height: #{height}px;"

126

style += "height: #{height}px;"

127

%>

127

%>

128

<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>

128

<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>

129

<%= link_to h("#{month_f.year}-#{month_f.month}"),

129

<%= link_to h("#{month_f.year}-#{month_f.month}"),

130

@gantt.params.merge(:year => month_f.year, :month => month_f.month),

130

@gantt.params.merge(:year => month_f.year, :month => month_f.month),

131

:title => "#{month_name(month_f.month)} #{month_f.year}" %>

131

:title => "#{month_name(month_f.month)} #{month_f.year}" %>

132

<% end %>

132

<% end %>

133

<%

133

<%

134

left = left + width + 1

134

left = left + width + 1

135

month_f = month_f >> 1

135

month_f = month_f >> 1

136

%>

136

%>

137

<% end %>

137

<% end %>

138

139

<% ###### Weeks headers ###### %>

139

<% ###### Weeks headers ###### %>

140

<% if show_weeks %>

140

<% if show_weeks %>

141

<%

141

<%

142

left = 0

142

left = 0

143

height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)

143

height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)

144

%>

144

%>

145

<% if @gantt.date_from.cwday == 1 %>

145

<% if @gantt.date_from.cwday == 1 %>

146

<%

146

<%

147

# @date_from is monday

147

# @date_from is monday

148

week_f = @gantt.date_from

148

week_f = @gantt.date_from

149

%>

149

%>

150

<% else %>

150

<% else %>

151

<%

151

<%

152

# find next monday after @date_from

152

# find next monday after @date_from

153

week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)

153

week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)

154

width = (7 - @gantt.date_from.cwday + 1) * zoom - 1

154

width = (7 - @gantt.date_from.cwday + 1) * zoom - 1

155

style = ""

155

style = ""

156

style += "left: #{left}px;"

156

style += "left: #{left}px;"

157

style += "top: 19px;"

157

style += "top: 19px;"

158

style += "width: #{width}px;"

158

style += "width: #{width}px;"

159

style += "height: #{height}px;"

159

style += "height: #{height}px;"

160

%>

160

%>

161

<%= content_tag(:div, ' '.html_safe,

161

<%= content_tag(:div, ' '.html_safe,

162

:style => style, :class => "gantt_hdr") %>

162

:style => style, :class => "gantt_hdr") %>

163

<% left = left + width + 1 %>

163

<% left = left + width + 1 %>

164

<% end %>

164

<% end %>

165

<% while week_f <= @gantt.date_to %>

165

<% while week_f <= @gantt.date_to %>

166

<%

166

<%

167

width = ((week_f + 6 <= @gantt.date_to) ?

167

width = ((week_f + 6 <= @gantt.date_to) ?

168

7 * zoom - 1 :

168

7 * zoom - 1 :

169

(@gantt.date_to - week_f + 1) * zoom - 1).to_i

169

(@gantt.date_to - week_f + 1) * zoom - 1).to_i

170

style = ""

170

style = ""

171

style += "left: #{left}px;"

171

style += "left: #{left}px;"

172

style += "top: 19px;"

172

style += "top: 19px;"

173

style += "width: #{width}px;"

173

style += "width: #{width}px;"

174

style += "height: #{height}px;"

174

style += "height: #{height}px;"

175

%>

175

%>

176

<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>

176

<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>

177

<%= content_tag(:small) do %>

177

<%= content_tag(:small) do %>

178

<%= week_f.cweek if width >= 16 %>

178

<%= week_f.cweek if width >= 16 %>

179

<% end %>

179

<% end %>

180

<% end %>

180

<% end %>

181

<%

181

<%

182

left = left + width + 1

182

left = left + width + 1

183

week_f = week_f + 7

183

week_f = week_f + 7

184

%>

184

%>

185

<% end %>

185

<% end %>

186

<% end %>

186

<% end %>

187

188

<%

188

<% ###### Days headers ####### %>

189

#

190

# Days headers

191

#

192

%>

193

<% if show_days %>

189

<% if show_days %>

194

<%

190

<%

195

left = 0

191

left = 0

196

height = g_height + header_heigth - 1

192

height = g_height + header_heigth - 1

197

wday = @gantt.date_from.cwday

193

wday = @gantt.date_from.cwday

198

%>

194

%>

199

<% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>

195

<% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>

200

<%

196

<%

201

width = zoom - 1

197

width = zoom - 1

202

style = ""

198

style = ""

203

style += "left: #{left}px;"

199

style += "left: #{left}px;"

204

style += "top:37px;"

200

style += "top:37px;"

205

style += "width: #{width}px;"

201

style += "width: #{width}px;"

206

style += "height: #{height}px;"

202

style += "height: #{height}px;"

207

style += "font-size:0.7em;"

203

style += "font-size:0.7em;"

208

style += 'background:#f1f1f1;' if wday > 5

204

style += 'background:#f1f1f1;' if wday > 5

209

%>

205

%>

210

<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>

206

<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>

211

<%= day_letter(wday) %>

207

<%= day_letter(wday) %>

212

<% end %>

208

<% end %>

213

<%

209

<%

214

left = left + width + 1

210

left = left + width + 1

215

wday = wday + 1

211

wday = wday + 1

216

wday = 1 if wday > 7

212

wday = 1 if wday > 7

217

%>

213

%>

218

<% end %>

214

<% end %>

219

<% end %>

215

<% end %>

220

216

221

<%= @gantt.lines.html_safe %>

217

<%= @gantt.lines.html_safe %>

222

218

223

<% ###### Today red line (excluded from cache) ###### %>

219

<% ###### Today red line (excluded from cache) ###### %>

224

<% 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 %>

225

<%

221

<%

226

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

227

style = ""

223

style = ""

228

style += "position: absolute;"

224

style += "position: absolute;"

229

style += "height: #{g_height}px;"

225

style += "height: #{g_height}px;"

230

style += "top: #{headers_height + 1}px;"

226

style += "top: #{headers_height + 1}px;"

231

style += "left: #{today_left}px;"

227

style += "left: #{today_left}px;"

232

style += "width:10px;"

228

style += "width:10px;"

233

style += "border-left: 1px dashed red;"

229

style += "border-left: 1px dashed red;"

234

%>

230

%>

235

<%= content_tag(:div, ' '.html_safe, :style => style) %>

231

<%= content_tag(:div, ' '.html_safe, :style => style) %>

236

<% end %>

232

<% end %>

237

233

238

</div>

234

</div>

239

</td>

235

</td>

240

</tr>

236

</tr>

241

</table>

237

</table>

242

238

243

239

244

<tr>

240

<tr>

245

241

246

<%= link_to_content_update("\xc2\xab " + l(:label_previous),

242

<%= link_to_content_update("\xc2\xab " + l(:label_previous),

247

params.merge(@gantt.params_previous)) %>

243

params.merge(@gantt.params_previous)) %>

248

</td>

244

</td>

249

245

250

<%= link_to_content_update(l(:label_next) + " \xc2\xbb",

246

<%= link_to_content_update(l(:label_next) + " \xc2\xbb",

251

params.merge(@gantt.params_next)) %>

247

params.merge(@gantt.params_next)) %>

252

</td>

248

</td>

253

</tr>

249

</tr>

254

</table>

250

</table>

255

251

256

<% other_formats_links do |f| %>

252

<% other_formats_links do |f| %>

257

<%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>

253

<%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>

258

<%= 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') %>

259

<% end %>

255

<% end %>

260

<% end # query.valid? %>

256

<% end # query.valid? %>

261

257

262

<% content_for :sidebar do %>

258

<% content_for :sidebar do %>

263

<%= render :partial => 'issues/sidebar' %>

259

<%= render :partial => 'issues/sidebar' %>

264

<% end %>

260

<% end %>

265

261

266

<% html_title(l(:label_gantt)) -%>

262

<% html_title(l(:label_gantt)) -%>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             <% @gantt.view = self %>
             <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
             <%= form_tag({:controller => 'gantts', :action => 'show',
                          :project_id => @project, :month => params[:month],
                          :year => params[:year], :months => params[:months]},
                          :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p class="contextual">
               <%= gantt_zoom_link(@gantt, :in) %>
               <%= gantt_zoom_link(@gantt, :out) %>
             </p>
             <p class="buttons">
             <%= text_field_tag 'months', @gantt.months, :size => 2 %>
             <%= l(:label_months_from) %>
             <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
             <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
             <%= hidden_field_tag 'zoom', @gantt.zoom %>
             <%= link_to_function l(:button_apply), '$("#query_form").submit()',
                                  :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
                         :class => 'icon icon-reload' %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%
               zoom = 1
               @gantt.zoom.times { zoom = zoom * 2 }
               subject_width = 330
               header_heigth = 18
               headers_height = header_heigth
               show_weeks = false
               show_days  = false
               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
               # 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 %>
               <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
             <% end %>
             <table style="width:100%; border:0; border-collapse: collapse;">
             <tr>
             <td style="width:<%= subject_width %>px; padding:0px;">
               <%
                 style  = ""
                 style += "position:relative;"
                 style += "height: #{t_height + 24}px;"
                 style += "width: #{subject_width + 1}px;"
               %>
               <%= content_tag(:div, :style => style) do %>
                 <%
                   style  = ""
                   style += "right:-2px;"
                   style += "width: #{subject_width}px;"
                   style += "height: #{headers_height}px;"
                   style += 'background: #eee;'
                 %>
                 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
                 <%
                   style  = ""
                   style += "right:-2px;"
                   style += "width: #{subject_width}px;"
                   style += "height: #{t_height}px;"
                   style += 'border-left: 1px solid #c0c0c0;'
                   style += 'overflow: hidden;'
                 %>
                 <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
                 <%= content_tag(:div, :class => "gantt_subjects") do %>
                   <%= @gantt.subjects.html_safe %>
                 <% end %>
               <% end %>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <%
               style  = ""
               style += "width: #{g_width - 1}px;"
               style += "height: #{headers_height}px;"
               style += 'background: #eee;'
             %>
             <%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :class => "gantt_hdr") %>
             <% ###### Months headers ###### %>
             <%
               month_f = @gantt.date_from
               left = 0
               height = (show_weeks ? header_heigth : header_heigth + g_height)
             %>
             <% @gantt.months.times do %>
               <%
                 width = (((month_f >> 1) - month_f) * zoom - 1).to_i
                 style  = ""
                 style += "left: #{left}px;"
                 style += "width: #{width}px;"
                 style += "height: #{height}px;"
               %>
               <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
                 <%= 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}" %>
               <% end %>
               <%
                 left = left + width + 1
                 month_f = month_f >> 1
               %>
             <% end %>
             <% ###### Weeks headers ###### %>
             <% if show_weeks %>
               <%
                 left = 0
                 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
               %>
               <% if @gantt.date_from.cwday == 1 %>
                 <%
                   # @date_from is monday
                   week_f = @gantt.date_from
                 %>
               <% else %>
                 <%
                   # find next monday after @date_from
                   week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
                   width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
                   style  = ""
                   style += "left: #{left}px;"
                   style += "top: 19px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                 %>
                 <%= content_tag(:div, '&nbsp;'.html_safe,
                                 :style => style, :class => "gantt_hdr") %>
                 <% left = left + width + 1 %>
               <% end %>
               <% while week_f <= @gantt.date_to %>
                 <%
                   width = ((week_f + 6 <= @gantt.date_to) ?
 * zoom - 1 :
                               (@gantt.date_to - week_f + 1) * zoom - 1).to_i
                   style  = ""
                   style += "left: #{left}px;"
                   style += "top: 19px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                 %>
                 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
                   <%= content_tag(:small) do %>
                     <%= week_f.cweek if width >= 16 %>
                   <% end %>
                 <% end %>
                 <%
                   left = left + width + 1
                   week_f = week_f + 7
                 %>
               <% end %>
             <% end %>
-            <%
+            <% ###### Days headers ####### %>
-            # Days headers
-            %>
             <% if show_days %>
               <%
-              left = 0
+                left = 0
-              height = g_height + header_heigth - 1
+                height = g_height + header_heigth - 1
-              wday = @gantt.date_from.cwday
+                wday = @gantt.date_from.cwday
               %>
               <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
                 <%
                   width =  zoom - 1
                   style  = ""
                   style += "left: #{left}px;"
                   style += "top:37px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                   style += "font-size:0.7em;"
                   style += 'background:#f1f1f1;' if wday > 5
                 %>
                 <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
                   <%= day_letter(wday) %>
                 <% end %>
                 <%
-                left = left + width + 1
+                  left = left + width + 1
-                wday = wday + 1
+                  wday = wday + 1
-                wday = 1 if wday > 7
+                  wday = 1 if wday > 7
                 %>
               <% end %>
             <% end %>
             <%= @gantt.lines.html_safe %>
             <% ###### Today red line (excluded from cache) ###### %>
             <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
               <%
                 today_left = (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i
                 style  = ""
                 style += "position: absolute;"
                 style += "height: #{g_height}px;"
                 style += "top: #{headers_height + 1}px;"
                 style += "left: #{today_left}px;"
                 style += "width:10px;"
                 style += "border-left: 1px dashed red;"
               %>
               <%= content_tag(:div, '&nbsp;'.html_safe, :style => style) %>
             <% end %>
             </div>
             </td>
             </tr>
             </table>
             <table style="width:100%">
             <tr>
               <td align="left">
                 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
                                            params.merge(@gantt.params_previous)) %>
               </td>
               <td align="right">
                 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
                                            params.merge(@gantt.params_next)) %>
               </td>
             </tr>
             </table>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
               <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
             <% end %>
             <% end # query.valid? %>
             <% content_for :sidebar do %>
               <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_gantt)) -%>