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 

Conflicts:
	db/schema.rb
This commit is contained in:
nwb 2014-07-14 15:15:56 +08:00
parent 2a1a051362 31245f6fb2
commit 1da147684a
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers/application_helper.rb
View File

@ -80,11 +80,12 @@ module ApplicationHelper
name = h(user.name(options[:format])) name = h(user.name(options[:format]))
end end
if user.active? || (User.current.admin? && user.logged?) #if user.active? || (User.current.admin? && user.logged?)
link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes # link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
else #else
name # name
end #end
link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
else else
h(user.to_s) h(user.to_s)
end end

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

@ -33,21 +33,27 @@
<%= image_tag "/images/time_member.png", :class => "img_member_time"%> <%= image_tag "/images/time_member.png", :class => "img_member_time"%>
<div> <div>
<%= image_tag(url_to_avatar(user), :class => 'avatar') %> <table style="width: 100%;table-layout: fixed">
<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %> <tr>
<td rowspan="2" style="width: 60px;">
<!-- modified by bai --> <%= image_tag(url_to_avatar(user), :class => 'avatar') %>
<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px"> </td>
<span style="color:#ec6300"> <td style="width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= user.name %>">
<%= render :partial => 'users/user_score', :locals => {:user => user}%></span> <span style="position: relative;font-size: 16px;display:block; "><%= link_to_user(user) %></span>
</div> </td>
<!-- end --> <td>
</div> <span style="color:#ec6300">
<%= render :partial => 'users/user_score', :locals => {:user => user}%>
<div style="margin-top: 20px;margin-left:66px"> </span>
<%= l(:label_x_has_fans,:count=>user.watcher_users.count)%> </td>
<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %> </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>
<div class="user-bottom"> <div class="user-bottom">
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %> <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>