jro_apps/redmine Commit - r4408:98c7c179ca3f

Gantt code cleanup....

Jean-Philippe Lang -

r4408:98c7c179ca3f

parent child

Context file:

r4408:98c7c179ca3f

Collapse all files

lib/redmine/helpers/gantt.rb +13 -58

             # Redmine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module Helpers
                 # Simple class to handle gantt chart data
                 class Gantt
                   include ERB::Util
                   include Redmine::I18n
                   # :nodoc:
                   # Some utility methods for the PDF export
                   class PDF
                     MaxCharactorsForSubject = 45
                     TotalWidth = 280
                     LeftPaneWidth = 100
                     def self.right_pane_width
                       TotalWidth - LeftPaneWidth
                     end
                   end
                   attr_reader :year_from, :month_from, :date_from, :date_to, :zoom, :months, :truncated, :max_rows
                   attr_accessor :query
                   attr_accessor :project
                   attr_accessor :view
                   def initialize(options={})
                     options = options.dup
                     if options[:year] && options[:year].to_i >0
                       @year_from = options[:year].to_i
                       if options[:month] && options[:month].to_i >=1 && options[:month].to_i <= 12
                         @month_from = options[:month].to_i
                       else
                         @month_from = 1
                       end
                     else
                       @month_from ||= Date.today.month
                       @year_from ||= Date.today.year
                     end
                     zoom = (options[:zoom] || User.current.pref[:gantt_zoom]).to_i
                     @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
                     months = (options[:months] || User.current.pref[:gantt_months]).to_i
                     @months = (months > 0 && months < 25) ? months : 6
                     # Save gantt parameters as user preference (zoom and months count)
                     if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
                       User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
                       User.current.preference.save
                     end
                     @date_from = Date.civil(@year_from, @month_from, 1)
                     @date_to = (@date_from >> @months) - 1
                     @subjects = ''
                     @lines = ''
                     @number_of_rows = nil
                     @truncated = false
                     if options.has_key?(:max_rows)
                       @max_rows = options[:max_rows]
                     else
                       @max_rows = Setting.gantt_items_limit.blank? ? nil : Setting.gantt_items_limit.to_i
                     end
                   end
                   def common_params
                     { :controller => 'gantts', :action => 'show', :project_id => @project }
                   end
                   def params
                     common_params.merge({  :zoom => zoom, :year => year_from, :month => month_from, :months => months })
                   end
                   def params_previous
                     common_params.merge({:year => (date_from << months).year, :month => (date_from << months).month, :zoom => zoom, :months => months })
                   end
                   def params_next
                     common_params.merge({:year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months })
                   end
                         ### Extracted from the HTML view/helpers
                   # Returns the number of rows that will be rendered on the Gantt chart
                   def number_of_rows
                     return @number_of_rows if @number_of_rows
                     rows = if @project
                       number_of_rows_on_project(@project)
                     else
                       Project.roots.visible.has_module('issue_tracking').inject(0) do |total, project|
                         total += number_of_rows_on_project(project)
                       end
                     end
                     rows > @max_rows ? @max_rows : rows
                   end
                   # Returns the number of rows that will be used to list a project on
                   # the Gantt chart.  This will recurse for each subproject.
                   def number_of_rows_on_project(project)
                     # Remove the project requirement for Versions because it will
                     # restrict issues to only be on the current project.  This
                     # ends up missing issues which are assigned to shared versions.
                     @query.project = nil if @query.project
                     # One Root project
                     count = 1
                     # Issues without a Version
                     count += project.issues.for_gantt.without_version.with_query(@query).count
                     # Versions
                     count += project.versions.count
                     # Issues on the Versions
                     project.versions.each do |version|
                       count += version.fixed_issues.for_gantt.with_query(@query).count
                     end
                     # Subprojects
                     project.children.visible.has_module('issue_tracking').each do |subproject|
                       count += number_of_rows_on_project(subproject)
                     end
                     count
                   end
                   # Renders the subjects of the Gantt chart, the left side.
                   def subjects(options={})
                     render(options.merge(:only => :subjects)) unless @subjects_rendered
                     @subjects
                   end
                   # Renders the lines of the Gantt chart, the right side
                   def lines(options={})
                     render(options.merge(:only => :lines)) unless @lines_rendered
                     @lines
                   end
                   def render(options={})
                     options = {:indent => 4, :render => :subject, :format => :html}.merge(options)
                     @subjects = '' unless options[:only] == :lines
                     @lines = '' unless options[:only] == :subjects
                     @number_of_rows = 0
                     if @project
                       render_project(@project, options)
                     else
                       Project.roots.visible.has_module('issue_tracking').each do |project|
                         render_project(project, options)
                         break if abort?
                       end
                     end
                     @subjects_rendered = true unless options[:only] == :lines
                     @lines_rendered = true unless options[:only] == :subjects
                     render_end(options)
                   end
                   def render_project(project, options={})
                     options[:top] = 0 unless options.key? :top
                     options[:indent_increment] = 20 unless options.key? :indent_increment
                     options[:top_increment] = 20 unless options.key? :top_increment
                     subject_for_project(project, options) unless options[:only] == :lines
                     line_for_project(project, options) unless options[:only] == :subjects
                     options[:top] += options[:top_increment]
                     options[:indent] += options[:indent_increment]
                     @number_of_rows += 1
                     return if abort?
                     # Second, Issues without a version
                     issues = project.issues.for_gantt.without_version.with_query(@query).all(:limit => current_limit)
                     sort_issues!(issues)
                     if issues
                       render_issues(issues, options)
                       return if abort?
                     end
                     # Third, Versions
                     project.versions.sort.each do |version|
                       render_version(version, options)
                       return if abort?
                     end
                     # Fourth, subprojects
                     project.children.visible.has_module('issue_tracking').each do |project|
                       render_project(project, options)
                       return if abort?
                     end unless project.leaf?
                     # Remove indent to hit the next sibling
                     options[:indent] -= options[:indent_increment]
                   end
                   def render_issues(issues, options={})
                     issues.each do |i|
                       subject_for_issue(i, options) unless options[:only] == :lines
                       line_for_issue(i, options) unless options[:only] == :subjects
                       options[:top] += options[:top_increment]
                       @number_of_rows += 1
                       return if abort?
                     end
                   end
                   def render_version(version, options={})
                     # Version header
                     subject_for_version(version, options) unless options[:only] == :lines
                     line_for_version(version, options) unless options[:only] == :subjects
                     options[:top] += options[:top_increment]
                     @number_of_rows += 1
                     return if abort?
                     # Remove the project requirement for Versions because it will
                     # restrict issues to only be on the current project.  This
                     # ends up missing issues which are assigned to shared versions.
                     @query.project = nil if @query.project
                     issues = version.fixed_issues.for_gantt.with_query(@query).all(:limit => current_limit)
                     if issues
                       sort_issues!(issues)
                       # Indent issues
                       options[:indent] += options[:indent_increment]
                       render_issues(issues, options)
                       options[:indent] -= options[:indent_increment]
                     end
                   end
                   def render_end(options={})
                     case options[:format]
                     when :pdf
                       options[:pdf].Line(15, options[:top], PDF::TotalWidth, options[:top])
                     end
                   end
                   def subject_for_project(project, options)
                     case options[:format]
                     when :html
                       output = ''
                       output << "<div class='project-name' style='position: absolute;line-height:1.2em;height:16px;top:#{options[:top]}px;left:#{options[:indent]}px;overflow:hidden;'><small>    "
                       if project.is_a? Project
                         output << "<span class='icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>"
                         output << view.link_to_project(project)
                         output << '</span>'
                       else
                         ActiveRecord::Base.logger.debug "Gantt#subject_for_project was not given a project"
                         ''
                       end
                       output << "</small></div>"
                       @subjects << output
                       output
                     when :image
                       options[:image].fill('black')
                       options[:image].stroke('transparent')
                       options[:image].stroke_width(1)
                       options[:image].text(options[:indent], options[:top] + 2, project.name)
                     when :pdf
                       pdf_new_page?(options)
                       options[:pdf].SetY(options[:top])
                       options[:pdf].SetX(15)
                       char_limit = PDF::MaxCharactorsForSubject - options[:indent]
                       options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{project.name}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
                       options[:pdf].SetY(options[:top])
                       options[:pdf].SetX(options[:subject_width])
                       options[:pdf].Cell(options[:g_width], 5, "", "LR")
                     end
                   end
                   def line_for_project(project, options)
                     # Skip versions that don't have a start_date or due date
                     if project.is_a?(Project) && project.start_date && project.due_date
                       options[:zoom] ||= 1
                       options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
                       case options[:format]
                       when :html
                         output = ''
                         i_left = ((project.start_date - self.date_from)*options[:zoom]).floor
                         start_date = project.start_date
                         start_date ||= self.date_from
                         start_left = ((start_date - self.date_from)*options[:zoom]).floor
                         i_end_date = ((project.due_date <= self.date_to) ? project.due_date : self.date_to )
                         i_done_date = start_date + ((project.due_date - start_date+1)* project.completed_percent(:include_subprojects => true)/100).floor
                         i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
                         i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
                         i_late_date = [i_end_date, Date.today].min if start_date < Date.today
                         i_end = ((i_end_date - self.date_from) * options[:zoom]).floor
                         i_width = (i_end - i_left + 1).floor - 2                  # total width of the issue (- 2 for left and right borders)
                         d_width = ((i_done_date - start_date)*options[:zoom]).floor - 2                     # done width
                         l_width = i_late_date ? ((i_late_date - start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
                         # Bar graphic
                         # Make sure that negative i_left and i_width don't
                         # overflow the subject
                         if i_end > 0 && i_left <= options[:g_width]
                           output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ i_width }px;' class='task project_todo'>&nbsp;</div>"
                         end
                         if l_width > 0 && i_left <= options[:g_width]
                           output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ l_width }px;' class='task project_late'>&nbsp;</div>"
                         end
                         if d_width > 0 && i_left <= options[:g_width]
                           output<< "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ d_width }px;' class='task project_done'>&nbsp;</div>"
                         end
                         # Starting diamond
                         if start_left <= options[:g_width] && start_left > 0
                           output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:15px;' class='task project-line starting'>&nbsp;</div>"
                           output << "<div style='top:#{ options[:top] }px;left:#{ start_left + 12 }px;' class='task label'>"
                           output << "</div>"
                         end
                         # Ending diamond
                         # Don't show items too far ahead
                         if i_end <= options[:g_width] && i_end > 0
                           output << "<div style='top:#{ options[:top] }px;left:#{ i_end }px;width:15px;' class='task project-line ending'>&nbsp;</div>"
                         end
                         # DIsplay the Project name and %
                         if i_end <= options[:g_width]
                           # Display the status even if it's floated off to the left
                           status_px = i_end + 12 # 12px for the diamond
                           status_px = 0 if status_px <= 0
                           output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='task label project-name'>"
                           output << "<strong>#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%</strong>"
                           output << "</div>"
                         end
                         @lines << output
                         output
                       when :image
                         options[:image].stroke('transparent')
                         i_left = options[:subject_width] + ((project.due_date - self.date_from)*options[:zoom]).floor
                         # Make sure negative i_left doesn't overflow the subject
                         if i_left > options[:subject_width]
                           options[:image].fill('blue')
                           options[:image].rectangle(i_left, options[:top], i_left + 6, options[:top] - 6)
                           options[:image].fill('black')
                           options[:image].text(i_left + 11, options[:top] + 1, project.name)
                         end
                       when :pdf
                         options[:pdf].SetY(options[:top]+1.5)
                         i_left = ((project.due_date - @date_from)*options[:zoom])
                         # Make sure negative i_left doesn't overflow the subject
                         if i_left > 0
                           options[:pdf].SetX(options[:subject_width] + i_left)
                           options[:pdf].SetFillColor(50,50,200)
                           options[:pdf].Cell(2, 2, "", 0, 0, "", 1)
                           options[:pdf].SetY(options[:top]+1.5)
                           options[:pdf].SetX(options[:subject_width] + i_left + 3)
                           options[:pdf].Cell(30, 2, "#{project.name}")
                         end
                       end
                     else
                       ActiveRecord::Base.logger.debug "Gantt#line_for_project was not given a project with a start_date"
                       ''
                     end
                   end
                   def subject_for_version(version, options)
                     case options[:format]
                     when :html
                       output = ''
                       output << "<div class='version-name' style='position: absolute;line-height:1.2em;height:16px;top:#{options[:top]}px;left:#{options[:indent]}px;overflow:hidden;'><small>    "
                       if version.is_a? Version
                         output << "<span class='icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>"
                         output << view.link_to_version(version)
                         output << '</span>'
                       else
                         ActiveRecord::Base.logger.debug "Gantt#subject_for_version was not given a version"
                         ''
                       end
                       output << "</small></div>"
                       @subjects << output
                       output
                     when :image
                       options[:image].fill('black')
                       options[:image].stroke('transparent')
                       options[:image].stroke_width(1)
                       options[:image].text(options[:indent], options[:top] + 2, version.to_s_with_project)
                     when :pdf
                       pdf_new_page?(options)
                       options[:pdf].SetY(options[:top])
                       options[:pdf].SetX(15)
                       char_limit = PDF::MaxCharactorsForSubject - options[:indent]
                       options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{version.to_s_with_project}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
                       options[:pdf].SetY(options[:top])
                       options[:pdf].SetX(options[:subject_width])
                       options[:pdf].Cell(options[:g_width], 5, "", "LR")
                     end
                   end
                   def line_for_version(version, options)
                     # Skip versions that don't have a start_date
                     if version.is_a?(Version) && version.start_date && version.due_date
                       options[:zoom] ||= 1
                       options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
                       case options[:format]
                       when :html
