From 3e3c2333e4756ebc261b31563f50754c4cdaa890 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 29 May 2011 11:59:16 +0000 Subject: [PATCH] Slight UI changes (#4273). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5960 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/projects/settings/_repository.rhtml | 5 ++--- app/views/settings/_repositories.rhtml | 8 +------- public/stylesheets/application.css | 5 ++++- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml index b91078645..3bd3b4338 100644 --- a/app/views/projects/settings/_repository.rhtml +++ b/app/views/projects/settings/_repository.rhtml @@ -9,9 +9,8 @@

<%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %> <% if @repository && ! @repository.class.scm_available %> -
-<%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%> -<%= l(:text_scm_command_not_available) %> +
+ <%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %> <% end %>

<% button_disabled = true %> diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml index 4406d2c2a..b3c252f16 100644 --- a/app/views/settings/_repositories.rhtml +++ b/app/views/settings/_repositories.rhtml @@ -4,8 +4,6 @@ <%= l(:setting_enabled_scm) %> - - @@ -15,15 +13,13 @@ <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %> <% setting = :enabled_scm %> - - -
<%= l(:text_scm_command) %> <%= l(:text_scm_command_version) %>
+ <%= check_box_tag( "settings[#{setting}][]", value, Setting.send(setting).include?(value)) %> - <%= text.to_s %> @@ -33,8 +29,6 @@ :style => "vertical-align:bottom;" ) %> - <%= scm_class.scm_command %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 0b6cc755e..d74cba136 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -434,8 +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 table {width:100%} .tabular.settings.enabled_scm td.scm_name{ font-weight: bold; } -.tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; } +.tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; font-style:italic;} fieldset.settings label { display: block; } fieldset#notified_events .parent { padding-left: 20px; } @@ -508,6 +509,8 @@ div.flash.warning { color: #A6750C; } +span.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;} + #errorExplanation ul { font-size: 0.9em;} #errorExplanation h2, #errorExplanation p { display: none; } -- 2.39.5