##// END OF EJS Templates
Merged r3258 and r3281 from trunk....
Merged r3258 and r3281 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3286 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r3111:e26eeef837f1
r3172:4c75864948c6
Show More
_sidebar.rhtml
33 lines | 1.1 KiB | text/html+ruby | RhtmlLexer
/ app / views / my / _sidebar.rhtml
Jean-Philippe Lang
More flexible mail notifications settings at user level. A user has now 3 options:...
r842 <h3><%=l(:label_my_account)%></h3>
<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
Eric Davis
Added an API token for each User to use when making API requests. (#3920)...
r3103
<h4><%= l(:label_feeds_access_key) %></h4>
<p>
Jean-Philippe Lang
More flexible mail notifications settings at user level. A user has now 3 options:...
r842 <% if @user.rss_token %>
Eric Davis
Added an API token for each User to use when making API requests. (#3920)...
r3103 <%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
<% else %>
<%= l(:label_missing_feeds_access_key) %>
<% end %>
(<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
</p>
Jean-Philippe Lang
Do not display API key if API is disabled....
r3110 <% if Setting.rest_api_enabled? %>
Eric Davis
Added an API token for each User to use when making API requests. (#3920)...
r3103 <h4><%= l(:label_api_access_key) %></h4>
Jean-Philippe Lang
Display API key in the sidebar, just below the API key heading....
r3111 <p>
<%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%>
<pre id='api-access-key' class='autoscroll'><%= @user.api_key %></pre>
</p>
<%= javascript_tag("$('api-access-key').hide();") %>
Eric Davis
Added an API token for each User to use when making API requests. (#3920)...
r3103 <p>
<% if @user.api_token %>
<%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %>
<% else %>
<%= l(:label_missing_api_access_key) %>
Jean-Philippe Lang
More flexible mail notifications settings at user level. A user has now 3 options:...
r842 <% end %>
Eric Davis
Added an API token for each User to use when making API requests. (#3920)...
r3103 (<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
</p>
Jean-Philippe Lang
Do not display API key if API is disabled....
r3110 <% end %>