Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).
This commit is contained in:
parent
fadc951208
commit
6ce6c2c75a
70 changed files with 553 additions and 934 deletions
21
app/views/shared/memberships/_current_members.rhtml
Normal file
21
app/views/shared/memberships/_current_members.rhtml
Normal file
|
|
@ -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 %>
|
||||
24
app/views/shared/memberships/_members.rhtml
Normal file
24
app/views/shared/memberships/_members.rhtml
Normal file
|
|
@ -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>
|
||||
11
app/views/shared/memberships/_non_members.rhtml
Normal file
11
app/views/shared/memberships/_non_members.rhtml
Normal file
|
|
@ -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>
|
||||
Loading…
Add table
Add a link
Reference in a new issue