summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-05-29 11:59:16 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-05-29 11:59:16 +0000
commit3e3c2333e4756ebc261b31563f50754c4cdaa890 (patch)
treefd0bfe7a3ab6142fce768f89531caf8358ac2348
parenta3df0f7d3803c26169f50043f298ebb292afeead (diff)
downloadredmine-3e3c2333e4756ebc261b31563f50754c4cdaa890.tar.gz
redmine-3e3c2333e4756ebc261b31563f50754c4cdaa890.zip
Slight UI changes (#4273).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5960 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/projects/settings/_repository.rhtml5
-rw-r--r--app/views/settings/_repositories.rhtml8
-rw-r--r--public/stylesheets/application.css5
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 @@
<p>
<%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
<% if @repository && ! @repository.class.scm_available %>
-<br />
-<%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%>
-<%= l(:text_scm_command_not_available) %>
+ <br />
+ <em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
<% end %>
</p>
<% 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
@@ -5,8 +5,6 @@
<table>
<tr>
<th></th>
- <th></th>
- <th></th>
<th><%= l(:text_scm_command) %></th>
<th><%= l(:text_scm_command_version) %></th>
</tr>
@@ -15,15 +13,13 @@
<% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
<% setting = :enabled_scm %>
<tr>
- <td>
+ <td class="scm_name">
<%=
check_box_tag(
"settings[#{setting}][]",
value,
Setting.send(setting).include?(value))
%>
- </td>
- <td class="scm_name">
<%= text.to_s %>
</td>
<td>
@@ -33,8 +29,6 @@
:style => "vertical-align:bottom;"
)
%>
- </td>
- <td>
<%= scm_class.scm_command %>
</td>
<td>
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; }