修复软件创客列表当用户姓名比较长时,用户姓名会被个人得分覆盖掉的BUG
This commit is contained in:
parent
59a5541e45
commit
7a9b5156c9
|
@ -33,21 +33,27 @@
|
|||
<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
|
||||
|
||||
<div>
|
||||
<%= image_tag(url_to_avatar(user), :class => 'avatar') %>
|
||||
<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
|
||||
|
||||
<!-- modified by bai -->
|
||||
<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
|
||||
<span style="color:#ec6300">
|
||||
<%= render :partial => 'users/user_score', :locals => {:user => user}%></span>
|
||||
</div>
|
||||
<!-- end -->
|
||||
</div>
|
||||
|
||||
<div style="margin-top: 20px;margin-left:66px">
|
||||
<%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
|
||||
<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
|
||||
|
||||
<table style="width: 100%;table-layout: fixed">
|
||||
<tr>
|
||||
<td rowspan="2" style="width: 60px;">
|
||||
<%= image_tag(url_to_avatar(user), :class => 'avatar') %>
|
||||
</td>
|
||||
<td style="width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= user.name %>">
|
||||
<span style="position: relative;font-size: 16px;display:block; "><%= link_to_user(user) %></span>
|
||||
</td>
|
||||
<td>
|
||||
<span style="color:#ec6300">
|
||||
<%= render :partial => 'users/user_score', :locals => {:user => user}%>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
|
||||
<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="user-bottom">
|
||||
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
|
||||
|
|
1199
db/schema.rb
1199
db/schema.rb
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue