Merge 7abfbc7587 into 25a1c116fd

2014-06-03 18:42:36 +00:00 · 2014-06-03 18:42:36 +00:00 · b27a2b9a58
commit b27a2b9a58
parent 25a1c116fd 7abfbc7587
3 changed files with 23 additions and 16 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -21,12 +21,18 @@
    - if controller.class.name.split("::").first=="Admin"
      = render 'layouts/admin'
    -else
-      .container#messages
-        .row
-          .col-md-12
+      - if content_for :splash
+        %div#splash
+          #messages
            = render 'layouts/messages'
-      .container#content
-        = yield
+          = yield :splash
+      -else
+        .container#messages
+          .row
+            .col-md-12
+              = render 'layouts/messages'
+        .container#content
+          = yield

    #footer
      .container