From 86835fc916917d2d26efe6fc582f299377e4ba31 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 27 Sep 2016 09:58:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AEinput?=
 =?UTF-8?q?=E6=A1=86=E8=81=9A=E7=84=A6=E5=90=8E=E8=BE=B9=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAcss=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/css/project.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 722c9dc86..4a2ec5683 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -784,7 +784,6 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
 /* 缺陷列表 */
 .issues_greycirbg_btn{  background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; }
 .issues_greycirbg_btn:hover{background-color:#cbcbcb;}
-input:focus,select:focus{ border:none;outline:medium;border-right:none;}
 .issues_con{ width:718px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; }
 .issues_statistics{ line-height:35px;}
 .issues_statistics ul li{ float:left; }

From c339b3e4a3ee8773297ca91ba5204f0a892fab18 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 27 Sep 2016 11:59:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=98=E7=89=B9?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E5=AF=BC=E5=87=BApdf=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/gantts/show.html.erb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 39ac2032b..4581199ce 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -294,10 +294,7 @@
 </tr>
 </table>
 
-<% other_formats_links do |f| %>
-  <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
-  <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
-<% end %>
+
 <% end # query.valid? %>
 
 <% content_for :sidebar do %>

From 405f4e0a20da1aaf2706940cf10a647aa773d33e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 27 Sep 2016 13:36:04 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE=E7=9A=84=E6=94=BE=E5=A4=A7=E7=BC=A9=E5=B0=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/gantts/show.html.erb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 4581199ce..759f8c232 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -48,10 +48,10 @@
   </div>
 </fieldset>
 
-<p class="contextual">
-  <%= gantt_zoom_link(@gantt, :in) %>
-  <%= gantt_zoom_link(@gantt, :out) %>
-</p>
+<!--<p class="contextual">-->
+  <!--<%#= gantt_zoom_link(@gantt, :in) %>-->
+  <!--<%#= gantt_zoom_link(@gantt, :out) %>-->
+<!--</p>-->
 
 <p class="buttons">
 <%= text_field_tag 'months', @gantt.months, :size => 2 %>
@@ -99,9 +99,9 @@
   t_height = g_height + headers_height
 %>
 
-<% if @gantt.truncated %>
-  <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
-<% end %>
+<%# if @gantt.truncated %>
+  <!--<p class="warning"><%#= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>-->
+<%# end %>
 
 <table style="width:100%; border:0; border-collapse: collapse;">
 <tr>

From e7bfc9ee60d3a19839bee0f027a8035b495a73a4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 27 Sep 2016 13:37:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/show.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 4447e45a0..21db53a31 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -79,8 +79,9 @@
 
 <a href="https://<%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
 <div class="fr">
-  <%= link_to "代码统计：导出excel", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev } %></br>
-
+  <a style="color: #7f7f7f;">导出统计结果：</a>
+  <%= link_to "当前一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week"  } %> <a style="color: #7f7f7f;">|</a>
+  <%= link_to "当前一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" } %>
 </div>
 
   <%#= link_to "导出excel", {:controller => 'repositories', :action => 'export_rep_static', :rev => @rev}, :format => 'xls' %>
@@ -94,4 +95,4 @@
 
 <script>
   $("#RSide").css("width","730px");
-</script>
+</script>