summaryrefslogtreecommitdiffstats
path: root/app/views/settings
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-23 17:56:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-23 17:56:39 +0000
commitff36245f3e1eefc9bd2dcc0d5cd18d50a3cb0445 (patch)
treec038069dde6a2c58eb2909861eab860daeaeb4f8 /app/views/settings
parentedab0f0cbb85fb571097d2365bc8edc03962707e (diff)
downloadredmine-ff36245f3e1eefc9bd2dcc0d5cd18d50a3cb0445.tar.gz
redmine-ff36245f3e1eefc9bd2dcc0d5cd18d50a3cb0445.zip
Move API setting to Authentication tab and add translations strings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3222 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/settings')
-rw-r--r--app/views/settings/_authentication.rhtml2
-rw-r--r--app/views/settings/_integration.html.erb8
2 files changed, 2 insertions, 8 deletions
diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
index 0d066f91a..eb51ee9f6 100644
--- a/app/views/settings/_authentication.rhtml
+++ b/app/views/settings/_authentication.rhtml
@@ -15,6 +15,8 @@
<p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
<p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
+
+<p><%= setting_check_box :rest_api_enabled %></p>
</div>
<div style="float:right;">
diff --git a/app/views/settings/_integration.html.erb b/app/views/settings/_integration.html.erb
deleted file mode 100644
index 23a612e56..000000000
--- a/app/views/settings/_integration.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'integration'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :rest_api_enabled %></p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>