From 4c87525f8f18f201f5638a34759f1b97121a514a Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Mon, 27 Aug 2012 16:01:37 +0200
Subject: [PATCH] upgrade devise simply stored

---
 Gemfile.lock                            | 2 +-
 app/helpers/application_helper.rb       | 4 ++++
 app/views/layouts/application.html.slim | 6 +++---
 app/views/layouts/phone.html.slim       | 4 ++--
 app/views/layouts/tablet.html.slim      | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ba7e4797..8a2f62b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,7 +79,7 @@ GEM
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)
       warden (~> 1.1.1)
-    devise_simply_stored (0.0.2)
+    devise_simply_stored (0.0.3)
       devise
     diff-lcs (1.1.3)
     erubis (2.7.0)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6c3667cc..ba86ea63 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -22,6 +22,10 @@ module ApplicationHelper
     active_list_object
   end
 
+  def application_title
+    'Qwaiter'
+  end
+
   def list_open?
     session[:active_list_id].present?
   end
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 2d9a14c9..fcdc6ee0 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -4,7 +4,7 @@ html lang="en"
     meta charset="utf-8"
     meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
     meta name="viewport" content="width=device-width, initial-scale=1.0"
-    title= content_for?(:title) ? yield(:title) : "Qrammer"
+    title= content_for?(:title) ? yield(:title) : application_title
     = csrf_meta_tags
 
     /! Le HTML5 shim, for IE6-8 support of HTML elements
@@ -27,7 +27,7 @@ html lang="en"
             span.icon-bar
             span.icon-bar
             span.icon-bar
-          a.brand href=root_path Qrammer
+          a.brand href=root_path = application_title
           .container.nav-collapse
             ul.nav
               li= link_to User.model_name.human_plural, users_path
@@ -54,7 +54,7 @@ html lang="en"
             = yield
           .span3
             .well.sidebar-nav
-              h3 Qrammer
+              h3= application_title
               ul.nav.nav-list
                 li.nav-header Links
                 li= link_to "Home", root_path
diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim
index d92f2849..72777675 100644
--- a/app/views/layouts/phone.html.slim
+++ b/app/views/layouts/phone.html.slim
@@ -4,7 +4,7 @@ html lang="en"
     meta charset="utf-8"
     meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
     meta name="viewport" content="width=device-width, initial-scale=1.0"
-    title= content_for?(:title) ? yield(:title) : "Qrammer"
+    title= content_for?(:title) ? yield(:title) : application_title
     = csrf_meta_tags
 
     /! Le HTML5 shim, for IE6-8 support of HTML elements
@@ -28,7 +28,7 @@ html lang="en"
             span.icon-bar
             span.icon-bar
             span.icon-bar
-          a.brand href=user_root_path Qrammer
+          a.brand href=user_root_path = application_title
           .container.nav-collapse
             ul.nav#top-navigation-list
               - if list_open?
diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim
index 541dd85c..de96211b 100644
--- a/app/views/layouts/tablet.html.slim
+++ b/app/views/layouts/tablet.html.slim
@@ -4,7 +4,7 @@ html lang="en"
     meta charset="utf-8"
     meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
     meta name="viewport" content="width=device-width, initial-scale=1.0"
-    title= content_for?(:title) ? yield(:title) : "Qrammer"
+    title= content_for?(:title) ? yield(:title) : application_title
     = csrf_meta_tags
 
     /! Le HTML5 shim, for IE6-8 support of HTML elements
@@ -28,7 +28,7 @@ html lang="en"
             span.icon-bar
             span.icon-bar
             span.icon-bar
-          a.brand href=supplier_root_path Qrammer
+          a.brand href=supplier_root_path = application_title
           ul.nav#top-navigation-list
             li= link_to t('supplier.menu.active_orders', orders: Order.model_name.human_plural), supplier_active_orders_path
             li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path