-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into translations_en-yml--master_fr
- Loading branch information
Showing
27 changed files
with
929 additions
and
61 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -109,3 +109,7 @@ | |
text-decoration: line-through; | ||
} | ||
|
||
.enabled-setting { | ||
background: lightgray; | ||
pointer-events: none; | ||
} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
<div> | ||
<div class="mb-6 row"> | ||
<div class="col-12"> | ||
<div class="form-group"> | ||
<label class="form-label"><%= t("modal.room_settings.mute") %></label> | ||
<label class="form-label text-muted"><%= t("administrator.room_configuration.mute.info") %></label> | ||
<div class="dropdown"> | ||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
<%= room_configuration_string("Room Configuration Mute On Join") %> | ||
</button> | ||
<div class="dropdown-menu"> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Mute On Join", value: "enabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.enabled") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Mute On Join", value: "optional"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.optional") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Mute On Join", value: "disabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.disabled") %> | ||
<% end %> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
<div class="mb-6 row"> | ||
<div class="col-12"> | ||
<div class="form-group"> | ||
<label class="form-label"><%= t("modal.room_settings.require_approval") %></label> | ||
<label class="form-label text-muted"><%= t("administrator.room_configuration.require_moderator.info") %></label> | ||
<div class="dropdown"> | ||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
<%= room_configuration_string("Room Configuration Require Moderator") %> | ||
</button> | ||
<div class="dropdown-menu"> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Require Moderator", value: "enabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.enabled") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Require Moderator", value: "optional"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.optional") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Require Moderator", value: "disabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.disabled") %> | ||
<% end %> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
<div class="mb-6 row"> | ||
<div class="col-12"> | ||
<div class="form-group"> | ||
<label class="form-label"><%= t("modal.room_settings.start") %></label> | ||
<label class="form-label text-muted"><%= t("administrator.room_configuration.allow_any.info") %></label> | ||
<div class="dropdown"> | ||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
<%= room_configuration_string("Room Configuration Allow Any Start") %> | ||
</button> | ||
<div class="dropdown-menu"> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Allow Any Start", value: "enabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.enabled") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Allow Any Start", value: "optional"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.optional") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration Allow Any Start", value: "disabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.disabled") %> | ||
<% end %> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
<div class="mb-6 row"> | ||
<div class="col-12"> | ||
<div class="form-group"> | ||
<label class="form-label"><%= t("modal.room_settings.join_moderator") %></label> | ||
<label class="form-label text-muted"><%= t("administrator.room_configuration.all_moderator.info") %></label> | ||
<div class="dropdown"> | ||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
<%= room_configuration_string("Room Configuration All Join Moderator") %> | ||
</button> | ||
<div class="dropdown-menu"> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration All Join Moderator", value: "enabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.enabled") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration All Join Moderator", value: "optional"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.optional") %> | ||
<% end %> | ||
<%= button_to admin_update_room_configuration_path(setting: "Room Configuration All Join Moderator", value: "disabled"), class: "dropdown-item", "data-disable": "" do %> | ||
<%= t("administrator.room_configuration.options.disabled") %> | ||
<% end %> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> |
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,27 @@ | ||
<% | ||
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||
# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | ||
# This program is free software; you can redistribute it and/or modify it under the | ||
# terms of the GNU Lesser General Public License as published by the Free Software | ||
# Foundation; either version 3.0 of the License, or (at your option) any later | ||
# version. | ||
# | ||
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | ||
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | ||
# You should have received a copy of the GNU Lesser General Public License along | ||
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||
%> | ||
|
||
<div class="container pt-6"> | ||
<%= render "shared/components/subtitle", subtitle: t("administrator.title"), search: false %> | ||
|
||
<div class="row"> | ||
<div class="col-lg-3 mb-4"> | ||
<%= render "admins/components/menu_buttons" %> | ||
</div> | ||
<div id="room_configuration" class="col-lg-9"> | ||
<%= render "admins/components/setting_view", setting_id: "room_settings", setting_title: t("administrator.room_configuration.title"), search: false %> | ||
</div> | ||
</div> | ||
</div> |
Oops, something went wrong.