forked from External/greenlight
		
	add rails flash messages that dismiss after 5 seconds
This commit is contained in:
		@@ -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();
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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">×</span>
 | 
			
		||||
            </button>
 | 
			
		||||
            <span class="alert-message"><%= msg %></span>
 | 
			
		||||
          </div>
 | 
			
		||||
        <% end %>
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
 | 
			
		||||
    <!-- Header -->
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user