138 lines
5.5 KiB
Plaintext
138 lines
5.5 KiB
Plaintext
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
|
<p class="subtitle">
|
|
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
|
</p>
|
|
|
|
<!-- <div id="activity">
|
|
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
|
<h3><%= format_activity_day(day) %></h3>
|
|
<dl>
|
|
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
|
<dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
|
|
<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
|
|
<span class="time"><%= format_time(e.event_datetime, false) %></span>
|
|
<%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
|
|
<%= link_to format_activity_title(e.event_title), e.event_url %>
|
|
</dt>
|
|
<dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
|
|
<span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
|
|
<% end -%>
|
|
</dl>
|
|
<% end -%>
|
|
</div> -->
|
|
|
|
<!-- <div id="activity">
|
|
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
|
<h3><%= format_activity_day(day) %></h3>
|
|
<div>
|
|
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
|
<div class="issue-note">
|
|
<!-- <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %> -->
|
|
<!--<div class="img-activity">
|
|
<%= tag('img', {:src => 'http://localhost:3000/images/12_50.png', :class => 'img-ta2'}, false, false) %>
|
|
</div>
|
|
<div class="<%= "grouped" if in_group %>">
|
|
<div class="description">
|
|
<%= format_activity_description(e.event_description) %>
|
|
</div>
|
|
</div>
|
|
<div class="activity-info">
|
|
<div class="time">
|
|
<span>时间： </span><%= format_time(e.event_datetime, false) %>
|
|
</div>
|
|
<div class="content">
|
|
<span>主题： </span><span class="project-name"><%= h(e.project) if @project.nil? || @project != e.project %></span>
|
|
<%= link_to format_activity_title(e.event_title), e.event_url %>
|
|
</div>
|
|
<div class="author">
|
|
<span>作者： </span><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
|
</div>
|
|
<div style="clear: both"></div>
|
|
</div>
|
|
|
|
</div>
|
|
<% end -%>
|
|
</div>
|
|
<% end -%>
|
|
</div>-->
|
|
<!--add by huang-->
|
|
<div id="activity">
|
|
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
|
<h3></h3>
|
|
<div>
|
|
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
|
<div class="issue-note">
|
|
<table width="660px" border="0" align="center">
|
|
<tr>
|
|
<td colspan="2" valign="top" width="50" ><img src="/images/new/user.jpg" width="40" height="40"/></td>
|
|
<td><table width="580px" border="0">
|
|
<tr>
|
|
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong>
|
|
<span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
|
|
</tr>
|
|
<tr>
|
|
<td colspan="2" width="580px" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td>
|
|
</tr>
|
|
<tr>
|
|
<td align="left"><a class="font_lighter"><%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
|
|
<td width="200" align="center" class="a"><a class="font_lighter"></a><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></td>
|
|
</tr>
|
|
</table></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<% end -%>
|
|
</div>
|
|
<% end -%>
|
|
</div>
|
|
<!--end-->
|
|
<div class="pagination">
|
|
<ul>
|
|
<%= pagination_links_full @activity_pages%>
|
|
</ul>
|
|
</div>
|
|
<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
|
|
|
|
<div style="float:left;">
|
|
<%= link_to_content_update("\xc2\xab " + l(:label_previous),
|
|
params.merge(:from => @date_to - @days - 1),
|
|
:title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>
|
|
</div>
|
|
<div style="float:right;">
|
|
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",
|
|
params.merge(:from => @date_to + @days - 1),
|
|
:title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
|
|
</div>
|
|
<% other_formats_links do |f| %>
|
|
<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
|
|
<% end %>
|
|
|
|
<% content_for :header_tags do %>
|
|
<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
|
|
<% end %>
|
|
|
|
<% content_for :sidebar do %>
|
|
<%= form_tag({}, :method => :get) do %>
|
|
<h3><%= l(:label_activity) %></h3>
|
|
<p>
|
|
<% @activity.event_types.each do |t| %>
|
|
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
|
|
<label for="show_<%= t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%></label>
|
|
<br />
|
|
<% end %>
|
|
</p>
|
|
<% if @project && @project.descendants.active.any? %>
|
|
<%= hidden_field_tag 'with_subprojects', 0 %>
|
|
<p>
|
|
<label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%= l(:label_subproject_plural)%></label>
|
|
</p>
|
|
<% end %>
|
|
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
|
|
<p>
|
|
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
|
|
</p>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% html_title(l(:label_activity), @author) -%>
|