diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-01 18:44:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-01 18:44:35 +0000 |
| commit | 74bb6212c82523b098b4be0d930e324fe056ae21 (patch) | |
| tree | 97037d65a5c87278bae7d071020da5c2d427d032 | |
| parent | 16cc9ec06a5760ab8143ba27bd7324ebf55507a1 (diff) | |
| download | redmine-74bb6212c82523b098b4be0d930e324fe056ae21.tar.gz redmine-74bb6212c82523b098b4be0d930e324fe056ae21.zip | |
Moved API settings to their own tab.
git-svn-id: http://svn.redmine.org/redmine/trunk@14636 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/settings_helper.rb | 1 | ||||
| -rw-r--r-- | app/views/settings/_api.html.erb | 10 | ||||
| -rw-r--r-- | app/views/settings/_authentication.html.erb | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/fr.yml | 1 |
5 files changed, 13 insertions, 4 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 17a4f49af..6a1482419 100644 --- 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 index 000000000..6ee401037 --- /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 80fb4bd5a..3c5b1c1fe 100644 --- 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 d38b85d81..4a3cac92a 100644 --- 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 8c2a13d32..29e3a0727 100644 --- 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 |