| @@ -1,66 +1,66 | |||
|
|
1 | 1 | <div class="contextual"> |
|
|
2 | 2 | <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %> |
|
|
3 | 3 | </div> |
|
|
4 | 4 | |
|
|
5 | 5 | <h2><%= avatar @user %> <%=h @user.name %></h2> |
|
|
6 | 6 | |
|
|
7 | 7 | <div class="splitcontentleft"> |
|
|
8 | 8 | <p> |
|
|
9 | 9 | <%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %> |
|
|
10 | 10 | <ul> |
|
|
11 | 11 | <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li> |
|
|
12 | 12 | <% for custom_value in @custom_values %> |
|
|
13 | 13 | <% if !custom_value.value.empty? %> |
|
|
14 | 14 | <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li> |
|
|
15 | 15 | <% end %> |
|
|
16 | 16 | <% end %> |
|
|
17 | 17 | </ul> |
|
|
18 | 18 | </p> |
|
|
19 | 19 | |
|
|
20 | 20 | <% unless @memberships.empty? %> |
|
|
21 | 21 | <h3><%=l(:label_project_plural)%></h3> |
|
|
22 | 22 | <ul> |
|
|
23 | 23 | <% for membership in @memberships %> |
|
|
24 | 24 | <li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %> |
|
|
25 | 25 | (<%=h membership.role.name %>, <%= format_date(membership.created_on) %>)</li> |
|
|
26 | 26 | <% end %> |
|
|
27 | 27 | </ul> |
|
|
28 | 28 | <% end %> |
|
|
29 | 29 | </div> |
|
|
30 | 30 | |
|
|
31 | 31 | <div class="splitcontentright"> |
|
|
32 | 32 | |
|
|
33 | 33 | <% unless @events_by_day.empty? %> |
|
|
34 | <h3><%=l(:label_activity)%></h3> | |
|
|
34 | <h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :user_id => @user, :from => @events_by_day.keys.first %></h3> | |
|
|
35 | 35 | |
|
|
36 | 36 | <p> |
|
|
37 | 37 | <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %> |
|
|
38 | 38 | </p> |
|
|
39 | 39 | |
|
|
40 | 40 | <div id="activity"> |
|
|
41 | 41 | <% @events_by_day.keys.sort.reverse.each do |day| %> |
|
|
42 | 42 | <h4><%= format_activity_day(day) %></h4> |
|
|
43 | 43 | <dl> |
|
|
44 | 44 | <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> |
|
|
45 | 45 | <dt class="<%= e.event_type %>"> |
|
|
46 | 46 | <span class="time"><%= format_time(e.event_datetime, false) %></span> |
|
|
47 | 47 | <%= content_tag('span', h(e.project), :class => 'project') %> |
|
|
48 | 48 | <%= link_to format_activity_title(e.event_title), e.event_url %></dt> |
|
|
49 | 49 | <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd> |
|
|
50 | 50 | <% end -%> |
|
|
51 | 51 | </dl> |
|
|
52 | 52 | <% end -%> |
|
|
53 | 53 | </div> |
|
|
54 | 54 | |
|
|
55 | 55 | <p class="other-formats"> |
|
|
56 | 56 | <%= l(:label_export_to) %> |
|
|
57 | 57 | <%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key}, :class => 'feed' %> |
|
|
58 | 58 | </p> |
|
|
59 | 59 | |
|
|
60 | 60 | <% content_for :header_tags do %> |
|
|
61 | 61 | <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %> |
|
|
62 | 62 | <% end %> |
|
|
63 | 63 | <% end %> |
|
|
64 | 64 | </div> |
|
|
65 | 65 | |
|
|
66 | 66 | <% html_title @user.name %> |
| @@ -1,60 +1,60 | |||
|
|
1 |
<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, @author |
|
|
|
1 | <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2> | |
|
|
2 | 2 | <p class="subtitle"><%= "#{l(:label_date_from)} #{format_date(@date_to - @days)} #{l(:label_date_to).downcase} #{format_date(@date_to-1)}" %></p> |
|
|
3 | 3 | |
|
|
4 | 4 | <div id="activity"> |
|
|
5 | 5 | <% @events_by_day.keys.sort.reverse.each do |day| %> |
|
|
6 | 6 | <h3><%= format_activity_day(day) %></h3> |
|
|
7 | 7 | <dl> |
|
|
8 | 8 | <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> |
|
|
9 | 9 | <dt class="<%= e.event_type %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>"> |
|
|
10 | 10 | <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %> |
|
|
11 | 11 | <span class="time"><%= format_time(e.event_datetime, false) %></span> |
|
|
12 | 12 | <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> |
|
|
13 | 13 | <%= link_to format_activity_title(e.event_title), e.event_url %></dt> |
|
|
14 | 14 | <dd><span class="description"><%= format_activity_description(e.event_description) %></span> |
|
|
15 | 15 | <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd> |
|
|
16 | 16 | <% end -%> |
|
|
17 | 17 | </dl> |
|
|
18 | 18 | <% end -%> |
|
|
19 | 19 | </div> |
|
|
20 | 20 | |
|
|
21 | 21 | <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %> |
|
|
22 | 22 | |
|
|
23 | 23 | <div style="float:left;"> |
|
|
24 | 24 | <%= link_to_remote(('« ' + l(:label_previous)), |
|
|
25 | 25 | {:update => "content", :url => params.merge(:from => @date_to - @days - 1), :complete => 'window.scrollTo(0,0)'}, |
|
|
26 | 26 | {:href => url_for(params.merge(:from => @date_to - @days - 1)), |
|
|
27 | 27 | :title => "#{l(:label_date_from)} #{format_date(@date_to - 2*@days)} #{l(:label_date_to).downcase} #{format_date(@date_to - @days - 1)}"}) %> |
|
|
28 | 28 | </div> |
|
|
29 | 29 | <div style="float:right;"> |
|
|
30 | 30 | <%= link_to_remote((l(:label_next) + ' »'), |
|
|
31 | 31 | {:update => "content", :url => params.merge(:from => @date_to + @days - 1), :complete => 'window.scrollTo(0,0)'}, |
|
|
32 | 32 | {:href => url_for(params.merge(:from => @date_to + @days - 1)), |
|
|
33 | 33 | :title => "#{l(:label_date_from)} #{format_date(@date_to)} #{l(:label_date_to).downcase} #{format_date(@date_to + @days - 1)}"}) unless @date_to >= Date.today %> |
|
|
34 | 34 | </div> |
|
|
35 | 35 | |
|
|
36 | 36 | <p class="other-formats"> |
|
|
37 | 37 | <%= l(:label_export_to) %> |
|
|
38 | 38 | <%= link_to 'Atom', params.merge(:format => :atom, :from => nil, :key => User.current.rss_key), :class => 'feed' %> |
|
|
39 | 39 | </p> |
|
|
40 | 40 | |
|
|
41 | 41 | <% content_for :header_tags do %> |
|
|
42 | 42 | <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %> |
|
|
43 | 43 | <% end %> |
|
|
44 | 44 | |
|
|
45 | 45 | <% content_for :sidebar do %> |
|
|
46 | 46 | <% form_tag({}, :method => :get) do %> |
|
|
47 | 47 | <h3><%= l(:label_activity) %></h3> |
|
|
48 | 48 | <p><% @activity.event_types.each do |t| %> |
|
|
49 | 49 | <label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br /> |
|
|
50 | 50 | <% end %></p> |
|
|
51 | 51 | <% if @project && @project.active_children.any? %> |
|
|
52 | 52 | <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> |
|
|
53 | 53 | <%= hidden_field_tag 'with_subprojects', 0 %> |
|
|
54 | 54 | <% end %> |
|
|
55 | 55 | <%= hidden_field_tag 'user_id', params[:user_id] %> |
|
|
56 | 56 | <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p> |
|
|
57 | 57 | <% end %> |
|
|
58 | 58 | <% end %> |
|
|
59 | 59 | |
|
|
60 | 60 | <% html_title(l(:label_activity), @author) -%> |
General Comments 0
You need to be logged in to leave comments.
Login now