Merge pull request #3581 from HDinger/fix/19528-button-not-on-line-admin-groups

[19528] Button not on line for admin/groups/edit

app/assets/stylesheets/content/_table.sass

@@ -171,6 +171,7 @@ table.generic-table
 
       &.buttons
         text-align: right
+        white-space: nowrap
 
     p
       padding: 0 8px
@@ -222,6 +223,9 @@ table.generic-table
       text-align: right
       min-width: 1em
 
+  .generic-table--cell-controls
+    white-space: nowrap
+
 .generic-table--header-background
   position:     absolute
   top:          0

app/views/groups/_memberships.html.erb

@@ -78,9 +78,11 @@ See doc/COPYRIGHT.rdoc for more details.
                         <p><% roles.each do |role| %>
                             <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label>
                           <% end %></p>
-                        <p><%= submit_tag l(:button_change), class: 'button -highlight -small' %>
+                        <p class="generic-table--cell-controls">
+                          <%= submit_tag l(:button_change), class: 'button -highlight -small' %>
                           <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;",
-                    class: 'button -small' %></p>
+                                                                  class: 'button -small' %>
+                        </p>
                       <% end %>
                     </td>
                     <td class="buttons">