Reorder roles and add icons

app/views/admin/users/_users.html.haml

@@ -18,7 +18,7 @@
         - if FoodsoftConfig[:use_nick]
           %td= user.name
         %td= user.email
-        %td= format_roles(user)
+        %td= format_roles(user, true)
         %td= format_time(user.last_activity)
         %td= link_to t('ui.edit'), edit_admin_user_path(user), class: 'btn btn-mini'
         %td= link_to t('ui.delete'), [:admin, user], :data => {:confirm => t('admin.confirm', name: user.name)},

app/views/admin/workgroups/_form.html.haml

@@ -2,11 +2,11 @@
 = simple_form_for [:admin, @workgroup] do |f|
   - captured = capture do
     %h4= t 'admin.access_to'
-    = f.input :role_admin
-    = f.input :role_finance
     = f.input :role_suppliers
     = f.input :role_article_meta
     = f.input :role_orders
+    = f.input :role_finance
+    = f.input :role_admin
   = render 'shared/group_form_fields', :f => f, captured: captured
   .form-actions
     = f.button :submit