From 6e93b0dc0d1f5a7e02a0c887b620dd44fd28a6ed Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 8 Oct 2016 17:08:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E7=99=BD=E8=89=B2=E5=9D=97=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/member.html.erb | 2 +- app/views/projects/settings.html.erb | 2 +- app/views/projects/watcherlist.html.erb | 2 +- app/views/pull_requests/_new.html.erb | 2 +- app/views/pull_requests/_show.html.erb | 2 +- app/views/quality_analysis/_show.html.erb | 2 +- app/views/repositories/changes.html.erb | 2 +- .../repositories/quality_analyses.html.erb | 156 +++---- app/views/repositories/stats.html.erb | 394 +++++++++--------- 9 files changed, 286 insertions(+), 278 deletions(-) diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb index eb46a41e6..12944e1f5 100644 --- a/app/views/projects/member.html.erb +++ b/app/views/projects/member.html.erb @@ -12,6 +12,6 @@ diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 0d4a55ff9..ce12b6b76 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -16,7 +16,7 @@ <% end%> <% end%> $("div[nhname='pro_setting']").show(); - $("#RSide").css('width',"730px"); + $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"}); }); diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index 180cd22b0..a8a948a11 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -26,5 +26,5 @@ <% html_title(l(:label_followers)) -%> \ No newline at end of file diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb index 54c7434b0..08e723e6d 100644 --- a/app/views/pull_requests/_new.html.erb +++ b/app/views/pull_requests/_new.html.erb @@ -10,7 +10,7 @@ diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb index 8471b503c..b7e744288 100644 --- a/app/views/repositories/changes.html.erb +++ b/app/views/repositories/changes.html.erb @@ -25,5 +25,5 @@ <% html_title(l(:label_change_plural)) -%> diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb index 69dae2629..273721bee 100644 --- a/app/views/repositories/quality_analyses.html.erb +++ b/app/views/repositories/quality_analyses.html.erb @@ -1,76 +1,80 @@ -<%= javascript_include_tag 'highcharts','highcharts-more' %> -
-

<%= l(:label_quality_analyses) %>

-
- -
- <%#= render :partial => 'navigation' %> -
-
- -
-
-
-
- - - -

<%= link_to l(:button_back), :action => 'show', :id => @project %>

-<% html_title(l(:label_repository), l(:label_statistics)) -%> \ No newline at end of file +<%= javascript_include_tag 'highcharts','highcharts-more' %> +
+

<%= l(:label_quality_analyses) %>

+
+ +
+ <%#= render :partial => 'navigation' %> +
+
+ +
+
+
+
+ + + +

<%= link_to l(:button_back), :action => 'show', :id => @project %>

+<% html_title(l(:label_repository), l(:label_statistics)) -%> + + \ No newline at end of file diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb index 4b35e64f6..f14022810 100644 --- a/app/views/repositories/stats.html.erb +++ b/app/views/repositories/stats.html.erb @@ -1,195 +1,199 @@ -<%= javascript_include_tag 'highcharts','highcharts-more' %> -
-

<%= l(:label_statistics) %>

-
-<% if false %> -
请在版本库中提交代码,统计信息将更准确
-<% else %> -
- <%= render :partial => 'navigation' %> -
-
- -
-
-
-
- - - -

<%= link_to l(:button_back), :action => 'show', :id => @project %>

- <% html_title(l(:label_repository), l(:label_statistics)) -%> -<% end %> \ No newline at end of file +<%= javascript_include_tag 'highcharts','highcharts-more' %> +
+

<%= l(:label_statistics) %>

+
+<% if false %> +
请在版本库中提交代码,统计信息将更准确
+<% else %> +
+ <%= render :partial => 'navigation' %> +
+
+ +
+
+
+
+ + + +

<%= link_to l(:button_back), :action => 'show', :id => @project %>

+ <% html_title(l(:label_repository), l(:label_statistics)) -%> +<% end %> + + \ No newline at end of file From 1db5064486218ecfd6295b02312aa761b1144a6d Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 8 Oct 2016 17:37:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/_new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb index 08e723e6d..8a376d995 100644 --- a/app/views/pull_requests/_new.html.erb +++ b/app/views/pull_requests/_new.html.erb @@ -10,7 +10,7 @@