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

app/controllers/finance/balancing_controller.rb

@@ -34,9 +34,9 @@ class Finance::BalancingController < ApplicationController
     )
 
     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"
-      @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
 
     view = params[:view]

app/views/home/index.html.haml

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

app/views/home/ordergroup.html.erb

@@ -5,7 +5,7 @@
     <p><b>Beschreibung:</b> <%=h @ordergroup.description %>
     <%= link_to '(ändern)', :controller => 'foodcoop', :action => 'edit_group', :id => @ordergroup %>
     </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>
     <ul style="list-style-type:decimal;">
     <% for membership in @ordergroup.memberships -%>

public/stylesheets/main.css

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

public/stylesheets/nav.css

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

public/stylesheets/print.css

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

public/stylesheets/sass/main.sass

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

public/stylesheets/sass/nav.sass

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