diff options
author | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
commit | fc3c5994df61de04b8b17b495a638efc0d760126 (patch) | |
tree | 644aa93dfd0a6da2ed9b20ba688712fb9082f425 /app/views/layouts/application.html.haml | |
parent | cfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff) | |
parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) |
Merge branch 'master' into feature/disable_account
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
Diffstat (limited to 'app/views/layouts/application.html.haml')
-rw-r--r-- | app/views/layouts/application.html.haml | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e6d22f0..380f92d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,23 +1,25 @@ +- @show_navigation = true if @show_navigation.nil? && logged_in? !!! %html %head %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"} - %title= content_for?(:title) ? yield(:title) : "Leap Web" + %title= html_title %meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"} = stylesheet_link_tag "application", :media => "all" = javascript_include_tag "application" = csrf_meta_tags = yield(:head) %body - %header.navbar.navbar-fixed-top - %nav.navbar-inner - .container - = render 'layouts/navigation' - #main{:role => "main"} - .container - .content - .row + #masthead + - if params[:controller] != 'home' + = render 'layouts/masthead' + #main + .container-fluid + - if logged_in? + .row-fluid .span12 - = render 'layouts/messages' - = yield - %footer + = render 'layouts/header' + .row-fluid + = render 'layouts/content' + #footer + = render 'layouts/footer' |