|
|
|
@ -39,7 +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">
|
|
|
|
|
<span style="color:#ec6300">
|
|
|
|
|
<%= render :partial => 'users/user_score', :locals => {:user => user}%></span>
|
|
|
|
|
</div>
|
|
|
|
|
<!-- end -->
|
|
|
|
@ -61,14 +61,17 @@
|
|
|
|
|
<% end %>
|
|
|
|
|
|
|
|
|
|
<p>
|
|
|
|
|
<% unless user.memberships.empty? %>
|
|
|
|
|
<% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
|
|
|
|
|
<% memberships = user.memberships.all(:conditions => cond) %>
|
|
|
|
|
<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
|
|
|
|
|
<% for member in memberships %>
|
|
|
|
|
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : ',' %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<%# unless user.memberships.empty? %>
|
|
|
|
|
<%# cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
|
|
|
|
|
<%# memberships = user.memberships.all(:conditions => cond) %>
|
|
|
|
|
<% user_courses = user.coursememberships.map(&:course) %>
|
|
|
|
|
<%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
|
|
|
|
|
<% for course in user_courses %>
|
|
|
|
|
<%# if course.name != nil %>
|
|
|
|
|
<%= link_to course.name,course_path(course) %><%= (user_courses.last == course) ? '' : ',' %>
|
|
|
|
|
<%# end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<%# end %>
|
|
|
|
|
</p>
|
|
|
|
|
|
|
|
|
|
<%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
|
|
|
|
|