diff app/views/settings/_repositories.html.erb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

--- a/app/views/settings/_repositories.html.erb	Wed Jun 27 14:54:18 2012 +0100
+++ b/app/views/settings/_repositories.html.erb	Mon Jan 07 12:01:42 2013 +0000
@@ -1,8 +1,8 @@
-<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'repositories'}) do %>
 
 <fieldset class="box settings enabled_scm">
+<legend><%= l(:setting_enabled_scm) %></legend>
 <%= hidden_field_tag 'settings[enabled_scm][]', '' %>
-<legend><%= l(:setting_enabled_scm) %></legend>
 <table>
   <tr>
     <th></th>
@@ -13,17 +13,16 @@
     <% scm_class = "Repository::#{choice}".constantize %>
     <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
     <% setting = :enabled_scm %>
+		<% enabled = Setting.send(setting).include?(value) %>
     <tr>
       <td class="scm_name">
-        <%=
-          check_box_tag(
-              "settings[#{setting}][]",
-               value,
-               Setting.send(setting).include?(value))
-         %>
+        <label>
+        <%= check_box_tag("settings[#{setting}][]", value, enabled, :id => nil) %>
         <%= text.to_s %>
+        </label>
       </td>
       <td>
+         <% if enabled %>
          <%=
            image_tag(
               (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
@@ -31,14 +30,15 @@
            )
            %>
           <%= scm_class.scm_command %>
+					<% end %>
        </td>
        <td>
-          <%= scm_class.scm_version_string %>
+          <%= scm_class.scm_version_string if enabled %>
        </td>
      </tr>
   <% end %>
 </table>
-<p><em><%= l(:text_scm_config) %></em></p>
+<p><em class="info"><%= l(:text_scm_config) %></em></p>
 </fieldset>
 
 <div class="box tabular settings">
@@ -46,7 +46,7 @@
 
 <p><%= setting_check_box :sys_api_enabled,
                          :onclick =>
-                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
+                             "if (this.checked) { $('#settings_sys_api_key').removeAttr('disabled'); } else { $('#settings_sys_api_key').attr('disabled', true); }" %></p>
 
 <p><%= setting_text_field :sys_api_key,
                           :size     => 30,
@@ -54,7 +54,7 @@
                           :disabled => !Setting.sys_api_enabled?,
                           :label    => :setting_mail_handler_api_key %>
   <%= link_to_function l(:label_generate_key),
-                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
+                       "if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %>
 </p>
 
 <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
@@ -62,8 +62,8 @@
 
 <fieldset class="box tabular settings">
 <legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
-<p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
+<p><%= setting_text_field :commit_ref_keywords, :size => 30 %>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
 &nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
@@ -76,11 +76,13 @@
                                                        (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
                                                        :blank => :label_no_change_option,
                                                        :label => false %>
-<br /><em><%= l(:text_comma_separated) %></em></p>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_check_box :commit_cross_project_ref %></p>
 
 <p><%= setting_check_box :commit_logtime_enabled,
                          :onclick =>
-                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
+                            "if (this.checked) { $('#settings_commit_logtime_activity_id').removeAttr('disabled'); } else { $('#settings_commit_logtime_activity_id').attr('disabled', true); }"%></p>
 
 <p><%= setting_select :commit_logtime_activity_id,
                       [[l(:label_default), 0]] +