forked from bigbluebutton/bbb-app-rooms
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release-0.15.x' into master-elos
- Loading branch information
Showing
13 changed files
with
232 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
db/migrate/20240314172824_add_external_context_url_to_consumer_configs.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
class AddExternalContextUrlToConsumerConfigs < ActiveRecord::Migration[6.1] | ||
def change | ||
add_column(:consumer_configs, :external_context_url, :string) | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
themes/elos/views/rooms/external_context_selector.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<div class="col-12 col-md-12 col-lg-12"> | ||
|
||
<div class="d-flex justify-content-end align-items-center user-data mb-5"> | ||
<i class="icon material-icons mr-2">person</i> | ||
<div class="user-name"><%= @user.full_name %> (<%= @user.email %>) </div> | ||
</div> | ||
|
||
<h2 class="mb-4"> | ||
<%= t('rooms.external_handler_selector.title') %> | ||
</h2> | ||
|
||
<table class="table"> | ||
<tbody> | ||
<% @handlers.each_with_index do |handler, index| %> | ||
<% # TODO: remove the gsub %> | ||
<% path = Rails.application.routes.url_helpers.room_launch_path(launch_nonce: @launch_nonce, handler: handler['handler']).gsub(Regexp.new('^/rooms/rooms'), '/rooms') %> | ||
<tr class="d-flex row tr-row"> | ||
<td class="d-flex col-12 col-md-6 align-items-sm-center align-items-md-start"> | ||
<%= handler['name'] %> | ||
</td> | ||
<td class="col-12 col-md-6 align-items-md-end"> | ||
<%= button_to t('rooms.external_handler_selector.enter'), path, method: :post, class: "btn btn-primary btn-external-handler-access", data: { disable_with: t('rooms.external_handler_selector.entering') } %> | ||
</td> | ||
</tr> | ||
<% end %> | ||
</tbody> | ||
</table> | ||
</div> | ||
<div id="elos-logo" class="d-flex align-items-center"> | ||
<%= image_tag "elos-logo.svg", title: "Elos", class: "mx-auto" %> | ||
</div> |