From 66f881aad385e33ee3b4d60c21cbe287cc9c17da Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 11 Sep 2012 00:57:10 +0000
Subject: [PATCH] gantt: use content_tag instead of html tag at the task bar

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10355 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/helpers/gantt.rb | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index 8187efe51..59b40fc16 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -704,12 +704,33 @@ module Redmine
         output = ''
         # Renders the task bar, with progress and late
         if coords[:bar_start] && coords[:bar_end]
-          output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'>&nbsp;</div>".html_safe
+          width = coords[:bar_end] - coords[:bar_start] - 2
+          style = ""
+          style << "top: #{params[:top]}px;"
+          style << "left: #{coords[:bar_start]}px;"
+          style << "width: #{width}px;"
+          output << view.content_tag(:div, '&nbsp;'.html_safe,
+                                     :style => style,
+                                     :class => "#{options[:css]} task_todo")
           if coords[:bar_late_end]
-            output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'>&nbsp;</div>".html_safe
+            width = coords[:bar_late_end] - coords[:bar_start] - 2
+            style = ""
+            style << "top: #{params[:top]}px;"
+            style << "left: #{coords[:bar_start]}px;"
+            style << "width: #{width}px;"
+            output << view.content_tag(:div, '&nbsp;'.html_safe,
+                                       :style => style,
+                                       :class => "#{options[:css]} task_late")
           end
           if coords[:bar_progress_end]
-            output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_progress_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_done'>&nbsp;</div>".html_safe
+            width = coords[:bar_progress_end] - coords[:bar_start] - 2
+            style = ""
+            style << "top: #{params[:top]}px;"
+            style << "left: #{coords[:bar_start]}px;"
+            style << "width: #{width}px;"
+            output << view.content_tag(:div, '&nbsp;'.html_safe,
+                                       :style => style,
+                                       :class => "#{options[:css]} task_done")
           end
         end
         # Renders the markers
-- 
2.39.5