forked from External/greenlight
GRN2-129: Added server recordings and refactored adminsitrator panel (#662)
* Added server recordings and refactored adminsitrator panel * Fixed some issues * Fixed issue with owner email search * Fixed issue with edit user
This commit is contained in:
committed by
Jesus Federico
parent
8c63f793a5
commit
a055b88eb7
@ -43,9 +43,9 @@ $(document).on('turbolinks:load', function(){
|
||||
|
||||
window.location.replace(url);
|
||||
})
|
||||
|
||||
/* COLOR SELECTORS */
|
||||
}
|
||||
|
||||
if (controller == "admins" && action == "site_settings") {
|
||||
loadColourSelectors()
|
||||
}
|
||||
|
||||
|
41
app/assets/javascripts/recording.js
Normal file
41
app/assets/javascripts/recording.js
Normal file
@ -0,0 +1,41 @@
|
||||
// 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/>.
|
||||
|
||||
// Handle changing of settings tabs.
|
||||
$(document).on('turbolinks:load', function(){
|
||||
var controller = $("body").data('controller');
|
||||
var action = $("body").data('action');
|
||||
|
||||
if (controller == "rooms" && action == "show"
|
||||
|| controller == "rooms" && action == "update"
|
||||
|| controller == "users" && action == "recordings"
|
||||
|| controller == "admins" && action == "server_recordings"){
|
||||
// Handle recording emails.
|
||||
$('.email-link').each(function(){
|
||||
$(this).click(function(){
|
||||
var subject = $(".username").text() + " " + t('room.mailer.subject');
|
||||
var body = t('room.mailer.body') + "\n\n" + $(this).attr("data-pres-link");
|
||||
var autogenerated = "\n\n" + t('room.mailer.autogenerated') + "\n";
|
||||
var footer = t('room.mailer.footer');
|
||||
|
||||
var url = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body) + encodeURIComponent(autogenerated) + encodeURIComponent(footer);
|
||||
var win = window.open(url, '_blank');
|
||||
|
||||
win.focus();
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
@ -18,7 +18,10 @@ $(document).on('turbolinks:load', function(){
|
||||
var controller = $("body").data('controller');
|
||||
var action = $("body").data('action');
|
||||
|
||||
if(controller == "rooms" && action == "show" || controller == "rooms" && action == "update" || controller == "users" && action == "recordings"){
|
||||
if(controller == "rooms" && action == "show"
|
||||
|| controller == "rooms" && action == "update"
|
||||
|| controller == "users" && action == "recordings"
|
||||
|| controller == "admins" && action == "server_recordings"){
|
||||
|
||||
// Set a room header rename event
|
||||
var configure_room_header = function(room_title){
|
||||
|
@ -39,21 +39,6 @@ $(document).on('turbolinks:load', function(){
|
||||
}, 2000)
|
||||
}
|
||||
});
|
||||
|
||||
// Handle recording emails.
|
||||
$('.email-link').each(function(){
|
||||
$(this).click(function(){
|
||||
var subject = $(".username").text() + " " + t('room.mailer.subject');
|
||||
var body = t('room.mailer.body') + "\n\n" + $(this).attr("data-pres-link");
|
||||
var autogenerated = "\n\n" + t('room.mailer.autogenerated') + "\n";
|
||||
var footer = t('room.mailer.footer');
|
||||
|
||||
var url = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body) + encodeURIComponent(autogenerated) + encodeURIComponent(footer);
|
||||
var win = window.open(url, '_blank');
|
||||
|
||||
win.focus();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// Display and update all fields related to creating a room in the createRoomModal
|
||||
|
@ -22,7 +22,8 @@ $(document).on('turbolinks:load', function(){
|
||||
(controller == "rooms" && action == "show") ||
|
||||
(controller == "rooms" && action == "update") ||
|
||||
(controller == "rooms" && action == "join") ||
|
||||
(controller == "users" && action == "recordings")) {
|
||||
(controller == "users" && action == "recordings") ||
|
||||
(controller == "admins" && action == "server_recordings")) {
|
||||
// Submit search if the user hits enter
|
||||
$("#search-input").keypress(function(key) {
|
||||
var keyPressed = key.which
|
||||
|
@ -20,7 +20,7 @@ $(document).on('turbolinks:load', function(){
|
||||
var action = $("body").data('action');
|
||||
|
||||
// Only run on the settings page.
|
||||
if ((controller == "users" && action == "edit") || (controller == "users" && action == "update") || (controller == "admins" && action == "index")){
|
||||
if ((controller == "users" && action == "edit") || (controller == "users" && action == "update")){
|
||||
var settingsButtons = $('.setting-btn');
|
||||
var settingsViews = $('.setting-view');
|
||||
|
||||
|
@ -18,7 +18,10 @@ $(document).on('turbolinks:load', function(){
|
||||
var controller = $("body").data('controller');
|
||||
var action = $("body").data('action');
|
||||
|
||||
if(controller == "rooms" && action == "show" || controller == "rooms" && action == "update" || controller == "users" && action == "recordings"){
|
||||
if(controller == "rooms" && action == "show"
|
||||
|| controller == "rooms" && action == "update"
|
||||
|| controller == "users" && action == "recordings"
|
||||
|| controller == "admins" && action == "server_recordings"){
|
||||
|
||||
// Choose active header
|
||||
// (Name, Length or Users)
|
||||
|
Reference in New Issue
Block a user