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

Merge branch 'master' of git://github.com/bennibu/foodsoft

Browse source
This commit is contained in:
sandoz 2009-04-07 18:23:44 +02:00
commit 394b4b161f
8 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/finance/balancing_controller.rb
View file

@ -34,9 +34,9 @@ class Finance::BalancingController < ApplicationController
) )
if params[:sort] == "order_number" if params[:sort] == "order_number"
@articles = @articles.sort { |a,b| a.article.order_number.gsub(/[a-zA-Z]/, "").to_i <=> b.article.order_number.gsub(/[a-zA-Z]/, "").to_i } @articles = @articles.sort { |a,b| a.article.order_number.gsub(/[^[:digit:]]/, "").to_i <=> b.article.order_number.gsub(/[^[:digit:]]/, "").to_i }
elsif params[:sort] == "order_number_reverse" elsif params[:sort] == "order_number_reverse"
@articles = @articles.sort { |a,b| b.article.order_number.gsub(/[a-zA-Z]/, "").to_i <=> a.article.order_number.gsub(/[a-zA-Z]/, "").to_i } @articles = @articles.sort { |a,b| b.article.order_number.gsub(/[^[:digit:]]/, "").to_i <=> a.article.order_number.gsub(/[^[:digit:]]/, "").to_i }
end end
view = params[:view] view = params[:view]

4
app/views/home/index.html.haml
View file

@ -47,8 +47,8 @@
%p %p
%b= @ordergroup.name %b= @ordergroup.name
| |
Kontostand: Verfügbares Guthaben:
= number_to_currency(@ordergroup.account_balance) = number_to_currency(@ordergroup.get_available_funds())
%span{:style => "color:grey"} %span{:style => "color:grey"}
(zuletzt aktualisiert vor (zuletzt aktualisiert vor
= distance_of_time_in_words(Time.now, @ordergroup.account_updated) + "(n))" = distance_of_time_in_words(Time.now, @ordergroup.account_updated) + "(n))"

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

@ -5,7 +5,7 @@
<p><b>Beschreibung:</b> <%=h @ordergroup.description %> <p><b>Beschreibung:</b> <%=h @ordergroup.description %>
<%= link_to '(ändern)', :controller => 'foodcoop', :action => 'edit_group', :id => @ordergroup %> <%= link_to '(ändern)', :controller => 'foodcoop', :action => 'edit_group', :id => @ordergroup %>
</p> </p>
<p><b>Kontostand:</b> <%= number_to_currency(@ordergroup.account_balance) %></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 -%>

3
public/stylesheets/main.css
View file

@ -128,10 +128,9 @@ span.click-me {
#logininfo ul { #logininfo ul {
list-style: none; } list-style: none; }
#logininfo ul li { #logininfo ul li {
margin: 0 3px; margin: 0 0 0 5px;
float: left; } float: left; }
#logininfo a { #logininfo a {
padding: 0.2em;
color: #737272; color: #737272;
font-weight: bold; } font-weight: bold; }
#logininfo a:hover { #logininfo a:hover {

14
public/stylesheets/nav.css
View file

@ -2,7 +2,8 @@
#nav { #nav {
position: relative; position: relative;
height: 3em; height: 3em;
text-align: right; } text-align: right;
margin-top: 5px; }
#nav ul { #nav ul {
padding: 0 0 0 0; padding: 0 0 0 0;
margin: -2.3em 0 0 0; margin: -2.3em 0 0 0;
@ -10,9 +11,10 @@
#nav ul li { #nav ul li {
display: inline; display: inline;
list-style: none; list-style: none;
padding: 0.3em 0.3em 0.3em 0; padding: 0.3em 0 0.3em 0;
margin: 0 0.2em; margin: 0 0 0 0.2em;
background: none; } background: none;
vertical-align: middle; }
#nav ul li a { #nav ul li a {
margin: 0.1em 0 0 0; margin: 0.1em 0 0 0;
text-align: center; text-align: center;
@ -21,9 +23,8 @@
text-decoration: none; text-decoration: none;
color: #737272; color: #737272;
border: none; border: none;
border-bottom: none;
background: #e3e3e3; background: #e3e3e3;
padding: 0.5em 1.2em 0.1em 1.2em; padding: 0.5em 1.2em 0.6em 1.2em;
margin-top: 0; } margin-top: 0; }
#nav ul li a:hover { #nav ul li a:hover {
color: #ED0606; } color: #ED0606; }
@ -43,7 +44,6 @@
border: none; border: none;
background: none; background: none;
color: #FFF; color: #FFF;
padding: 0.7em;
font-style: normal; font-style: normal;
font-size: 1em; } font-size: 1em; }
#nav ul li.current a { #nav ul li.current a {

3
public/stylesheets/print.css
View file

@ -128,10 +128,9 @@ span.click-me {
#logininfo ul { #logininfo ul {
list-style: none; } list-style: none; }
#logininfo ul li { #logininfo ul li {
margin: 0 3px; margin: 0 0 0 5px;
float: left; } float: left; }
#logininfo a { #logininfo a {
padding: 0.2em;
color: #737272; color: #737272;
font-weight: bold; } font-weight: bold; }
#logininfo a:hover { #logininfo a:hover {

3
public/stylesheets/sass/main.sass
View file

@ -143,10 +143,9 @@ span.click-me
ul ul
:list-style none :list-style none
li li
:margin 0 3px :margin 0 0 0 5px
:float left :float left
a a
:padding 0.2em
:color #737272 :color #737272
:font-weight bold :font-weight bold
a:hover a:hover

10
public/stylesheets/sass/nav.sass
View file

@ -3,6 +3,7 @@
:position relative :position relative
:height 3em :height 3em
:text-align right :text-align right
:margin-top 5px
ul ul
:padding 0 0 0 0 :padding 0 0 0 0
:margin -2.3em 0 0 0 :margin -2.3em 0 0 0
@ -10,9 +11,10 @@
li li
:display inline :display inline
:list-style none :list-style none
:padding 0.3em 0.3em 0.3em 0 :padding 0.3em 0 0.3em 0
:margin 0 0.2em :margin 0 0 0 0.2em
:background none :background none
:vertical-align middle
a a
:margin 0.1em 0 0 0 :margin 0.1em 0 0 0
:text-align center :text-align center
@ -21,9 +23,8 @@
:text-decoration none :text-decoration none
:color #737272 :color #737272
:border none :border none
:border-bottom none
:background #e3e3e3 :background #e3e3e3
:padding 0.5em 1.2em 0.1em 1.2em :padding 0.5em 1.2em 0.6em 1.2em
:margin-top 0 :margin-top 0
a:hover a:hover
:color #ED0606 :color #ED0606
@ -45,7 +46,6 @@
:border none :border none
:background none :background none
:color #FFF :color #FFF
:padding 0.7em
:font-style normal :font-style normal
:font-size 1em :font-size 1em