From 79bb782319ecc2f9da7658924c6c31e16fe8d338 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 4 Mar 2019 16:29:07 -0500
Subject: [PATCH] Fixed issues with application js order and flash messages
 (#387)

---
 app/assets/javascripts/application.js  |  4 ++--
 app/views/layouts/application.html.erb | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 0cc4f5e4..9e2fd706 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,9 +26,9 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require turbolinks
 //= require jquery
-//= require jquery_ujs
 //= require tabler
 //= require tabler.plugins
-//= require turbolinks
+//= require jquery_ujs
 //= require_tree .
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 89508afd..0873db12 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -39,18 +39,22 @@
 
     <div class="wrapper">
       <% if bigbluebutton_endpoint_default? %>
-        <%= render "shared/error_banner" do %>
-          <i class="fas fa-exclamation-triangle"></i>
-          <p class="d-inline"><%= t("test_install",
-            href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank")
-          ).html_safe %>
-        <% end %>
+        <div class="alert alert-icon alert-danger text-center mb-0">
+          <div class="flash alert d-inline">
+            <i class="fas fa-exclamation-triangle"></i>
+            <p class="d-inline"><%= t("test_install",
+              href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank")
+            ).html_safe %>
+          </div>
+        </div>
       <% end %>
 
       <% unless Rails.configuration.banner_message.blank? %>
-        <%= render "shared/error_banner" do %>
-          <p class="d-inline"><%= Rails.configuration.banner_message %></p>
-        <% end %>
+        <div class="alert alert-icon alert-danger text-center mb-0">
+          <div class="flash alert d-inline">
+            <p class="d-inline"><%= Rails.configuration.banner_message %></p>
+          </div>
+        </div>
       <% end %>
 
       <%= yield %>