Admin namespace beendet.

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

@@ -1,30 +1,10 @@
-- form_for [:admin, @workgroup] do |@form|
-  - render :layout => 'shared/group_form' do
-    %div{:style => "float:right;width:40%"}
-      %h3 Gruppe hat Zugriff auf
-      %table
-        %tr
-          %td
-            = @form.label :role_admin, "Administration"
-          %td= @form.check_box :role_admin
-        %tr
-          %td
-            = @form.label :role_finance, "Finanzen"
-          %td= @form.check_box :role_finance
-        %tr
-          %td
-            = @form.label :role_suppliers, "Lieferantenverwaltung"
-          %td= @form.check_box :role_suppliers
-        %tr
-          %td
-            = @form.label :role_article_meta, "Artikelverwaltung"
-          %td= @form.check_box :role_article_meta
-        %tr
-          %td
-            = @form.label :role_orders, "Bestellungsverwaltung"
-          %td= @form.check_box :role_orders
-
-  %br{ :style => "clear:both" }
-  = submit_tag "Speichern"
-  |
-  = link_to "Abbrechen", admin_workgroups_path
+= simple_form_for [:admin, @workgroup] do |f|
+  = render :layout => 'shared/group_form_fields', :locals => {:f => f} do
+    %h3 Zugriff auf ..
+    = f.input :role_admin
+    = f.input :role_finance
+    = f.input :role_suppliers
+    = f.input :role_article_meta
+    = f.input :role_orders
+  = f.submit
+  = link_to "oder abbrechen", admin_workgroups_path

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

@@ -19,7 +19,6 @@
         %td= workgroup.users.size
         %td= format_roles(workgroup)
         %td
-          = link_to icon(:members), memberships_admin_workgroup_path(workgroup)
           = link_to icon(:edit), edit_admin_workgroup_path(workgroup)
           = link_to icon(:delete), [:admin, workgroup], :confirm => 'Willst du ' + workgroup.name + ' wirklich löschen?',
             :method => :delete

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

@@ -1,4 +1,3 @@
 - title "Arbeitsgruppe bearbeiten"
 
-.edit_form{:style => "width:50em"}
-  = render :partial => 'form'
+= render :partial => 'form'

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

@@ -1,3 +0,0 @@
-= render :partial => 'shared/memberships/members'
-%p{ :style => "clear:both" }
-  = link_to 'Gruppenübersicht', admin_workgroups_path

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

@@ -1,4 +1,3 @@
 - title "Erstelle Arbeitsgruppe"
 
-.edit_form{:style => "width:50em"}
-  = render :partial => 'form'
+= render :partial => 'form'

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

@@ -6,11 +6,9 @@
     = render :partial => 'shared/group', :locals => { :group => @workgroup }
 
     %p
-      = link_to 'Gruppe bearbeiten', edit_admin_workgroup_path(@workgroup)
+      = link_to 'Gruppe/Mitglieder bearbeiten', edit_admin_workgroup_path(@workgroup)
       |
       = link_to 'Löschen', [:admin, @workgroup], :confirm => 'Bist Du sicher?', :method => :delete
       |
-      = link_to 'Nachricht senden', :controller => 'messages', :action => 'group', :id => @workgroup
-      |
-      = link_to 'Mitglieder bearbeiten', memberships_admin_workgroup_path(@workgroup)
+      = link_to 'Nachricht senden', new_message_path(:message => {:group_id => @ordergroup.id})
 %p{:style => "clear:both"}= link_to "Gruppenübersicht", admin_workgroups_path