From bce403f6245ffb168504a87d0460dbda06d989c8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 14:06:49 +0800
Subject: [PATCH] =?UTF-8?q?#1242=20=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BE=97=E5=88=86=E5=9C=A8=E5=BC=B9=E5=87=BA=E7=9A=84=E6=A1=86?=
 =?UTF-8?q?=E4=B8=AD=E7=82=B9=E5=87=BB=E5=90=84=E9=A1=B9=E7=9B=AE=E5=BE=97?=
 =?UTF-8?q?=E5=88=86=E6=98=8E=E7=BB=86=E5=8F=8D=E5=BA=94=E6=85=A2=E3=80=82?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E9=9C=80=E8=A6=81=E5=90=91=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E3=80=82=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=EF=BC=9A=E4=BD=BF=E7=94=A8js=E5=9C=A8=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=A4=84=E7=90=86=E5=90=84=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=9C=A8=E5=90=91=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        |  1 -
 .../projects/_issue_score_index.html.erb      | 10 ++---
 app/views/projects/_news_score_index.html.erb |  5 +--
 .../projects/_project_score_index.html.erb    |  8 ++--
 .../projects/_show_projects_score.html.erb    | 44 ++++++++++++++++---
 app/views/projects/show_projects_score.js.erb |  2 -
 6 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c1593e320..fc331e96d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -842,7 +842,6 @@ class ProjectsController < ApplicationController
     @project = nil
   end
 
-# added by bai  
   def show_projects_score
     render :layout => false
   end
diff --git a/app/views/projects/_issue_score_index.html.erb b/app/views/projects/_issue_score_index.html.erb
index 7353ce5a3..729369280 100644
--- a/app/views/projects/_issue_score_index.html.erb
+++ b/app/views/projects/_issue_score_index.html.erb
@@ -1,6 +1,4 @@
-<!-- added by bai -->
-<div><%= l(:label_issue_number) %> * 4 = <%= issue_num(@project) %> * 4 = <%= format("%.2f" , issue_num(@project) * 4).to_i %></div>
-<div><%= l(:label_issue_journal_number) %> * 1 = <%= issue_journal_num(@project) %> * 1 = <%= format("%.2f" , issue_journal_num(@project)).to_i %></div>
-<div><%= l(:label_issue_score) %> = <%= format("%.2f" , issue_num(@project) * 4).to_i %> + <%= format("%.2f" , issue_journal_num(@project)).to_i %>
-                                  = <%= format("%.2f" , issue_score(@project)).to_i %></div>
-<!-- end -->
\ No newline at end of file
+<div><%= l(:label_issue_number) %> * 4 = <%= issue_num(project) %> * 4 = <%= format("%.2f" , issue_num(project) * 4).to_i %></div>
+<div><%= l(:label_issue_journal_number) %> * 1 = <%= issue_journal_num(project) %> * 1 = <%= format("%.2f" , issue_journal_num(project)).to_i %></div>
+<div><%= l(:label_issue_score) %> = <%= format("%.2f" , issue_num(project) * 4).to_i %> + <%= format("%.2f" , issue_journal_num(project)).to_i %>
+                                  = <%= format("%.2f" , issue_score(project)).to_i %></div>
diff --git a/app/views/projects/_news_score_index.html.erb b/app/views/projects/_news_score_index.html.erb
index b3d66efeb..c936ece05 100644
--- a/app/views/projects/_news_score_index.html.erb
+++ b/app/views/projects/_news_score_index.html.erb
@@ -1,5 +1,2 @@
-<!-- added by bai -->
-
 <div><%= l(:label_new_number) %> * 1 = <%= news_num(@project) %> * 1 = <%= format("%.2f" , news_score(@project)).to_i %></div>
