multi meeting rooms

This commit is contained in:
Zachary Chai
2017-01-27 15:44:24 -05:00
parent 0ce2a226a7
commit d67663fbf1
17 changed files with 123 additions and 66 deletions

View File

@ -8,6 +8,8 @@
<div class="verticle-line"></div>
<div class="col-xs-6">
<%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %>
<%= render 'shared/join_form' %>
<button type="button" class="btn btn-primary center-block meeting-start">
<%= t('start_meeting') %>
</button>
</div>
</div>

View File

@ -31,18 +31,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class="center-block center-panel-content-size col-xs-12">
<% if admin? %>
<%= render 'shared/meeting_name_form' %>
<div class="invite-join-wrapper">
<div class="col-xs-6">
<%= render 'shared/title', title: t('invite') do %>
<span><%= t('invite_description') %></span>
<% end %>
<%= render 'shared/meeting_url', hidden: false %>
</div>
<div class="verticle-line"></div>
<div class="col-xs-6">
<%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %>
<%= render 'shared/join_form' %>
</div>
<div class="row">
<%= render 'landing/invite_join' %>
</div>
<% else %>
<%= render 'shared/meeting_url', hidden: true %>

View File

@ -0,0 +1,29 @@
<!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
Copyright (c) 2016 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/>.
-->
<% content_for :title do %>
<div class="title">
<h2>
<%= t('join_session_id', id: @meeting_id) %>
</h2>
</div>
<% end %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-content-size col-xs-12">
<%= render 'shared/meeting_url', hidden: true %>
<%= render 'shared/join_form' %>
</div>
<% end %>

View File

@ -19,11 +19,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% page_title= t('greet_guest', name: @user.username) %>
<% end %>
<div class="page-wrapper rooms" data-id="<%= @user.encrypted_id %>">
<div class="page-wrapper rooms" data-main-room="<%= @main_room %>" data-id="<%= @meeting_id %>" data-admin-id="<%= @user.encrypted_id %>">
<div class="container-fluid">
<div class="center-panel-wrapper">
<%= render 'rooms_center_panel' %>
<% if @main_room %>
<%= render 'rooms_center_panel' %>
<% else %>
<%= render 'rooms_meetings_center_panel' %>
<% end %>
</div>
<%= render 'shared/signup' %>

View File

@ -13,4 +13,4 @@ You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
<%= render 'rooms_center_panel' %>
<%= render 'rooms_meetings_center_panel' %>