jro_apps/redmine Commit - r425:708c3c9ec6ef

Added versions due dates on gantt chart....

Jean-Philippe Lang -

r425:708c3c9ec6ef

parent child

Context file:

r425:708c3c9ec6ef

Collapse all files

app/controllers/projects_controller.rb +4 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'csv'
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init "#{Project.table_name}.name", "asc"
                 sort_update
                 @project_count = Project.count(:all, :conditions => ["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["#{Project.table_name}.is_public=?", true],
             						:include => :parent,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if params[:repository_enabled] && params[:repository_enabled] == "1"
                     @project.repository = Repository.new
                     @project.repository.attributes = params[:repository]
                   end
                   if "1" == params[:wiki_enabled]
                     @project.wiki = Wiki.new
                     @project.wiki.attributes = params[:wiki]
                   end
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role], :order => 'position')
                 @subprojects = @project.children if @project.children.size > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = Tracker.find(:all, :order => 'position')
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find(:all, :order => 'position')
                 @users = User.find_active(:all) - @project.users
                 @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if params[:repository_enabled]
                     case params[:repository_enabled]
                     when "0"
                       @project.repository = nil
                     when "1"
                       @project.repository ||= Repository.new
                       @project.repository.update_attributes params[:repository]
                     end
                   end
                   if params[:wiki_enabled]
                     case params[:wiki_enabled]
                     when "0"
                       @project.wiki.destroy if @project.wiki
                     when "1"
                       @project.wiki ||= Wiki.new
                       @project.wiki.update_attributes params[:wiki]
                     end
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :tab => 'categories', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :tab => 'members', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members.find(:all)
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   # Save the attachments
                   params[:attachments].each { |a|
                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :action => 'list_documents', :id => @project
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents.find :all, :include => :category
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 default_status = IssueStatus.default
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 @issue.status = default_status
                 @allowed_statuses = default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 if request.get?
                   @issue.start_date = Date.today
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Multiple file upload
                   @attachments = []
                   params[:attachments].each { |a|
                     @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     @attachments.each(&:save)
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 @results_per_page_options = [ 15, 25, 50, 100 ]
                 if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
                   @results_per_page = params[:per_page].to_i
                   session[:results_per_page] = @results_per_page
                 else
                   @results_per_page = session[:results_per_page] || 25
                 end
                 if @query.valid?
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :assigned_to, :status, :tracker, :project, :priority ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
                 @trackers = Tracker.find :all, :order => 'position'
                 render :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#", l(:field_status),
                                    l(:field_tracker),
                                    l(:field_priority),
                                    l(:field_subject),
                                    l(:field_assigned_to),
                                    l(:field_author),
                                    l(:field_start_date),
                                    l(:field_due_date),
                                    l(:field_done_ratio),
                                    l(:field_created_on),
                                    l(:field_updated_on)
                                    ]
                   for custom_field in @project.all_custom_fields
                     headers << custom_field.name
                   end
                   csv << headers.collect {|c| ic.iconv(c) }
                   # csv lines
                   @issues.each do |issue|
                     fields = [issue.id, issue.status.name,
                                         issue.tracker.name,
                                         issue.priority.name,
                                         issue.subject,
                                         (issue.assigned_to ? issue.assigned_to.name : ""),
                                         issue.author.name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                                         issue.due_date ? l_date(issue.due_date) : nil,
                                         issue.done_ratio,
                                         l_datetime(issue.created_on),
                                         l_datetime(issue.updated_on)
                                         ]
                     for custom_field in @project.all_custom_fields
                       fields << (show_value issue.custom_value_for(custom_field))
                     end
                     csv << fields.collect {|c| ic.iconv(c.to_s) }
                   end
                 end
                 export.rewind
                 send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
               end
               # Export filtered/sorted issues to PDF
               def export_issues_pdf
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :priority ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
                 render :layout => false
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :action => 'list_issues', :id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role)}
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? and params[:new_project_id] and params[:new_tracker_id]
                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
                     # project dependent properties
                     unless i.project_id == new_project.id
                       i.category = nil
                       i.fixed_version = nil
                     end
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker
                     i.save
                   }
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list_issues', :id => @project
                 end
               end
               def add_query
                 @query = Query.new(params[:query])
                 @query.project = @project
                 @query.user = logged_in_user
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                 end if params[:fields]
                 if request.post? and @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
                 end
                 render :layout => false if request.xhr?
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "#{News.table_name}.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   # Save the attachments
                   @attachments = []
                   params[:attachments].each { |file|
                     next unless file.size > 0
                     a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
                     @attachments << a unless a.new_record?
                   } if params[:attachments] and params[:attachments].is_a? Array
                   Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "#{IssueStatus.table_name}.is_closed=? and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}) and #{Issue.table_name}.fixed_version_id is not null", true],
                   :order => "#{Version.table_name}.effective_date DESC, #{Issue.table_name}.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.find(:all,
                   :conditions => [ "#{Version.table_name}.effective_date>?", Date.today],
                   :order => "#{Version.table_name}.effective_date ASC"
                 )
               end
               def activity
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 @events_by_day = {}
                 unless params[:show_issues] == "0"
                   @project.issues.find(:all, :include => [:author, :status], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_issues = 1
                 end
                 unless params[:show_news] == "0"
                   @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_news = 1
                 end
                 unless params[:show_files] == "0"
                   Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_files = 1
                 end
                 unless params[:show_documents] == "0"
                   @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
                 unless params[:show_wiki_edits] == "0"
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comment, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
                   conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
                                 @project.id, @date_from, @date_to]
                   WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions).each { |i|
                     # We provide this alias so all events can be treated in the same manner
                     def i.created_on
                       self.updated_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_wiki_edits = 1
                 end
                 unless @project.repository.nil? || params[:show_changesets] == "0"
                   @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to]).each { |i|
                     def i.created_on
                       self.committed_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_changesets = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 # start on monday
                 @date_from = @date_from - (@date_from.cwday-1)
                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @issues = Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority],
                                        :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @issues ||=[]
                 @ending_issues_by_days = @issues.group_by {|issue| issue.due_date}
                 @starting_issues_by_days = @issues.group_by {|issue| issue.start_date}
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= (Date.today << 1).month
                   @year_from ||= (Date.today << 1).year
                 end
                 @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
                 @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
+                @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
-                  @issues = Issue.find(:all,
+                  @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
-                @issues ||=[]
+                @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
+                @events.sort! {|x,y| x.start_date <=> y.start_date }
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
               def search
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
                 @scope = params[:scope] || (params[:submit] ? [] : %w(issues changesets news documents wiki) )
                 # tokens must be at least 3 character long
                 @tokens = @question.split.uniq.select {|w| w.length > 2 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w}%"}
                   operator = @all_words ? " AND " : " OR "
                   limit = 10
                   @results = []
                   @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
                   @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
                   @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
                   @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki')
                   @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comment) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
                   @question = @tokens.join(" ")
                 else
                   @question = ""
                 end
               end
               def feeds
                 @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                 @key = logged_in_user.get_or_create_rss_key.value if logged_in_user
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
                 @html_title = @project.name
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = @project.queries.find(params[:query_id])
                   session[:query] = @query
                 else
                   if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = @query
                   else
                     @query = session[:query]
                   end
                 end
               end
             end

app/models/version.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006  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.
             class Version < ActiveRecord::Base
               before_destroy :check_integrity
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
               has_many :attachments, :as => :container, :dependent => :destroy
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date
+              def start_date
+                effective_date
+              end
+              def due_date
+                effective_date
+              end
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)
               end
             end

