##// END OF EJS Templates
Slight changes to profile on account page and last connexion date added....
Jean-Philippe Lang -
r2069:dfc7a9457864
parent child
Show More
@@ -1,66 +1,69
1 <div class="contextual">
1 <div class="contextual">
2 <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
2 <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
3 </div>
3 </div>
4
4
5 <h2><%= avatar @user %> <%=h @user.name %></h2>
5 <h2><%= avatar @user %> <%=h @user.name %></h2>
6
6
7 <div class="splitcontentleft">
7 <div class="splitcontentleft">
8 <p>
9 <%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %>
10 <ul>
8 <ul>
11 <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
9 <% unless @user.pref.hide_mail %>
12 <% for custom_value in @custom_values %>
10 <li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail)) %></li>
13 <% if !custom_value.value.empty? %>
11 <% end %>
12 <% for custom_value in @custom_values %>
13 <% if !custom_value.value.empty? %>
14 <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
14 <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
15 <% end %>
15 <% end %>
16 <% end %>
16 <% end %>
17 <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
18 <% unless @user.last_login_on.nil? %>
19 <li><%=l(:field_last_login_on)%>: <%= format_date(@user.last_login_on) %></li>
20 <% end %>
17 </ul>
21 </ul>
18 </p>
19
22
20 <% unless @memberships.empty? %>
23 <% unless @memberships.empty? %>
21 <h3><%=l(:label_project_plural)%></h3>
24 <h3><%=l(:label_project_plural)%></h3>
22 <ul>
25 <ul>
23 <% for membership in @memberships %>
26 <% for membership in @memberships %>
24 <li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
27 <li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
25 (<%=h membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
28 (<%=h membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
26 <% end %>
29 <% end %>
27 </ul>
30 </ul>
28 <% end %>
31 <% end %>
29 </div>
32 </div>
30
33
31 <div class="splitcontentright">
34 <div class="splitcontentright">
32
35
33 <% unless @events_by_day.empty? %>
36 <% unless @events_by_day.empty? %>
34 <h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :user_id => @user, :from => @events_by_day.keys.first %></h3>
37 <h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :user_id => @user, :from => @events_by_day.keys.first %></h3>
35
38
36 <p>
39 <p>
37 <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
40 <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
38 </p>
41 </p>
39
42
40 <div id="activity">
43 <div id="activity">
41 <% @events_by_day.keys.sort.reverse.each do |day| %>
44 <% @events_by_day.keys.sort.reverse.each do |day| %>
42 <h4><%= format_activity_day(day) %></h4>
45 <h4><%= format_activity_day(day) %></h4>
43 <dl>
46 <dl>
44 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
47 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
45 <dt class="<%= e.event_type %>">
48 <dt class="<%= e.event_type %>">
46 <span class="time"><%= format_time(e.event_datetime, false) %></span>
49 <span class="time"><%= format_time(e.event_datetime, false) %></span>
47 <%= content_tag('span', h(e.project), :class => 'project') %>
50 <%= content_tag('span', h(e.project), :class => 'project') %>
48 <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
51 <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
49 <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
52 <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
50 <% end -%>
53 <% end -%>
51 </dl>
54 </dl>
52 <% end -%>
55 <% end -%>
53 </div>
56 </div>
54
57
55 <p class="other-formats">
58 <p class="other-formats">
56 <%= l(:label_export_to) %>
59 <%= l(:label_export_to) %>
57 <%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key}, :class => 'feed' %>
60 <%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key}, :class => 'feed' %>
58 </p>
61 </p>
59
62
60 <% content_for :header_tags do %>
63 <% content_for :header_tags do %>
61 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
64 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
62 <% end %>
65 <% end %>
63 <% end %>
66 <% end %>
64 </div>
67 </div>
65
68
66 <% html_title @user.name %>
69 <% html_title @user.name %>
General Comments 0
You need to be logged in to leave comments. Login now