lib/generators/bootstrap/layout/templates/layout.html.haml in twitter-bootstrap-rails-2.0.0 vs lib/generators/bootstrap/layout/templates/layout.html.haml in twitter-bootstrap-rails-2.0.1
- old
+ new
@@ -49,14 +49,28 @@
%li.nav-header Sidebar
%li= link_to "Link 1", "/path1"
%li= link_to "Link 2", "/path2"
%li= link_to "Link 3", "/path3"
.span9
+ <% [:notice, :error, :alert].each do |level| %>
+ <% unless flash[level].blank? %>
+ .alert.fade.in{:class => "alert-<%= flash_class(level) %>", "data-alert" => "alert"}
+ %a.close{"data-dismiss" => "alert", :href => "#"} ×
+ <%= content_tag :p, flash[level] %>
+ <% end %>
+ <% end %>
= yield
<% else %>
.content
.row
.span9
+ <% [:notice, :error, :alert].each do |level| %>
+ <% unless flash[level].blank? %>
+ .alert.fade.in{:class => "alert-<%= flash_class(level) %>", "data-alert" => "alert"}
+ %a.close{"data-dismiss" => "alert", :href => "#"} ×
+ <%= content_tag :p, flash[level] %>
+ <% end %>
+ <% end %>
= yield
.span1
.span3
.well.sidebar-nav
%h3 Sidebar