nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conferences: Visual adjustments, fixed Active Conferences links.

Browse Source 
Active Conferences: Reworked/renamed permissions, removed Active Conference from the User's menu (addressing Issue 662), misc visual adjustments.
Conference Center: Misc visual adjustments.
This commit is contained in:
Nate Jones
2015-02-12 02:09:59 +00:00
parent 163c8a1e8c
commit 557a1d6e6d
11 changed files with 181 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/conferences/app_languages.php
View File

@@ -11,20 +11,20 @@
$text['description']['pt-pt'] = "As conferências são utilizadas para configurar salas de conferência com um nome, descrição e número pin opcional.";
$text['description']['fr-fr'] = "Ce menu est utilisé pour créer des salles de conférence avec un nom, une description et en option un code PIN.";
$text['title-2']['en-us'] = "Active Conferences";
$text['title-2']['es-cl'] = "Conferencias Activas";
$text['title-2']['pt-pt'] = "Conferências Activas";
$text['title-2']['fr-fr'] = "Conférences actives";
$text['label-active_conferences']['en-us'] = "Active Conferences";
$text['label-active_conferences']['es-cl'] = "Conferencias Activas";
$text['label-active_conferences']['pt-pt'] = "Conferências Activas";
$text['label-active_conferences']['fr-fr'] = "Conférences actives";
$text['title-3']['en-us'] = "Active Conference";
$text['title-3']['es-cl'] = "Conferencia Activa";
$text['title-3']['pt-pt'] = "Conferência Activa";
$text['title-3']['fr-fr'] = "Conférence active";
$text['button-view_active']['en-us'] = "View Active";
$text['button-view_active']['es-cl'] = "Ver Activo";
$text['button-view_active']['pt-pt'] = "Ver Ativo";
$text['button-view_active']['fr-fr'] = "Voir Active";
$text['description-2']['en-us'] = "and then select a conference to monitor and interact with it.";
$text['description-2']['es-cl'] = "y luego seleccionar una conferencia para monitorear e interacuar con ella.";
$text['description-2']['pt-pt'] = "e selecione uma conferência para monitorizar e poder interagir.";
$text['description-2']['fr-fr'] = "et ensuite sélectionner la conférence à superviser et à gérer.";
$text['button-view']['en-us'] = "View";
$text['button-view']['es-cl'] = "Ver";
$text['button-view']['pt-pt'] = "Ver";
$text['button-view']['fr-fr'] = "Voir";
$text['table-name']['en-us'] = "Name";
$text['table-name']['es-cl'] = "Nombre";
@@ -198,4 +198,24 @@
$text['description-flags']['pt-pt'] = "Flags opcionais de conferências. Exemplos: mute|deaf|waste|moderator";
$text['description-flags']['fr-fr'] = "Flags Optionnels de la conférence. exemple: mute|deaf|waste|moderator";
$text['label-true']['en-us'] = "True";
$text['label-true']['es-cl'] = "Verdadero";
$text['label-true']['pt-pt'] = "Sim";
$text['label-true']['fr-fr'] = "Oui";
$text['label-false']['en-us'] = "False";
$text['label-false']['es-cl'] = "Falso";
$text['label-false']['pt-pt'] = "Não";
$text['label-false']['fr-fr'] = "Non";
$text['label-user_list']['en-us'] = "User List";
$text['label-user_list']['es-cl'] = "Lista de usuarios";
$text['label-user_list']['pt-pt'] = "Lista de usuários";
$text['label-user_list']['fr-fr'] = "Liste des utilisateurs";
$text['label-flags']['en-us'] = "Flags";
$text['label-flags']['es-cl'] = "Banderas";
$text['label-flags']['pt-pt'] = "Bandeiras";
$text['label-flags']['fr-fr'] = "Drapeaux";
?>

79
app/conferences/conference_edit.php
View File

