Merge pull request #2642 from myabc/feature/repository-settings-use-form-grouping-styles

Use form grouping styling in repository settings

app/views/settings/_repositories.html.erb

@@ -52,18 +52,29 @@ See doc/COPYRIGHT.rdoc for more details.
       <%= setting_text_field :commit_ref_keywords, :size => 30 %>
       <div class="form--field-instructions"><%= l(:text_comma_separated) %></div>
     </div>
-    <div class="form--field">
-      <%= styled_label_tag I18n.t("setting_commit_fix_keywords") %>
-      <div class="form--field-container">
-        <%= setting_text_field :commit_fix_keywords, :size => 30, label: false %>
-        <label for="settings_commit_fix_status_id">
-          <%= l(:label_applied_status) %>:
-        </label>
-        <%= setting_select :commit_fix_status_id, [["", 0]] + Status.all.collect{|status| [status.name, status.id.to_s]}, :label => false %>
-        <label for="settings_commit_fix_done_ratio">
-          <%= WorkPackage.human_attribute_name(:done_ratio) %>:
-        </label>
-        <%= setting_select :commit_fix_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+    <div class="form--grouping" role="group" aria-labelledby="form-grouping-label-setting_commit_fix_keywords">
+      <div id="form-grouping-label-setting_commit_fix_keywords" class="form--grouping-label">
+        <%= I18n.t("setting_commit_fix_keywords") %>
+      </div>
+      <div class="form--grouping-row">
+        <div class="form--field -full-width">
+          <%= label_tag 'commit_fix_keywords', I18n.t(:setting_commit_fix_keywords), class: 'hidden-for-sighted' %>
+          <div class="form--field-container">
+            <%= setting_text_field :commit_fix_keywords, :size => 30, label: false %>
+          </div>
+        </div>
+        <div class="form--field -wide-label">
+          <%= styled_label_tag :settings_commit_fix_status_id, l(:label_applied_status) %>
+          <div class="form--field-container">
+            <%= setting_select :commit_fix_status_id, [["", 0]] + Status.all.collect{|status| [status.name, status.id.to_s]}, :label => false %>
+          </div>
+        </div>
+        <div class="form--field -wide-label">
+          <%= styled_label_tag :settings_commit_fix_done_ratio, WorkPackage.human_attribute_name(:done_ratio) %>
+          <div class="form--field-container">
+            <%= setting_select :commit_fix_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+          </div>
+        </div>
       </div>
       <div class="form--field-instructions"><%= l(:text_comma_separated) %></div>
     </div>