From aacac0aa02e1b45a43c9f8d6a23875223d004b99 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 22 Sep 2016 16:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb        |  2 +-
 app/views/users/_reply_banner.html.erb |  2 +-
 app/views/versions/_overview.html.erb  | 14 ++++++++++----
 app/views/versions/index.html.erb      |  7 ++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 83645720a..a1497ec74 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -140,7 +140,7 @@
         <% end %>
 
         <div style="float: left; padding-top: 30px">
-          <%= 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 @@
   <div class="homepagePostReplyBannerCount">
     <span>回复</span>
     <span  class="reply_iconup" > ︿</span>
-    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+    <span class="mr15"><%= count>0 ? "（#{count}）" : "" %></span><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
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 @@
     <p class="f14 mb5">&#187;<%= l(:label_versions_progress)%></p>
     <%= progress_bar([version.closed_percent], :width => '648px;', :legend => ('%0.0f%' % version.completed_percent)) %>
     <p class="progress-info">
-    	  <%= 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",) %>
+      <a  class="c_dblue" target="_blank"><%=version.issues_count%>&nbsp;问题</a>
 				&nbsp;
-        (<%= 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 %>
+      <a class="c_dblue" target="_blank"><%end%><%=version.closed_issues_count%>&nbsp;已关闭</a>
         &#8212;
-        <%= 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%>
+      <a class="c_dblue" target="_blank"><%end%><%=version.open_issues_count%>&nbsp;打开</a>
+      )
     </p>
 <% else %>
     <div class="flash error"><%= l(:label_roadmap_no_issues) %></div>
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 @@
             <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
               <%=h tracker.name %></label>
         <% end %>
-        <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
+        <!--label for="completed"><%#= check_box_tag "completed", 1, params[:completed] %> <%#= l(:label_show_completed_versions) %></label-->
         <% if @project.descendants.active.any? %>
             <%= hidden_field_tag 'with_subprojects', 0 %>
             <label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
@@ -26,7 +26,8 @@
 
           <div class="roadmap_box">
             <p><a href="javascript:void(0)" class=" f16 fb c_dblue " target="_blank">
-              <%= link_to_version_show version, :name => version_anchor(version) %>
+              <a href="javascript:void(0)" class=" f16 fb c_dblue " target="_blank"><%= version_anchor(version)%></a>
+              <%#= link_to_version_show version, :name => version_anchor(version) %>
               <% if version.completed? %>
                   <span style="color: #E8770D;float:right;"><%= format_date(version.effective_date) %></span>
               <% elsif version.effective_date %>
@@ -57,7 +58,7 @@
             <div class="roadmap_list">
               <p class="f14 mb5">&#187;<%= l(:label_versions_description)%></p>
               <p><%=h version.description %></p>
-              <p class="f14 mb5">&#187;<%= link_to "导出：XLS", version_path(version, :format => 'xls') %></p>
+              <p class="f14 mb5">&#187;<%= link_to "导出：Excel", version_path(version, :format => 'xls') %></p>
             </div><!--roadmap_list end-->
           </div><!--roadmap_box end-->
       <% end %>