From 532c7bd2af07f80375eb4f9f7152ff720f4a92e6 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Wed, 27 Feb 2019 15:21:52 -0500
Subject: [PATCH] Refactored flash messages code (#372)

---
 app/views/shared/_error_banner.html.erb   | 18 ------------------
 app/views/shared/_flash_messages.html.erb | 12 ++++++++----
 app/views/shared/_success_banner.html.erb | 18 ------------------
 3 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100755 app/views/shared/_error_banner.html.erb
 delete mode 100644 app/views/shared/_success_banner.html.erb

diff --git a/app/views/shared/_error_banner.html.erb b/app/views/shared/_error_banner.html.erb
deleted file mode 100755
index 8fd88739..00000000
--- a/app/views/shared/_error_banner.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-%>
-
-<div class="alert alert-icon alert-danger text-center mb-0">
-  <%= yield %>
-</div>
diff --git a/app/views/shared/_flash_messages.html.erb b/app/views/shared/_flash_messages.html.erb
index b24b32bf..b75d7bb4 100644
--- a/app/views/shared/_flash_messages.html.erb
+++ b/app/views/shared/_flash_messages.html.erb
@@ -15,12 +15,16 @@
 
 <% flash.each do |key,value| %>
   <% if key.eql? "success" %>
-    <%= render "shared/success_banner" do %>
+    <div class="alert alert-icon alert-success text-center mb-0">
       <%= content_tag :div, value, class: "flash #{key} d-inline" %>
-    <% end %>
+    </div>
   <% elsif key.eql? "alert" %>
-    <%= render "shared/error_banner" do %>
+    <div class="alert alert-icon alert-danger text-center mb-0">
       <%= content_tag :div, value, class: "flash #{key} d-inline" %>
-    <% end %>
+    </div>
+  <% elsif key.eql? "info" %>
+    <div class="alert alert-icon alert-info text-center mb-0">
+      <%= content_tag :div, value, class: "flash #{key} d-inline" %>
+    </div>
   <% end %>
 <% end %>
diff --git a/app/views/shared/_success_banner.html.erb b/app/views/shared/_success_banner.html.erb
deleted file mode 100644
index d1e57a90..00000000
--- a/app/views/shared/_success_banner.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-%>
-
-<div class="alert alert-icon alert-success text-center mb-0">
-  <%= yield %>
-</div>