jro_apps/redmine Commit - r4470:dd87ebef5864

474

(date_to - @date_from + 1).to_i.times do

474

(date_to - @date_from + 1).to_i.times do

475

width = zoom

475

width = zoom

476

gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')

476

gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')

477

gc.stroke('~~grey~~')

477

gc.stroke('#ddd')

478

gc.stroke_width(1)

478

gc.stroke_width(1)

479

gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)

479

gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)

480

left = left + width

480

left = left + width

824

825

# Renders the task bar, with progress and late

825

# Renders the task bar, with progress and late

826

if coords[:bar_start] && coords[:bar_end]

826

if coords[:bar_start] && coords[:bar_end]

827

params[:image].fill('~~grey~~')

827

params[:image].fill('#aaa')

828

params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height)

828

params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height)

829

830

if coords[:bar_late_end]

830

if coords[:bar_late_end]

831

params[:image].fill('~~red~~')

831

params[:image].fill('#f66')

832

params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height)

832

params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height)

833

end

833

end

834

if coords[:bar_progress_end]

834

if coords[:bar_progress_end]

835

params[:image].fill('~~green~~')

835

params[:image].fill('#00c600')

836

params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_progress_end], params[:top] - height)

836

params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_progress_end], params[:top] - height)

837

end

837

end

838

end

838

end

839

# Renders the markers

839

# Renders the markers

840

if options[:markers]

840

if options[:markers]

841

if coords[:start]

841

if coords[:start]

842

x = params[:subject_width] + coords[:start]

843

y = params[:top] - height / 2

842

params[:image].fill('blue')

844

params[:image].fill('blue')

843

params[:image].rectangle(params[:subject_width] + coords[:start], params[:top] + 1, params[:subject_width] + coords[:start] + 4, params[:top] - 4)

845

params[:image].polygon(x-4, y, x, y-4, x+4, y, x, y+4)

844

end

846

end

845

if coords[:end]

847

if coords[:end]

848

x = params[:subject_width] + coords[:end] + params[:zoom]

849

y = params[:top] - height / 2

846

params[:image].fill('blue')

850

params[:image].fill('blue')

847

params[:image].rectangle(params[:subject_width] + coords[:end], params[:top] + 1, params[:subject_width] + coords[:end] + 4, params[:top] - 4)

851

params[:image].polygon(x-4, y, x, y-4, x+4, y, x, y+4)

848

end

852

end

849

end

853

end

850

# Renders the label on the right

854

# Renders the label on the right

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                     	(date_to - @date_from + 1).to_i.times do
                           width =  zoom
                           gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
-                          gc.stroke('grey')
+                          gc.stroke('#ddd')
                           gc.stroke_width(1)
                           gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
                           left = left + width
                     # Renders the task bar, with progress and late
                     if coords[:bar_start] && coords[:bar_end]
-                      params[:image].fill('grey')
+                      params[:image].fill('#aaa')
                       params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height)
                       if coords[:bar_late_end]
-                        params[:image].fill('red')
+                        params[:image].fill('#f66')
                         params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height)
                       end
                       if coords[:bar_progress_end]
-                        params[:image].fill('green')
+                        params[:image].fill('#00c600')
                         params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_progress_end], params[:top] - height)
                       end
                     end
                     # Renders the markers
                     if options[:markers]
                       if coords[:start]
+                        x = params[:subject_width] + coords[:start]
+                        y = params[:top] - height / 2
                         params[:image].fill('blue')
-                        params[:image].rectangle(params[:subject_width] + coords[:start], params[:top] + 1, params[:subject_width] + coords[:start] + 4, params[:top] - 4)
+                        params[:image].polygon(x-4, y, x, y-4, x+4, y, x, y+4)
                       end
                       if coords[:end]
+                        x = params[:subject_width] + coords[:end] + params[:zoom]
+                        y = params[:top] - height / 2
                         params[:image].fill('blue')
-                        params[:image].rectangle(params[:subject_width] + coords[:end], params[:top] + 1, params[:subject_width] + coords[:end] + 4, params[:top] - 4)
+                        params[:image].polygon(x-4, y, x, y-4, x+4, y, x, y+4)
                       end
                     end
                     # Renders the label on the right