Mercurial > hg > soundsoftware-site
comparison app/views/my/.svn/text-base/_sidebar.rhtml.svn-base @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | cbce1fd3b1b7 |
children |
comparison
equal
deleted
inserted
replaced
512:b9aebdd7dd40 | 514:7eba09d624db |
---|---|
1 <h3><%=l(:label_my_account)%></h3> | 1 <h3><%=l(:label_my_account)%></h3> |
2 | 2 |
3 <p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br /> | 3 <p><%=l(:field_login)%>: <strong><%= link_to_user(@user, :format => :username) %></strong><br /> |
4 <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p> | 4 <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p> |
5 | 5 |
6 | 6 |
7 <h4><%= l(:label_feeds_access_key) %></h4> | 7 <h4><%= l(:label_feeds_access_key) %></h4> |
8 | 8 |
17 | 17 |
18 <% if Setting.rest_api_enabled? %> | 18 <% if Setting.rest_api_enabled? %> |
19 <h4><%= l(:label_api_access_key) %></h4> | 19 <h4><%= l(:label_api_access_key) %></h4> |
20 <div> | 20 <div> |
21 <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%> | 21 <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%> |
22 <pre id='api-access-key' class='autoscroll'><%= @user.api_key %></pre> | 22 <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre> |
23 </div> | 23 </div> |
24 <%= javascript_tag("$('api-access-key').hide();") %> | 24 <%= javascript_tag("$('api-access-key').hide();") %> |
25 <p> | 25 <p> |
26 <% if @user.api_token %> | 26 <% if @user.api_token %> |
27 <%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %> | 27 <%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %> |