240 characters or less limited in activity info. ===> projects#show
This commit is contained in:
yanxd
parent
534457547e
commit
332bc0765d
|
|
@ -1398,4 +1398,8 @@ module ApplicationHelper
|
||||||
user.watcher_users.count
|
user.watcher_users.count
|
||||||
end
|
end
|
||||||
#end
|
#end
|
||||||
|
#author : nyan
|
||||||
|
def stringCut240(str)
|
||||||
|
(str.length > 240) ? (str[0,240]<<"\n......") : str
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,57 +1,66 @@
|
||||||
<% if @events_by_day.size >0 %>
|
<p>
|
||||||
<div style="padding-left: 8px">
|
<% if @events_by_day.size >0 %>
|
||||||
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
<div style="padding-left: 8px">
|
||||||
<p class="subtitle">
|
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
||||||
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
<p class="subtitle">
|
||||||
</p>
|
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
||||||
<div id="activity">
|
</p>
|
||||||
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
<div id="activity">
|
||||||
<h3></h3>
|
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
||||||
<div>
|
<h3></h3>
|
||||||
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
<div>
|
||||||
<div class="issue-note">
|
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
||||||
<table width="660px" border="0" align="center" style="font-size: 14px;">
|
<div class="issue-note">
|
||||||
<tr>
|
<table width="660px" border="0" align="center" style="font-size: 14px;">
|
||||||
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
|
<tr>
|
||||||
<td><table width="580px" border="0">
|
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
|
||||||
<tr>
|
<td>
|
||||||
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong> <span class="font_lighter">
|
<table width="580px" border="0">
|
||||||
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %>
|
<tr>
|
||||||
</span>
|
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong><span class="font_lighter"> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %> </span> <%= link_to format_activity_title(e.event_title), e.event_url %> </td>
|
||||||
<%= link_to format_activity_title(e.event_title), e.event_url %>
|
</tr>
|
||||||
</td>
|
<tr>
|
||||||
</tr>
|
<td colspan="2" width="580px" >
|
||||||
<tr>
|
<p class="font_description">
|
||||||
<td colspan="2" width="580px" ><p class="font_description"><%= textilizable(e.event_description) %></p></td>
|
<!-- modify by nyan -->
|
||||||
</tr>
|
<%= textilizable( stringCut240(e.event_description) ) %>
|
||||||
<tr>
|
</p></td>
|
||||||
|
</tr>
|
||||||
<td align="left"><a class="font_lighter">
|
<tr>
|
||||||
<%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
|
<td align="left"><a class="font_lighter"> <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
|
||||||
<% if e.event_type == "issue" %>
|
<% if e.event_type == "issue" %>
|
||||||
<td align="right"><span>
|
<td align="right"><span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span></td>
|
||||||
<%= link_to l(:label_find_all_comments), issue_path(e) %>
|
<% end %>
|
||||||
</span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span></td>
|
</tr>
|
||||||
<% end %>
|
</table></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></td>
|
</table>
|
||||||
</tr>
|
</div>
|
||||||
</table>
|
<% end %>
|
||||||
|
</div>
|
||||||
|
<% end -%>
|
||||||
|
<div class="pagination">
|
||||||
|
<ul>
|
||||||
|
<%= pagination_links_full @events_pages%>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end -%>
|
|
||||||
</div>
|
</div>
|
||||||
<% end -%>
|
<% else %>
|
||||||
<div class="pagination">
|
|
||||||
<ul>
|
|
||||||
<%= pagination_links_full @events_pages%>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<% else %>
|
|
||||||
<p class="font_description">
|
<p class="font_description">
|
||||||
<table width="660"><tr><td><%=link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%></td><td colspan="2">
|
<table width="660">
|
||||||
<table width="580">
|
<tr>
|
||||||
<tr><td ><%=link_to (h @user.lastname+@user.firstname), user_path(@user) %> <%= l(:label_user_create_project) %> <%=link_to @project.name %><strong> !</strong></td></tr>
|
<td><%= link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%></td>
|
||||||
<tr><td class="font_lighter" style="float: right"><%= format_time(@project.created_on) %></table></td></tr></table></p>
|
<td colspan="2">
|
||||||
|
<table width="580">
|
||||||
|
<tr>
|
||||||
|
<td > <%= link_to (h @user.lastname+@user.firstname), user_path(@user) %> <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="font_lighter" style="float: right"><%= format_time(@project.created_on) %>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
</p>
|
||||||
Loading…
Reference in New Issue