upgrade devise simply stored
This commit is contained in:
+1
-1
@@ -79,7 +79,7 @@ GEM
|
|||||||
orm_adapter (~> 0.0.3)
|
orm_adapter (~> 0.0.3)
|
||||||
railties (~> 3.1)
|
railties (~> 3.1)
|
||||||
warden (~> 1.1.1)
|
warden (~> 1.1.1)
|
||||||
devise_simply_stored (0.0.2)
|
devise_simply_stored (0.0.3)
|
||||||
devise
|
devise
|
||||||
diff-lcs (1.1.3)
|
diff-lcs (1.1.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ module ApplicationHelper
|
|||||||
active_list_object
|
active_list_object
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def application_title
|
||||||
|
'Qwaiter'
|
||||||
|
end
|
||||||
|
|
||||||
def list_open?
|
def list_open?
|
||||||
session[:active_list_id].present?
|
session[:active_list_id].present?
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ html lang="en"
|
|||||||
meta charset="utf-8"
|
meta charset="utf-8"
|
||||||
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
|
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
|
||||||
meta name="viewport" content="width=device-width, initial-scale=1.0"
|
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
|
= csrf_meta_tags
|
||||||
|
|
||||||
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
/! 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
|
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
|
.container.nav-collapse
|
||||||
ul.nav
|
ul.nav
|
||||||
li= link_to User.model_name.human_plural, users_path
|
li= link_to User.model_name.human_plural, users_path
|
||||||
@@ -54,7 +54,7 @@ html lang="en"
|
|||||||
= yield
|
= yield
|
||||||
.span3
|
.span3
|
||||||
.well.sidebar-nav
|
.well.sidebar-nav
|
||||||
h3 Qrammer
|
h3= application_title
|
||||||
ul.nav.nav-list
|
ul.nav.nav-list
|
||||||
li.nav-header Links
|
li.nav-header Links
|
||||||
li= link_to "Home", root_path
|
li= link_to "Home", root_path
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ html lang="en"
|
|||||||
meta charset="utf-8"
|
meta charset="utf-8"
|
||||||
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
|
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
|
||||||
meta name="viewport" content="width=device-width, initial-scale=1.0"
|
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
|
= csrf_meta_tags
|
||||||
|
|
||||||
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
/! 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
|
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
|
.container.nav-collapse
|
||||||
ul.nav#top-navigation-list
|
ul.nav#top-navigation-list
|
||||||
- if list_open?
|
- if list_open?
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ html lang="en"
|
|||||||
meta charset="utf-8"
|
meta charset="utf-8"
|
||||||
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
|
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
|
||||||
meta name="viewport" content="width=device-width, initial-scale=1.0"
|
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
|
= csrf_meta_tags
|
||||||
|
|
||||||
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
/! 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
|
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
|
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_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
|
li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path
|
||||||
|
|||||||
Reference in New Issue
Block a user