From 67650ea9fead442cb2f66a2fbbec452c890d0775 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 22 Jan 2014 02:18:30 -0800 Subject: added a default footer with links to privacy policy, tos, pricing, about us, contact. --- app/views/layouts/application.html.haml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'app/views/layouts/application.html.haml') diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 816b558..e52ca7f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -10,15 +10,18 @@ = csrf_meta_tags = yield(:head) %body - #masthead - = render 'layouts/masthead' - #main - .container-fluid - - if logged_in? + #wrap + #masthead + = render 'layouts/masthead' + #main + .container-fluid + - if logged_in? + .row-fluid + .span12 + = render 'layouts/header' .row-fluid - .span12 - = render 'layouts/header' - .row-fluid - = render 'layouts/content' + = render 'layouts/content' + #push + -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer = render 'layouts/footer' -- cgit v1.2.3 From 91c535a080f05be23ee1320b0701dae6ff3601af Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 23 Jan 2014 02:05:37 -0800 Subject: move #masthead out of main templates to make the masthead partials more flexible. --- app/views/layouts/application.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/views/layouts/application.html.haml') diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e52ca7f..1cd4ec3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,8 +11,7 @@ = yield(:head) %body #wrap - #masthead - = render 'layouts/masthead' + = render 'layouts/masthead' #main .container-fluid - if logged_in? -- cgit v1.2.3