upgrade devise simply stored

This commit is contained in:
2012-08-27 16:01:37 +02:00
parent 2d605ed13d
commit 4c87525f8f
5 changed files with 12 additions and 8 deletions
+1 -1
View File
@@ -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)
+4
View File
@@ -22,6 +22,10 @@ module ApplicationHelper
active_list_object
end
def application_title
'Qwaiter'
end
def list_open?
session[:active_list_id].present?
end
+3 -3
View File
@@ -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
+2 -2
View File
@@ -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?
+2 -2
View File
@@ -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