@@ -319,37 +319,37 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
require_once "resources/header.php";
//show the content
echo "<div align='center'>";
echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
echo "<tr class='border'>\n";
echo " <td align=\"left\">\n";
echo " <br>";
echo "<form method='post' name='frm' action=''>\n";
echo "<div align='center'>\n";
echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td align='left' nowrap='nowrap' valign='top'>";
if ($action == "add") {
echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['label-conference-add']."</b></td>\n";
echo "<b>".$text['label-conference-add']."</b>";
}
if ($action == "update") {
echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['label-conference-edit']."</b></td>\n";
echo "<b>".$text['label-conference-edit']."</b>";
}
echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='conferences.php'\" value='".$text['button-back']."'></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo "<td align='left' colspan='2'>\n";
echo "".$text['description']." \n";
echo "Click on <a href='".PROJECT_PATH."/app/conferences_active/conference_interactive.php?c=".str_replace(" ", "-", $conference_name)."'>".$text['title-3']."</a> \n";
echo "".$text['description-3']."<br /><br />\n";
echo "</td>\n";
echo " <br /><br />";
echo $text['description'];
echo " <br /><br />";
echo " </td>\n";
echo " <td align='right' valign='top'>";
echo " <input type='button' class='btn' name='' alt='back' onclick=\"window.location='conferences.php'\" value='".$text['button-back']."'>";
if (permission_exists('conference_active_view')) {
echo " <input type='button' class='btn' alt='".$text['button-view']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php?c=".str_replace(" ", "-", $conference_name)."';\" value='".$text['button-view']."'>\n";
}
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo " </td>\n";
echo "</tr>\n";
echo "</table>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-name'].":\n";
echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-name']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo "<td width='70%' class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='conference_name' maxlength='255' value=\"$conference_name\">\n";
echo "<br />\n";
echo "".$text['description-name']."\n";
@@ -358,7 +358,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-extension'].":\n";
echo " ".$text['label-extension']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='conference_extension' maxlength='255' value=\"$conference_extension\">\n";
@@ -369,7 +369,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-pin'].":\n";
echo " ".$text['label-pin']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='conference_pin_number' maxlength='255' value=\"$conference_pin_number\">\n";
@@ -381,7 +381,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if (if_group("admin") || if_group("superadmin")) {
if ($action == "update") {
echo " <tr>";
echo " <td class='vncell' valign='top'>User List:</td>";
echo " <td class='vncell' valign='top'>".$text['label-user_list']."</td>";
echo " <td class='vtable'>";
echo " <table width='52%'>\n";
@@ -410,7 +410,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "and user_enabled = 'true' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
echo " <select name=\"user_uuid\" class='frm'>\n";
echo " <select name=\"user_uuid\" class='formfld'>\n";
echo " <option value=\"\"></option>\n";
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach($result as $field) {
@@ -429,7 +429,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['table-profile'].":\n";
echo " ".$text['table-profile']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='conference_profile'>\n";
@@ -447,7 +447,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " Flags:\n";
echo " ".$text['label-flags']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='conference_flags' maxlength='255' value=\"$conference_flags\">\n";
@@ -458,7 +458,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-order'].":\n";
echo " ".$text['label-order']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select name='conference_order' class='formfld'>\n";
@@ -480,7 +480,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['table-enabled'].":\n";
echo " ".$text['table-enabled']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='conference_enabled'>\n";
@@ -505,7 +505,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-description'].":\n";
echo " ".$text['label-description']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='conference_description' maxlength='255' value=\"$conference_description\">\n";
@@ -514,23 +514,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n";
echo "</tr>\n";
echo " <tr>\n";
echo " <td colspan='2' align='right'>\n";
echo "<tr>\n";
echo " <td colspan='2' align='right'>\n";
if ($action == "update") {
echo " <input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
echo " <input type='hidden' name='conference_uuid' value='$conference_uuid'>\n";
echo " <input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
echo " <input type='hidden' name='conference_uuid' value='$conference_uuid'>\n";
}
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo " </td>\n";
echo " </tr>";
echo " <br><input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo " </td>\n";
echo "</tr>";
echo "</table>";
echo "</form>";
echo " </td>";
echo " </tr>";
echo "</table>";
echo "</div>";
//include the footer
require_once "resources/footer.php";
?>

63
app/conferences/conferences.php
View File

@@ -47,26 +47,19 @@ else {
$order = $_GET["order"];
//show the content
echo "<div align='center'>";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
echo "<tr class='border'>\n";
echo " <td align=\"center\">\n";
echo " <br />";
echo "<table width='100%' border='0'>\n";
echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
echo " <tr>\n";
echo " <td align='left' width='50%' nowrap><b>".$text['title']."</b></td>\n";
echo " <td width='50%' align='right'>&nbsp;</td>\n";
echo " </tr>\n";
echo " <tr>\n";
echo " <td align='left' colspan='2'>\n";
echo " ".$text['description']." \n";
if (permission_exists('conference_active_advanced_view')) {
echo " Show <a href='".PROJECT_PATH."/app/conferences_active/conferences_active.php'>".$text['title-2']."</a> ".$text['description-2']."<br /><br />\n";
echo " <td valign='top'><b>".$text['title']."</b></td>\n";
echo " <td valign='top' align='right'>\n";
if (permission_exists('conference_active_view')) {
echo " <input type='button' class='btn' alt='".$text['button-view_active']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php';\" value='".$text['button-view_active']."'>\n";
}
echo " </td>\n";
echo " </tr>\n";
echo "</table>\n";
echo "<br />\n";
echo $text['description'];
echo "<br /><br />\n";
//prepare to page the results
if (if_group("superadmin") || if_group("admin")) {
@@ -98,9 +91,9 @@ else {
$rows_per_page = 10;
$param = "";
$page = $_GET['page'];
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
$offset = $rows_per_page * $page;
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
$offset = $rows_per_page * $page;
//get the list
if (if_group("superadmin") || if_group("admin")) {
@@ -127,17 +120,15 @@ else {
$row_style["0"] = "row_style0";
$row_style["1"] = "row_style1";
echo "<div align='center'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo th_order_by('conference_name', $text['table-name'], $order_by, $order);
echo th_order_by('conference_extension', $text['table-extension'], $order_by, $order);
echo th_order_by('conference_profile', $text['table-profile'], $order_by, $order);
//echo th_order_by('conference_flags', 'Flags', $order_by, $order);
echo th_order_by('conference_order', $text['table-order'], $order_by, $order);
echo th_order_by('conference_enabled', $text['table-enabled'], $order_by, $order);
echo th_order_by('conference_description', $text['table-description'], $order_by, $order);
echo "<td align='right' width='42'>\n";
echo "<td class='list_control_icons'>\n";
if (permission_exists('conference_add')) {
echo " <a href='conference_edit.php' alt='add'>$v_link_label_add</a>\n";
}
@@ -145,28 +136,28 @@ else {
echo " &nbsp;\n";
}
echo "</td>\n";
echo "<tr>\n";
echo "</tr>\n";
if ($result_count > 0) {
foreach($result as $row) {
$conference_name = $row['conference_name'];
$conference_name = str_replace("-", " ", $conference_name);
echo "<tr >\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$conference_name."&nbsp;</td>\n";
$tr_link = "href='conference_edit.php?id=".$row['conference_uuid']."'";
echo "<tr ".$tr_link.">\n";
echo " <td valign='top' class='".$row_style[$c]."'><a href='conference_edit.php?id=".$row['conference_uuid']."'>".$conference_name."</a>&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_extension']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_profile']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_flags']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_order']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_enabled']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$text['label-'.$row['conference_enabled']]."&nbsp;</td>\n";
echo " <td valign='top' class='row_stylebg' width='35%'>".$row['conference_description']."&nbsp;</td>\n";
echo " <td valign='top' align='right'>\n";
echo " <td class='list_control_icons'>";
if (permission_exists('conference_edit')) {
echo " <a href='conference_edit.php?id=".$row['conference_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
echo "<a href='conference_edit.php?id=".$row['conference_uuid']."' alt='edit'>$v_link_label_edit</a>";
}
if (permission_exists('conference_delete')) {
echo " <a href='conference_delete.php?id=".$row['conference_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
echo "<a href='conference_delete.php?id=".$row['conference_uuid']."' alt='delete' onclick=\"return confirm('".$text['confirm-delete-2']."')\">$v_link_label_delete</a>";
}
echo " </td>\n";
echo "</td>\n";
echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; }
} //end foreach
@@ -179,7 +170,7 @@ else {
echo " <tr>\n";
echo " <td width='33.3%' nowrap>&nbsp;</td>\n";
echo " <td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
echo " <td width='33.3%' align='right'>\n";
echo " <td class='list_control_icons'>\n";
if (permission_exists('conference_add')) {
echo " <a href='conference_edit.php' alt='add'>$v_link_label_add</a>\n";
}
@@ -193,14 +184,6 @@ else {
echo "</tr>\n";
echo "</table>";
echo "</div>";
echo "<br /><br />";
echo "<br /><br />";
echo "</td>";
echo "</tr>";
echo "</table>";
echo "</div>";
echo "<br /><br />";
//include the footer