Merged r5950 to r5960 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-29 12:06:05 +00:00
parent 2c2760d041
commit f08f09a9d3
48 changed files with 183 additions and 31 deletions
@@ -8,12 +8,9 @@
 <div class="box tabular">
 <p>
 <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
-<% if @repository %>
-<br />
-<%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%>
-<%=  l(:text_scm_command) -%>: <%= @repository.class.scm_command %>
-|
-<%=  l(:text_scm_command_version) -%>: <%= @repository.class.scm_version_string %>
+<% if @repository && ! @repository.class.scm_available %>
+	<br />
+	<em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
 <% end %>
 </p>
 <% button_disabled = true %>