Merge branch 'master' into routing-filter

.gitignore

@@ -8,3 +8,4 @@ capfile
 config/environments/fcschinke09.rb
 *.swp
 public/**/*_cached.*
+config/initializers/session_store.rb

app/views/home/_stats.erb

@@ -22,6 +22,6 @@ unless global_avg == 0 or global_avg.nan?
   </div>
   <span class="description">
     Abgebildet ist das Verhältnis von erledigten Aufgaben zu dem Bestellvolumen Deiner Bestellgruppe im Vergleich zum Durchschnitt in der Foodcoop.
-    Konkret: Für jede <%= number_to_currency 1/global_avg %> Bestellsumme solltest Du eine Aufgabe machen!
+    Konkret: Pro <%= number_to_currency( (1/global_avg).round, :precision => 0 ) %> Bestellsumme solltest Du eine Aufgabe machen!
   </span>
 <%- end -%>

config/environment.rb

@@ -45,16 +45,7 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time
-  config.time_zone = 'UTC'
-  
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
-  # no regular words or you'll be exposed to dictionary attacks.
-  config.action_controller.session = {
-    :session_key => '_foodsoft_session',
-    :secret      => "dhjfuez47892nsl39fh83ham3jsdfjkh4879sdh"
-  }
+  config.time_zone = 'Berlin'
   
   # Specify gems that this application depends on.
   # They can then be installed with "rake gems:install" on new installations.
@@ -66,7 +57,7 @@ Rails::Initializer.run do |config|
   #
   # library for parsing/writing files from/to csv-file
   config.gem "fastercsv"
-  config.gem "prawn"
+  config.gem "prawn", :version => '<=0.6.3'
   config.gem "haml", :version => '>=2.0.6'
   config.gem "routing-filter", :lib => "routing_filter"
 

config/initializers/session_store.rb.SAMPLE

@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :key         => '_foodsoft_session',
+  :secret      => 'as27ashi20867asdl27a9l2oa87dgh2o6a6s92l34las00121hha87072hla70072h097243hha092h4a'
+}
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store