##// END OF EJS Templates
Merged r4913, r4914, r4916 from trunk....
Jean-Philippe Lang -
r4893:f6f7467cdd98
parent child
Show More
@@ -60,7 +60,7 end
60 # Width of the entire chart
60 # Width of the entire chart
61 g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
61 g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
62
62
63 @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width)
63 @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width, :subject_width => subject_width)
64
64
65 g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max
65 g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max
66 t_height = g_height + headers_height
66 t_height = g_height + headers_height
@@ -357,7 +357,7 module Redmine
357 end
357 end
358 subject << view.link_to_issue(issue)
358 subject << view.link_to_issue(issue)
359 subject << '</span>'
359 subject << '</span>'
360 html_subject(options, subject, :css => "issue-subject") + "\n"
360 html_subject(options, subject, :css => "issue-subject", :title => issue.subject) + "\n"
361 when :image
361 when :image
362 image_subject(options, issue.subject)
362 image_subject(options, issue.subject)
363 when :pdf
363 when :pdf
@@ -709,9 +709,10 module Redmine
709 end
709 end
710
710
711 def html_subject(params, subject, options={})
711 def html_subject(params, subject, options={})
712 output = "<div class=' #{options[:css] }' style='position: absolute;line-height:1.2em;height:16px;top:#{params[:top]}px;left:#{params[:indent]}px;overflow:hidden;'>"
712 style = "position: absolute;top:#{params[:top]}px;left:#{params[:indent]}px;"
713 output << subject
713 style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width]
714 output << "</div>"
714
715 output = view.content_tag 'div', subject, :class => options[:css], :style => style, :title => options[:title]
715 @subjects << output
716 @subjects << output
716 output
717 output
717 end
718 end
@@ -783,6 +783,7 background-image:url('../images/close_hl.png');
783 }
783 }
784
784
785 .gantt_subjects { font-size: 0.8em; }
785 .gantt_subjects { font-size: 0.8em; }
786 .gantt_subjects div { line-height:1.2em;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
786
787
787 .task {
788 .task {
788 position: absolute;
789 position: absolute;
General Comments 0
You need to be logged in to leave comments. Login now