Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed bugs on my-ordergroup page and typos on invitation page.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-09-23 12:08:21 +02:00
parent aa341628a6
commit 8bba70594d
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/views/home/ordergroup.html.erb
View file

@ -2,39 +2,43 @@
<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;">
<label for="financial_transaction_note">Filter für Notizen: </label> <label for="financial_transaction_note">Filter für Notizen: </label>
<%= text_field_tag("query", params['query'], :size => 10 ) %> <%= text_field_tag("query", params['query'], :size => 10 ) %>
</form> </form>
</p> </p>
<%= observe_field 'query', :frequency => 2, <%= observe_field 'query', :frequency => 2,
:before => "Element.show('loader')", :before => "Element.show('loader')",
:success => "Element.hide('loader')", :success => "Element.hide('loader')",
:url => {:action => 'ordergroup'}, :url => {:action => 'ordergroup'},
:with => 'query', :with => 'query',
:update => 'transactions' %> :update => 'transactions' %>
<div id="transactions"> <div id="transactions">
<%= render :partial => "/finance/transactions/list" %> <%= render :partial => "/finance/transactions/list" %>
</div> </div>
</div> </div>
</div> </div>
<div id="edit_box" style="display:none"></div>

4
app/views/login/invite.haml
View file

@ -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.