From df937e89d84bbd854aabf6ab3e58cd3fd5037365 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 23 Oct 2014 16:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/activities/index.html.erb | 75 ++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 907d21ee2..d03a05477 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -10,24 +10,46 @@
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
- - - - - -
- - - - - - - - - - -
<%= h(e.project) if @project.nil? || @project != e.project %> - <%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %>

<%= format_activity_description(e.event_description) %>

<%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+ + + + + +
+ + + + + + + + + + + + + +
+ + <%= h(e.project) if @project.nil? || @project != e.project %> + + + <%= l(:label_new_activity) %> + + <%= link_to format_activity_title(e.event_title), e.event_url %> +
+

+ <%= format_activity_description(e.event_description) %> +

+
+ + <%= format_activity_day(day) %> + <%= format_time(e.event_datetime, false) %> + + + <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> +
+
<% end -%>
@@ -52,11 +74,11 @@ :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %> <% other_formats_links do |f| %> -<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %> + <%= 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)) %> + <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %> <% end %> <% content_for :sidebar do %> @@ -64,15 +86,20 @@

<%= l(:label_activity) %>

<% @activity.event_types.each do |t| %> - <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> - -
+ <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> + +
<% end %>

<% if @project && @project.descendants.active.any? %> <%= hidden_field_tag 'with_subprojects', 0 %>

- +

<% end %> <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>