jro_apps/redmine Commit - r10134:3431b860ad6b

gantt: use content_tag instead of html tag at gantt today red line...

Toshi MARUYAMA -

r10134:3431b860ad6b

parent child

Context file:

r10134:3431b860ad6b

Collapse all files

app/views/gantts/show.html.erb +10 -5

              <% @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;">
              <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
              <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
              <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;"
                   class="gantt_hdr"></div>
              <div class="gantt_subjects">
              <%= @gantt.subjects.html_safe %>
              </div>
              </div>
              </td>
              <td>
              <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
              <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;"
                   class="gantt_hdr">&nbsp;</div>
              <%
              #
              # 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
              #
              %>
              <% if show_days %>
                <%
                left = 0
                height = g_height + header_heigth - 1
                wday = @gantt.date_from.cwday
                %>
                <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
                  <% width =  zoom - 1 %>
                    <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
                         class="gantt_hdr">
                      <%= day_letter(wday) %>
                    </div>
                  <%
                  left = left + width + 1
                  wday = wday + 1
                  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 red line (excluded from cache)
+             #
+                style  = ""
+                style += "position: absolute;"
+                style += "height: #{g_height}px;"
+                style += "top: #{headers_height + 1}px;"
+                style += "left: #{(((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i}px;"
+                style += "width:10px;"
+                style += "border-left: 1px dashed red;"
              %>
-             <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
-               <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>
+               <%= 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)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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