From 87383e624855def55e13d238b2f20b79c418c1d9 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 21 Jan 2014 13:54:45 -0800 Subject: added default pricing, privacy policy and tos pages. --- app/views/layouts/_footer.html.haml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'app/views/layouts') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index e69de29..ab925e8 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -0,0 +1,11 @@ +.container + .row + = link_to t(:home), home_path + = link_to t(:privacy_policy), privacy_policy_path + = link_to t(:terms_of_service), terms_of_service_path + - if lookup_context.exists?('pages/about') + = link_to t(:about), about_path + - if lookup_context.exists?('pages/contact') + = link_to t(:contact), contact_path + - if APP_CONFIG[:service_levels] + = link_to t(:pricing), pricing_path \ No newline at end of file -- cgit v1.2.3 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/_footer.html.haml | 21 ++++++++++----------- app/views/layouts/_masthead.html.haml | 5 +++-- app/views/layouts/application.html.haml | 21 ++++++++++++--------- 3 files changed, 25 insertions(+), 22 deletions(-) (limited to 'app/views/layouts') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index ab925e8..5909bdd 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,11 +1,10 @@ -.container - .row - = link_to t(:home), home_path - = link_to t(:privacy_policy), privacy_policy_path - = link_to t(:terms_of_service), terms_of_service_path - - if lookup_context.exists?('pages/about') - = link_to t(:about), about_path - - if lookup_context.exists?('pages/contact') - = link_to t(:contact), contact_path - - if APP_CONFIG[:service_levels] - = link_to t(:pricing), pricing_path \ No newline at end of file +.full-height + = link_to icon('home') + t(:home), home_path + = link_to icon('eye-close') + t(:privacy_policy), privacy_policy_path + = link_to icon('file') + t(:terms_of_service), terms_of_service_path + - if lookup_context.exists?('pages/about') + = link_to icon('info-sign') + t(:about), about_path + - if lookup_context.exists?('pages/contact') + = link_to icon('comment') + t(:contact), contact_path + - if APP_CONFIG[:service_levels] + = link_to icon('shopping-cart') + t(:pricing), pricing_path \ No newline at end of file diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml index 280f2c2..5f40c05 100644 --- a/app/views/layouts/_masthead.html.haml +++ b/app/views/layouts/_masthead.html.haml @@ -1,4 +1,5 @@ .title %span.sitename - = APP_CONFIG[:domain] - = t(:user_control_panel) \ No newline at end of file + %a{:href => home_path}= APP_CONFIG[:domain] + - if @show_navigation + = t(:user_control_panel) \ No newline at end of file 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/_masthead.html.haml | 11 ++++++----- app/views/layouts/application.html.haml | 3 +-- app/views/layouts/home.html.haml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'app/views/layouts') diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml index 5f40c05..35225a1 100644 --- a/app/views/layouts/_masthead.html.haml +++ b/app/views/layouts/_masthead.html.haml @@ -1,5 +1,6 @@ -.title - %span.sitename - %a{:href => home_path}= APP_CONFIG[:domain] - - if @show_navigation - = t(:user_control_panel) \ No newline at end of file +#masthead + .title + %span.sitename + %a{:href => home_path}= APP_CONFIG[:domain] + - if @show_navigation + = t(:user_control_panel) \ No newline at end of file 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? diff --git a/app/views/layouts/home.html.haml b/app/views/layouts/home.html.haml index e6fa15d..8451de5 100644 --- a/app/views/layouts/home.html.haml +++ b/app/views/layouts/home.html.haml @@ -8,5 +8,5 @@ = javascript_include_tag "application" = csrf_meta_tags = yield(:head) - %body + %body.home = yield \ No newline at end of file -- cgit v1.2.3