forked from External/greenlight
		
	Replace all CRLF files to LF (#2572)
This commit is contained in:
		
							
								
								
									
										64
									
								
								.github/workflows/build.release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										64
									
								
								.github/workflows/build.release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,32 +1,32 @@ | |||||||
| env: | env: | ||||||
|   RUBY_VERSION: 2.7.2 |   RUBY_VERSION: 2.7.2 | ||||||
|  |  | ||||||
|  |  | ||||||
| name: Build Release | name: Build Release | ||||||
| on: | on: | ||||||
|   release: |   release: | ||||||
|     types: [released] |     types: [released] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   main: |   main: | ||||||
|     name: Build Docker Image |     name: Build Docker Image | ||||||
|     runs-on: ubuntu-18.04 |     runs-on: ubuntu-18.04 | ||||||
|     steps: |     steps: | ||||||
|       - name: Set up Docker Buildx |       - name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v1 |         uses: docker/setup-buildx-action@v1 | ||||||
|          |          | ||||||
|       - name: Login to Github Container Registry |       - name: Login to Github Container Registry | ||||||
|         uses: docker/login-action@v1 |         uses: docker/login-action@v1 | ||||||
|         with: |         with: | ||||||
|           username: ${{ secrets.DOCKER_USERNAME }} |           username: ${{ secrets.DOCKER_USERNAME }} | ||||||
|           password: ${{ secrets.DOCKER_PASSWORD }} |           password: ${{ secrets.DOCKER_PASSWORD }} | ||||||
|  |  | ||||||
|       - name: Build and Push release |       - name: Build and Push release | ||||||
|         uses: docker/build-push-action@v2 |         uses: docker/build-push-action@v2 | ||||||
|         with: |         with: | ||||||
|           push: true |           push: true | ||||||
|           tags: | |           tags: | | ||||||
|             bigbluebutton/greenlight:latest |             bigbluebutton/greenlight:latest | ||||||
|             bigbluebutton/greenlight:v2 |             bigbluebutton/greenlight:v2 | ||||||
|             bigbluebutton/greenlight:${{ github.event.release.tag_name }} |             bigbluebutton/greenlight:${{ github.event.release.tag_name }} | ||||||
|           build-args: version_code=${{ github.event.release.tag_name }} |           build-args: version_code=${{ github.event.release.tag_name }} | ||||||
|   | |||||||
| @@ -1,140 +1,140 @@ | |||||||
| <% | <% | ||||||
| # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||||||
| # Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | # 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 | # 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 | # 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 | # Foundation; either version 3.0 of the License, or (at your option) any later | ||||||
| # version. | # version. | ||||||
| # | # | ||||||
| # BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | # 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 | # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||||
| # PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | # 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 | # You should have received a copy of the GNU Lesser General Public License along | ||||||
| # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||||||
| %> | %> | ||||||
|  |  | ||||||
| <% exceeds_limit = current_room_exceeds_limit(@room)%> | <% exceeds_limit = current_room_exceeds_limit(@room)%> | ||||||
| <% if exceeds_limit%> | <% if exceeds_limit%> | ||||||
|   <div class="alert alert-danger alert-dismissible text-center mb-0"> |   <div class="alert alert-danger alert-dismissible text-center mb-0"> | ||||||
|     <%= t("room.room_limit_exceeded", difference: @diff) %> |     <%= t("room.room_limit_exceeded", difference: @diff) %> | ||||||
|   </div> |   </div> | ||||||
| <% end %> | <% end %> | ||||||
| <div class="background pb-1"> | <div class="background pb-1"> | ||||||
|   <div class="container"> |   <div class="container"> | ||||||
|     <div class="row pt-7 pt-sm-9 mb-7"> |     <div class="row pt-7 pt-sm-9 mb-7"> | ||||||
|       <div class="col-lg-9 col-sm-12"> |       <div class="col-lg-9 col-sm-12"> | ||||||
|         <div id="room-title" class="display-3 form-inline <%= 'edit_hover_class' if current_user.main_room != @room %>" data-path="<%= update_settings_path(@room) %>"> |         <div id="room-title" class="display-3 form-inline <%= 'edit_hover_class' if current_user.main_room != @room %>" data-path="<%= update_settings_path(@room) %>"> | ||||||
|            <h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400 text-break"><%= title(@room.name) %></h1> |            <h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400 text-break"><%= title(@room.name) %></h1> | ||||||
|           <% if current_user.main_room == @room %> |           <% if current_user.main_room == @room %> | ||||||
|             <a class="disable-click"><i class="fas fa-home align-top home-indicator ml-2"></i></a> |             <a class="disable-click"><i class="fas fa-home align-top home-indicator ml-2"></i></a> | ||||||
|           <% else %> |           <% else %> | ||||||
|             <a><i id="edit-room" class="fa fa-edit align-top home-indicator ml-2" data-edit-room="<%= @room.uid %>"></i></a> |             <a><i id="edit-room" class="fa fa-edit align-top home-indicator ml-2" data-edit-room="<%= @room.uid %>"></i></a> | ||||||
|           <% end %> |           <% end %> | ||||||
|         </div> |         </div> | ||||||
|         <h4 class="text-left mb-6"><%= @room.sessions %> <%= t("room.sessions") %><% unless hide_recording_tables %> | <%= @recordings.length %> <%= t("room.recordings") %><% end %></h4> |         <h4 class="text-left mb-6"><%= @room.sessions %> <%= t("room.sessions") %><% unless hide_recording_tables %> | <%= @recordings.length %> <%= t("room.recordings") %><% end %></h4> | ||||||
|         <% unless exceeds_limit %> |         <% unless exceeds_limit %> | ||||||
|           <label class="form-label"><%= t("room.invite_participants") %></label> |           <label class="form-label"><%= t("room.invite_participants") %></label> | ||||||
|           <div class="row"> |           <div class="row"> | ||||||
|             <div class="col-lg-6 col-md-12 mt-2"> |             <div class="col-lg-6 col-md-12 mt-2"> | ||||||
|               <div class="input-icon invite-link-input"> |               <div class="input-icon invite-link-input"> | ||||||
|                 <span class="input-icon-addon"> |                 <span class="input-icon-addon"> | ||||||
|                   <i class="fas fa-link"></i> |                   <i class="fas fa-link"></i> | ||||||
|                 </span> |                 </span> | ||||||
|                 <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly=""> |                 <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly=""> | ||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|             <div class="col-lg-6 pr-lg-7 col-md-12 pl-lg-0"> |             <div class="col-lg-6 pr-lg-7 col-md-12 pl-lg-0"> | ||||||
|               <div class="row"> |               <div class="row"> | ||||||
|                 <div class="col-sm-6 mt-2"> |                 <div class="col-sm-6 mt-2"> | ||||||
|                   <button id="copy-invite" class="btn btn-primary btn-block" onclick="copyInvite()"> |                   <button id="copy-invite" class="btn btn-primary btn-block" onclick="copyInvite()"> | ||||||
|                     <i class="fas fa-copy mr-1"></i> |                     <i class="fas fa-copy mr-1"></i> | ||||||
|                     <%= t("copy") %> |                     <%= t("copy") %> | ||||||
|                   </button> |                   </button> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div class="col-sm-6 pl-0 mt-2"> |                 <div class="col-sm-6 pl-0 mt-2"> | ||||||
|                   <% if @room.access_code.present? %> |                   <% if @room.access_code.present? %> | ||||||
|                     <input id="copy-code" value="<%= @room.access_code %>" type="hidden"> |                     <input id="copy-code" value="<%= @room.access_code %>" type="hidden"> | ||||||
|                     <button id="copy-access" class="btn btn-secondary btn-block" onclick="copyAccess()"> |                     <button id="copy-access" class="btn btn-secondary btn-block" onclick="copyAccess()"> | ||||||
|                       <i class="fas fa-copy mr-1"></i> |                       <i class="fas fa-copy mr-1"></i> | ||||||
|                       <%= t("room.copy_access") %> |                       <%= t("room.copy_access") %> | ||||||
|                     </button> |                     </button> | ||||||
|                   <% end %> |                   <% end %> | ||||||
|                   <% if Rails.configuration.enable_google_calendar_button %> |                   <% if Rails.configuration.enable_google_calendar_button %> | ||||||
|                     <a href="<%= google_calendar_path %>" target="__blank" id="schedule" class="btn btn-primary btn-block mt-2"> |                     <a href="<%= google_calendar_path %>" target="__blank" id="schedule" class="btn btn-primary btn-block mt-2"> | ||||||
|                       <i class="fas fa-calendar-plus"></i> |                       <i class="fas fa-calendar-plus"></i> | ||||||
|                       <%= t("add_to_google_calendar") %> |                       <%= t("add_to_google_calendar") %> | ||||||
|                     </a> |                     </a> | ||||||
|                   <% end %> |                   <% end %> | ||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
|         <% end %> |         <% end %> | ||||||
|       </div> |       </div> | ||||||
|       <div class="col-lg-3 col-sm-12 force-bottom mt-5"> |       <div class="col-lg-3 col-sm-12 force-bottom mt-5"> | ||||||
|         <% if @room_running %> |         <% if @room_running %> | ||||||
|           <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> |           <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> | ||||||
|         <% else %> |         <% else %> | ||||||
|           <% unless exceeds_limit %> |           <% unless exceeds_limit %> | ||||||
|             <%= button_to t("room.start"), start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> |             <%= button_to t("room.start"), start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> | ||||||
|           <% end %> |           <% end %> | ||||||
|         <% end %> |         <% end %> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|  |  | ||||||
|     <% if total_room_count(current_user) > 5 %> |     <% if total_room_count(current_user) > 5 %> | ||||||
|       <div class="input-icon invite-link-input mb-3"> |       <div class="input-icon invite-link-input mb-3"> | ||||||
|         <span class="input-icon-addon"> |         <span class="input-icon-addon"> | ||||||
|           <i class="fas fa-search"></i> |           <i class="fas fa-search"></i> | ||||||
|           </span> |           </span> | ||||||
|         <input id="room-search" type="text" placeholder="<%= t("room.search") %>" class="form-control w-100" onChange="filterRooms()" onKeyUp="filterRooms()"> |         <input id="room-search" type="text" placeholder="<%= t("room.search") %>" class="form-control w-100" onChange="filterRooms()" onKeyUp="filterRooms()"> | ||||||
|         <span id="clear-room-search" class="text-primary" onclick="clearRoomSearch()"> |         <span id="clear-room-search" class="text-primary" onclick="clearRoomSearch()"> | ||||||
|           <i class="fas fa-times"></i> |           <i class="fas fa-times"></i> | ||||||
|         </span> |         </span> | ||||||
|       </div> |       </div> | ||||||
|     <% end %> |     <% end %> | ||||||
|  |  | ||||||
|     <div id="room_block_container" class="row mb-5"> |     <div id="room_block_container" class="row mb-5"> | ||||||
|       <% if current_user.role.get_permission("can_create_rooms") %> |       <% if current_user.role.get_permission("can_create_rooms") %> | ||||||
|         <% current_user.ordered_rooms.each do |room| %> |         <% current_user.ordered_rooms.each do |room| %> | ||||||
|           <div class="col-lg-4 col-md-6 col-sm-12"> |           <div class="col-lg-4 col-md-6 col-sm-12"> | ||||||
|             <%= link_to room do %> |             <%= link_to room do %> | ||||||
|               <%= render "rooms/components/room_block", room: room %> |               <%= render "rooms/components/room_block", room: room %> | ||||||
|             <% end %> |             <% end %> | ||||||
|           </div> |           </div> | ||||||
|         <% end %> |         <% end %> | ||||||
|       <% end %> |       <% end %> | ||||||
|  |  | ||||||
|       <% if shared_access_allowed %> |       <% if shared_access_allowed %> | ||||||
|         <% current_user.shared_rooms.each do |room| %> |         <% current_user.shared_rooms.each do |room| %> | ||||||
|           <div class="col-lg-4 col-md-6 col-sm-12"> |           <div class="col-lg-4 col-md-6 col-sm-12"> | ||||||
|             <%= link_to room do %> |             <%= link_to room do %> | ||||||
|               <%= render "rooms/components/shared_room_block", room: room %> |               <%= render "rooms/components/shared_room_block", room: room %> | ||||||
|             <% end %> |             <% end %> | ||||||
|           </div> |           </div> | ||||||
|         <% end %> |         <% end %> | ||||||
|       <% end %> |       <% end %> | ||||||
|  |  | ||||||
|       <% if current_user.role.get_permission("can_create_rooms") && !room_limit_exceeded %> |       <% if current_user.role.get_permission("can_create_rooms") && !room_limit_exceeded %> | ||||||
|         <%= render "rooms/components/create_room_block"%> |         <%= render "rooms/components/create_room_block"%> | ||||||
|       <% end %> |       <% end %> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
| </div> | </div> | ||||||
|  |  | ||||||
| <% unless hide_recording_tables %> | <% unless hide_recording_tables %> | ||||||
|   <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%> |   <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%> | ||||||
| <% end %> | <% end %> | ||||||
|  |  | ||||||
| <%= render "shared/modals/delete_room_modal" %> | <%= render "shared/modals/delete_room_modal" %> | ||||||
|  |  | ||||||
| <%= render "shared/modals/create_room_modal" %> | <%= render "shared/modals/create_room_modal" %> | ||||||
|  |  | ||||||
| <% if preupload_allowed? %> | <% if preupload_allowed? %> | ||||||
|   <%= render "shared/modals/preupload_presentation_modal" %> |   <%= render "shared/modals/preupload_presentation_modal" %> | ||||||
| <% end %> | <% end %> | ||||||
|  |  | ||||||
| <% if shared_access_allowed %> | <% if shared_access_allowed %> | ||||||
|   <%= render "shared/modals/share_room_modal" %> |   <%= render "shared/modals/share_room_modal" %> | ||||||
|   <%= render "shared/modals/remove_access_modal" %> |   <%= render "shared/modals/remove_access_modal" %> | ||||||
| <% end %> | <% end %> | ||||||
|   | |||||||
| @@ -1,44 +1,44 @@ | |||||||
| <% | <% | ||||||
| # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||||||
| # Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | # 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 | # 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 | # 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 | # Foundation; either version 3.0 of the License, or (at your option) any later | ||||||
| # version. | # version. | ||||||
| # | # | ||||||
| # BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | # 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 | # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||||
| # PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | # 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 | # You should have received a copy of the GNU Lesser General Public License along | ||||||
| # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||||||
| %> | %> | ||||||
|  |  | ||||||
| <div class="modal fade" id="inviteModal" tabindex="-1" role="dialog"> | <div class="modal fade" id="inviteModal" tabindex="-1" role="dialog"> | ||||||
|   <div class="modal-dialog modal-dialog-centered" role="document"> |   <div class="modal-dialog modal-dialog-centered" role="document"> | ||||||
|     <div class="modal-content text-center"> |     <div class="modal-content text-center"> | ||||||
|       <div class="modal-body"> |       <div class="modal-body"> | ||||||
|         <div class="card-body p-6"> |         <div class="card-body p-6"> | ||||||
|           <div class="card-title"> |           <div class="card-title"> | ||||||
|             <h3><%= t("modal.invite_user.title") %></h3> |             <h3><%= t("modal.invite_user.title") %></h3> | ||||||
|           </div> |           </div> | ||||||
|  |  | ||||||
|           <%= form_for(:invite_user, url: invite_user_path) do |f| %> |           <%= form_for(:invite_user, url: invite_user_path) do |f| %> | ||||||
|             <div class="input-icon mb-2"> |             <div class="input-icon mb-2"> | ||||||
|               <span class="input-icon-addon"> |               <span class="input-icon-addon"> | ||||||
|                 <i class="fas fa-envelope"></i> |                 <i class="fas fa-envelope"></i> | ||||||
|               </span> |               </span> | ||||||
|               <%= f.text_field :email, class: "form-control", value: "", placeholder: t("modal.invite_user.email_placeholder"), autocomplete: :off %> |               <%= f.text_field :email, class: "form-control", value: "", placeholder: t("modal.invite_user.email_placeholder"), autocomplete: :off %> | ||||||
|               <div class="invalid-feedback text-left"><%= t("modal.invite_user.not_blank") %></div> |               <div class="invalid-feedback text-left"><%= t("modal.invite_user.not_blank") %></div> | ||||||
|             </div> |             </div> | ||||||
|           <div class="mt-4"> |           <div class="mt-4"> | ||||||
|             <%= f.submit t("modal.invite_user.send"), class:"btn btn-primary btn-block" %> |             <%= f.submit t("modal.invite_user.send"), class:"btn btn-primary btn-block" %> | ||||||
|           </div> |           </div> | ||||||
|           <% end %> |           <% end %> | ||||||
|         </div> |         </div> | ||||||
|         <div class="card-footer"> |         <div class="card-footer"> | ||||||
|           <p><%= t("modal.invite_user.footer") %></p> |           <p><%= t("modal.invite_user.footer") %></p> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
| </div> | </div> | ||||||
|   | |||||||
| @@ -1,43 +1,43 @@ | |||||||
| <% | <% | ||||||
| # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||||||
| # Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | # 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 | # 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 | # 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 | # Foundation; either version 3.0 of the License, or (at your option) any later | ||||||
| # version. | # version. | ||||||
| # | # | ||||||
| # BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | # 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 | # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||||
| # PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | # 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 | # You should have received a copy of the GNU Lesser General Public License along | ||||||
| # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||||||
| %> | %> | ||||||
|  |  | ||||||
| <div class="modal fade" id="shareRoomModal" tabindex="-1" role="dialog"> | <div class="modal fade" id="shareRoomModal" tabindex="-1" role="dialog"> | ||||||
|   <div class="modal-dialog modal-dialog-centered" role="document"> |   <div class="modal-dialog modal-dialog-centered" role="document"> | ||||||
|     <div class="modal-content text-center"> |     <div class="modal-content text-center"> | ||||||
|       <div class="modal-body"> |       <div class="modal-body"> | ||||||
|         <div class="card-body p-6"> |         <div class="card-body p-6"> | ||||||
|           <div class="card-title"> |           <div class="card-title"> | ||||||
|             <h3><%= t("modal.share_access.title") %></h3> |             <h3><%= t("modal.share_access.title") %></h3> | ||||||
|           </div> |           </div> | ||||||
|           <select id="share-room-select" class="selectpicker" title="<%= t("modal.share_access.select") %>" data-live-search="true" data-virtual-scroll="true" data-path="<%= shared_access_list_path %>" > |           <select id="share-room-select" class="selectpicker" title="<%= t("modal.share_access.select") %>" data-live-search="true" data-virtual-scroll="true" data-path="<%= shared_access_list_path %>" > | ||||||
|           </select> |           </select> | ||||||
|           <div class="mt-5 text-left"> |           <div class="mt-5 text-left"> | ||||||
|             <label class="form-label"><%= t("modal.share_access.list") %></label> |             <label class="form-label"><%= t("modal.share_access.list") %></label> | ||||||
|             <ul id="user-list" class="list-group"> |             <ul id="user-list" class="list-group"> | ||||||
|             </ul> |             </ul> | ||||||
|           </div> |           </div> | ||||||
|           <input id="room-owner-uid" type="hidden"> |           <input id="room-owner-uid" type="hidden"> | ||||||
|           <div class="mt-6"> |           <div class="mt-6"> | ||||||
|             <button id="save-access" class="btn btn-primary btn-block" onclick="saveAccessChanges()" ><%= t("modal.share_access.save") %></button> |             <button id="save-access" class="btn btn-primary btn-block" onclick="saveAccessChanges()" ><%= t("modal.share_access.save") %></button> | ||||||
|             <button class="btn btn-secondary text-primary btn-block" onclick="$('#shareRoomModal').modal('hide')"><%= t("modal.share_access.cancel_changes") %></button> |             <button class="btn btn-secondary text-primary btn-block" onclick="$('#shareRoomModal').modal('hide')"><%= t("modal.share_access.cancel_changes") %></button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|         <div class="card-footer"> |         <div class="card-footer"> | ||||||
|           <p><%= t("modal.share_access.footer") %></p> |           <p><%= t("modal.share_access.footer") %></p> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
| </div> | </div> | ||||||
|   | |||||||
| @@ -1,43 +1,43 @@ | |||||||
| <% | <% | ||||||
| # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||||||
| # | # | ||||||
| # Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | # 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 | # 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 | # 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 | # Foundation; either version 3.0 of the License, or (at your option) any later | ||||||
| # version. | # version. | ||||||
| # | # | ||||||
| # BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | # 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 | # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||||
| # PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | # 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 | # You should have received a copy of the GNU Lesser General Public License along | ||||||
| # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||||||
| %> | %> | ||||||
|  |  | ||||||
|   <div style="text-align:center; font-family:'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif"> |   <div style="text-align:center; font-family:'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif"> | ||||||
|     <div style="display:inline-block; background-color:#F5F7FB; border:1px solid #d3d3d3; padding: 25px 70px"> |     <div style="display:inline-block; background-color:#F5F7FB; border:1px solid #d3d3d3; padding: 25px 70px"> | ||||||
|       <%= image_tag(@image, height: '70') %> |       <%= image_tag(@image, height: '70') %> | ||||||
|  |  | ||||||
|       <h1 style="margin-bottom:30px"> |       <h1 style="margin-bottom:30px"> | ||||||
|         <%= t('mailer.user.invite.subject') %> |         <%= t('mailer.user.invite.subject') %> | ||||||
|       </h1> |       </h1> | ||||||
|  |  | ||||||
|       <p> |       <p> | ||||||
|         <%= t('mailer.user.invite.info', name: @name) %> |         <%= t('mailer.user.invite.info', name: @name) %> | ||||||
|       </p> |       </p> | ||||||
|  |  | ||||||
|       <p> |       <p> | ||||||
|         <%= t('mailer.user.invite.username', email: @email) %> |         <%= t('mailer.user.invite.username', email: @email) %> | ||||||
|       </p> |       </p> | ||||||
|  |  | ||||||
|       <p style="margin-bottom:35px;"> |       <p style="margin-bottom:35px;"> | ||||||
|         <%= t('mailer.user.invite.signup_info') %> |         <%= t('mailer.user.invite.signup_info') %> | ||||||
|       </p> |       </p> | ||||||
|  |  | ||||||
|       <a style="background: <%= @color %>;color: #ffffff; padding: 10px 15px; box-shadow: 0 2px 4px 0 rgba(0,0,0,.25);border: 1px solid transparent;text-decoration:none;" href="<%= @url %>"> |       <a style="background: <%= @color %>;color: #ffffff; padding: 10px 15px; box-shadow: 0 2px 4px 0 rgba(0,0,0,.25);border: 1px solid transparent;text-decoration:none;" href="<%= @url %>"> | ||||||
|         <%= t('mailer.user.invite.signup_link') %> |         <%= t('mailer.user.invite.signup_link') %> | ||||||
|       </a> |       </a> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   | |||||||
| @@ -1,27 +1,27 @@ | |||||||
| <% | <% | ||||||
| # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||||||
| # | # | ||||||
| # Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | # 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 | # 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 | # 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 | # Foundation; either version 3.0 of the License, or (at your option) any later | ||||||
| # version. | # version. | ||||||
| # | # | ||||||
| # BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | # 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 | # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||||
| # PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | # 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 | # You should have received a copy of the GNU Lesser General Public License along | ||||||
| # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||||||
| %> | %> | ||||||
|  |  | ||||||
| <%= t('mailer.user.invite.subject') %> | <%= t('mailer.user.invite.subject') %> | ||||||
|  |  | ||||||
| <%= t('mailer.user.invite.info', name: @name) %> | <%= t('mailer.user.invite.info', name: @name) %> | ||||||
|  |  | ||||||
| <%= t('mailer.user.invite.username', email: @email) %> | <%= t('mailer.user.invite.username', email: @email) %> | ||||||
|  |  | ||||||
| <%= t('mailer.user.invite.signup_info') %> | <%= t('mailer.user.invite.signup_info') %> | ||||||
|  |  | ||||||
| <%= @url %> | <%= @url %> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user