diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-30 06:54:51 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-30 06:54:51 +0000 |
commit | f05fdd5cfa8a5b628ed3b463b62c2f7afde01a52 (patch) | |
tree | e7393b02df42fcf5fcdade87708584fabf4471a3 | |
parent | a0bb70ed2d7769da869d25090cdd3c4895c076cf (diff) | |
download | redmine-f05fdd5cfa8a5b628ed3b463b62c2f7afde01a52.tar.gz redmine-f05fdd5cfa8a5b628ed3b463b62c2f7afde01a52.zip |
Merged r4780 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4781 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r-- | app/views/gantts/show.html.erb | 2 | ||||
-rw-r--r-- | lib/redmine/helpers/gantt.rb | 10 | ||||
-rw-r--r-- | public/stylesheets/application.css | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 820366279..05c015bed 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -60,7 +60,7 @@ end # 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) +@gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width, :subject_width => subject_width) g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max t_height = g_height + headers_height diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index b0d722906..d4323f6b9 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -263,7 +263,7 @@ module Redmine def subject_for_project(project, options) case options[:format] when :html - subject = "<span class='icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>" + subject = "<span class='gantt_subject-text icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>" subject << view.link_to_project(project) subject << '</span>' html_subject(options, subject, :css => "project-name") @@ -301,7 +301,7 @@ module Redmine def subject_for_version(version, options) case options[:format] when :html - subject = "<span class='icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>" + subject = "<span class='gantt_subject-text 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") @@ -345,7 +345,7 @@ module Redmine output = case options[:format] when :html - css_classes = '' + css_classes = 'gantt_subject-text' 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 @@ -357,7 +357,7 @@ module Redmine 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 @@ -709,7 +709,7 @@ module Redmine end def html_subject(params, subject, options={}) - 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 = "<div class='gantt_subject #{options[:css] }' style='top:#{params[:top]}px;left:#{params[:indent]}px;width:#{params[:subject_width]-params[:indent]}px;'>" output << subject output << "</div>" @subjects << output diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 7fa1d2f9e..05f4e8249 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -783,6 +783,8 @@ background-image:url('../images/close_hl.png'); } .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; |