##// END OF EJS Templates
Merged r15490 to r15493, r15496, r15497 (#22951)....
Merged r15490 to r15493, r15496, r15497 (#22951). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15500 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r14339:6e7e2ef59b59
r15118:8516e1c88dfe
Show More
show.html.erb
81 lines | 3.0 KiB | text/plain | TextLexer
Jean-Philippe Lang
Adds 'Edit' link on account/show for admin users....
r1732 <div class="contextual">
Eric Davis
Refactor: convert UsersController to resource...
r4117 <%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
Jean-Philippe Lang
Adds 'Edit' link on account/show for admin users....
r1732 </div>
Jean-Philippe Lang
Removed unneeded #h calls in views....
r13661 <h2><%= avatar @user, :size => "50" %> <%= @user.name %></h2>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064 <div class="splitcontentleft">
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 <ul>
Jean-Philippe Lang
User detail : show user login to admins (#17354)....
r13381 <% if User.current.admin? %>
<li><%=l(:field_login)%>: <%= @user.login %></li>
<% end %>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <% unless @user.pref.hide_mail %>
Jean-Philippe Lang
Removed unneeded #h calls in views....
r13661 <li><%=l(:field_mail)%>: <%= mail_to(@user.mail, nil, :encode => 'javascript') %></li>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <% end %>
<% @user.visible_custom_field_values.each do |custom_value| %>
<% if !custom_value.value.blank? %>
Jean-Philippe Lang
Removed unneeded #h calls in views....
r13661 <li><%= custom_value.custom_field.name %>: <%= show_value(custom_value) %></li>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <% end %>
<% end %>
Jean-Philippe Lang
Slight changes to profile on account page and last connexion date added....
r2069 <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <% unless @user.last_login_on.nil? %>
<li><%=l(:field_last_login_on)%>: <%= format_date(@user.last_login_on) %></li>
<% end %>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 </ul>
Jean-Philippe Lang
Link to assigned issues on user profiles (#3398)....
r14335 <h3><%=l(:label_issue_plural)%></h3>
<ul>
<li><%= link_to l(:label_assigned_issues),
Jean-Philippe Lang
Wrong filter value for assigned issues (#3398)....
r14339 issues_path(:set_filter => 1, :assigned_to_id => @user.id, :sort => 'priority:desc,updated_on:desc') %>:
Jean-Philippe Lang
Adds a scope to get issues assigned to a user....
r14338 <%= Issue.visible.open.assigned_to(@user).count %>
Jean-Philippe Lang
Link to assigned issues on user profiles (#3398)....
r14335 <li><%= link_to l(:label_reported_issues),
issues_path(:set_filter => 1, :status_id => '*', :author_id => @user.id) %>:
<%= Issue.visible.where(:author_id => @user.id).count %>
</ul>
Jean-Philippe Lang
Don't show "Projects" label if projects list is empty....
r565 <% unless @memberships.empty? %>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 <h3><%=l(:label_project_plural)%></h3>
Jean-Philippe Lang
Fixed confidentiality issue on account/show....
r564 <ul>
<% for membership in @memberships %>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <li><%= link_to_project(membership.project) %>
Jean-Philippe Lang
Removed unneeded #h calls in views....
r13661 (<%= membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 <% end %>
Jean-Philippe Lang
Fixed confidentiality issue on account/show....
r564 </ul>
Jean-Philippe Lang
Don't show "Projects" label if projects list is empty....
r565 <% end %>
Eric Davis
Added two plugin hooks to the account page:...
r2672 <%= call_hook :view_account_left_bottom, :user => @user %>
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064 </div>
<div class="splitcontentright">
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064 <% unless @events_by_day.empty? %>
Toshi MARUYAMA
code layout cleanup app/views/users/show.html.erb...
r8801 <h3><%= link_to l(:label_activity), :controller => 'activities',
:action => 'index', :id => nil, :user_id => @user,
:from => @events_by_day.keys.first %></h3>
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064
<div id="activity">
<% @events_by_day.keys.sort.reverse.each do |day| %>
<h4><%= format_activity_day(day) %></h4>
<dl>
<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
<dt class="<%= e.event_type %>">
<span class="time"><%= format_time(e.event_datetime, false) %></span>
Jean-Philippe Lang
Removed unneeded #h calls in views....
r13661 <%= content_tag('span', e.project, :class => 'project') %>
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064 <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
<dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
<% end -%>
</dl>
<% end -%>
</div>
Jean-Philippe Lang
Adds atom feed on user's account page....
r2067
Jean-Philippe Lang
Adds an helper to render other formats download links....
r2331 <% other_formats_links do |f| %>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
Jean-Philippe Lang
Adds an helper to render other formats download links....
r2331 <% end %>
Jean-Philippe Lang
Adds atom feed on user's account page....
r2067
<% content_for :header_tags do %>
Toshi MARUYAMA
replace tabs to spaces at app/views/users/show.html.erb...
r7150 <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
Jean-Philippe Lang
Adds atom feed on user's account page....
r2067 <% end %>
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064 <% end %>
Eric Davis
Added two plugin hooks to the account page:...
r2672 <%= call_hook :view_account_right_bottom, :user => @user %>
Jean-Philippe Lang
Display latest user's activity on account/show view....
r2064 </div>
Etienne Massip
Remove unecessary page title HTML escaping from views (#9252)....
r7445 <% html_title @user.name %>