Moved API settings to their own tab.

git-svn-id: http://svn.redmine.org/redmine/trunk@14636 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 17a4f49afbda74c7485eec3aedcb693c06c7de4d..6a14824192c5b31a2a7e20156d1208546c46caa9 100644 (file)
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -22,6 +22,7 @@ module SettingsHelper
     tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
             {:name => 'display', :partial => 'settings/display', :label => :label_display},
             {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
+            {:name => 'api', :partial => 'settings/api', :label => :label_api},
             {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
             {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},

diff --git a/app/views/settings/_api.html.erb b/app/views/settings/_api.html.erb
new file mode 100644 (file)
index 0000000..6ee4010
--- /dev/null
+++ b/app/views/settings/_api.html.erb
@@ -0,0 +1,10 @@
+<%= form_tag({:action => 'edit', :tab => 'api'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :rest_api_enabled %></p>
+
+<p><%= setting_check_box :jsonp_enabled %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>

diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index 80fb4bd5aae49040cc71cbbe4a65d4da63d6259a..3c5b1c1fe4fa0325a26d0d6a32eedf6b18d6b700 100644 (file)
--- a/app/views/settings/_authentication.html.erb
+++ b/app/views/settings/_authentication.html.erb
@@ -23,10 +23,6 @@
 <p><%= setting_text_field :max_additional_emails, :size => 6 %></p>
 
 <p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
-
-<p><%= setting_check_box :rest_api_enabled %></p>
-
-<p><%= setting_check_box :jsonp_enabled %></p>
 </div>
 
 <fieldset class="box">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d38b85d814f523b7fd71b9e2bae962d730bca149..4a3cac92a5899fcd77311864c2ee6fbe6dba14da 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -971,6 +971,7 @@ en:
   label_fields_mapping: Fields mapping
   label_file_content_preview: File content preview
   label_create_missing_values: Create missing values
+  label_api: API
 
   button_login: Login
   button_submit: Submit

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8c2a13d322beb626aba3911be7fb29f5dd509d03..29e3a07270f4e2d60c4757c6336849e540c57710 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -989,6 +989,7 @@ fr:
   label_fields_mapping: Correspondance des champs
   label_file_content_preview: Aperçu du contenu du fichier
   label_create_missing_values: Créer les valeurs manquantes
+  label_api: API
 
   button_login: Connexion
   button_submit: Soumettre