Merged r4913, r4914, r4916 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5013 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
4d0a955d3c
commit
f6f7467cdd
3 files changed
+7
-5
No files matched your search
@@ -60,7 +60,7 @@ end
|
|||||||
# Width of the entire chart
|
# Width of the entire chart
|
||||||
g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
|
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
|
g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max
|
||||||
t_height = g_height + headers_height
|
t_height = g_height + headers_height
|
||||||
|
|||||||
@@ -357,7 +357,7 @@ module Redmine
|
|||||||
end
|
end
|
||||||
subject << view.link_to_issue(issue)
|
subject << view.link_to_issue(issue)
|
||||||
subject << '</span>'
|
subject << '</span>'
|
||||||
html_subject(options, subject, :css => "issue-subject") + "\n"
|
html_subject(options, subject, :css => "issue-subject", :title => issue.subject) + "\n"
|
||||||
when :image
|
when :image
|
||||||
image_subject(options, issue.subject)
|
image_subject(options, issue.subject)
|
||||||
when :pdf
|
when :pdf
|
||||||
@@ -709,9 +709,10 @@ module Redmine
|
|||||||
end
|
end
|
||||||
|
|
||||||
def html_subject(params, subject, options={})
|
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;top:#{params[:top]}px;left:#{params[:indent]}px;"
|
||||||
output << subject
|
style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width]
|
||||||
output << "</div>"
|
|
||||||
|
output = view.content_tag 'div', subject, :class => options[:css], :style => style, :title => options[:title]
|
||||||
@subjects << output
|
@subjects << output
|
||||||
output
|
output
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -783,6 +783,7 @@ background-image:url('../images/close_hl.png');
|
|||||||
}
|
}
|
||||||
|
|
||||||
.gantt_subjects { font-size: 0.8em; }
|
.gantt_subjects { font-size: 0.8em; }
|
||||||
|
.gantt_subjects div { line-height:1.2em;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
|
||||||
|
|
||||||
.task {
|
.task {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
Reference in new issue
Block a user