From b5ff9af40f4d16dd48d76615ba5f3a0c7c457707 Mon Sep 17 00:00:00 2001
From: Nick Veys <nickveys@gmail.com>
Date: Thu, 20 Dec 2012 15:00:12 -0600
Subject: [PATCH] Making sure bootstrap_flash is in both layouts in all
 templates

---
 lib/generators/bootstrap/layout/templates/layout.html.erb  | 3 ++-
 lib/generators/bootstrap/layout/templates/layout.html.haml | 1 +
 lib/generators/bootstrap/layout/templates/layout.html.slim | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/generators/bootstrap/layout/templates/layout.html.erb b/lib/generators/bootstrap/layout/templates/layout.html.erb
index 0b9130e4..6ae59d5e 100644
--- a/lib/generators/bootstrap/layout/templates/layout.html.erb
+++ b/lib/generators/bootstrap/layout/templates/layout.html.erb
@@ -77,7 +77,8 @@
       <%- else -%>
         <div class="row">
           <div class="span9">
-             <%%= yield %>
+            <%%= bootstrap_flash %>
+            <%%= yield %>
           </div>
           <div class="span3">
             <div class="well sidebar-nav">
diff --git a/lib/generators/bootstrap/layout/templates/layout.html.haml b/lib/generators/bootstrap/layout/templates/layout.html.haml
index d0ec20e3..8826c53e 100644
--- a/lib/generators/bootstrap/layout/templates/layout.html.haml
+++ b/lib/generators/bootstrap/layout/templates/layout.html.haml
@@ -44,6 +44,7 @@
               %li= link_to "Link 2", "/path2"
               %li= link_to "Link 3", "/path3"
         .span9
+          = bootstrap_flash
           = yield
     <% else %>
       .row
diff --git a/lib/generators/bootstrap/layout/templates/layout.html.slim b/lib/generators/bootstrap/layout/templates/layout.html.slim
index 5480f0d3..40baa422 100644
--- a/lib/generators/bootstrap/layout/templates/layout.html.slim
+++ b/lib/generators/bootstrap/layout/templates/layout.html.slim
@@ -44,6 +44,7 @@ html lang="en"
               li= link_to "Link 2", "/path2"
               li= link_to "Link 3", "/path3"
         .span9
+          = bootstrap_flash
           = yield
     <% else %>
       .row