-                        output = ''
+                        coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom])
-                        i_left = ((version.start_date - self.date_from)*options[:zoom]).floor
+                        label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
-                        # TODO: or version.fixed_issues.collect(&:start_date).min
+                        label = h("#{version.project} -") + label unless @project && @project == version.project
-                        start_date = version.fixed_issues.minimum('start_date') if version.fixed_issues.present?
+                        output = html_task(options[:top], coords, :css => "version task", :label => label, :markers => true)
-                        start_date ||= self.date_from
-                        start_left = ((start_date - self.date_from)*options[:zoom]).floor
-                        i_end_date = ((version.due_date <= self.date_to) ? version.due_date : self.date_to )
-                        i_done_date = start_date + ((version.due_date - start_date+1)* version.completed_pourcent/100).floor
-                        i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
-                        i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
-                        i_late_date = [i_end_date, Date.today].min if start_date < Date.today
-                        i_width = (i_left - start_left + 1).floor - 2                  # total width of the issue (- 2 for left and right borders)
-                        d_width = ((i_done_date - start_date)*options[:zoom]).floor - 2                     # done width
-                        l_width = i_late_date ? ((i_late_date - start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
-                        i_end = ((i_end_date - self.date_from) * options[:zoom]).floor # Ending pixel
-                        # Bar graphic
-                        # Make sure that negative i_left and i_width don't
-                        # overflow the subject
-                        if i_width > 0 && i_left <= options[:g_width]
-                          output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ i_width }px;' class='task milestone_todo'>&nbsp;</div>"
-                        end
-                        if l_width > 0 && i_left <= options[:g_width]
-                          output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ l_width }px;' class='task milestone_late'>&nbsp;</div>"
-                        end
-                        if d_width > 0 && i_left <= options[:g_width]
-                          output<< "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ d_width }px;' class='task milestone_done'>&nbsp;</div>"
-                        end
-                        # Starting diamond
-                        if start_left <= options[:g_width] && start_left > 0
-                          output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:15px;' class='task milestone starting'>&nbsp;</div>"
-                          output << "<div style='top:#{ options[:top] }px;left:#{ start_left + 12 }px;background:#fff;' class='task'>"
-                          output << "</div>"
-                        end
-                        # Ending diamond
-                        # Don't show items too far ahead
-                        if i_left <= options[:g_width] && i_end > 0
-                          output << "<div style='top:#{ options[:top] }px;left:#{ i_end }px;width:15px;' class='task milestone ending'>&nbsp;</div>"
-                        end
-                        # Display the Version name and %
-                        if i_end <= options[:g_width]
-                          # Display the status even if it's floated off to the left
-                          status_px = i_end + 12 # 12px for the diamond
-                          status_px = 0 if status_px <= 0
-                          output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='task label version-name'>"
-                          output << h("#{version.project} -") unless @project && @project == version.project
-                          output << "<strong>#{h version } #{h version.completed_pourcent.to_i.to_s}%</strong>"
-                          output << "</div>"
-                        end
                         @lines << output
                         output
                       when :image
                         options[:image].stroke('transparent')
                         i_left = options[:subject_width] + ((version.start_date - @date_from)*options[:zoom]).floor
                         # Make sure negative i_left doesn't overflow the subject
                         if i_left > options[:subject_width]
                           options[:image].fill('green')
                           options[:image].rectangle(i_left, options[:top], i_left + 6, options[:top] - 6)
                           options[:image].fill('black')
                           options[:image].text(i_left + 11, options[:top] + 1, version.name)
                         end
                       when :pdf
                         options[:pdf].SetY(options[:top]+1.5)
                         i_left = ((version.start_date - @date_from)*options[:zoom])
                         # Make sure negative i_left doesn't overflow the subject
                         if i_left > 0
                           options[:pdf].SetX(options[:subject_width] + i_left)
                           options[:pdf].SetFillColor(50,200,50)
                           options[:pdf].Cell(2, 2, "", 0, 0, "", 1)
                           options[:pdf].SetY(options[:top]+1.5)
                           options[:pdf].SetX(options[:subject_width] + i_left + 3)
                           options[:pdf].Cell(30, 2, "#{version.name}")
                         end
                       end
                     else
                       ActiveRecord::Base.logger.debug "Gantt#line_for_version was not given a version with a start_date"
                       ''
                     end
                   end
                   def subject_for_issue(issue, options)
                     case options[:format]
                     when :html
                       output = ''
                       output << "<div class='tooltip'>"
                       output << "<div class='issue-subject' style='position: absolute;line-height:1.2em;height:16px;top:#{options[:top]}px;left:#{options[:indent]}px;overflow:hidden;'><small>    "
                       if issue.is_a? Issue
                         css_classes = []
                         css_classes << 'issue-overdue' if issue.overdue?
                         css_classes << 'issue-behind-schedule' if issue.behind_schedule?
                         css_classes << 'icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
                         if issue.assigned_to.present?
                           assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
                           output << view.avatar(issue.assigned_to, :class => 'gravatar icon-gravatar', :size => 10, :title => assigned_string)
                         end
                         output << "<span class='#{css_classes.join(' ')}'>"
                         output << view.link_to_issue(issue)
                         output << '</span>'
                       else
                         ActiveRecord::Base.logger.debug "Gantt#subject_for_issue was not given an issue"
                         ''
                       end
                       output << "</small></div>"
                       # Tooltip
                       if issue.is_a? Issue
                         output << "<span class='tip' style='position: absolute;top:#{ options[:top].to_i + 16 }px;left:#{ options[:indent].to_i + 20 }px;'>"
                         output << view.render_issue_tooltip(issue)
                         output << "</span>"
                       end
                       output << "</div>"
                       @subjects << output
                       output
                     when :image
                       options[:image].fill('black')
                       options[:image].stroke('transparent')
                       options[:image].stroke_width(1)
                       options[:image].text(options[:indent], options[:top] + 2, issue.subject)
                     when :pdf
                       pdf_new_page?(options)
                       options[:pdf].SetY(options[:top])
                       options[:pdf].SetX(15)
                       char_limit = PDF::MaxCharactorsForSubject - options[:indent]
                       options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{issue.tracker} #{issue.id}: #{issue.subject}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
                       options[:pdf].SetY(options[:top])
                       options[:pdf].SetX(options[:subject_width])
                       options[:pdf].Cell(options[:g_width], 5, "", "LR")
                     end
                   end
                   def line_for_issue(issue, options)
                     # Skip issues that don't have a due_before (due_date or version's due_date)
                     if issue.is_a?(Issue) && issue.due_before
                       case options[:format]
                       when :html
                         coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom])
                         css = "task " + (issue.leaf? ? 'leaf' : 'parent')
                         output = html_task(options[:top], coords, :css => css, :label => "#{ issue.status.name } #{ issue.done_ratio }%", :issue => issue)
                         @lines << output
                         output
                       when :image
                         # Handle nil start_dates, rare but can happen.
                         i_start_date =  if issue.start_date && issue.start_date >= @date_from
                                           issue.start_date
                                         else
                                           @date_from
                                         end
                         i_end_date = (issue.due_before <= date_to ? issue.due_before : date_to )
                         i_done_date = i_start_date + ((issue.due_before - i_start_date+1)*issue.done_ratio/100).floor
                         i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
                         i_done_date = (i_done_date >= date_to ? date_to : i_done_date )
                         i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
                         i_left = options[:subject_width] + ((i_start_date - @date_from)*options[:zoom]).floor
                         i_width = ((i_end_date - i_start_date + 1)*options[:zoom]).floor                  # total width of the issue
                         d_width = ((i_done_date - i_start_date)*options[:zoom]).floor                     # done width
                         l_width = i_late_date ? ((i_late_date - i_start_date+1)*options[:zoom]).floor : 0 # delay width
                         # Make sure that negative i_left and i_width don't
                         # overflow the subject
                         if i_width > 0
                           options[:image].fill('grey')
                           options[:image].rectangle(i_left, options[:top], i_left + i_width, options[:top] - 6)
                           options[:image].fill('red')
                           options[:image].rectangle(i_left, options[:top], i_left + l_width, options[:top] - 6) if l_width > 0
                           options[:image].fill('blue')
                           options[:image].rectangle(i_left, options[:top], i_left + d_width, options[:top] - 6) if d_width > 0
                         end
                         # Show the status and % done next to the subject if it overflows
                         options[:image].fill('black')
                         if i_width > 0
                           options[:image].text(i_left + i_width + 5,options[:top] + 1, "#{issue.status.name} #{issue.done_ratio}%")
                         else
                           options[:image].text(options[:subject_width] + 5,options[:top] + 1, "#{issue.status.name} #{issue.done_ratio}%")
                         end
                       when :pdf
                         options[:pdf].SetY(options[:top]+1.5)
                         # Handle nil start_dates, rare but can happen.
                         i_start_date =  if issue.start_date && issue.start_date >= @date_from
                                       issue.start_date
                                     else
                                       @date_from
                                     end
                         i_end_date = (issue.due_before <= @date_to ? issue.due_before : @date_to )
                         i_done_date = i_start_date + ((issue.due_before - i_start_date+1)*issue.done_ratio/100).floor
                         i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
                         i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
                         i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
                         i_left = ((i_start_date - @date_from)*options[:zoom])
                         i_width = ((i_end_date - i_start_date + 1)*options[:zoom])
                         d_width = ((i_done_date - i_start_date)*options[:zoom])
                         l_width = ((i_late_date - i_start_date+1)*options[:zoom]) if i_late_date
                         l_width ||= 0
                         # Make sure that negative i_left and i_width don't
                         # overflow the subject
                         if i_width > 0
                           options[:pdf].SetX(options[:subject_width] + i_left)
                           options[:pdf].SetFillColor(200,200,200)
                           options[:pdf].Cell(i_width, 2, "", 0, 0, "", 1)
                         end
                         if l_width > 0
                           options[:pdf].SetY(options[:top]+1.5)
                           options[:pdf].SetX(options[:subject_width] + i_left)
                           options[:pdf].SetFillColor(255,100,100)
                           options[:pdf].Cell(l_width, 2, "", 0, 0, "", 1)
                         end
                         if d_width > 0
                           options[:pdf].SetY(options[:top]+1.5)
                           options[:pdf].SetX(options[:subject_width] + i_left)
                           options[:pdf].SetFillColor(100,100,255)
                           options[:pdf].Cell(d_width, 2, "", 0, 0, "", 1)
                         end
                         options[:pdf].SetY(options[:top]+1.5)
                         # Make sure that negative i_left and i_width don't
                         # overflow the subject
                         if (i_left + i_width) >= 0
                           options[:pdf].SetX(options[:subject_width] + i_left + i_width)
                         else
                           options[:pdf].SetX(options[:subject_width])
                         end
                         options[:pdf].Cell(30, 2, "#{issue.status} #{issue.done_ratio}%")
                       end
                     else
                       ActiveRecord::Base.logger.debug "GanttHelper#line_for_issue was not given an issue with a due_before"
                       ''
                     end
                   end
                   # Generates a gantt image
                   # Only defined if RMagick is avalaible
                   def to_image(format='PNG')
                     date_to = (@date_from >> @months)-1
                     show_weeks = @zoom > 1
                     show_days = @zoom > 2
                     subject_width = 400
                     header_heigth = 18
                     # width of one day in pixels
                     zoom = @zoom*2
                     g_width = (@date_to - @date_from + 1)*zoom
                     g_height = 20 * number_of_rows + 30
                     headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
                     height = g_height + headers_heigth
                     imgl = Magick::ImageList.new
                     imgl.new_image(subject_width+g_width+1, height)
                     gc = Magick::Draw.new
                     # Subjects
                     subjects(:image => gc, :top => (headers_heigth + 20), :indent => 4, :format => :image)
                     # Months headers
                     month_f = @date_from
                     left = subject_width
                     @months.times do
                       width = ((month_f >> 1) - month_f) * zoom
                       gc.fill('white')
                       gc.stroke('grey')
                       gc.stroke_width(1)
                       gc.rectangle(left, 0, left + width, height)
                       gc.fill('black')
                       gc.stroke('transparent')
                       gc.stroke_width(1)
                       gc.text(left.round + 8, 14, "#{month_f.year}-#{month_f.month}")
                       left = left + width
                       month_f = month_f >> 1
                     end
                     # Weeks headers
                     if show_weeks
                     	left = subject_width
                     	height = header_heigth
                     	if @date_from.cwday == 1
                     	    # date_from is monday
                             week_f = date_from
                     	else
                     	    # find next monday after date_from
                     		week_f = @date_from + (7 - @date_from.cwday + 1)
                     		width = (7 - @date_from.cwday + 1) * zoom
                             gc.fill('white')
                             gc.stroke('grey')
                             gc.stroke_width(1)
                             gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
                     		left = left + width
                     	end
                     	while week_f <= date_to
                     		width = (week_f + 6 <= date_to) ? 7 * zoom : (date_to - week_f + 1) * zoom
                             gc.fill('white')
                             gc.stroke('grey')
                             gc.stroke_width(1)
                             gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
                             gc.fill('black')
                             gc.stroke('transparent')
                             gc.stroke_width(1)
                             gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
                     		left = left + width
                     		week_f = week_f+7
                     	end
                     end
                     # Days details (week-end in grey)
                     if show_days
                     	left = subject_width
                     	height = g_height + header_heigth - 1
                     	wday = @date_from.cwday
                     	(date_to - @date_from + 1).to_i.times do
                           width =  zoom
                           gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
                           gc.stroke('grey')
                           gc.stroke_width(1)
                           gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
                           left = left + width
                           wday = wday + 1
                           wday = 1 if wday > 7
                     	end
                     end
                     # border
                     gc.fill('transparent')
                     gc.stroke('grey')
                     gc.stroke_width(1)
                     gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
                     gc.stroke('black')
                     gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
                     # content
                     top = headers_heigth + 20
                     lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image)
                     # today red line
                     if Date.today >= @date_from and Date.today <= date_to
                       gc.stroke('red')
                       x = (Date.today-@date_from+1)*zoom + subject_width
                       gc.line(x, headers_heigth, x, headers_heigth + g_height-1)
                     end
                     gc.draw(imgl)
                     imgl.format = format
                     imgl.to_blob
                   end if Object.const_defined?(:Magick)
                   def to_pdf
                     pdf = ::Redmine::Export::PDF::IFPDF.new(current_language)
                     pdf.SetTitle("#{l(:label_gantt)} #{project}")
                     pdf.AliasNbPages
                     pdf.footer_date = format_date(Date.today)
                     pdf.AddPage("L")
                     pdf.SetFontStyle('B',12)
                     pdf.SetX(15)
                     pdf.Cell(PDF::LeftPaneWidth, 20, project.to_s)
                     pdf.Ln
                     pdf.SetFontStyle('B',9)
                     subject_width = PDF::LeftPaneWidth
                     header_heigth = 5
                     headers_heigth = header_heigth
                     show_weeks = false
                     show_days = false
                     if self.months < 7
                       show_weeks = true
                       headers_heigth = 2*header_heigth
                       if self.months < 3
                         show_days = true
                         headers_heigth = 3*header_heigth
                       end
                     end
                     g_width = PDF.right_pane_width
                     zoom = (g_width) / (self.date_to - self.date_from + 1)
                     g_height = 120
                     t_height = g_height + headers_heigth
                     y_start = pdf.GetY
                     # Months headers
                     month_f = self.date_from
                     left = subject_width
                     height = header_heigth
                     self.months.times do
                       width = ((month_f >> 1) - month_f) * zoom
                       pdf.SetY(y_start)
                       pdf.SetX(left)
                       pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
                       left = left + width
                       month_f = month_f >> 1
                     end
                     # Weeks headers
                     if show_weeks
                       left = subject_width
                       height = header_heigth
                       if self.date_from.cwday == 1
                         # self.date_from is monday
                         week_f = self.date_from
                       else
                         # find next monday after self.date_from
                         week_f = self.date_from + (7 - self.date_from.cwday + 1)
                         width = (7 - self.date_from.cwday + 1) * zoom-1
                         pdf.SetY(y_start + header_heigth)
                         pdf.SetX(left)
                         pdf.Cell(width + 1, height, "", "LTR")
                         left = left + width+1
                       end
                       while week_f <= self.date_to
                         width = (week_f + 6 <= self.date_to) ? 7 * zoom : (self.date_to - week_f + 1) * zoom
                         pdf.SetY(y_start + header_heigth)
                         pdf.SetX(left)
                         pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
                         left = left + width
                         week_f = week_f+7
                       end
                     end
                     # Days headers
                     if show_days
                       left = subject_width
                       height = header_heigth
                       wday = self.date_from.cwday
                       pdf.SetFontStyle('B',7)
                       (self.date_to - self.date_from + 1).to_i.times do
                         width = zoom
                         pdf.SetY(y_start + 2 * header_heigth)
                         pdf.SetX(left)
                         pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
                         left = left + width
                         wday = wday + 1
                         wday = 1 if wday > 7
                       end
                     end
                     pdf.SetY(y_start)
                     pdf.SetX(15)
                     pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
                     # Tasks
                     top = headers_heigth + y_start
                     options = {
                       :top => top,
                       :zoom => zoom,
                       :subject_width => subject_width,
                       :g_width => g_width,
                       :indent => 0,
                       :indent_increment => 5,
                       :top_increment => 5,
                       :format => :pdf,
                       :pdf => pdf
                     }
                     render(options)
                     pdf.Output
                   end
                   private
                   def coordinates(start_date, end_date, progress, zoom=nil)
                     zoom ||= @zoom
                     coords = {}
                     if start_date && end_date && start_date < self.date_to && end_date > self.date_from
                       if start_date > self.date_from
                         coords[:start] = start_date - self.date_from
                         coords[:bar_start] = start_date - self.date_from
                       else
                         coords[:bar_start] = 0
                       end
                       if end_date < self.date_to
                         coords[:end] = end_date - self.date_from
                         coords[:bar_end] = end_date - self.date_from + 1
                       else
                         coords[:bar_end] = self.date_to - self.date_from + 1
                       end
                       if progress
                         progress_date = start_date + (end_date - start_date) * (progress / 100.0)
                         if progress_date > self.date_from && progress_date > start_date
                           if progress_date < self.date_to
                             coords[:bar_progress_end] = progress_date - self.date_from + 1
                           else
                             coords[:bar_progress_end] = self.date_to - self.date_from + 1
                           end
                         end
                         if progress_date < Date.today
                           late_date = [Date.today, end_date].min
                           if late_date > self.date_from && late_date > start_date
                             if late_date < self.date_to
                               coords[:bar_late_end] = late_date - self.date_from + 1
                             else
                               coords[:bar_late_end] = self.date_to - self.date_from + 1
                             end
                           end
                         end
                       end
                     end
                     # Transforms dates into pixels witdh
                     coords.keys.each do |key|
                       coords[key] = (coords[key] * zoom).floor
                     end
                     coords
                   end
                   # Sorts a collection of issues by start_date, due_date, id for gantt rendering
                   def sort_issues!(issues)
                     issues.sort! do |a, b|
                       cmp = 0
                       cmp = (a.start_date <=> b.start_date) if a.start_date? && b.start_date?
                       cmp = (a.due_date <=> b.due_date) if cmp == 0 && a.due_date? && b.due_date?
                       cmp = (a.id <=> b.id) if cmp == 0
                       cmp
                     end
                   end
                   def current_limit
                     if @max_rows
                       @max_rows - @number_of_rows
                     else
                       nil
                     end
                   end
                   def abort?
                     if @max_rows && @number_of_rows >= @max_rows
                       @truncated = true
                     end
                   end
                   def pdf_new_page?(options)
                     if options[:top] > 180
                       options[:pdf].Line(15, options[:top], PDF::TotalWidth, options[:top])
                       options[:pdf].AddPage("L")
                       options[:top] = 15
                       options[:pdf].Line(15, options[:top] - 0.1, PDF::TotalWidth, options[:top] - 0.1)
                     end
                   end
                   def html_task(top, coords, options={})
                     output = ''
                     # Renders the task bar, with progress and late
                     if coords[:bar_start] && coords[:bar_end]
                       output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'>&nbsp;</div>"
                       if coords[:bar_late_end]
                         output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'>&nbsp;</div>"
                       end
                       if coords[:bar_progress_end]
                         output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_progress_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_done'>&nbsp;</div>"
                       end
                     end
