summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-23 18:13:24 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-23 18:13:24 +0000
commite26eeef837f15de2d8f139ca838980eaa9de4da0 (patch)
tree263ba38f7580ce4b4bf2e5ee2faaa43e241874cf /app
parentd404d2f586645cfc6d334c3ef4e963b2fa1b9667 (diff)
downloadredmine-e26eeef837f15de2d8f139ca838980eaa9de4da0.tar.gz
redmine-e26eeef837f15de2d8f139ca838980eaa9de4da0.zip
Display API key in the sidebar, just below the API key heading.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3225 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/my/_sidebar.rhtml5
-rw-r--r--app/views/my/account.rhtml11
2 files changed, 5 insertions, 11 deletions
diff --git a/app/views/my/_sidebar.rhtml b/app/views/my/_sidebar.rhtml
index ee3c8abdc..0a95acfea 100644
--- a/app/views/my/_sidebar.rhtml
+++ b/app/views/my/_sidebar.rhtml
@@ -18,6 +18,11 @@
<% if Setting.rest_api_enabled? %>
<h4><%= l(:label_api_access_key) %></h4>
<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();") %>
+<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 %>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index a3136f4cd..9bf45b33e 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -52,17 +52,6 @@
<% end %>
</div>
-<% if Setting.rest_api_enabled? && @user.api_token %>
-<h3><%=l(:label_api_access_key) %></h3>
-<div class="box">
- <p>
- <%= link_to_function(l(:button_show), "$('api-access-key').show();")%>
- <pre id='api-access-key'><%= @user.api_key %></pre>
- </p>
- <%= javascript_tag("$('api-access-key').hide();") %>
-</div>
-<% end %>
-
</div>
<% end %>