Merge 3427233057 into 00c095d054

app/views/layouts/_messages.html.haml

@@ -6,12 +6,4 @@
   %h2
     JavaScript is not enabled
   %p
-    OSEM requires JavaScript to be enabled to function. Please turn on JavaScript in your browser's settings and reload the page to continue.
-- flash.each do |type, message|
-  .row
-    .col-md-12
-      %div{:class=>"alert alert-dismissable #{bootstrap_class_for(type)}", :id=>"flash"}
-        .button.close{"data-dismiss" => "alert", "aria-hidden"=>"true"}
-          ×
-        %p
-          = message
+    OSEM requires JavaScript to be enabled to function. Please turn on JavaScript in your browser's settings and reload the page to continue.

app/views/layouts/application.html.haml

@@ -18,10 +18,10 @@
       };
     = content_for(:script_head)
     = javascript_include_tag "//cdn.transifex.com/live.js"
-
     = yield(:head)
   %body
     = render 'layouts/navigation'
+    = render 'toastr_rails/flash'
     -# Admin area
     - if controller.class.name.split("::").first=="Admin"
       = render 'layouts/admin'