add rails flash messages that dismiss after 5 seconds

This commit is contained in:
Zachary Chai 2017-03-14 14:16:14 -04:00
parent b0512a0569
commit b2031c97a3
4 changed files with 21 additions and 3 deletions

View File

@ -51,6 +51,13 @@ var showAlert = function(html, timeout_delay) {
}
};
// remove flash alerts after 5 seconds
var flashAlertDelayedDismiss = function() {
setTimeout(function(){
$('.flash-alerts').remove();
}, 5000);
};
var displayRoomURL = function() {
$('.meeting-url').val(Meeting.getInstance().getURL());
};
@ -78,4 +85,5 @@ $(document).on("turbolinks:load", function() {
if (isRoomOwner()) {
Notification.requestPermission();
}
flashAlertDelayedDismiss();
});

View File

@ -23,12 +23,12 @@ class LandingController < ApplicationController
def resource
if params[:id].size > meeting_name_limit
redirect_to action: :index
elsif params[:resource] == 'meetings'
elsif params[:resource] == 'meetings' && !params[:room_id]
render_meeting
elsif params[:resource] == 'rooms'
render_room
else
render 'errors/error'
redirect_to root_url, flash: {danger: "An error occured"}
end
end

View File

@ -51,6 +51,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
style="background-image:url(<%= image_path('greenlight_background.png') if params[:controller] == 'landing' %>);">
<!-- Messages -->
<div id='alerts'>
<div class='flash-alerts'>
<% flash.each do |name, msg| %>
<div class="alert alert-<%= name %> alert-dismissible fade in" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<span class="alert-message"><%= msg %></span>
</div>
<% end %>
</div>
</div>
<!-- Header -->

View File

@ -45,7 +45,7 @@ Rails.application.routes.draw do
# routes shared between meetings and rooms
get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}
get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => /[^\/]+/}
get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => /[^\/]+/} # override the constraint to allow '.' and disallow '/'
end
root to: 'landing#index', :resource => 'meetings'