|
|
|
@ -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> <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> <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> </td></tr> -->
|
|
|
|
|
<%# end %>
|
|
|
|
|
<% else %>
|
|
|
|
|
<tr><td colspan="2" valign="top"><strong><%= link_to("#{@user.name}", user_path(e.user_id)) %></strong> <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> <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>
|
|
|
|
|