jro_apps/redmine Commit - r4663:77c4667dbc19

Merged r4782 from trunk....

Jean-Philippe Lang -

r4663:77c4667dbc19

parent child

Context file:

r4663:77c4667dbc19

Collapse all files

app/views/gantts/show.html.erb +1 -1

              # Width of the entire chart
              g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
-             @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width, :subject_width => subject_width)
+             @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width)
              g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max
              t_height = g_height + headers_height

lib/redmine/helpers/gantt.rb +5 -5

                    def subject_for_project(project, options)
                      case options[:format]
                      when :html
-                       subject = "<span class='gantt_subject-text icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>"
+                       subject = "<span class='icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>"
                        subject << view.link_to_project(project)
                        subject << '</span>'
                        html_subject(options, subject, :css => "project-name")
                    def subject_for_version(version, options)
                      case options[:format]
                      when :html
-                       subject = "<span class='gantt_subject-text icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>"
+                       subject = "<span class='icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>"
                        subject << view.link_to_version(version)
                        subject << '</span>'
                        html_subject(options, subject, :css => "version-name")
                      output = case options[:format]
                      when :html
-                       css_classes = 'gantt_subject-text'
+                       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
                        end
                        subject << view.link_to_issue(issue)
                        subject << '</span>'
-                       html_subject(options, subject, :css => 'issue-subject') + "\n"
+                       html_subject(options, subject, :css => "issue-subject") + "\n"
                      when :image
                        image_subject(options, issue.subject)
                      when :pdf
                    end
                    def html_subject(params, subject, options={})
-                     output = "<div class='gantt_subject #{options[:css] }' style='top:#{params[:top]}px;left:#{params[:indent]}px;width:#{params[:subject_width]-params[:indent]}px;'>"
+                     output = "<div class=' #{options[:css] }' style='position: absolute;line-height:1.2em;height:16px;top:#{params[:top]}px;left:#{params[:indent]}px;overflow:hidden;'>"
                      output << subject
                      output << "</div>"
                      @subjects << output

public/stylesheets/application.css 0 -2

              }
              .gantt_subjects { font-size: 0.8em; }
-             .gantt_subject { position: absolute; line-height: 1.2em; height: 16px; overflow: hidden; text-overflow: ellipsis; }
-             .gantt_subject-text { float: left; white-space: nowrap; }
              .task {
                position: absolute;

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