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

1.个人动态留言显示出留言人 

2.留言添加跳转链接
This commit is contained in:
nwb 2014-05-15 13:37:24 +08:00
parent aa89900813
commit 8ef716b920
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/users/show.html.erb
View File

@ -33,14 +33,17 @@
<% when 'JournalsForMessage' %>
<% if User.current.login == @user.login %>
<%# if e.user_id == act.jour.id %>
<tr><td colspan="2" valign="top"><strong><%= link_to("#{e.user.name}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter">有了<%= link_to("#{e.act.user.name}", user_path(e.user.id))%>的留言</span></td></tr>
<tr><td colspan="2" valign="top"><strong><%= link_to("#{e.user.name}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_have_feedback) %><%=
link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %></span></td></tr>
<%# else %>
<!-- <tr><td colspan="2" valign="top" class="font_lighter"><strong><%#= link_to("#{e.user.name}", user_path(e.user_id)) %> 给 <%#= link_to("#{act.at_user.name if act.at_user}", user_path(act.jour.id)) %> 留言了</strong>&nbsp;</td></tr> -->
<%# end %>
<% else %>
<tr><td colspan="2" valign="top"><strong><%= link_to("#{@user.name}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter">有了新的动态</span></td></tr>
<tr><td colspan="2" valign="top"><strong><%= link_to("#{e.user.name}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_have_feedback) %><%=
link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %></span></td></tr>
<% end %>
<tr> <td colspan="2" width="580" > <p class="font_description"> <%=textilizable act.notes %> </p></td> </tr>
<tr> <td colspan="2" width="580" > <p class="font_description"> <%=textilizable act.notes %>
<%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> </p></td> </tr>
<tr> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <%=(l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %></span>

3
config/locales/en.yml
View File

@ -1306,6 +1306,7 @@ en:
label_have_respond: had a respond
label_welcome: Welcome
label_goto: Go to>>
label_join: join Trustie！
label_repository_new: link to existing SVN repository
label_repository_path: path of repository
@ -1411,6 +1412,8 @@ en:
label_user_activity_myself: About me
label_user_all_respond: All replies
label_layouts_feedback: Messages
label_have_feedback: Have
label_of_feedback: Of
label_welcome_participate: participates
#modify by men
label_x_welcome_participate:

3
config/locales/zh.yml
View File

@ -1495,6 +1495,7 @@ zh:
label_issue_praise_over: 我刚才顶过了~
label_issue_tread_over: 我刚才踩过了~
#end
label_goto: 前往>>
label_issue_appraise_over: 只能评价一次哦！
label_welcome_my_respond: 请在此留下你的意见和建议！
label_no_current_fans: 该用户暂无粉丝
@ -1575,6 +1576,8 @@ zh:
label_my_honework_no_homework: 暂无任何作业！
label_user_all_respond: 所有反馈
label_layouts_feedback: 留言
label_have_feedback: 有了
label_of_feedback: 的
label_welcome_participate: 参与了
#modify by men
label_x_welcome_participate: