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

diff --git a/app/views/my/_sidebar.rhtml b/app/views/my/_sidebar.rhtml
index ee3c8abdc561d70d8e07ddcb1f0e87fc25031f7c..0a95acfea00e3bd9360f1803d06c0a0335a4b17a 100644 (file)
--- a/app/views/my/_sidebar.rhtml
+++ b/app/views/my/_sidebar.rhtml
@@ -17,6 +17,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)) %>

diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index a3136f4cd84afc1c914be92e9984f637538a9e67..9bf45b33e4dfed04ee6f18c0e6f98d7d2260e75d 100644 (file)
--- 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 %>