dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Music on Hold: Style/layout tweaks. 

Recordings:  Updated to support new audio playback indicator. Show upload date/time (when not using base64).
VM Messages:  Updated to support new audio playback indicator.
VM Greetings:  Updated to support new audio playback indicator.
CDR:  Updated to support new audio playback indicator.
This commit is contained in:
reliberate 2016-06-22 12:42:03 -06:00
parent 39c01aeda2
commit 3c823fa651
6 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/music_on_hold/music_on_hold.php
View File

@ -341,17 +341,11 @@ else {
echo "</script>\n";
echo "<script language='JavaScript' type='text/javascript' src='".PROJECT_PATH."/resources/javascript/reset_file_input.js'></script>\n";
echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
echo " <tr>\n";
echo " <td align='left'>\n";
echo " <b>".$text['label-moh']."</b>";
echo " <br /><br />\n";
echo " ".$text['desc-moh']."\n";
echo " <br /><br />\n";
echo " </td>\n";
echo " </tr>\n";
echo "</table>\n";
echo "<br>\n";
echo "<b>".$text['label-moh']."</b>";
echo "<br /><br />\n";
echo $text['desc-moh']."\n";
echo "<br /><br />\n";
//show the upload form
if (permission_exists('music_on_hold_add') || permission_exists('music_on_hold_global_add')) {
@ -512,9 +506,9 @@ else {
}
echo " <tr>\n";
echo " <th class='listhdr'>".(($auto_rate) ? ($moh_rate/1000).' kHz / '.$text['option-default'] : ($moh_rate/1000)." kHz").$icons."</th>\n";
echo " <th class='listhdr' style='width: 70px;'>&nbsp;</th>\n";
echo " <th class='listhdr' style='width: 85px; text-align: right; white-space: nowrap;'>".$text['label-file-size']."</th>\n";
echo " <th class='listhdr' style='width: 170px; text-align: right;'>".$text['label-uploaded']."</th>\n";
echo " <th class='listhdr' style='width: 55px;'>".$text['label-tools']."</th>\n";
echo " <th class='listhdr' style='width: 65px; text-align: right; white-space: nowrap;'>".$text['label-file-size']."</th>\n";
echo " <th class='listhdr' style='width: 150px; text-align: right;'>".$text['label-uploaded']."</th>\n";
echo " <td class='".((!permission_exists('music_on_hold_global_delete')) ? 'list_control_icon' : 'list_control_icons')." tr_link_void'>";
if ( ($domain_uuid == '_global_' && permission_exists('music_on_hold_global_edit')) || ($domain_uuid != '_global_' && permission_exists('music_on_hold_edit')) ) {
echo "<a href='music_on_hold_edit.php?id=".$moh_settings['uuid']."'>".$v_link_label_edit."</a>";
@ -545,15 +539,15 @@ else {
echo "<tr id='recording_progress_bar_".$row_uuid."' style='display: none;'><td colspan='4' class='".$row_style[$c]." playback_progress_bar_background' style='padding: 0; border: none;'><span class='playback_progress_bar' id='recording_progress_".$row_uuid."'></span></td></tr>\n";
$tr_link = "href=\"javascript:recording_play('".$row_uuid."');\"";
echo "<tr ".$tr_link.">\n";
echo " <td class='".$row_style[$c]."'>".$moh_file."</td>\n";
echo " <td class='".$row_style[$c]."'>".str_replace('_', '_&#8203;', $moh_file)."</td>\n";
echo " <td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void'>";
echo "<audio id='recording_audio_".$row_uuid."' style='display: none;' preload='none' ontimeupdate=\"update_progress('".$row_uuid."')\" onended=\"recording_reset('".$row_uuid."');\" src='?action=download&id=".$moh_settings['uuid']."&file=".base64_encode($moh_file)."' type='".$moh_file_type."'></audio>";
echo "<span id='recording_button_".$row_uuid."' onclick=\"recording_play('".$row_uuid."')\" title='".$text['label-play']." / ".$text['label-pause']."'>".$v_link_label_play."</span>";
echo "<span onclick=\"recording_stop('".$row_uuid."')\" title='".$text['label-stop']."'>".$v_link_label_stop."</span>";
echo " </td>\n";
echo " <td class='".$row_style[$c]."' style='text-align: right; white-space: nowrap;'>".$moh_file_size."</td>\n";
echo " <td class='".$row_style[$c]."' style='text-align: right;'>".$moh_file_date."</td>\n";
echo " <td class='".((!permission_exists('music_on_hold_global_delete')) ? 'list_control_icon' : 'list_control_icons')."'>\n";
echo " <td valign='top' class='".$row_style[$c]."' style='text-align: right; white-space: nowrap;'>".$moh_file_size."</td>\n";
echo " <td valign='top' class='".$row_style[$c]."' style='text-align: right;'>".$moh_file_date."</td>\n";
echo " <td valign='top' class='".((!permission_exists('music_on_hold_global_delete')) ? 'list_control_icon' : 'list_control_icons')."'>\n";
echo "<a href='?action=download&id=".$moh_settings['uuid']."&file=".base64_encode($moh_file)."' title='".$text['label-download']."'>".$v_link_label_download."</a>";
if ( ($domain_uuid == '_global_' && permission_exists('music_on_hold_global_delete')) || ($domain_uuid != '_global_' && permission_exists('music_on_hold_delete')) ) {
echo "<a href='?action=delete&id=".$moh_settings['uuid']."&file=".base64_encode($moh_file)."' onclick=\"return confirm('".$text['confirm-delete']."')\">".$v_link_label_delete."</a>";

11
app/recordings/app_languages.php
View File

@ -40,6 +40,17 @@ $text['message-uploaded']['sv-se'] = "File Uppladdade";
$text['message-uploaded']['uk'] = "файл Завантажено";
$text['message-uploaded']['de-at'] = "Datei hochgeladen";
$text['label-uploaded']['en-us'] = "Uploaded";
$text['label-uploaded']['es-cl'] = "Subir";
$text['label-uploaded']['pt-pt'] = "Carregado";
$text['label-uploaded']['fr-fr'] = "Envoyé";
$text['label-uploaded']['pt-br'] = "Carregado";
$text['label-uploaded']['pl'] = "Przesłano";
$text['label-uploaded']['sv-se'] = "Uppladdad";
$text['label-uploaded']['uk'] = "Завантажено";
$text['label-uploaded']['de-at'] = "Hochgeladen";
$text['label-uploaded']['he'] = "הוטען";
$text['label-upload']['en-us'] = "File Path";
$text['label-upload']['es-cl'] = "Archivo a subir";
$text['label-upload']['pt-pt'] = "Ficheiro a carregar";

41
app/recordings/recordings.php
View File

@ -290,10 +290,15 @@ require_once "resources/check_auth.php";
echo th_order_by('recording_name', $text['label-recording_name'], $order_by, $order);
if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
echo th_order_by('recording_filename', $text['label-file_name'], $order_by, $order);
echo "<th class='listhdr' style='text-align: center;' nowrap>".$text['label-file-size']."</th>\n";
}
echo "<th class='listhdr' nowrap>".$text['label-tools']."</th>\n";
echo th_order_by('recording_description', $text['label-description'], $order_by, $order);
if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
echo "<th class='listhdr' style='text-align: center;' nowrap>".$text['label-file-size']."</th>\n";
echo "<th class='listhdr' style='text-align: right;'>".$text['label-uploaded']."</th>\n";
}
else {
echo th_order_by('recording_description', $text['label-description'], $order_by, $order);
}
echo "<td class='list_control_icons'>&nbsp;</td>\n";
echo "</tr>\n";
@ -306,25 +311,16 @@ require_once "resources/check_auth.php";
foreach($result as $row) {
//playback progress bar
if (permission_exists('recording_play')) {
echo "<tr id='recording_progress_bar_".$row['recording_uuid']."' style='display: none;'><td class='".$row_style[$c]."' style='border: none; padding: 0;' colspan='".$colspan."'><span class='playback_progress_bar' id='recording_progress_".$row['recording_uuid']."'></span></td></tr>\n";
echo "<tr id='recording_progress_bar_".$row['recording_uuid']."' style='display: none;'><td class='".$row_style[$c]." playback_progress_bar_background' style='padding: 0; border: none;' colspan='".$colspan."'><span class='playback_progress_bar' id='recording_progress_".$row['recording_uuid']."'></span></td></tr>\n";
}
$tr_link = (permission_exists('recording_edit')) ? "href='recording_edit.php?id=".$row['recording_uuid']."'" : null;
echo "<tr ".$tr_link.">\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['recording_name']."</td>\n";
if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
echo " <td valign='top' class='".$row_style[$c]."'>".$row['recording_filename']."</td>\n";
$file_name = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$row['recording_filename'];
if (file_exists($file_name)) {
$file_size = filesize($file_name);
$file_size = byte_convert($file_size);
}
else {
$file_size = '';
}
echo " <td class='".$row_style[$c]."' style='text-align: center;'>".$file_size."</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".str_replace('_', '_&#8203;', $row['recording_filename'])."</td>\n";
}
if (permission_exists('recording_play') || permission_exists('recording_download')) {
echo " <td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void'>";
echo " <td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void' style='width: 55px;'>";
if (permission_exists('recording_play')) {
$recording_file_path = $row['recording_filename'];
$recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME));
@ -342,7 +338,22 @@ require_once "resources/check_auth.php";
}
echo " </td>\n";
}
echo " <td valign='top' class='row_stylebg' width='30%'>".$row['recording_description']."&nbsp;</td>\n";
if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
$file_name = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$row['recording_filename'];
if (file_exists($file_name)) {
$file_size = filesize($file_name);
$file_size = byte_convert($file_size);
}
else {
$file_size = '';
}
echo " <td valign='top' class='".$row_style[$c]."' style='text-align: center; white-space: nowrap;'>".$file_size."</td>\n";
$file_date = date("M d, Y H:i:s", filemtime($file_name));
echo " <td valign='top' class='".$row_style[$c]."' style='text-align: right;'>".$file_date."</td>\n";
}
else {
echo " <td valign='top' class='row_stylebg' width='30%'>".$row['recording_description']."&nbsp;</td>\n";
}
echo " <td class='list_control_icons'>";
if (permission_exists('recording_edit')) {
echo "<a href='recording_edit.php?id=".$row['recording_uuid']."' alt='edit'>$v_link_label_edit</a>";

2
app/voicemails/voicemail_messages.php
View File

@ -151,7 +151,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
$style = ($row['message_status'] == '' && $_REQUEST["uuid"] != $row['voicemail_message_uuid']) ? "font-weight: bold;" : null;
//playback progress bar
echo "<tr id='recording_progress_bar_".$row['voicemail_message_uuid']."' style='display: none;'><td colspan='".((permission_exists('voicemail_message_delete')) ? 7 : 6)."' class='".$row_style[$c]."' style='padding: 0px; border: none;'><span class='playback_progress_bar' id='recording_progress_".$row['voicemail_message_uuid']."'></span></td></tr>\n";
echo "<tr id='recording_progress_bar_".$row['voicemail_message_uuid']."' style='display: none;'><td colspan='".((permission_exists('voicemail_message_delete')) ? 7 : 6)."' class='".$row_style[$c]." playback_progress_bar_background' style='padding: 0px; border: none;'><span class='playback_progress_bar' id='recording_progress_".$row['voicemail_message_uuid']."'></span></td></tr>\n";
$tr_link = "href=\"javascript:recording_play('".$row['voicemail_message_uuid']."');\"";
echo "<tr ".$tr_link.">\n";

2
app/xml_cdr/xml_cdr.php
View File

@ -457,7 +457,7 @@ else {
//recording playback
if (permission_exists('recording_play') && $recording_file_path != '') {
echo "<tr id='recording_progress_bar_".$row['uuid']."' style='display: none;'><td class='".$row_style[$c]."' style='border: none; padding: 0;' colspan='".((if_group("admin") || if_group("superadmin") || if_group("cdr")) ? ($col_count - 1) : $col_count)."'><span class='playback_progress_bar' id='recording_progress_".$row['uuid']."'></span></td></tr>\n";
echo "<tr id='recording_progress_bar_".$row['uuid']."' style='display: none;'><td class='".$row_style[$c]." playback_progress_bar_background' style='padding: 0; border: none;' colspan='".((if_group("admin") || if_group("superadmin") || if_group("cdr")) ? ($col_count - 1) : $col_count)."'><span class='playback_progress_bar' id='recording_progress_".$row['uuid']."'></span></td></tr>\n";
}
if (if_group("admin") || if_group("superadmin") || if_group("cdr")) {

3
themes/default/css.php
View File

@ -738,6 +738,9 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
echo $body_top_style;
?>
text-align: left;
color: <?php echo ($_SESSION['theme']['body_text_color']['text'] != '') ? $_SESSION['theme']['body_text_color']['text'] : '#5f5f5f'; ?>;
font-size: <?php echo ($_SESSION['theme']['body_text_size']['text'] != '') ? $_SESSION['theme']['body_text_size']['text'] : '12px'; ?>;
font-family: <?php echo ($_SESSION['theme']['body_text_font']['text'] != '') ? $_SESSION['theme']['body_text_font']['text'] : 'arial'; ?>;
}
/* default body padding */