Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality

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>
@@ -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 %>

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>

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; }