Fixed bugs on my-ordergroup page and typos on invitation page.
This commit is contained in:
parent
aa341628a6
commit
8bba70594d
2 changed files with 26 additions and 20 deletions
|
@ -2,23 +2,26 @@
|
||||||
<div class="left_column">
|
<div class="left_column">
|
||||||
<div class="box_title"><h2><%=h @ordergroup.name %></h2></div>
|
<div class="box_title"><h2><%=h @ordergroup.name %></h2></div>
|
||||||
<div class="column_content">
|
<div class="column_content">
|
||||||
<p><b>Beschreibung:</b> <%=h @ordergroup.description %>
|
<p>
|
||||||
<%= link_to '(ändern)', :controller => 'foodcoop', :action => 'edit_group', :id => @ordergroup %>
|
<b>Beschreibung:</b> <%=h @ordergroup.description %>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<b>Verfügbares Guthaben:</b> <%= number_to_currency(@ordergroup.get_available_funds()) %>
|
||||||
</p>
|
</p>
|
||||||
<p><b>Verfügbares Guthaben:</b> <%= number_to_currency(@ordergroup.get_available_funds()) %></p>
|
|
||||||
<h2>Personen</h2>
|
<h2>Personen</h2>
|
||||||
<ul style="list-style-type:decimal;">
|
<ul style="list-style-type:decimal;">
|
||||||
<% for membership in @ordergroup.memberships -%>
|
<% for membership in @ordergroup.memberships -%>
|
||||||
<li><%= membership.user.nick -%></li>
|
<li><%= membership.user.nick -%></li>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
</ul>
|
</ul>
|
||||||
<%= link_to('Hinzufügen/entfernen', :controller => 'foodcoop', :action => 'memberships', :id => @ordergroup) %> |
|
<%= remote_link_to('Person einladen', :url => new_invite_path(:id => @ordergroup)) %>
|
||||||
<%= link_to('Person einladen', :controller => 'foodcoop', :action => 'invite', :id => @ordergroup) %>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right_column">
|
<div class="right_column">
|
||||||
<div class="box_title"><h2>Kontoauszug</h2></div>
|
<div class="box_title">
|
||||||
|
<h2>Kontoauszug</h2>
|
||||||
|
</div>
|
||||||
<div class="column_content">
|
<div class="column_content">
|
||||||
<p>
|
<p>
|
||||||
<form name="sform" action="" style="display:inline;">
|
<form name="sform" action="" style="display:inline;">
|
||||||
|
@ -37,4 +40,5 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="edit_box" style="display:none"></div>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
- title "Einladung in die #{Foodsoft.config[:name]}"
|
- title "Einladung in die #{Foodsoft.config[:name]}"
|
||||||
%p
|
%p
|
||||||
Du bist eingeladen worden in der Foodcoop
|
Du bist eingeladen worden als Mitglied der Gruppe
|
||||||
%b= @invite.group.name
|
%b= @invite.group.name
|
||||||
|
in der Foodcoop
|
||||||
|
= Foodsoft.config[:name]
|
||||||
mitzumachen.
|
mitzumachen.
|
||||||
%p
|
%p
|
||||||
Wenn Du mitmachen möchtest, dann fülle bitte dieses Formular aus.
|
Wenn Du mitmachen möchtest, dann fülle bitte dieses Formular aus.
|
||||||
|
|
Loading…
Reference in a new issue