Merge pull request #6906 from opf/fix/workflow-filters

[29133] Workflow filters corrected

app/assets/stylesheets/content/_simple_filters.sass

@@ -51,6 +51,11 @@ $filters--border-color: $gray !default
 
   .simple-filter--trailing-labels
     @extend %filters-grid
+    grid-column: 1 / -1
+
+    > .-trailing-label.form--field
+      grid-column: 1 / -1
+      margin-bottom: 0
 
   &.collapsed
     display: none

app/views/workflows/edit.html.erb

@@ -45,18 +45,18 @@ See docs/COPYRIGHT.rdoc for more details.
           <%= styled_select_tag 'type_id', options_from_collection_for_select(@types, "id", "name", @type && @type.id) %>
         </div>
       </li>
-      <li class="simple-filters--controls">
-        <%= submit_tag l(:button_edit), name: nil, accesskey: accesskey(:edit), class: 'button -highlight' %>
-      </li>
-    </ul>
-    <ul class="simple-filter--trailing-labels">
-      <li class="form--field -trailing-label">
-        <%= hidden_field_tag 'used_statuses_only', '0', id: 'used_statuses_only_hidden' %>
+      <ul class="simple-filter--trailing-labels">
+        <li class="form--field -trailing-label">
+          <%= hidden_field_tag 'used_statuses_only', '0', id: 'used_statuses_only_hidden' %>
 
-        <%= styled_label_tag :used_statuses_only, l(:label_display_used_statuses_only) %>
-        <span class="form--field-container">
-          <%= styled_check_box_tag :used_statuses_only, '1', @used_statuses_only %>
-        </span>
+          <%= styled_label_tag :used_statuses_only, l(:label_display_used_statuses_only) %>
+          <span class="form--field-container">
+            <%= styled_check_box_tag :used_statuses_only, '1', @used_statuses_only %>
+          </span>
+        </li>
+      </ul>
+      <li class="simple-filters--controls">
+        <%= submit_tag l(:button_edit), name: nil, accesskey: accesskey(:edit), class: 'button -small -highlight' %>
       </li>
     </ul>
   </fieldset>