-<div><%= l(:label_news_score) %> = <%= format("%.2f" ,  news_score(@project)).to_i %></div>
-<!-- end -->
\ No newline at end of file
+<div><%= l(:label_news_score) %> = <%= format("%.2f" ,  news_score(@project)).to_i %></div>
\ No newline at end of file
diff --git a/app/views/projects/_project_score_index.html.erb b/app/views/projects/_project_score_index.html.erb
index 3cee4413c..7a3022f44 100644
--- a/app/views/projects/_project_score_index.html.erb
+++ b/app/views/projects/_project_score_index.html.erb
@@ -3,8 +3,8 @@
 <%= l(:label_projects_score) %> 
 <div> = <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> + 
 	  <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %></div>
-<div> = <%= format("%.2f" , issue_score(@project)).to_i %> + <%= format("%.2f" , news_score(@project)).to_i %> +
-	  <%= format("%.2f" , documents_score(@project)).to_i %> + <%= format("%.2f" , changesets_score(@project)).to_i %> +
-	  <%= format("%.2f" , board_message_score(@project)).to_i %></div>
-<div> = <%= format("%.2f" , project_scores(@project)).to_i %></div>
+<div> = <%= format("%.2f" , issue_score(project)).to_i %> + <%= format("%.2f" , news_score(project)).to_i %> +
+	  <%= format("%.2f" , documents_score(project)).to_i %> + <%= format("%.2f" , changesets_score(project)).to_i %> +
+	  <%= format("%.2f" , board_message_score(project)).to_i %></div>
+<div> = <%= format("%.2f" , project_scores(project)).to_i %></div>
 <!-- end -->
\ No newline at end of file
diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb
index 156e63f7b..57af1f138 100644
--- a/app/views/projects/_show_projects_score.html.erb
+++ b/app/views/projects/_show_projects_score.html.erb
@@ -21,35 +21,65 @@
 </table>
 </div>
 
+<script type="text/javascript">
+    function show_div(url)
+    {
+        if(url == 'project_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/project_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'issue_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/issue_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'news_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/news_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'file_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/file_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'code_submit_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/code_submit_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'projects_topic_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/projects_topic_score_index', :locals => {:project => @project}) %>');
+        }
+    }
+</script>
+
 <div class="tabs_new">
 	<ul>
 		<li>
-			<%= link_to l(:label_projects_score), {:controller => 'projects', :action => 'show_projects_score', :remote => true}%> : 
+			<%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> :
 			<%= format("%.2f" , project_scores(@project) ).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_issue_score), {:controller => 'projects', :action => 'issue_score_index', :remote => true}%> : 
+			<%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> :
 			<%= format("%.2f" , issue_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_news_score), {:controller => 'projects', :action => 'news_score_index', :remote => true}%> :
+			<%= link_to l(:label_news_score),  "javascript:void(0)", :onclick => "show_div('news_score_index')"%> :
 			<%= format("%.2f" , news_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_file_score), {:controller => 'projects', :action => 'file_score_index', :remote => true}%> :
+			<%= link_to l(:label_file_score),  "javascript:void(0)", :onclick => "show_div('file_score_index')"%> :
 			<%= format("%.2f" , documents_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_code_submit_score), {:controller => 'projects', :action => 'code_submit_score_index', :remote => true}%> :
+			<%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> :
 			<%= format("%.2f" , changesets_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_topic_score), {:controller => 'projects', :action => 'projects_topic_score_index', :remote => true}%> :
+			<%= link_to l(:label_topic_score),  "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> :
 			<%= format("%.2f" , board_message_score(@project)).to_i %>
 		</li>
 	</ul>
 </div>
 <div id="show_score_detail">
-	<%= render :partial => 'projects/project_score_index', :locals => {:index => 0 } %>
+	<%= render :partial => 'projects/project_score_index', :locals => {:project => @project } %>
 </div>
 <!-- end -->
\ No newline at end of file
diff --git a/app/views/projects/show_projects_score.js.erb b/app/views/projects/show_projects_score.js.erb
index 540db5395..bf84cbe73 100644
--- a/app/views/projects/show_projects_score.js.erb
+++ b/app/views/projects/show_projects_score.js.erb
@@ -1,5 +1,3 @@
-<!-- added by bai -->
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/show_projects_score') %>');
 showModal('ajax-modal', '400px');
 $('#ajax-modal').addClass('new-watcher');
-<!-- end -->
\ No newline at end of file