Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).

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

@@ -1,44 +1,12 @@
 - form_for [:admin, @ordergroup] do |@form|
-  = @form.error_messages
-
+  = render :partial => 'shared/group_form'
+  
   %div{:style => "float:left;width:55%;"}
-    %p
-      = @form.label :name
-      %br/
-      = @form.text_field :name, :size => 20
-    %p
-      = @form.label :description
-      %br/
-      = @form.text_field :description, :size => 40
     %p
       = @form.label :actual_size, "Aktuelle Gruppengröße"
       %br/
       = @form.text_field :actual_size, :size => 3
 
-  %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"
   |

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

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

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

@@ -1,42 +1,15 @@
-- title "Arbeitsgruppe #{@ordergroup.name}"
+- title "Bestellgruppe #{@ordergroup.name}"
 .left_column{:style => "width:45em"}
   .box_title
     %h2 Übersicht
   .column_content
+    = render :partial => 'shared/group', :locals => { :group => @ordergroup }
     %p
-      %b Beschreibung:
-      =h @ordergroup.description
-    %p
-      %b Gruppe hat Zugriff auf:
-      - roles = Array.new
-      - roles << 'Administration' if @ordergroup.role_admin?
-      - roles << 'Finanzen' if @ordergroup.role_finance?
-      - roles << 'Lieferanten' if @ordergroup.role_suppliers?
-      - roles << 'Artikel' if @ordergroup.role_article_meta?
-      - roles << 'Bestellungsverwaltung' if @ordergroup.role_orders?
-      =h roles.join(', ')
-    %p
-      - if @ordergroup.weekly_task
-        %b wöchentlicher Job:
-        =h @ordergroup.task_name
-        am
-        = weekday(@ordergroup.weekday)
-      - else
-        kein wöchentlicher Job definiert
-
-    = link_to 'Gruppe bearbeiten', edit_admin_ordergroup_path(@ordergroup)
-    |
-    = link_to 'Löschen', [:admin, @ordergroup], :confirm => 'Bist Du sicher?', :method => :delete
-    |
-    = link_to 'Nachricht senden', :controller => 'messages', :action => 'group', :id => @ordergroup
-  .box_title
-    %h2 Mitglieder
-  .column_content
-    - if @ordergroup.memberships.empty?
-      %i Diese Gruppe hat derzeit keine Mitglieder
-    - else
-      %ul{:style => "list-style-type:decimal;"}
-        - for membership in @ordergroup.memberships
-          %li= link_to membership.user.nick, [:admin, membership.user]
-    %p= link_to 'Mitglieder bearbeiten', memberships_admin_ordergroup_path(@ordergroup)
+      = link_to 'Gruppe bearbeiten', edit_admin_ordergroup_path(@ordergroup)
+      |
+      = link_to 'Löschen', [:admin, @ordergroup], :confirm => 'Bist Du sicher?', :method => :delete
+      |
+      = link_to 'Nachricht senden', :controller => 'messages', :action => 'group', :id => @ordergroup
+      |
+      = link_to 'Mitglieder bearbeiten', memberships_admin_ordergroup_path(@ordergroup)
 %p{:style => "clear:both"}= link_to "Gruppenübersicht", admin_ordergroups_path