app/views/projects/gantt.rfpdf +50 -31

             <%
             pdf=IfpdfHelper::IFPDF.new(current_language)
             pdf.SetTitle("#{@project.name} - #{l(:label_gantt)}")
             pdf.AliasNbPages
             pdf.footer_date = format_date(Date.today)
             pdf.AddPage("L")
             pdf.SetFontStyle('B',12)
             pdf.SetX(15)
             pdf.Cell(70, 20, @project.name)
             pdf.Ln
             pdf.SetFontStyle('B',9)
             subject_width = 70
             header_heigth = 5
             headers_heigth = header_heigth
             show_weeks = false
             show_days = false
             if @months < 7
                 show_weeks = true
                 headers_heigth = 2*header_heigth
                 if @months < 3
                     show_days = true
                     headers_heigth = 3*header_heigth
                 end
             end
             g_width = 210
             zoom = (g_width) / (@date_to - @date_from + 1)
             g_height = 120
             t_height = g_height + headers_heigth
             y_start = pdf.GetY
             #
             # Months headers
             #
             month_f = @date_from
             left = subject_width
             height = header_heigth
             @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 @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-1
             		pdf.SetY(y_start + header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width + 1, height, "", "LTR")
             		left = left + width+1
             	end
             	while week_f <= @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom : (@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 = @date_from.cwday
             	pdf.SetFontStyle('B',7)
             	(@date_to - @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)[0,1], "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
             pdf.SetFontStyle('B',7)
-            @issues.each do |i|
+            @events.each do |i|
             	pdf.SetY(top)
             	pdf.SetX(15)
-            	pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
+            	if i.is_a? Issue
+            		pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
+            	else
+            		pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR")
+            	end
             	pdf.SetY(top)
             	pdf.SetX(subject_width)
             	pdf.Cell(g_width, 5, "", "LR")
+            	pdf.SetY(top+1.5)
-            	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
+            	if i.is_a? Issue
-            	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+            		i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
+            		i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
-            	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
-            	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
+            		i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
-            	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
+            		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)*zoom)
+            		i_width = ((i_end_date - i_start_date + 1)*zoom)
+            		d_width = ((i_done_date - i_start_date)*zoom)
+            		l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
+            		l_width ||= 0
-            	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+            		pdf.SetX(subject_width + i_left)
+            		pdf.SetFillColor(200,200,200)
+            		pdf.Cell(i_width, 2, "", 0, 0, "", 1)
-            	i_left = ((i_start_date - @date_from)*zoom)
+            		if l_width > 0
-            	i_width = ((i_end_date - i_start_date + 1)*zoom)
+            			pdf.SetY(top+1.5)
-            	d_width = ((i_done_date - i_start_date)*zoom)
+            			pdf.SetX(subject_width + i_left)
-            	l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
+            			pdf.SetFillColor(255,100,100)
-            	l_width ||= 0
+            			pdf.Cell(l_width, 2, "", 0, 0, "", 1)
+            		end
-            	pdf.SetY(top+1.5)
+            		if d_width > 0
-            	pdf.SetX(subject_width + i_left)
+            			pdf.SetY(top+1.5)
-            	pdf.SetFillColor(200,200,200)
+            			pdf.SetX(subject_width + i_left)
-            	pdf.Cell(i_width, 2, "", 0, 0, "", 1)
+            			pdf.SetFillColor(100,100,255)
+            			pdf.Cell(d_width, 2, "", 0, 0, "", 1)
-            	if l_width > 0
+            		end
             		pdf.SetY(top+1.5)
+            		pdf.SetX(subject_width + i_left + i_width)
+            		pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
+            	else
+            		i_left = ((i.start_date - @date_from)*zoom)
             		pdf.SetX(subject_width + i_left)
-            		pdf.SetFillColor(255,100,100)
+            		pdf.SetFillColor(50,200,50)
-            		pdf.Cell(l_width, 2, "", 0, 0, "", 1)
+            		pdf.Cell(2, 2, "", 0, 0, "", 1)
-            	end
-            	if d_width > 0
             		pdf.SetY(top+1.5)
-            		pdf.SetX(subject_width + i_left)
+            		pdf.SetX(subject_width + i_left + 3)
-            		pdf.SetFillColor(100,100,255)
+            		pdf.Cell(30, 2, "#{i.name}")
-            		pdf.Cell(d_width, 2, "", 0, 0, "", 1)
             	end
-            	pdf.SetY(top+1.5)
-            	pdf.SetX(subject_width + i_left + i_width)
-            	pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
             	top = top + 5
             	pdf.SetDrawColor(200, 200, 200)
             	pdf.Line(15, top, subject_width+g_width, top)
             	if pdf.GetY() > 180
             		pdf.AddPage("L")
             		top = 20
             		pdf.Line(15, top, subject_width+g_width, top)
             	end
             	pdf.SetDrawColor(0, 0, 0)
             end
             pdf.Line(15, top, subject_width+g_width, top)
             %>
             <%= pdf.Output %>

