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

app/views/shared/_group.html.haml

@@ -0,0 +1,28 @@
+%table
+  %tr
+    %td Beschreibung:
+    %td=h group.description
+  %tr
+    %td Gruppe hat Zugriff auf:
+    %td
+      - roles = Array.new
+      - roles << 'Administration' if group.role_admin?
+      - roles << 'Finanzen' if group.role_finance?
+      - roles << 'Lieferanten' if group.role_suppliers?
+      - roles << 'Artikel' if group.role_article_meta?
+      - roles << 'Bestellungsverwaltung' if group.role_orders?
+      = roles.join(', ')
+  %tr
+    %td Mitglieder:
+    %td
+      - members = group.users
+      = "(#{members.size})"
+      = members.collect(&:nick).join(", ")
+  - if group.is_a?(Workgroup)
+    %tr
+      %td wöchentlicher Job:
+      %td
+        - if group.weekly_task
+          =h "#{group.task_name} am #{weekday(group.weekday)}"
+        - else
+          kein wöchentlicher Job definiert

app/views/shared/_group_form.html.haml

@@ -0,0 +1,57 @@
+= @form.error_messages
+
+%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
+
+= yield
+
+- if @group.is_a?(Workgroup)
+  %div{:style => "clear:both"}
+    %h3
+      Wöchentliche Jobs definieren?
+      = @form.check_box :weekly_task, {:onclick => "toggleWeeklyTask();"}
+    %table
+      %tr
+        %td
+          = @form.label :weekday, "Wochentag:"
+        %td
+          = @form.select :weekday, Workgroup.weekdays
+      %tr
+        %td
+          = @form.label :task_name, "Dienstname:"
+        %td= @form.text_field :task_name, :size => 20
+      %tr
+        %td
+          = @form.label :task_required_users, "Benötigte Verantwortliche:"
+        %td= @form.text_field :task_required_users, :size => 3
+      %tr
+        %td
+          = @form.label :task_description, "Beschreibung:"
+        %td= @form.text_area :task_description
+
+  %script{ 'type' => "text/javascript"}
+    :plain
+      //<![CDATA[
+      // preset data
+      function toggleWeeklyTask(){
+        if ($("workgroup_weekly_task").checked == true) {
+          $('workgroup_weekday').disabled = false;
+          $('workgroup_task_name').disabled = false;
+          $('workgroup_task_required_users').disabled = false;
+          $('workgroup_task_description').disabled = false;
+        } else {
+          $('workgroup_weekday').disabled = true;
+          $('workgroup_task_name').disabled = true;
+          $('workgroup_task_required_users').disabled = true;
+          $('workgroup_task_description').disabled = true;
+        }
+      }
+      toggleWeeklyTask();
+      //]]>

app/views/shared/_loginInfo.haml

@@ -1,7 +1,7 @@
 %ul
   %li
     = image_tag 'b_user.png' , :size => '7x10',  :border => 0, :alt => _("User")
-    = link_to h(@current_user.nick), { :controller => 'index', :action => 'myProfile' }, { :title => _("User Settings") }
+    = link_to h(@current_user.nick), my_profile_path, { :title => _("User Settings") }
   - if APP_CONFIG[:base_url]
     %li= link_to APP_CONFIG[:name], APP_CONFIG[:base_url], { :title => _("Go to your FoodCoop-Hompage") }
   %li= link_to _("Help"), 'http://dev.foodcoops.net/wiki/FoodsoftDoku'

app/views/shared/_user_memberships.rhtml

@@ -0,0 +1,5 @@
+<% for membership in Membership.find_all_by_user_id(@user.id) %>
+<p>
+    <%= link_to(membership.group.name, :action => 'showGroup', :id => membership.group) %>
+</p>
+<% end %>

app/views/shared/_workgroup_members.haml

@@ -0,0 +1,6 @@
+- for group in Group.find :all, :conditions => "type != 'Ordergroup'"
+  %h4= link_to_function group.name, "Element.toggle('group_#{group.id}')"
+  %ul{:style => "display:none"}[group]
+    - for user in group.users.find :all, :order => "nick"
+      %li= user.nick + " (#{user.find_ordergroup.name if user.find_ordergroup})"
+  

app/views/shared/memberships/_current_members.rhtml

@@ -0,0 +1,21 @@
+<% if flash[:error] %>
+  <h3 class="error" id="flashError" ><%= flash[:error] %></h3>
+  <%= javascript_tag("new Effect.Highlight('flashError', {delay:0.8, duration:1});") -%>
+<% end %>
+
+<% memberships = @group.memberships 
+   if memberships.size != 0 %>
+<ul style="">
+    <% for membership in memberships %>
+      <li style="margin-left:-15px">
+        <b><%= membership.user.nick %></b> (<%=h membership.user.first_name + ' ' + membership.user.last_name %>)
+         | <%= link_to_remote 'entfernen', 
+                :url => { :controller => '/memberships', :action => 'drop_member', :group_id => @group, :membership_id => membership },
+                :before => "Element.show('loader')",
+                :success => "Element.hide('loader')" %>
+       </li>
+    <% end %>
+</ul>
+  <% else %>
+<p><i><%= @group.name %> hat keine Mitglieder.</i></p>
+  <% end %>

app/views/shared/memberships/_members.rhtml

@@ -0,0 +1,24 @@
+<h1>Mitglieder von <%=h @group.name %></h1>
+<p>
+    <i>
+      Hier kannst Du die Mitglieder der Gruppe verwalten oder ein neues Foodcoop-Mitglied in die Gruppe
+      <%= link_to('einladen', :controller => '/foodcoop', :action => 'invite', :id => @group) %>.
+    </i>
+</p>
+<div class="left_column" style="width:48%">
+    <div class="box_title">
+        <h2>Sind schon Mitglieder</h2>
+    </div>
+    <div class="column_content" id="members">
+        <%=render :partial => 'shared/memberships/current_members' %>
+    </div>
+</div>
+<div class="right_column" style="width:48%">
+    <div class="box_title">
+        <h2>Sind noch keine Mitglieder</h2>
+    </div>
+    <div class="column_content" id="non_members">
+        <%= render :partial => 'shared/memberships/non_members' %>
+		<%= link_to('Person einladen', :controller => '/foodcoop', :action => 'invite', :id => @group) %>
+    </div>
+</div>

app/views/shared/memberships/_non_members.rhtml

@@ -0,0 +1,11 @@
+<ul>
+ <% for user in @group.non_members %>
+  <li>
+    <b><%= user.nick %></b> (<%=h user.first_name + ' ' + user.last_name %>)
+    | <%= link_to_remote 'hinzufügen', 
+        :url => { :controller => '/memberships', :action => 'add_member', :group_id => @group, :user_id => user },
+        :before => "Element.show('loader')",
+        :success => "Element.hide('loader')" %>
+  </li>
+ <% end %>
+</ul>