|
|
|
@ -15,15 +15,17 @@
|
|
|
|
|
<!-- fq -->
|
|
|
|
|
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
|
|
|
|
|
<td>
|
|
|
|
|
<table width="580" border="0">
|
|
|
|
|
<table width="580" border="0" class "info-break">
|
|
|
|
|
<% case e.act_type %>
|
|
|
|
|
<% when 'Bid' %>
|
|
|
|
|
<tr>
|
|
|
|
|
<% if act.reward_type ==3 %>
|
|
|
|
|
<% if e.user == User.current%>
|
|
|
|
|
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
|
|
|
|
|
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span>
|
|
|
|
|
<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
|
|
|
|
|
<% else %>
|
|
|
|
|
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong> <span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
|
|
|
|
|
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong> <span class="font_lighter"><%= l(:label_new_activity) %></span>
|
|
|
|
|
<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
|
|
|
|
|
<% end %>
|
|
|
|
|
<% else %>
|
|
|
|
|
<% if e.user == User.current%>
|
|
|
|
@ -38,7 +40,7 @@
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan="2" width="580" >
|
|
|
|
|
<p class="font_description">
|
|
|
|
|
<%= textilizable act.description %>
|
|
|
|
|
<%= h act.description %>
|
|
|
|
|
</p></td>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr>
|
|
|
|
@ -57,7 +59,7 @@
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan="2" width="580" >
|
|
|
|
|
<p class="font_description">
|
|
|
|
|
<%= textilizable act.notes %>
|
|
|
|
|
<%= h act.notes %>
|
|
|
|
|
</p></td>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr>
|
|
|
|
@ -74,7 +76,7 @@
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan="2" width="580" >
|
|
|
|
|
<p class="font_description">
|
|
|
|
|
<%= textilizable act.long_comments %>
|
|
|
|
|
<%= h act.long_comments %>
|
|
|
|
|
</p></td>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr>
|
|
|
|
@ -91,7 +93,7 @@
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan="2" width="580" >
|
|
|
|
|
<p class="font_description">
|
|
|
|
|
<%= textilizable act.content %>
|
|
|
|
|
<%= h stringCut240(act.content) %>
|
|
|
|
|
</p></td>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr>
|
|
|
|
@ -125,7 +127,7 @@
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan="2" width="580" >
|
|
|
|
|
<p class="font_description">
|
|
|
|
|
<%= textilizable act.description %>
|
|
|
|
|
<%= h act.description %>
|
|
|
|
|
</p></td>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr>
|
|
|
|
|