app/views/projects/gantt.rhtml +20 -8

             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :output => 'pdf'}, :class => 'icon icon-pdf' %>
             </div>
             <h2><%= l(:label_gantt) %></h2>
             <% form_tag do %>
             <table width="100%">
             <tr>
             <td align="left">
                 <input type="text" name="months" size="2" value="<%= @months %>" />
                 <%= l(:label_months_from) %>
                 <%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
                 <%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
                 <%= hidden_field_tag 'zoom', @zoom %>
                 <%= submit_tag l(:button_submit), :class => "button-small" %>
             </td>
             <td>
                 <a href="#" onclick="Element.toggle('trackerselect')"><%= l(:label_options) %></a>
                 <div id="trackerselect" class="rightbox overlay" style="width:140px; display: none;">
                 <p><strong><%=l(:label_tracker_plural)%></strong></p>
                 <% @trackers.each do |tracker| %>
                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
                 <% if @project.children.any? %>
                 <p><strong><%=l(:label_subproject_plural)%></strong></p>
                 <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
                 <% end %>
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
                 </div>
             </td>
             <td align="right">
             <%= if @zoom < 4
                 link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_in_g.png'
               end %>
             <%= if @zoom > 1
                 link_to image_tag('zoom_out.png'),{:zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_out_g.png'
               end %>
             </td>
             </tr>
             </table>
             <% end %>
             <% zoom = 1
             @zoom.times { zoom = zoom * 2 }
             subject_width = 260
             header_heigth = 18
             headers_height = header_heigth
             show_weeks = false
             show_days = false
             if @zoom >1
                 show_weeks = true
                 headers_height = 2*header_heigth
                 if @zoom > 2
                     show_days = true
                     headers_height = 3*header_heigth
                 end
             end
             g_width = (@date_to - @date_from + 1)*zoom
-            g_height = [(20 * @issues.length + 6)+150, 206].max
+            g_height = [(20 * @events.length + 6)+150, 206].max
             t_height = g_height + headers_height
             %>
             <table width="100%" style="border:0; border-collapse: collapse;">
             <tr>
             <td style="width:260px;">
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
             <%
             #
             # Tasks subjects
             #
             top = headers_height + 8
-            @issues.each do |i| %>
+            @events.each do |i| %>
-                <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;">
+                <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
-              	<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
+                <% if i.is_a? Issue %>
-              	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+                  	<%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
-              	</div>
+                  	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %>
+              	<% else %>
+                  	<strong><%= "#{l(:label_version)}: #{i.name}" %></strong>
+              	<% end %>
+              	</small></div>
                 <% top = top + 20
             end %>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @months.times do
             	width = ((month_f >> 1) - month_f) * zoom - 1
             	%>
             	<div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
             	<%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
             	</div>
             	<%
             	left = left + width + 1
             	month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
             	left = 0
             	height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
             	if @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-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
             		<%
             		left = left + width+1
             	end %>
             	<%
             	while week_f <= @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
             		<small><%= week_f.cweek if width >= 16 %></small>
             		</div>
             		<%
             		left = left + width+1
             		week_f = week_f+7
             	end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
             	left = 0
             	height = g_height + header_heigth - 1
             	wday = @date_from.cwday
             	(@date_to - @date_from + 1).to_i.times do
             	width =  zoom - 1
             	%>
             	<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
             	<%= day_name(wday)[0,1] %>
             	</div>
             	<%
             	left = left + width+1
             	wday = wday + 1
             	wday = 1 if wday > 7
             	end
             end %>
             <%
             #
             # Today red line
             #
             if Date.today >= @date_from and Date.today <= @date_to %>
                 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             <%
             #
             # Tasks
             #
             top = headers_height + 10
-            @issues.each do |i| %>
+            @events.each do |i|
-            	<%
+              if i.is_a? Issue
             	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
             	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
             	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.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)*zoom).floor
             	i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2                  # total width of the issue (- 2 for left and right borders)
             	d_width = ((i_done_date - i_start_date)*zoom).floor - 2                     # done width
             	l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
             	%>
             	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
             	<% if l_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
             	<% end %>
             	<% if d_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
             	<% end %>
             	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
             	<%= i.status.name %>
             	<%= (i.done_ratio).to_i %>%
             	</div>
             	<% # === tooltip === %>
             	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
             	<span class="tip">
                 <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
             	</span></div>
+            <% else
+                i_left = ((i.start_date - @date_from)*zoom).floor
+                %>
+                <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
+            	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
+            	<strong><%= i.name %></strong>
+            	</div>
+            <% end %>
             	<% top = top + 20
             end %>
             </div>
             </td>
             </tr>
             </table>
             <table width="100%">
             <tr>
             <td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             </tr>
             </table>

public/stylesheets/application.css +1 0

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             margin:0;
             }
             a{color:#467aa7;font-weight:bold;text-decoration:none;background-color:inherit;}
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{margin:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:0;
             padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             }
             #header{
             height:4.5em;
             margin:0;
             background:#467aa7;
             color:#ffffff;
             margin-bottom:1px;
             }
             #header h1{
             padding:10px 0 0 20px;
             font-size:2em;
             background-color:inherit;
             color:#fff;
             letter-spacing:-1px;
             font-weight:bold;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header h2{
             margin:3px 0 0 40px;
             font-size:1.5em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #navigation{
             height:2.2em;
             line-height:2.2em;
             margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             #navigation li.submenu {background:url(../images/arrow_down.png) 96% 80% no-repeat;}
             #navigation li.submenu a {padding:0px 16px 0px 22px;}
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons *******************/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             vertical-align: middle;
             }
             #navigation .icon {
             background-position: 4px 50%;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.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-pdf { background-image: url(../images/pdf.png); }
             .icon-csv { background-image: url(../images/csv.png); }
             .icon-html { background-image: url(../images/html.png); }
             .icon-txt { background-image: url(../images/txt.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.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-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-feed  { background-image: url(../images/feed.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             /**************** Content styles ****************/
             html>body #content {
             height: auto;
             min-height: 500px;
             }
             #content{
             width: auto;
             height:500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2, #content div.wiki h1 {
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
             #content h4{font-size: 1em; margin-bottom: 12px; margin-top: 20px; font-weight: normal; border-bottom: dotted 1px #c0c0c0;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             #content .tabs{height: 2.6em;}
             #content .tabs ul{margin:0;}
             #content .tabs ul li{
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1em;
             padding:4px;
             border: 1px solid #c0c0c0;
             }
             #content .tabs ul li a.selected, #content .tabs ul li a:hover{
             background-color: #80b0da;
             border: 1px solid #80b0da;
             color: #fff;
             text-decoration:none;
             }
             /***********************************************/
             form {display: inline;}
             blockquote {padding-left: 6px; border-left: 2px solid #ccc;}
             input, select {vertical-align: middle; margin-bottom: 4px;}
             input.button-small {font-size: 0.8em;}
             textarea.wiki-edit { width: 99.5%; }
             .select-small {font-size: 0.8em;}
             label {font-weight: bold; font-size: 1em; color: #505050;}
             fieldset {border:1px solid #c0c0c0; padding: 6px;}
             legend {color: #505050;}
             .required {color: #bb0000;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             hr { border:0; border-top: dotted 1px #fff; border-bottom: dotted 1px #c0c0c0; }
             table p {margin:0; padding:0;}
             .highlight { background-color: #FCFD8D;}
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .4em .5em 0 0;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             ul.documents {
             list-style-type: none;
             padding: 0;
             margin: 0;
             }
             ul.documents li {
             background-image: url(../images/32x32/file.png);
             background-repeat: no-repeat;
             background-position: 0 1px;
             padding-left: 36px;
             margin-bottom: 10px;
             margin-left: -37px;
             }
             /********** Table used to display lists of things ***********/
             table.list {
                 width:100%;
                 border-collapse: collapse;
                 border: 1px dotted #d0d0d0;
                 margin-bottom: 6px;
             }
             table.with-cells td {
                 border: 1px solid #d7d7d7;
             }
             table.list td {
                 padding:2px;
             }
             table.list thead th {
                 text-align: center;
                 background: #eee;
                 border: 1px solid #d7d7d7;
                 color: #777;
             }
             table.list tbody th {
             	font-weight: normal;
                 background: #eed;
                 border: 1px solid #d7d7d7;
             }
             /********** Validation error messages *************/
             #errorExplanation {
               width: 400px;
               border: 0;
               padding: 7px;
               padding-bottom: 3px;
               margin-bottom: 0px;
             }
             #errorExplanation h2 {
               text-align: left;
               font-weight: bold;
               padding: 5px 5px 10px 26px;
               font-size: 1em;
               margin: -7px;
               background: url(../images/alert.png) no-repeat 6px 6px;
             }
             #errorExplanation p {
               color: #333;
               margin-bottom: 0;
               padding: 5px;
             }
             #errorExplanation ul li {
               font-size: 1em;
               list-style: none;
               margin-left: -16px;
             }
             /*==========  Drop down menu  ==============*/
             div.menu {
               background-color: #FFFFFF;
               border-style: solid;
               border-width: 1px;
               border-color: #7F9DB9;
               position: absolute;
               top: 0px;
               left: 0px;
               padding: 0;
               visibility: hidden;
               z-index: 101;
             }
             div.menu a.menuItem {
               font-size: 10px;
               font-weight: normal;
               line-height: 2em;
               color: #000000;
               background-color: #FFFFFF;
               cursor: default;
               display: block;
               padding: 0 1em;
               margin: 0;
               border: 0;
               text-decoration: none;
               white-space: nowrap;
             }
             div.menu a.menuItem:hover, div.menu a.menuItemHighlight {
               background-color: #80b0da;
               color: #ffffff;
             }
             div.menu a.menuItem span.menuItemText {}
             div.menu a.menuItem span.menuItemArrow {
               margin-right: -.75em;
             }
             /**************** Sidebar styles ****************/
             #subcontent{
             position: absolute;
             left: 0px;
             width:110px;
             padding:20px 20px 10px 5px;
             }
             #subcontent h2{
             display:block;
             margin:0 0 5px 0;
             font-size:1.0em;
             font-weight:bold;
             text-align:left;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             padding:5px 0;
             margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
             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');
             }
             .rightbox{
             background: #fafbfc;
             border: 1px solid #c0c0c0;
             float: right;
             padding: 8px;
             position: relative;
             margin: 0 5px 5px;
             }
             .overlay{
             position: absolute;
             margin-left:0;
             z-index: 50;
             }
             .layout-active {
             background: #ECF3E1;
             }
             .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;
             }
             .login {
             width: 50%;
             text-align: left;
             }
             img.calendar-trigger {
                 cursor: pointer;
                 vertical-align: middle;
                 margin-left: 4px;
             }
             #history p {
                 margin-left: 34px;
             }
             .progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 padding: 3px;
                 width: 40em;
                 text-align: center;
             }
             .progress td { height: 1em; }
             .progress .closed { background: #BAE0BA none repeat scroll 0%; }
             .progress .open { background: #FFF none repeat scroll 0%; }
             /***** Contextual links div *****/
             .contextual {
             float: right;
             font-size: 0.8em;
             line-height: 16px;
             padding: 2px;
             }
             .contextual select, .contextual input {
             font-size: 1em;
             }
             /***** 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;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
+            .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** 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;
             }
             /***** CSS FORM ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .error {
             color: #cc0000;
             }
             #settings .tabular p{ padding-left: 250px; }
             #settings .tabular label{ margin-left: -250px; width: 245px; }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
             to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
             */
             * html .threepxfix{
             margin-left: 3px;
             }
             /***** Wiki sections ****/
             #content div.wiki { font-size: 110%}
             #content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
             #content div.wiki h2 { font-size: 1.4em;}
             #content div.wiki h3 { font-size: 1.2em;}
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
             }
             div.wiki table, div.wiki td {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki code {
                 font-size: 1.2em;
             }
             #preview .preview { background: #fafbfc url(../images/draft.png); }

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