From 48d3ab5f4449aeaef4d3e332b8af1700eebc4dc6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 30 Jan 2011 09:09:50 +0000 Subject: [PATCH] Reverted r4780 that broke gantt tests (#7280). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4782 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/gantts/show.html.erb | 2 +- lib/redmine/helpers/gantt.rb | 10 +++++----- public/stylesheets/application.css | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 05c015bed..820366279 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, :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 diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index d4323f6b9..b0d722906 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 = "" + subject = "" subject << view.link_to_project(project) subject << '' 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 = "" + subject = "" subject << view.link_to_version(version) subject << '' html_subject(options, subject, :css => "version-name") @@ -345,7 +345,7 @@ module Redmine 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 @@ -357,7 +357,7 @@ module Redmine end subject << view.link_to_issue(issue) subject << '' - 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 = "
" + output = "
" output << subject output << "
" @subjects << output diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9152515c1..8ec94f3a9 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -783,8 +783,6 @@ 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; -- 2.39.5