+                    # Renders the markers
+                    if options[:markers]
+                      if coords[:start]
+                        output << "<div style='top:#{ top }px;left:#{ coords[:start] }px;width:15px;' class='#{options[:css]} marker starting'>&nbsp;</div>"
+                      end
+                      if coords[:end]
+                        output << "<div style='top:#{ top }px;left:#{ coords[:end] }px;width:15px;' class='#{options[:css]} marker ending'>&nbsp;</div>"
+                      end
+                    end
                     # Renders the label on the right
                     if options[:label]
                       output << "<div style='top:#{ top }px;left:#{ (coords[:bar_end] || 0) + 5 }px;' class='#{options[:css]} label'>"
                       output << options[:label]
                       output << "</div>"
                     end
                     # Renders the tooltip
                     if options[:issue] && coords[:bar_start] && coords[:bar_end]
                       output << "<div class='tooltip' style='position: absolute;top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] }px;height:12px;'>"
                       output << '<span class="tip">'
                       output << view.render_issue_tooltip(options[:issue])
                       output << "</span></div>"
                     end
                     output
                   end
                 end
               end
             end

public/stylesheets/application.css +5 -4

             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
             h1 {margin:0; padding:0; font-size: 24px;}
             h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #2C4056; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #header h1 a.ancestor { font-size: 80%; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #admin-menu ul {margin: 0;  padding: 0;}
             #admin-menu li {margin: 0;  padding: 0 0 12px 0; list-style-type:none;}
             #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
             #admin-menu a.projects { background-image: url(../images/projects.png); }
             #admin-menu a.users { background-image: url(../images/user.png); }
             #admin-menu a.groups { background-image: url(../images/group.png); }
             #admin-menu a.roles { background-image: url(../images/database_key.png); }
             #admin-menu a.trackers { background-image: url(../images/ticket.png); }
             #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
             #admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
             #admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
             #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
             #admin-menu a.settings { background-image: url(../images/changeset.png); }
             #admin-menu a.plugins { background-image: url(../images/plugin.png); }
             #admin-menu a.info { background-image: url(../images/help.png); }
             #admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
             * html #sidebar{ width: 22%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #sidebar .contextual { margin-right: 1em; }
             #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
             * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { min-height: 600px; }
             * html body #content { height: 600px; } /* IE */
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             #login-form input#username, #login-form input#password { width: 300px; }
             input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td { vertical-align: top; }
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 0px;}
             table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
             table.list td.buttons a { padding-right: 0.6em; }
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.project.idnt-1 td.name {padding-left: 0.5em;}
             tr.project.idnt-2 td.name {padding-left: 2em;}
             tr.project.idnt-3 td.name {padding-left: 3.5em;}
             tr.project.idnt-4 td.name {padding-left: 5em;}
             tr.project.idnt-5 td.name {padding-left: 6.5em;}
             tr.project.idnt-6 td.name {padding-left: 8em;}
             tr.project.idnt-7 td.name {padding-left: 9.5em;}
             tr.project.idnt-8 td.name {padding-left: 11em;}
             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category, td.assigned_to { white-space: normal; }
             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
             tr.issue.idnt-2 td.subject {padding-left: 2em;}
             tr.issue.idnt-3 td.subject {padding-left: 3.5em;}
             tr.issue.idnt-4 td.subject {padding-left: 5em;}
             tr.issue.idnt-5 td.subject {padding-left: 6.5em;}
             tr.issue.idnt-6 td.subject {padding-left: 8em;}
             tr.issue.idnt-7 td.subject {padding-left: 9.5em;}
             tr.issue.idnt-8 td.subject {padding-left: 11em;}
             tr.issue.idnt-9 td.subject {padding-left: 12.5em;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename { width: 30%; }
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry.file td.filename a { margin-left: 16px; }
             tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.changeset td.author { text-align: center; width: 15%; }
             tr.changeset td.committed_on { text-align: center; width: 15%; }
             table.files tr.file td { text-align: center; }
             table.files tr.file td.filename { text-align: left; padding-left: 24px; }
             table.files tr.file td.digest { font-size: 80%; }
             table.members td.roles, table.memberships td.roles { width: 45%; }
             tr.message { height: 2.6em; }
             tr.message td.subject { padding-left: 20px; }
             tr.message td.created_on { white-space: nowrap; }
             tr.message td.last_message { font-size: 80%; white-space: nowrap; }
             tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
             tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
             tr.version.closed, tr.version.closed a { color: #999; }
             tr.version td.name { padding-left: 20px; }
             tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; }
             tr.user td { width:13%; }
             tr.user td.email { width:18%; }
             tr.user td { white-space: nowrap; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.plugins td { vertical-align: middle; }
             table.plugins td.configure { text-align: right; padding-right: 1em; }
             table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
             table.plugins span.description { display: block; font-size: 0.9em; }
             table.plugins span.url { display: block; font-size: 0.9em; }
             table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; }
             table.list tbody tr.group span.count { color: #aaa; font-size: 80%; }
             table.list tbody tr:hover { background-color:#ffffdd; }
             table.list tbody tr.group:hover { background-color:inherit; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
             a.sort.asc  { background-image: url(../images/sort_asc.png); }
             a.sort.desc { background-image: url(../images/sort_desc.png); }
             table.attributes { width: 100% }
             table.attributes th { vertical-align: top; text-align: left; }
             table.attributes td { vertical-align: top; }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             td.center {text-align:center;}
             h3.version { background: url(../images/package.png) no-repeat 0% 50%; padding-left: 20px; }
             div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-left: 20px; }
             div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
             #watchers ul {margin: 0;  padding: 0;}
             #watchers li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
             #watchers select {width: 95%; display: block;}
             #watchers a.delete {opacity: 0.4;}
             #watchers a.delete:hover {opacity: 1;}
             #watchers img.gravatar {vertical-align: middle;margin: 0 4px 2px 0;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
             padding:6px;
             margin-bottom: 10px;
             background-color:#f6f6f6;
             color:#505050;
             line-height:1.5em;
             border: 1px solid #e4e4e4;
             }
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .3em .4em 0 .4em;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             acronym  { border-bottom: 1px dotted; cursor: help; }
             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             div.issue div.subject div div { padding-left: 16px; }
             div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: #999;}
             div.issue div.subject>div>p { margin-top: 0.5em; }
             div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
             #issue_tree table.issues { border: 0; }
             #issue_tree td.checkbox {display:none;}
             fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
             fieldset.collapsible legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
             fieldset.collapsible.collapsed legend { background-image: url(../images/arrow_collapsed.png); }
             fieldset#date-range p { margin: 2px 0 2px 0; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2em; }
             fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
             .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets div.changeset { padding: 4px;}
             div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
             div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap .related-issues { margin-bottom: 1em; }
             div#roadmap .related-issues td.checkbox { display: none; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary .total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr { font-style: italic; color: #777; }
             table#time-report tbody tr.last-level { font-style: normal; color: #555; }
             table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
             table#time-report .hours-dec { font-size: 0.9em; }
             form .attributes { margin-bottom: 8px; }
             form .attributes p { padding-top: 1px; padding-bottom: 2px; }
             form .attributes select { min-width: 50%; }
             ul.projects { margin: 0; padding-left: 1em; }
             ul.projects.root { margin: 0;  padding: 0; }
             ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
             ul.projects li.root { list-style-type:none; margin-bottom: 1em; }
             ul.projects li.child { list-style-type:none; margin-top: 1em;}
             ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
             .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
             #tracker_project_ids ul { margin: 0;  padding-left: 1em; }
             #tracker_project_ids li { list-style-type:none; }
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
             #workflow_copy_form select { width: 200px; }
             .pagination {font-size: 90%}
             p.pagination {margin-top:8px;}
             /***** Tabular forms ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             clear:left;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular label{
             font-weight: bold;
             float: left;
             text-align: right;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .tabular label.floating{
             font-weight: normal;
             margin-left: 0px;
             text-align: left;
             width: 270px;
             }
             .tabular label.block{
             font-weight: normal;
             margin-left: 0px !important;
             text-align: left;
             float: none;
             display: block;
             width: auto;
             }
             .tabular label.inline{
             float:none;
             margin-left: 5px !important;
             width: auto;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .tabular.settings textarea { width: 99%; }
             fieldset.settings label { display: block; }
             .parent { padding-left: 20px; }
             .required {color: #bb0000;}
             .summary {font-style: italic;}
             #attachments_fields input[type=text] {margin-left: 8px; }
             div.attachments { margin-top: 12px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             /* Project members tab */
             div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft, div#tab-content-users .splitcontentleft { width: 64% }
             div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright, div#tab-content-users .splitcontentright { width: 34% }
             div#tab-content-members fieldset, div#tab-content-memberships fieldset, div#tab-content-users fieldset { padding:1em; margin-bottom: 1em; }
             div#tab-content-members fieldset legend, div#tab-content-memberships fieldset legend, div#tab-content-users fieldset legend { font-weight: bold; }
             div#tab-content-members fieldset label, div#tab-content-memberships fieldset label, div#tab-content-users fieldset label { display: block; }
             div#tab-content-members fieldset div, div#tab-content-users fieldset div { max-height: 400px; overflow:auto; }
             table.members td.group { padding-left: 20px; background: url(../images/group.png) no-repeat 0% 50%; }
             input#principal_search, input#user_search {width:100%}
             * html div#tab-content-members fieldset div { height: 450px; }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning {
                 padding: 4px 4px 4px 30px;
                 margin-bottom: 12px;
             	font-size: 1.1em;
             	border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
             	background: url(../images/exclamation.png) 8px 50% no-repeat;
             	background-color: #ffe3e3;
             	border-color: #dd0000;
             	color: #880000;
             }
             div.flash.notice {
                 background: url(../images/true.png) 8px 5px no-repeat;
             	background-color: #dfffdf;
             	border-color: #9fcf9f;
             	color: #005f00;
             }
             div.flash.warning {
               background: url(../images/warning.png) 8px 5px no-repeat;
             	background-color: #FFEBC1;
             	border-color: #FDBF3B;
             	color: #A6750C;
               text-align: left;
             }
             .nodata, .warning {
                 text-align: center;
             	background-color: #FFEBC1;
             	border-color: #FDBF3B;
             	color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             #errorExplanation h2, #errorExplanation p { display: none; }
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
             table.cal thead th.week-number {width: auto;}
             table.cal tbody tr {height: 100px;}
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
             p.cal.legend span {display:block;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** Progress bar *****/
             table.progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 text-align: center;
                 float:left;
                 margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 0.9em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
             table.progress td.open { background: #FFF none repeat scroll 0%; }
             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-style: italic; font-size: 80%;}
             /***** Tabs *****/
             #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
             #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:1em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
             #content .tabs ul li {
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             position:relative;
             margin-bottom:-1px;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1.3em;
             padding:4px 6px 4px 6px;
             border: 1px solid #ccc;
             border-bottom: 1px solid #bbbbbb;
             background-color: #eeeeee;
             color:#777;
             font-weight:bold;
             }
             #content .tabs ul li a:hover {
             background-color: #ffffdd;
             text-decoration:none;
             }
             #content .tabs ul li a.selected {
             background-color: #fff;
             border: 1px solid #bbbbbb;
             border-bottom: 1px solid #fff;
             }
             #content .tabs ul li a.selected:hover {
             background-color: #fff;
             }
             div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
             button.tab-left, button.tab-right {
             	font-size: 0.9em;
             	cursor: pointer;
             	height:24px;
             	border: 1px solid #ccc;
             	border-bottom: 1px solid #bbbbbb;
             	position:absolute;
             	padding:4px;
             	width: 20px;
             	bottom: -1px;
             }
             button.tab-left {
             	right: 20px;
             	background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
             }
             button.tab-right {
             	right: 0;
             	background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
             }
             /***** Auto-complete *****/
             div.autocomplete {
               position:absolute;
               width:400px;
               margin:0;
               padding:0;
             }
             div.autocomplete ul {
               list-style-type:none;
               margin:0;
               padding:0;
             }
             div.autocomplete ul li {
               list-style-type:none;
               display:block;
               margin:-1px 0 0 0;
               padding:2px;
               cursor:pointer;
               font-size: 90%;
               border: 1px solid #ccc;
               border-left: 1px solid #ccc;
               border-right: 1px solid #ccc;
               background-color:white;
             }
             div.autocomplete ul li.selected { background-color: #ffb;}
             div.autocomplete ul li span.informal {
               font-size: 80%;
               color: #aaa;
             }
             #parent_issue_candidates ul li {width: 500px;}
             #related_issue_candidates ul li {width: 500px;}
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_in { background: #cfc; }
             /***** Wiki *****/
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
                 margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki .external {
                 background-position: 0% 60%;
                 background-repeat: no-repeat;
                 padding-left: 12px;
                 background-image: url(../images/external.png);
             }
             div.wiki a.new {
                 color: #b73535;
             }
             div.wiki pre {
                 margin: 1em 1em 1em 1.6em;
                 padding: 2px 2px 2px 0;
                 background-color: #fafafa;
                 border: 1px solid #dadada;
                 width:auto;
                 overflow-x: auto;
                 overflow-y: hidden;
             }
             div.wiki ul.toc {
                 background-color: #ffffdd;
                 border: 1px solid #e4e4e4;
                 padding: 4px;
                 line-height: 1.2em;
                 margin-bottom: 12px;
                 margin-right: 12px;
                 margin-left: 0;
                 display: table
             }
             * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li { list-style-type:none; margin: 0;}
             div.wiki ul.toc li li { margin-left: 1.5em; }
             div.wiki ul.toc li li li { font-size: 0.8em; }
             div.wiki ul.toc a {
                 font-size: 0.9em;
                 font-weight: normal;
                 text-decoration: none;
                 color: #606060;
             }
             div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
             a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
             a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
             h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
             div.wiki img { vertical-align: middle; }
             /***** My page layout *****/
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
               white-space:nowrap;
             }
             .task.label {width:100%;}
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .task_todo.parent { background: #888; border: 1px solid #888; height: 6px;}
             .task_late.parent, .task_done.parent { height: 3px;}
             .task_todo.parent .left  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -5px; left: 0px; top: -1px;}
             .task_todo.parent .right { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-right: -5px; right: 0px; top: -1px;}
-            .milestone { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; }
+            .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
-            .milestone_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
+            .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
-            .milestone_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
+            .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
-            .milestone_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
+            .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; }
             .project-line { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; }
             .project_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .project_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}
             /***** Icons *****/
             .icon {
             background-position: 0% 50%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-duplicate { background-image: url(../images/duplicate.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-multiple { background-image: url(../images/table_multiple.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-time-add  { background-image: url(../images/time_add.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon-comment  { background-image: url(../images/comment.png); }
             .icon-summary  { background-image: url(../images/lightning.png); }
             .icon-server-authentication { background-image: url(../images/server_key.png); }
             .icon-issue { background-image: url(../images/ticket.png); }
             .icon-zoom-in { background-image: url(../images/zoom_in.png); }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .icon-file.text-x-c { background-image: url(../images/files/c.png); }
             .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
             .icon-file.text-x-php { background-image: url(../images/files/php.png); }
             .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
             .icon-file.text-xml { background-image: url(../images/files/xml.png); }
             .icon-file.image-gif { background-image: url(../images/files/image.png); }
             .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
             .icon-file.image-png { background-image: url(../images/files/image.png); }
             .icon-file.image-tiff { background-image: url(../images/files/image.png); }
             .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
             .icon-file.application-zip { background-image: url(../images/files/zip.png); }
             .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
             img.gravatar {
             	padding: 2px;
               border: solid 1px #d5d5d5;
               background: #fff;
             }
             div.issue img.gravatar {
             	float: right;
             	margin: 0 0 0 1em;
             	padding: 5px;
             }
             div.issue table img.gravatar {
             	height: 14px;
             	width: 14px;
             	padding: 2px;
             	float: left;
             	margin: 0 0.5em 0 0;
             }
             h2 img.gravatar {
             	padding: 3px;
             	margin: -2px 4px -4px 0;
             	vertical-align: top;
             }
             h4 img.gravatar {
             	padding: 3px;
             	margin: -6px 0 -4px 0;
             	vertical-align: top;
             }
             td.username img.gravatar {
             	float: left;
             	margin: 0 1em 0 0;
             }
             #activity dt img.gravatar {
             	float: left;
             	margin: 0 1em 1em 0;
             }
             /* Used on 12px Gravatar img tags without the icon background */
             .icon-gravatar {
               float: left;
               margin-right: 4px;
             }
             #activity dt,
             .journal {
             	clear: left;
             }
             .journal-link {
             	float: right;
             }
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
             	#wiki_add_attachment { display:none; }
               .hide-when-print { display: none; }
             }

test/unit/lib/redmine/helpers/gantt_test.rb +18 -18

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../test_helper', __FILE__)
             class Redmine::Helpers::GanttTest < ActiveSupport::TestCase
               # Utility methods and classes so assert_select can be used.
               class GanttViewTest < ActionView::Base
                 include ActionView::Helpers::UrlHelper
                 include ActionView::Helpers::TextHelper
                 include ActionController::UrlWriter
                 include ApplicationHelper
                 include ProjectsHelper
                 include IssuesHelper
                 def self.default_url_options
                   {:only_path => true }
                 end
               end
               include ActionController::Assertions::SelectorAssertions
               def setup
                 @response = ActionController::TestResponse.new
                 # Fixtures
                 ProjectCustomField.delete_all
                 Project.destroy_all
                 User.current = User.find(1)
               end
               def build_view
                 @view = GanttViewTest.new
               end
               def html_document
                 HTML::Document.new(@response.body)
               end
               # Creates a Gantt chart for a 4 week span
               def create_gantt(project=Project.generate!, options={})
                 @project = project
                 @gantt = Redmine::Helpers::Gantt.new(options)
                 @gantt.project = @project
                 @gantt.query = Query.generate_default!(:project => @project)
                 @gantt.view = build_view
                 @gantt.instance_variable_set('@date_from', options[:date_from] || 2.weeks.ago.to_date)
                 @gantt.instance_variable_set('@date_to', options[:date_to] || 2.weeks.from_now.to_date)
               end
               context "#number_of_rows" do
                 context "with one project" do
                   should "return the number of rows just for that project"
                 end
                 context "with no project" do
                   should "return the total number of rows for all the projects, resursively"
                 end
                 should "not exceed max_rows option" do
                   p = Project.generate!
 .times do
                     Issue.generate_for_project!(p)
                   end
                   create_gantt(p)
                   @gantt.render
                   assert_equal 6, @gantt.number_of_rows
                   assert !@gantt.truncated
                   create_gantt(p, :max_rows => 3)
                   @gantt.render
                   assert_equal 3, @gantt.number_of_rows
                   assert @gantt.truncated
                 end
               end
               context "#number_of_rows_on_project" do
                 setup do
                   create_gantt
                 end
                 should "clear the @query.project so cross-project issues and versions can be counted" do
                   assert @gantt.query.project
                   @gantt.number_of_rows_on_project(@project)
                   assert_nil @gantt.query.project
                 end
                 should "count 1 for the project itself" do
                   assert_equal 1, @gantt.number_of_rows_on_project(@project)
                 end
                 should "count the number of issues without a version" do
                   @project.issues << Issue.generate_for_project!(@project, :fixed_version => nil)
                   assert_equal 2, @gantt.number_of_rows_on_project(@project)
                 end
                 should "count the number of versions" do
                   @project.versions << Version.generate!
                   @project.versions << Version.generate!
                   assert_equal 3, @gantt.number_of_rows_on_project(@project)
                 end
                 should "count the number of issues on versions, including cross-project" do
                   version = Version.generate!
                   @project.versions << version
                   @project.issues << Issue.generate_for_project!(@project, :fixed_version => version)
                   assert_equal 3, @gantt.number_of_rows_on_project(@project)
                 end
                 should "recursive and count the number of rows on each subproject" do
                   @project.versions << Version.generate! # +1
                   @subproject = Project.generate!(:enabled_module_names => ['issue_tracking']) # +1
                   @subproject.set_parent!(@project)
                   @subproject.issues << Issue.generate_for_project!(@subproject) # +1
                   @subproject.issues << Issue.generate_for_project!(@subproject) # +1
                   @subsubproject = Project.generate!(:enabled_module_names => ['issue_tracking']) # +1
                   @subsubproject.set_parent!(@subproject)
                   @subsubproject.issues << Issue.generate_for_project!(@subsubproject) # +1
                   assert_equal 7, @gantt.number_of_rows_on_project(@project) # +1 for self
                 end
               end
               # TODO: more of an integration test
               context "#subjects" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @version = Version.generate!(:effective_date => 1.week.from_now.to_date, :sharing => 'none')
                   @project.versions << @version
                   @issue = Issue.generate!(:fixed_version => @version,
                                            :subject => "gantt#line_for_project",
                                            :tracker => @tracker,
                                            :project => @project,
                                            :done_ratio => 30,
                                            :start_date => Date.yesterday,
                                            :due_date => 1.week.from_now.to_date)
                   @project.issues << @issue
                   @response.body = @gantt.subjects
                 end
                 context "project" do
                   should "be rendered" do
                     assert_select "div.project-name a", /#{@project.name}/
                   end
                   should "have an indent of 4" do
                     assert_select "div.project-name[style*=left:4px]"
                   end
                 end
                 context "version" do
                   should "be rendered" do
                     assert_select "div.version-name a", /#{@version.name}/
                   end
                   should "be indented 24 (one level)" do
                     assert_select "div.version-name[style*=left:24px]"
                   end
                 end
                 context "issue" do
                   should "be rendered" do
                     assert_select "div.issue-subject", /#{@issue.subject}/
                   end
                   should "be indented 44 (two levels)" do
                     assert_select "div.issue-subject[style*=left:44px]"
                   end
                 end
               end
               context "#lines" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @version = Version.generate!(:effective_date => 1.week.from_now.to_date)
                   @project.versions << @version
                   @issue = Issue.generate!(:fixed_version => @version,
                                            :subject => "gantt#line_for_project",
                                            :tracker => @tracker,
                                            :project => @project,
                                            :done_ratio => 30,
                                            :start_date => Date.yesterday,
                                            :due_date => 1.week.from_now.to_date)
                   @project.issues << @issue
                   @response.body = @gantt.lines
                 end
                 context "project" do
                   should "be rendered" do
                     assert_select "div.project_todo"
                     assert_select "div.project-line.starting"
                     assert_select "div.project-line.ending"
                     assert_select "div.label.project-name", /#{@project.name}/
                   end
                 end
                 context "version" do
                   should "be rendered" do
-                    assert_select "div.milestone_todo"
+                    assert_select "div.version.task_todo"
-                    assert_select "div.milestone.starting"
+                    assert_select "div.version.starting"
-                    assert_select "div.milestone.ending"
+                    assert_select "div.version.ending"
-                    assert_select "div.label.version-name", /#{@version.name}/
+                    assert_select "div.label.version", /#{@version.name}/
                   end
                 end
                 context "issue" do
                   should "be rendered" do
                     assert_select "div.task_todo"
                     assert_select "div.task.label", /#{@issue.done_ratio}/
                     assert_select "div.tooltip", /#{@issue.subject}/
                   end
                 end
               end
               context "#render_project" do
                 should "be tested"
               end
               context "#render_issues" do
                 should "be tested"
               end
               context "#render_version" do
                 should "be tested"
               end
               context "#subject_for_project" do
                 setup do
                   create_gantt
                 end
                 context ":html format" do
                   should "add an absolute positioned div" do
                     @response.body = @gantt.subject_for_project(@project, {:format => :html})
                     assert_select "div[style*=absolute]"
                   end
                   should "use the indent option to move the div to the right" do
                     @response.body = @gantt.subject_for_project(@project, {:format => :html, :indent => 40})
                     assert_select "div[style*=left:40]"
                   end
                   should "include the project name" do
                     @response.body = @gantt.subject_for_project(@project, {:format => :html})
                     assert_select 'div', :text => /#{@project.name}/
                   end
                   should "include a link to the project" do
                     @response.body = @gantt.subject_for_project(@project, {:format => :html})
                     assert_select 'a[href=?]', "/projects/#{@project.identifier}", :text => /#{@project.name}/
                   end
                   should "style overdue projects" do
                     @project.enabled_module_names = [:issue_tracking]
                     @project.versions << Version.generate!(:effective_date => Date.yesterday)
                     assert @project.overdue?, "Need an overdue project for this test"
                     @response.body = @gantt.subject_for_project(@project, {:format => :html})
                     assert_select 'div span.project-overdue'
                   end
                 end
                 should "test the PNG format"
                 should "test the PDF format"
               end
               context "#line_for_project" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @version = Version.generate!(:effective_date => Date.yesterday)
                   @project.versions << @version
                   @project.issues << Issue.generate!(:fixed_version => @version,
                                                      :subject => "gantt#line_for_project",
                                                      :tracker => @tracker,
                                                      :project => @project,
                                                      :done_ratio => 30,
                                                      :start_date => Date.yesterday,
                                                      :due_date => 1.week.from_now.to_date)
                 end
                 context ":html format" do
                   context "todo line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project_todo[style*=left:52px]"
                     end
                     should "be the total width of the project" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project_todo[style*=width:31px]"
                     end
                   end
                   context "late line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project_late[style*=left:52px]"
                     end
                     should "be the total delayed width of the project" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project_late[style*=width:6px]"
                     end
                   end
                   context "done line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project_done[style*=left:52px]"
                     end
                     should "Be the total done width of the project"  do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project_done[style*=left:52px]"
                     end
                   end
                   context "starting marker" do
                     should "not appear if the starting point is off the gantt chart" do
                       # Shift the date range of the chart
                       @gantt.instance_variable_set('@date_from', Date.today)
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-line.starting", false
                     end
                     should "appear at the starting point" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-line.starting[style*=left:52px]"
                     end
                   end
                   context "ending marker" do
                     should "not appear if the starting point is off the gantt chart" do
                       # Shift the date range of the chart
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-line.ending", false
                     end
                     should "appear at the end of the date range" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-line.ending[style*=left:84px]"
                     end
                   end
                   context "status content" do
                     should "appear at the far left, even if it's far in the past" do
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-name", /#{@project.name}/
                     end
                     should "show the project name" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-name", /#{@project.name}/
                     end
                     should "show the percent complete" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
                       assert_select "div.project-name", /0%/
                     end
                   end
                 end
                 should "test the PNG format"
                 should "test the PDF format"
               end
               context "#subject_for_version" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @version = Version.generate!(:effective_date => Date.yesterday)
                   @project.versions << @version
                   @project.issues << Issue.generate!(:fixed_version => @version,
                                                      :subject => "gantt#subject_for_version",
                                                      :tracker => @tracker,
                                                      :project => @project,
                                                      :start_date => Date.today)
                 end
                 context ":html format" do
                   should "add an absolute positioned div" do
                     @response.body = @gantt.subject_for_version(@version, {:format => :html})
                     assert_select "div[style*=absolute]"
                   end
                   should "use the indent option to move the div to the right" do
                     @response.body = @gantt.subject_for_version(@version, {:format => :html, :indent => 40})
                     assert_select "div[style*=left:40]"
                   end
                   should "include the version name" do
                     @response.body = @gantt.subject_for_version(@version, {:format => :html})
                     assert_select 'div', :text => /#{@version.name}/
                   end
                   should "include a link to the version" do
                     @response.body = @gantt.subject_for_version(@version, {:format => :html})
                     assert_select 'a[href=?]', Regexp.escape("/versions/show/#{@version.to_param}"), :text => /#{@version.name}/
                   end
                   should "style late versions" do
                     assert @version.overdue?, "Need an overdue version for this test"
                     @response.body = @gantt.subject_for_version(@version, {:format => :html})
                     assert_select 'div span.version-behind-schedule'
                   end
                   should "style behind schedule versions" do
                     assert @version.behind_schedule?, "Need a behind schedule version for this test"
                     @response.body = @gantt.subject_for_version(@version, {:format => :html})
                     assert_select 'div span.version-behind-schedule'
                   end
                 end
                 should "test the PNG format"
                 should "test the PDF format"
               end
               context "#line_for_version" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @version = Version.generate!(:effective_date => 1.week.from_now.to_date)
                   @project.versions << @version
                   @project.issues << Issue.generate!(:fixed_version => @version,
                                                      :subject => "gantt#line_for_project",
                                                      :tracker => @tracker,
                                                      :project => @project,
                                                      :done_ratio => 30,
-                                                     :start_date => Date.yesterday,
+                                                     :start_date => 1.week.ago.to_date,
                                                      :due_date => 1.week.from_now.to_date)
                 end
                 context ":html format" do
                   context "todo line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_todo[style*=left:52px]"
+                      assert_select "div.version.task_todo[style*=left:28px]", true, @response.body
                     end
                     should "be the total width of the version" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_todo[style*=width:31px]"
+                      assert_select "div.version.task_todo[style*=width:58px]", true, @response.body
                     end
                   end
                   context "late line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_late[style*=left:52px]"
+                      assert_select "div.version.task_late[style*=left:28px]", true, @response.body
                     end
                     should "be the total delayed width of the version" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_late[style*=width:6px]"
+                      assert_select "div.version.task_late[style*=width:30px]", true, @response.body
                     end
                   end
                   context "done line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_done[style*=left:52px]"
+                      assert_select "div.version.task_done[style*=left:28px]", true, @response.body
                     end
                     should "Be the total done width of the version"  do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_done[style*=left:52px]"
+                      assert_select "div.version.task_done[style*=width:18px]", true, @response.body
                     end
                   end
                   context "starting marker" do
                     should "not appear if the starting point is off the gantt chart" do
                       # Shift the date range of the chart
                       @gantt.instance_variable_set('@date_from', Date.today)
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.starting", false
+                      assert_select "div.version.starting", false
                     end
                     should "appear at the starting point" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.starting[style*=left:52px]"
+                      assert_select "div.version.starting[style*=left:28px]", true, @response.body
                     end
                   end
                   context "ending marker" do
                     should "not appear if the starting point is off the gantt chart" do
                       # Shift the date range of the chart
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.ending", false
+                      assert_select "div.version.ending", false
                     end
                     should "appear at the end of the date range" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.ending[style*=left:84px]"
+                      assert_select "div.version.ending[style*=left:84px]", true, @response.body
                     end
                   end
                   context "status content" do
                     should "appear at the far left, even if it's far in the past" do
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.version-name", /#{@version.name}/
+                      assert_select "div.version.label", /#{@version.name}/
                     end
                     should "show the version name" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.version-name", /#{@version.name}/
+                      assert_select "div.version.label", /#{@version.name}/
                     end
                     should "show the percent complete" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.version-name", /30%/
+                      assert_select "div.version.label", /30%/
                     end
                   end
                 end
                 should "test the PNG format"
                 should "test the PDF format"
               end
               context "#subject_for_issue" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @issue = Issue.generate!(:subject => "gantt#subject_for_issue",
                                            :tracker => @tracker,
                                            :project => @project,
                                            :start_date => 3.days.ago.to_date,
                                            :due_date => Date.yesterday)
                   @project.issues << @issue
                 end
                 context ":html format" do
                   should "add an absolute positioned div" do
                     @response.body = @gantt.subject_for_issue(@issue, {:format => :html})
                     assert_select "div[style*=absolute]"
                   end
                   should "use the indent option to move the div to the right" do
                     @response.body = @gantt.subject_for_issue(@issue, {:format => :html, :indent => 40})
                     assert_select "div[style*=left:40]"
                   end
                   should "include the issue subject" do
                     @response.body = @gantt.subject_for_issue(@issue, {:format => :html})
                     assert_select 'div', :text => /#{@issue.subject}/
                   end
                   should "include a link to the issue" do
                     @response.body = @gantt.subject_for_issue(@issue, {:format => :html})
                     assert_select 'a[href=?]', Regexp.escape("/issues/#{@issue.to_param}"), :text => /#{@tracker.name} ##{@issue.id}/
                   end
                   should "style overdue issues" do
                     assert @issue.overdue?, "Need an overdue issue for this test"
                     @response.body = @gantt.subject_for_issue(@issue, {:format => :html})
                     assert_select 'div span.issue-overdue'
                   end
                 end
                 should "test the PNG format"
                 should "test the PDF format"
               end
               context "#line_for_issue" do
                 setup do
                   create_gantt
                   @project.enabled_module_names = [:issue_tracking]
                   @tracker = Tracker.generate!
                   @project.trackers << @tracker
                   @version = Version.generate!(:effective_date => 1.week.from_now.to_date)
                   @project.versions << @version
                   @issue = Issue.generate!(:fixed_version => @version,
                                            :subject => "gantt#line_for_project",
                                            :tracker => @tracker,
                                            :project => @project,
                                            :done_ratio => 30,
                                            :start_date => 1.week.ago.to_date,
                                            :due_date => 1.week.from_now.to_date)
                   @project.issues << @issue
                 end
                 context ":html format" do
                   context "todo line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_todo[style*=left:28px]", true, @response.body
                     end
                     should "be the total width of the issue" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_todo[style*=width:58px]", true, @response.body
                     end
                   end
                   context "late line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_late[style*=left:28px]", true, @response.body
                     end
                     should "be the total delayed width of the issue" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_late[style*=width:30px]", true, @response.body
                     end
                   end
                   context "done line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_done[style*=left:28px]", true, @response.body
                     end
                     should "Be the total done width of the issue"  do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_done[style*=width:18px]", true, @response.body
                     end
                     should "not be the total done width if the chart starts after issue start date"  do
                       create_gantt(@project, :date_from => 5.days.ago.to_date)
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task_done[style*=left:0px]", true, @response.body
                       assert_select "div.task_done[style*=width:10px]", true, @response.body
                     end
                   end
                   context "status content" do
                     should "appear at the far left, even if it's far in the past" do
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task.label", true, @response.body
                     end
                     should "show the issue status" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task.label", /#{@issue.status.name}/
                     end
                     should "show the percent complete" do
                       @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                       assert_select "div.task.label", /30%/
                     end
                   end
                 end
                 should "have an issue tooltip" do
                   @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4})
                   assert_select "div.tooltip", /#{@issue.subject}/
                 end
                 should "test the PNG format"
                 should "test the PDF format"
               end
               context "#to_image" do
                 should "be tested"
               end
               context "#to_pdf" do
                 should "be tested"
               end
             end

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