From 27ee22e05dde0f54fe4f0766db36f202832f4857 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 6 Mar 2014 15:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA=E5=BE=97?=
 =?UTF-8?q?=E5=88=86=E7=AA=97=E5=8F=A3=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_my_joinedcourse.html.erb |  4 +--
 app/views/users/_score_index.html.erb     |  4 +--
 app/views/users/_show_score.html.erb      | 34 ++++++++++++++++++++---
 app/views/users/user_activities.html.erb  |  4 +--
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index 869c12f72..dc759a809 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -26,9 +26,9 @@
 	</p>
 
 	<div id="courses_history_block" class="courses_history hidden" >
-		<%= render :partial => 'course_form', :locals => {:memberships => @memberships_done}%>
+		<%= render :partial => 'course_form', :locals => {:memberships => @memberships_done}%> 
 	</div>
 	
 <% end %>
-	
+	 
 </div>
diff --git a/app/views/users/_score_index.html.erb b/app/views/users/_score_index.html.erb
index 210f45bf8..8c2f98541 100644
--- a/app/views/users/_score_index.html.erb
+++ b/app/views/users/_score_index.html.erb
@@ -26,8 +26,8 @@
 
 <div><%= l(:label_user_score) %></div>
 <div> = <%= l(:label_user_score_of_topic) %> + <%= l(:label_user_score_of_project) %> + 
-		<%= l(:label_user_score_of_activity) %></div>
-<div>&nbsp;&nbsp;&nbsp;+ <%= l(:label_user_score_of_influence) %></div>
+		<%= l(:label_user_score_of_activity)%> + <%= l(:label_user_score_of_influence) %></div>
+<!-- <div>&nbsp;&nbsp;&nbsp;+ <%= l(:label_user_score_of_influence) %></div> -->
 <div> = <%= format("%.2f" , finall_messages_score).to_f %> + <%= format("%.2f" , finall_user_project_score).to_f %> +
 	    <%= format("%.2f" , finall_activity_score).to_f %> + <%= format("%.2f" , finall_influence_score).to_f %></div>
 <div> = <%= format("%.2f" , finall_user_score).to_f %></div>
diff --git a/app/views/users/_show_score.html.erb b/app/views/users/_show_score.html.erb
index d17b2bfa9..655b1de6a 100644
--- a/app/views/users/_show_score.html.erb
+++ b/app/views/users/_show_score.html.erb
@@ -34,7 +34,7 @@
 	    <td width="35%">
 	    	<table>
 	    		<tr class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><td><%= h @user.show_name %></td></tr>
-	            <tr class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><td><%= @user.user_extensions.show_identity %></td></tr>
+	            <tr class="info_font" align="left" style=" word-wrap: break-word; word-break: break-all"><td><%= @user.user_extensions.show_identity %></td></tr>
 	        </table>
 	    </td>    
 	    <td>
@@ -44,10 +44,36 @@
 	    	</table>
 	    </td>
 	</tr>
+	
+
 </table>
+
+<table style="border-bottom: solid 0px #80a6d2;", width="100%">
+	<tr>
+			<%= link_to l(:label_user_score), {:controller => 'users', :action => 'score_index', :remote => true} %> : 
+			<%= format("%.2f" , finall_user_score).to_f %>
+	</tr><br>
+	<tr>
+			<%= link_to l(:label_user_score_of_topic), {:controller => 'users', :action => 'topic_score_index', :remote => true} %> :
+			<%= format("%.2f" , finall_messages_score).to_f %>
+	</tr><br>
+	<tr>
+			<%= link_to l(:label_user_score_of_project), {:controller => 'users', :action => 'project_score_index', :remote => true} %> : 
+			<%= format("%.2f" , finall_user_project_score).to_f %>
+	</tr><br>
+	<tr>
+			<%= link_to l(:label_user_score_of_activity), {:controller => 'users', :action => 'activity_score_index', :remote => true} %> : 
+			<%= format("%.2f" , finall_activity_score).to_f %>
+	</tr><br>
+	<tr>
+			<%= link_to l(:label_user_score_of_influence), {:controller => 'users', :action => 'influence_score_index', :remote => true} %> ：
+			<%= format("%.2f" , finall_influence_score).to_f %>
+	</tr><br>
+</table>
+
 </div>
 
-<div class="tabs_new">
+<!-- <div class="inf_user_image">
 	<ul>
 		<li>
 			<%= link_to l(:label_user_score), {:controller => 'users', :action => 'score_index', :remote => true} %> : 
@@ -70,8 +96,8 @@
 			<%= format("%.2f" , finall_influence_score).to_f %>
 	    </li>								
 	</ul>
-</div>
-<div id="show_score_detail">
+</div> -->
+<div id="show_score_detail", style="padding-left: 6px">
 	<%= render :partial => 'users/score_index', :locals => {:index => 0 } %>
 </div>
 <!-- end -->
\ No newline at end of file
diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb
index 813815a29..44447d47c 100644
--- a/app/views/users/user_activities.html.erb
+++ b/app/views/users/user_activities.html.erb
@@ -29,10 +29,10 @@
     <td><table width="580" border="0">
       <tr>
         <td colspan="2" valign="top"><strong> <%= content_tag('span', h(e.project), :class => 'project') %></strong> <span class="font_lighter"><%= l(:label_new_activity) %></span>  <%= link_to format_activity_title(e.event_title), e.event_url %></td>
-        </tr>
+      </tr>
       <tr>
         <td colspan="2" width="580" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td>
-        </tr>
+      </tr>
       <tr>
         <td align="left"><a class="font_lighter"></a></td>
         <td width="200" align="right" class="a"><span class="font_lighter"><%= format_activity_day(day) %></span></td>