dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged trunk r1773.

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-08-30 14:41:07 +00:00
parent ab83ed5d8e
commit a377069fb2
398 changed files with 14736 additions and 5683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
groups/app/views/projects/gantt.rhtml
+4 -5
View File
@@ -166,9 +166,9 @@ top = headers_height + 10
@events.each do |i|
if i.is_a? Issue
i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
@@ -190,7 +190,6 @@ top = headers_height + 10
<%= i.status.name %>
<%= (i.done_ratio).to_i %>%
</div>
<% # === tooltip === %>
<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
<span class="tip">
<%= render_issue_tooltip i %>
@@ -235,7 +234,7 @@ if Date.today >= @date_from and Date.today <= @date_to %>
<% content_for :sidebar do %>
<h3><%= l(:label_gantt) %></h3>
<% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
<% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
<% @trackers.each do |tracker| %>
<label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
<% end %>
@@ -243,7 +242,7 @@ if Date.today >= @date_from and Date.today <= @date_to %>
<br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
<%= hidden_field_tag 'with_subprojects', 0 %>
<% end %>
<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
<% end %>
<% end %>