diff options
| author | Azul <azul@leap.se> | 2012-12-07 17:26:42 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-07 17:26:42 +0100 |
| commit | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (patch) | |
| tree | 4df73c0a0f37ee9f16cd3f15fc2d23f458ca09ba /app | |
| parent | bc2ead40468f0d9372372f73260d83d30e93bc9a (diff) | |
| parent | bfe61e5132b379461425ce868e980e3a1ea0260a (diff) | |
Merge branch 'feature/email-forwards-for-users'
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_messages.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/layouts/_messages.html.haml b/app/views/layouts/_messages.html.haml new file mode 100644 index 0000000..80e34d4 --- /dev/null +++ b/app/views/layouts/_messages.html.haml @@ -0,0 +1,5 @@ +- flash.each do |name, msg| + - if msg.is_a?(String) + %div{:class => "alert alert-#{name == :notice ? "success" : "error"}"} + %a.close{"data-dismiss" => "alert"} × + = content_tag :div, msg, :id => "flash_#{name}" diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a57d65e..e6d22f0 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,6 +18,6 @@ .content .row .span12 - //= render 'layouts/messages' + = render 'layouts/messages' = yield %footer |