| @@ -9,9 +9,8 | |||||
| 9 | <p> |
|
9 | <p> | |
| 10 | <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %> |
|
10 | <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %> | |
| 11 | <% if @repository && ! @repository.class.scm_available %> |
|
11 | <% if @repository && ! @repository.class.scm_available %> | |
| 12 | <br /> |
|
12 | <br /> | |
| 13 | <%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%> |
|
13 | <em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em> | |
| 14 | <%= l(:text_scm_command_not_available) %> |
|
|||
| 15 | <% end %> |
|
14 | <% end %> | |
| 16 | </p> |
|
15 | </p> | |
| 17 | <% button_disabled = true %> |
|
16 | <% button_disabled = true %> | |
| @@ -5,8 +5,6 | |||||
| 5 | <table> |
|
5 | <table> | |
| 6 | <tr> |
|
6 | <tr> | |
| 7 | <th></th> |
|
7 | <th></th> | |
| 8 | <th></th> |
|
|||
| 9 | <th></th> |
|
|||
| 10 | <th><%= l(:text_scm_command) %></th> |
|
8 | <th><%= l(:text_scm_command) %></th> | |
| 11 | <th><%= l(:text_scm_command_version) %></th> |
|
9 | <th><%= l(:text_scm_command_version) %></th> | |
| 12 | </tr> |
|
10 | </tr> | |
| @@ -15,15 +13,13 | |||||
| 15 | <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %> |
|
13 | <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %> | |
| 16 | <% setting = :enabled_scm %> |
|
14 | <% setting = :enabled_scm %> | |
| 17 | <tr> |
|
15 | <tr> | |
| 18 | <td> |
|
16 | <td class="scm_name"> | |
| 19 | <%= |
|
17 | <%= | |
| 20 | check_box_tag( |
|
18 | check_box_tag( | |
| 21 | "settings[#{setting}][]", |
|
19 | "settings[#{setting}][]", | |
| 22 | value, |
|
20 | value, | |
| 23 | Setting.send(setting).include?(value)) |
|
21 | Setting.send(setting).include?(value)) | |
| 24 | %> |
|
22 | %> | |
| 25 | </td> |
|
|||
| 26 | <td class="scm_name"> |
|
|||
| 27 | <%= text.to_s %> |
|
23 | <%= text.to_s %> | |
| 28 | </td> |
|
24 | </td> | |
| 29 | <td> |
|
25 | <td> | |
| @@ -33,8 +29,6 | |||||
| 33 | :style => "vertical-align:bottom;" |
|
29 | :style => "vertical-align:bottom;" | |
| 34 | ) |
|
30 | ) | |
| 35 | %> |
|
31 | %> | |
| 36 | </td> |
|
|||
| 37 | <td> |
|
|||
| 38 | <%= scm_class.scm_command %> |
|
32 | <%= scm_class.scm_command %> | |
| 39 | </td> |
|
33 | </td> | |
| 40 | <td> |
|
34 | <td> | |
| @@ -434,8 +434,9 input#time_entry_comments { width: 90%;} | |||||
| 434 | .tabular.settings label{ margin-left: -300px; width: 295px; } |
|
434 | .tabular.settings label{ margin-left: -300px; width: 295px; } | |
| 435 | .tabular.settings textarea { width: 99%; } |
|
435 | .tabular.settings textarea { width: 99%; } | |
| 436 |
|
436 | |||
|
|
437 | .tabular.settings.enabled_scm table {width:100%} | |||
| 437 | .tabular.settings.enabled_scm td.scm_name{ font-weight: bold; } |
|
438 | .tabular.settings.enabled_scm td.scm_name{ font-weight: bold; } | |
| 438 | .tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; } |
|
439 | .tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; font-style:italic;} | |
| 439 |
|
440 | |||
| 440 | fieldset.settings label { display: block; } |
|
441 | fieldset.settings label { display: block; } | |
| 441 | fieldset#notified_events .parent { padding-left: 20px; } |
|
442 | fieldset#notified_events .parent { padding-left: 20px; } | |
| @@ -508,6 +509,8 div.flash.warning { | |||||
| 508 | color: #A6750C; |
|
509 | color: #A6750C; | |
| 509 | } |
|
510 | } | |
| 510 |
|
511 | |||
|
|
512 | span.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;} | |||
|
|
513 | ||||
| 511 | #errorExplanation ul { font-size: 0.9em;} |
|
514 | #errorExplanation ul { font-size: 0.9em;} | |
| 512 | #errorExplanation h2, #errorExplanation p { display: none; } |
|
515 | #errorExplanation h2, #errorExplanation p { display: none; } | |
| 513 |
|
516 | |||
General Comments 0
You need to be logged in to leave comments.
Login now