Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/layouts/base_users.html.erb

@@ -121,16 +121,6 @@
 														</td>
 													</tr>
                                                   <!-- end -->
-                                                  <!-- <tr><td class="score">
-                                                    <%= l(:label_user_grade)%>:
-                                                    <%= link_to(format("%.2f" , finall_user_score).to_f, {:controller => 'users',
-                                                                                                          :action => 'show_score',
-                                                                                                          :remote => true,
-                                                                                                          :id => @user.id
-                                                    }, :style => 'color :#E8770D;') %>
-                                                  </td>
-                                                  </tr>
-													-->
 												
 												</table></td>
 											</tr>

app/views/open_source_projects/master_apply.html.erb

@@ -39,11 +39,7 @@
 
 			<!-- modified by bai -->
 			<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
-				<%= l(:label_user_grade) %>: <span style="color:#ec6300"> <%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users',
-					:action => 'show_score',
-					:remote => true,
-					:id => user.id},
-					:style=>"color: #EC6300;") %></span>
+				<%= l(:label_user_grade) %>: <span style="color:#ec6300"> <%= render :partial => 'users/user_score', :locals => {:user => user}%></span>
 			</div>
 			<!-- end -->
 		</div>

app/views/users/_user_score.html.erb

@@ -1,5 +1,5 @@
 <%= l(:label_user_grade)%>:
-<%= link_to(format("%.2f" , @user.user_score_attr.total_score).to_f, {:controller => 'users',
+<%= link_to(format("%.2f" , user.user_score_attr.total_score).to_f, {:controller => 'users',
                                                                       :action => 'show_new_score',
                                                                       :remote => true,
                                                                       :id => user.id

app/views/users/_user_show.html.erb

@@ -40,11 +40,7 @@
 			<!-- modified by bai -->
 			<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
 				<%= l(:label_user_grade) %>: <span style="color:#ec6300">
-				<%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users', 
-																	   :action => 'show_score', 
-																	   :remote => true, 
-																	   :id => user.id}, 
-																	   :style=>"color: #EC6300;") %></span>
+				<%= render :partial => 'users/user_score', :locals => {:user => user}%></span>
 			</div>
             <!-- end -->
 		</div>