diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9e6b9fac2..c704f9847 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -170,7 +170,7 @@ <% end %>
- <%= link_to "导出:XLS", project_issues_path(:project_id => @project, :format => 'xls') %> + <%= link_to "导出:Excel", project_issues_path(:project_id => @project, :format => 'xls') %> <%# other_formats_links do |f| %> <%#= f.link_to "XLS", :url => params, :remote => false %> <%#= f.link_to 'PDF', :url => params %> diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb index 4f2094899..77da6e577 100644 --- a/app/views/users/_reply_banner.html.erb +++ b/app/views/users/_reply_banner.html.erb @@ -2,7 +2,7 @@
回复 ︿ - <%= count>0 ? "(#{count})" : "" %> + <%= count>0 ? "(#{count})" : "" %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> diff --git a/app/views/versions/_overview.html.erb b/app/views/versions/_overview.html.erb index 6d9719c8c..6dd89607e 100644 --- a/app/views/versions/_overview.html.erb +++ b/app/views/versions/_overview.html.erb @@ -3,14 +3,20 @@

»<%= l(:label_versions_progress)%>

<%= progress_bar([version.closed_percent], :width => '648px;', :legend => ('%0.0f%' % version.completed_percent)) %>

- <%= link_to(l(:label_x_issues, :count => version.issues_count), + <%#= link_to(l(:label_x_issues, :count => version.issues_count), project_issues_path(version.project, :status_id => '*', :fixed_version_id => version, :set_filter => 1), :class =>"c_dblue",) %> + <%=version.issues_count%> 问题   - (<%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), + (<%#= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), project_issues_path(version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1), :class =>"c_dblue") %> + <% if version.closed_issues_count > 0 %> + <%end%><%=version.closed_issues_count%> 已关闭 — - <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), - project_issues_path(version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1), :class =>"c_dblue") %>) + <%#= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), + project_issues_path(version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1), :class =>"c_dblue") %> + <% if version.open_issues_count > 0%> + <%end%><%=version.open_issues_count%> 打开 + )

<% else %>
<%= l(:label_roadmap_no_issues) %>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index 6b36ed5ff..bdfeac5fe 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -9,7 +9,7 @@ <% end %> - + <% if @project.descendants.active.any? %> <%= hidden_field_tag 'with_subprojects', 0 %> @@ -26,7 +26,8 @@

- <%= link_to_version_show version, :name => version_anchor(version) %> + <%= version_anchor(version)%> + <%#= link_to_version_show version, :name => version_anchor(version) %> <% if version.completed? %> <%= format_date(version.effective_date) %> <% elsif version.effective_date %> @@ -57,7 +58,7 @@

»<%= l(:label_versions_description)%>

<%=h version.description %>

-

»<%= link_to "导出:XLS", version_path(version, :format => 'xls') %>

+

»<%= link_to "导出:Excel", version_path(version, :format => 'xls') %>

<% end %>