diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
| commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
| tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /app/views/layouts/application.html.haml | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rw-r--r-- | app/views/layouts/application.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 74331af..33a730f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,10 +14,13 @@ / HTML5 shim, for IE6-8 support of HTML5 elements /[if lt IE 9] <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + %body .container .row .span12 + = render 'layouts/navbar' + - unless response.cache_control[:public] - flash.each do |name, msg| %div{:class => "alert alert-#{name == :notice ? "success" : "error"} fade in"} @@ -27,8 +30,6 @@ - if current_user = render_breadcrumbs :builder => ::BootstrapBreadcrumbsBuilder, :separator => "/" - = render 'layouts/navbar' - = yield .row |