From 9557f4ce7ce6a1f08452b3b663b447e9f39751db Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 29 May 2011 10:54:45 +0000 Subject: [PATCH] scm: show scm commands and versions on administration panel (#4273). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5952 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/settings/_repositories.rhtml | 50 ++++++++++++++++++++++++-- config/locales/en.yml | 7 ++-- public/stylesheets/application.css | 3 ++ 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml index 97af65cd9..4406d2c2a 100644 --- a/app/views/settings/_repositories.rhtml +++ b/app/views/settings/_repositories.rhtml @@ -1,5 +1,53 @@ <% form_tag({:action => 'edit', :tab => 'repositories'}) do %> +
+<%= l(:setting_enabled_scm) %> + + + + + + + + + <% Redmine::Scm::Base.all.collect do |choice| %> + <% scm_class = "Repository::#{choice}".constantize %> + <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %> + <% setting = :enabled_scm %> + + + + + + + + <% end %> +
<%= l(:text_scm_command) %><%= l(:text_scm_command_version) %>
+ <%= + check_box_tag( + "settings[#{setting}][]", + value, + Setting.send(setting).include?(value)) + %> + + <%= text.to_s %> + + <%= + image_tag( + (scm_class.scm_available ? 'true.png' : 'exclamation.png'), + :style => "vertical-align:bottom;" + ) + %> + + <%= scm_class.scm_command %> + + <%= scm_class.scm_version_string %> +
+

+<%= l(:text_scm_config) %> +

+
+

<%= setting_check_box :autofetch_changesets %>

@@ -16,8 +64,6 @@ "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>

-

<%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %>

-

<%= setting_text_field :repositories_encodings, :size => 60 %>
<%= l(:text_comma_separated) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 40d66093e..64587aaae 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -867,17 +867,17 @@ en: button_quote: Quote button_duplicate: Duplicate button_show: Show - + status_active: active status_registered: registered status_locked: locked - + version_status_open: open version_status_locked: locked version_status_closed: closed field_active: Active - + text_select_mail_notifications: Select actions for which email notifications should be sent. text_regexp_info: eg. ^[A-Z0-9]+$ text_min_max_length_info: 0 means no restriction @@ -946,6 +946,7 @@ en: text_mercurial_repository_note: "Local repository (e.g. /hgrepo, c:\hgrepo)" text_scm_command: Command text_scm_command_version: Version + text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it. default_role_manager: Manager default_role_developer: Developer diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 47eb839c8..0b6cc755e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -434,6 +434,9 @@ input#time_entry_comments { width: 90%;} .tabular.settings label{ margin-left: -300px; width: 295px; } .tabular.settings textarea { width: 99%; } +.tabular.settings.enabled_scm td.scm_name{ font-weight: bold; } +.tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; } + fieldset.settings label { display: block; } fieldset#notified_events .parent { padding-left: 20px; } -- 2.39.5