|
|
|
@ -7,31 +7,32 @@
|
|
|
|
|
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
|
|
|
|
|
<td><table width="580px" border="0">
|
|
|
|
|
<tr> <!-- modified by bai 增加了关注人的名字全称-->
|
|
|
|
|
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
|
|
|
|
|
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr> <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
|
|
|
|
|
<td colspan="2" width="580px" ><p class="font_description">
|
|
|
|
|
<% unless user.memberships.empty? %>
|
|
|
|
|
<%# unless user.memberships.empty? %>
|
|
|
|
|
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
|
|
|
|
|
<% memberships = user.memberships.all(:conditions => cond) %>
|
|
|
|
|
<%= l(:label_x_contribute_to, :count => memberships.count) %>
|
|
|
|
|
<% for member in memberships %>
|
|
|
|
|
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : ',' %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<%# end %>
|
|
|
|
|
</p>
|
|
|
|
|
<p class="font_description">
|
|
|
|
|
<% 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 %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<%# unless user.memberships.empty? %>
|
|
|
|
|
<% user_courses = user_courses_list(user) %>
|
|
|
|
|
<%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
|
|
|
|
|
<% for course in user_courses %>
|
|
|
|
|
<%# if course.name != nil %>
|
|
|
|
|
<%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : ',' %>
|
|
|
|
|
<%# end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<%# end %>
|
|
|
|
|
</p>
|
|
|
|
|
</td>
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
|
<!-- end -->
|
|
|
|
|
|
|
|
|
|