From: Toshi MARUYAMA Date: Sun, 28 Aug 2011 08:19:31 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/versions/_overview.rhtml. X-Git-Tag: 1.3.0~1268 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dcbe39adc8be64f062e67c7e657421e05f9945b4;p=redmine.git rename .rhtml to .html.erb of app/views/versions/_overview.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6694 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/versions/_overview.html.erb b/app/views/versions/_overview.html.erb new file mode 100644 index 000000000..550cf3e78 --- /dev/null +++ b/app/views/versions/_overview.html.erb @@ -0,0 +1,27 @@ +<% if version.completed? %> +

<%= format_date(version.effective_date) %>

+<% elsif version.effective_date %> +

<%= due_date_distance_in_words(version.effective_date) %> (<%= format_date(version.effective_date) %>)

+<% end %> + +

<%=h version.description %>

+ + +<% if version.fixed_issues.count > 0 %> + <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %> +

+ <%= 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_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) %>%) +

+<% else %> +

<%= l(:label_roadmap_no_issues) %>

+<% end %> diff --git a/app/views/versions/_overview.rhtml b/app/views/versions/_overview.rhtml deleted file mode 100644 index 550cf3e78..000000000 --- a/app/views/versions/_overview.rhtml +++ /dev/null @@ -1,27 +0,0 @@ -<% if version.completed? %> -

<%= format_date(version.effective_date) %>

-<% elsif version.effective_date %> -

<%= due_date_distance_in_words(version.effective_date) %> (<%= format_date(version.effective_date) %>)

-<% end %> - -

<%=h version.description %>

- - -<% if version.fixed_issues.count > 0 %> - <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %> -

- <%= 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_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) %>%) -

-<% else %> -

<%= l(:label_roadmap_no_issues) %>

-<% end %>