dynamic room content

This commit is contained in:
Zachary Chai 2016-11-09 15:29:36 -05:00
parent 7068d0b023
commit d22cc3e6d0
9 changed files with 43 additions and 37 deletions

View File

@ -2,7 +2,7 @@
var sessionStatusRefresh = function(url) {
$.get(url + "/session_status_refresh", function(html) {
$(".join-form-wrapper").html(html);
$(".center-panel-wrapper").html(html);
});
}

View File

@ -15,7 +15,7 @@
var init = function() {
$('.center-panel').on ('click', '.meeting-join', function (event) {
$('.center-panel-wrapper').on ('click', '.meeting-join', function (event) {
var url = $('.meeting-url').val();
var name = $('.meeting-user-name').val();
Meeting.getInstance().setURL(url);
@ -34,7 +34,7 @@
});
});
$('.center-panel').on ('click', '.meeting-end', function (event) {
$('.center-panel-wrapper').on ('click', '.meeting-end', function (event) {
var jqxhr = Meeting.getInstance().endMeeting();
var btn = $(this);
btn.prop("disabled", true);
@ -46,7 +46,7 @@
});
});
$('.center-panel').on ('click', '.meeting-url-copy', function (event) {
$('.center-panel-wrapper').on ('click', '.meeting-url-copy', function (event) {
meetingURL = $('.meeting-url');
meetingURL.select();
document.execCommand("copy");
@ -94,12 +94,7 @@
};
var initRooms = function() {
meetingURL = $('.meeting-url');
var link = window.location.protocol +
'//' +
window.location.hostname +
meetingURL.data('path');
meetingURL.val(link);
displayMeetingURL();
// initialize recordings datatable
recordingsTable = $('#recordings').dataTable({

View File

@ -91,3 +91,12 @@ var showAlert = function(html, timeout_delay) {
}, timeout_delay);
}
}
var displayMeetingURL = function() {
meetingURL = $('.meeting-url');
var link = window.location.protocol +
'//' +
window.location.hostname +
meetingURL.data('path');
meetingURL.val(link);
}

View File

@ -0,0 +1,24 @@
<% content_for :title do %>
<div class="title">
<% if current_user == @user %>
<%= t('start_new_session') %>
<% elsif current_user && current_user != @user %>
<%= t('join_session_user', name: @user.username) %>
<% else %>
<%= t('join_session') %>
<% end %>
</div>
<% end %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<% if current_user == @user %>
<%= render 'shared/meeting_url', hidden: false %>
<% else %>
<%= render 'shared/meeting_url', hidden: true %>
<% end %>
<div class="join-form-wrapper">
<%= render 'shared/join_form' %>
</div>
</div>
<% end %>

View File

@ -18,7 +18,7 @@
<% end %>
<div class="page-wrapper meetings">
<div class='container-fluid'>
<div class="container-fluid">
<%= render 'shared/title', title: t('start_new_session') %>

View File

@ -4,36 +4,13 @@
<% page_title= t('greet_guest', name: @user.username) %>
<% end %>
<% content_for :title do %>
<div class="title">
<% if current_user == @user %>
<%= t('start_new_session') %>
<% elsif current_user && current_user != @user %>
<%= t('join_session_user', name: @user.username) %>
<% else %>
<%= t('join_session_guest') %>
<% end %>
</div>
<% end %>
<div class="page-wrapper rooms" data-room="<%= @user.encrypted_id %>">
<div class="container-fluid">
<%= render 'shared/title', title: page_title %>
<div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<% if current_user == @user %>
<%= render 'shared/meeting_url', hidden: false %>
<% else %>
<%= render 'shared/meeting_url', hidden: true %>
<% end %>
<div class="join-form-wrapper">
<%= render 'shared/join_form' %>
</div>
</div>
<% end %>
<%= render 'rooms_center_panel' %>
</div>
<div class="table-wrapper">

View File

@ -1 +1 @@
<%= render 'shared/join_form' %>
<%= render 'rooms_center_panel' %>

View File

@ -8,6 +8,7 @@
</h3>
<%= yield %>
</div>
</div>
<%= yield :footer %>
</div>
</div>

View File

@ -31,7 +31,7 @@ en-US:
greet_guest: Welcome to %{name} Meeting Space
hi_all: Hi Everyone
join: Join
join_session_guest: Join the current session
join_session: Join the current session
join_session_user: Join %{name} session
login: login
logout: logout