merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issues with application js order and flash messages (#387)

This commit is contained in:
farhatahmad 2019-03-04 16:29:07 -05:00 committed by Jesus Federico
parent 404134aa8d
commit 79bb782319
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/application.js
View File

@ -26,9 +26,9 @@
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives. // about supported directives.
// //
//= require turbolinks
//= require jquery //= require jquery
//= require jquery_ujs
//= require tabler //= require tabler
//= require tabler.plugins //= require tabler.plugins
//= require turbolinks //= require jquery_ujs
//= require_tree . //= require_tree .

22
app/views/layouts/application.html.erb
View File

@ -39,18 +39,22 @@
<div class="wrapper"> <div class="wrapper">
<% if bigbluebutton_endpoint_default? %> <% if bigbluebutton_endpoint_default? %>
<%= render "shared/error_banner" do %> <div class="alert alert-icon alert-danger text-center mb-0">
<i class="fas fa-exclamation-triangle"></i> <div class="flash alert d-inline">
<p class="d-inline"><%= t("test_install", <i class="fas fa-exclamation-triangle"></i>
href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank") <p class="d-inline"><%= t("test_install",
).html_safe %> href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank")
<% end %> ).html_safe %>
</div>
</div>
<% end %> <% end %>
<% unless Rails.configuration.banner_message.blank? %> <% unless Rails.configuration.banner_message.blank? %>
<%= render "shared/error_banner" do %> <div class="alert alert-icon alert-danger text-center mb-0">
<p class="d-inline"><%= Rails.configuration.banner_message %></p> <div class="flash alert d-inline">
<% end %> <p class="d-inline"><%= Rails.configuration.banner_message %></p>
</div>
</div>
<% end %> <% end %>
<%= yield %> <%= yield %>