diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-21 15:06:11 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-21 15:06:11 +0000 |
| commit | 2f7084f7a27671c5f0b2db55fe3bdafe507f4f12 (patch) | |
| tree | 7217a6d6ebfd82e07d548966c61f34480403b914 | |
| parent | 111ae3c2e95843b1506a68541f0a9198a1e8724f (diff) | |
| download | redmine-2f7084f7a27671c5f0b2db55fe3bdafe507f4f12.tar.gz redmine-2f7084f7a27671c5f0b2db55fe3bdafe507f4f12.zip | |
Prevent text wrap in gantt subjects (#7280).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4913 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/gantts/show.html.erb | 2 | ||||
| -rw-r--r-- | lib/redmine/helpers/gantt.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 33220eea9..1e38647ee 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..d4492ec68 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -709,7 +709,10 @@ 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;'>" + style = "position: absolute;line-height:1.2em;height:16px;top:#{params[:top]}px;left:#{params[:indent]}px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis;" + style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width] + + output = "<div class='#{options[:css]}' style='#{style}'>" output << subject output << "</div>" @subjects << output |