From b5593af9ea928e869753ae4a040ced6da0ba8140 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 14 Jul 2015 09:54:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93---=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/stats.html.erb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb
index 50648f66f..5fd791810 100644
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@@ -1,12 +1,11 @@
-<h3 style="padding-top: 40px;"><%= l(:label_statistics) %></h3>
-
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_statistics) %></h2>
+</div>
 <p>
-<%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
+  <%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
 </p>
 <p>
-<%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_author")) %>
+  <%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_author")) %>
 </p>
-
 <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
-
 <% html_title(l(:label_repository), l(:label_statistics)) -%>

From 6890160375420f57edd0994d9f21959f42636226 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 15 Jul 2015 10:26:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E3=80=81issue?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B5=E9=9D=A2=E9=BC=A0=E6=A0=87=E7=BB=8F?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E6=97=B6=E5=80=99=E6=98=BE=E7=A4=BAissue?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/issues_helper.rb    | 9 +++++++--
 app/views/issues/_list.html.erb | 2 +-
 app/views/issues/show.html.erb  | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 873760562..a26d2661a 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -72,14 +72,19 @@ module IssuesHelper
     issuetype = []
     if value == "缺陷" || value == 1
       issuetype << "issues fl"
-    elsif value == "功能" || value == 2
+      issuetype << "缺陷"
+    elsif value == "任务" || value == 4
       issuetype << "duty fl"
+      issuetype << "任务"
     elsif value == "支持" || value == 3
       issuetype << "support fl"
-    elsif value == "任务" || value == 4
+      issuetype << "支持"
+    elsif value == "功能" || value == 2
       issuetype << "function fl"
+      issuetype << "功能"
     else
       issuetype << "weekly fl"
+      issuetype << "周报"
     end
   end
 
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 4549b32e0..e182fbd19 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -7,7 +7,7 @@
         <div class="problem_main">
           <% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
           <% unless issue.author.nil? || issue.author.name == "Anonymous" %>
-              <span class ="<%= get_issue_type(column_content[1])[0] %>"></span>
+              <span class ="<%= get_issue_type(column_content[1])[0] %>" title="<%= get_issue_type(column_content[1])[1] %>"></span>
             <div class="problem_txt fl">
                 <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
                 <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 23d295d81..8c12d62e0 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -14,7 +14,7 @@
     </div>
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
-        <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>'><%= get_issue_type(@issue.tracker_id)[1] %></span>
+        <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
         <span style="padding-left: 5px;"><%= @issue.subject %></span>
         <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span>
       </p><br/>