forked from External/greenlight
		
	Merge pull request #111 from zach-chai/update_mod_message
add invite link to moderator message
This commit is contained in:
		@@ -49,6 +49,13 @@ module BbbApi
 | 
				
			|||||||
    options[:meeting_name] ||= meeting_token
 | 
					    options[:meeting_name] ||= meeting_token
 | 
				
			||||||
    options[:room_owner] ||= nil
 | 
					    options[:room_owner] ||= nil
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if options[:room_owner]
 | 
				
			||||||
 | 
					      meeting_url = "#{request.base_url}/rooms/#{options[:room_owner]}/#{options[:meeting_name]}"
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					      meeting_url = "#{request.base_url}/meetings/#{meeting_token}"
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					    options[:moderator_message] ||= t('moderator_default_message', url: "<a href=\"#{meeting_url}\" target=\"_blank\"><u>#{meeting_url}</u></a>")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if !bbb
 | 
					    if !bbb
 | 
				
			||||||
      return call_invalid_res
 | 
					      return call_invalid_res
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
@@ -75,6 +82,7 @@ module BbbApi
 | 
				
			|||||||
          logoutURL: logout_url,
 | 
					          logoutURL: logout_url,
 | 
				
			||||||
          moderatorPW: moderator_password,
 | 
					          moderatorPW: moderator_password,
 | 
				
			||||||
          attendeePW: viewer_password,
 | 
					          attendeePW: viewer_password,
 | 
				
			||||||
 | 
					          moderatorOnlyMessage: options[:moderator_message],
 | 
				
			||||||
          "meta_#{BbbApi::META_LISTED}": false,
 | 
					          "meta_#{BbbApi::META_LISTED}": false,
 | 
				
			||||||
          "meta_#{BbbApi::META_TOKEN}": meeting_token
 | 
					          "meta_#{BbbApi::META_TOKEN}": meeting_token
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -74,16 +74,16 @@ en-US:
 | 
				
			|||||||
  invite: Invite
 | 
					  invite: Invite
 | 
				
			||||||
  invite_description: (share this link below to invite others to this meeting)
 | 
					  invite_description: (share this link below to invite others to this meeting)
 | 
				
			||||||
  join: Join
 | 
					  join: Join
 | 
				
			||||||
  logged_in_description_html: You are logged in as %{link}
 | 
					 | 
				
			||||||
  login: login
 | 
					 | 
				
			||||||
  login_description: Want to record a meeting?
 | 
					 | 
				
			||||||
  logout: logout
 | 
					 | 
				
			||||||
  landing_titles:
 | 
					  landing_titles:
 | 
				
			||||||
    start_meeting: Start your own meeting
 | 
					    start_meeting: Start your own meeting
 | 
				
			||||||
    get_work_down: Let's get some work done
 | 
					    get_work_down: Let's get some work done
 | 
				
			||||||
    connect: Connect in real-time with others
 | 
					    connect: Connect in real-time with others
 | 
				
			||||||
    collaborate: Collaborate with friends
 | 
					    collaborate: Collaborate with friends
 | 
				
			||||||
    teach: Teach students online
 | 
					    teach: Teach students online
 | 
				
			||||||
 | 
					  logged_in_description_html: You are logged in as %{link}
 | 
				
			||||||
 | 
					  login: login
 | 
				
			||||||
 | 
					  login_description: Want to record a meeting?
 | 
				
			||||||
 | 
					  logout: logout
 | 
				
			||||||
  meeting: Meeting
 | 
					  meeting: Meeting
 | 
				
			||||||
  meeting_invite:
 | 
					  meeting_invite:
 | 
				
			||||||
    explanation: Send an email with an invitation to this meeting
 | 
					    explanation: Send an email with an invitation to this meeting
 | 
				
			||||||
@@ -93,6 +93,7 @@ en-US:
 | 
				
			|||||||
    signed_in:
 | 
					    signed_in:
 | 
				
			||||||
      body: "You have been invited by %{user} to a meeting.\n\nPlease open the following page in your web browser: &&URL&&"
 | 
					      body: "You have been invited by %{user} to a meeting.\n\nPlease open the following page in your web browser: &&URL&&"
 | 
				
			||||||
      subject: "%{user} invited you to a meeting"
 | 
					      subject: "%{user} invited you to a meeting"
 | 
				
			||||||
 | 
					  moderator_default_message: Invitation link - %{url}
 | 
				
			||||||
  my_room: my room
 | 
					  my_room: my room
 | 
				
			||||||
  no: No
 | 
					  no: No
 | 
				
			||||||
  notification_mailer:
 | 
					  notification_mailer:
 | 
				
			||||||
@@ -104,7 +105,7 @@ en-US:
 | 
				
			|||||||
  past_recordings: Past Recordings
 | 
					  past_recordings: Past Recordings
 | 
				
			||||||
  presentation: Presentation
 | 
					  presentation: Presentation
 | 
				
			||||||
  previous_meetings: (previous meetings)
 | 
					  previous_meetings: (previous meetings)
 | 
				
			||||||
  return_to_room: Return to your personal room
 | 
					  return_to_room: Return to main page
 | 
				
			||||||
  session_url_explanation: The meeting will be taking place using the following URL
 | 
					  session_url_explanation: The meeting will be taking place using the following URL
 | 
				
			||||||
  signin_text: Log in with %{provider}
 | 
					  signin_text: Log in with %{provider}
 | 
				
			||||||
  start: Start
 | 
					  start: Start
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user