diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
| commit | fe28193e4eb9af2dc5262535a29ffde5249568fc (patch) | |
| tree | bd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /app/views/versions | |
| parent | 9a986ac0a51fe844eee816325e6a6d4122136d9a (diff) | |
| download | redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip | |
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/versions')
| -rw-r--r-- | app/views/versions/_overview.rhtml | 6 | ||||
| -rw-r--r-- | app/views/versions/show.rhtml | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/versions/_overview.rhtml b/app/views/versions/_overview.rhtml index 377e9178b..724f9f923 100644 --- a/app/views/versions/_overview.rhtml +++ b/app/views/versions/_overview.rhtml @@ -9,12 +9,10 @@ <% if version.fixed_issues.count > 0 %> <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %> <p class="progress-info"> - <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> - <%= lwr(:label_closed_issues, version.closed_issues_count) %> + <%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)   - <%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> - <%= lwr(:label_open_issues, version.open_issues_count)%> + <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%) </p> <% else %> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 7e5264562..ef5375198 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -10,12 +10,12 @@ <table> <tr> <td width="130px" align="right"><%= l(:field_estimated_hours) %></td> - <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(lwr(:label_f_hour, @version.estimated_hours)) %></td> + <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td> </tr> <% if User.current.allowed_to?(:view_time_entries, @project) %> <tr> <td width="130px" align="right"><%= l(:label_spent_time) %></td> - <td width="240px" class="total-hours"><%= html_hours(lwr(:label_f_hour, @version.spent_hours)) %></td> + <td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td> </tr> <% end %> </table> |