Selaa lähdekoodia

Tooltip on progress bar (#21497).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@15027 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.3.0
Jean-Philippe Lang 8 vuotta sitten
vanhempi
commit
719d4b527d
2 muutettua tiedostoa jossa 8 lisäystä ja 3 poistoa
  1. 5
    3
      app/helpers/application_helper.rb
  2. 3
    0
      app/views/versions/_overview.html.erb

+ 5
- 3
app/helpers/application_helper.rb Näytä tiedosto

@@ -1108,12 +1108,14 @@ module ApplicationHelper
pcts = pcts.collect(&:round)
pcts[1] = pcts[1] - pcts[0]
pcts << (100 - pcts[1] - pcts[0])
titles = options[:titles].to_a
titles[0] = "#{pcts[0]}%" if titles[0].blank?
legend = options[:legend] || ''
content_tag('table',
content_tag('tr',
(pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed') : ''.html_safe) +
(pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done') : ''.html_safe) +
(pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo') : ''.html_safe)
(pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed', :title => titles[0]) : ''.html_safe) +
(pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done', :title => titles[1]) : ''.html_safe) +
(pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo', :title => titles[2]) : ''.html_safe)
), :class => "progress progress-#{pcts[0]}").html_safe +
content_tag('p', legend, :class => 'percent').html_safe
end

+ 3
- 0
app/views/versions/_overview.html.erb Näytä tiedosto

@@ -16,6 +16,9 @@

<% if version.issues_count > 0 %>
<%= progress_bar([version.closed_percent, version.completed_percent],
:titles =>
["%s: %0.0f%" % [l(:label_closed_issues_plural), version.closed_percent],
"%s: %0.0f%" % [l(:field_done_ratio), version.completed_percent]],
:legend => ('%0.0f%' % version.completed_percent)) %>
<p class="progress-info">
<%= link_to(l(:label_x_issues, :count => version.issues_count),

Loading…
Peruuta
Tallenna