diff options
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_footer.html.haml | 21 | ||||
| -rw-r--r-- | app/views/layouts/_masthead.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 21 |
3 files changed, 25 insertions, 22 deletions
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' |