jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
nwb 2014-06-24 15:42:39 +08:00
parent ae3457e68b 02e221eedb
commit d5665c7bb7
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/layouts/base_users.html.erb
View File

@ -121,16 +121,6 @@
</td> </td>
</tr> </tr>
<!-- end --> <!-- 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> </table></td>
</tr> </tr>

6
app/views/open_source_projects/master_apply.html.erb
View File

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

2
app/views/users/_user_score.html.erb
View File

@ -1,5 +1,5 @@
<%= l(:label_user_grade)%>: <%= 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', :action => 'show_new_score',
:remote => true, :remote => true,
:id => user.id :id => user.id

6
app/views/users/_user_show.html.erb
View File

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