diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index b8d588af0f..70ba8acb0e 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -341,17 +341,11 @@ else { echo "\n"; echo "\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo " ".$text['label-moh'].""; - echo "

\n"; - echo " ".$text['desc-moh']."\n"; - echo "

\n"; - echo "
\n"; - echo "
\n"; + echo "".$text['label-moh'].""; + echo "

\n"; + echo $text['desc-moh']."\n"; + echo "

\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 " \n"; echo " ".(($auto_rate) ? ($moh_rate/1000).' kHz / '.$text['option-default'] : ($moh_rate/1000)." kHz").$icons."\n"; - echo "  \n"; - echo " ".$text['label-file-size']."\n"; - echo " ".$text['label-uploaded']."\n"; + echo " ".$text['label-tools']."\n"; + echo " ".$text['label-file-size']."\n"; + echo " ".$text['label-uploaded']."\n"; echo " "; if ( ($domain_uuid == '_global_' && permission_exists('music_on_hold_global_edit')) || ($domain_uuid != '_global_' && permission_exists('music_on_hold_edit')) ) { echo "".$v_link_label_edit.""; @@ -545,15 +539,15 @@ else { echo "\n"; $tr_link = "href=\"javascript:recording_play('".$row_uuid."');\""; echo "\n"; - echo " ".$moh_file."\n"; + echo " ".str_replace('_', '_​', $moh_file)."\n"; echo " "; echo ""; echo "".$v_link_label_play.""; echo "".$v_link_label_stop.""; echo " \n"; - echo " ".$moh_file_size."\n"; - echo " ".$moh_file_date."\n"; - echo " \n"; + echo " ".$moh_file_size."\n"; + echo " ".$moh_file_date."\n"; + echo " \n"; echo "".$v_link_label_download.""; if ( ($domain_uuid == '_global_' && permission_exists('music_on_hold_global_delete')) || ($domain_uuid != '_global_' && permission_exists('music_on_hold_delete')) ) { echo "".$v_link_label_delete.""; diff --git a/app/recordings/app_languages.php b/app/recordings/app_languages.php index be2dd3dc4d..c3d0c59a14 100644 --- a/app/recordings/app_languages.php +++ b/app/recordings/app_languages.php @@ -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"; diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 80104a7292..c4ee8cf7b0 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -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 "".$text['label-file-size']."\n"; } echo "".$text['label-tools']."\n"; - echo th_order_by('recording_description', $text['label-description'], $order_by, $order); + if ($_SESSION['recordings']['storage_type']['text'] != 'base64') { + echo "".$text['label-file-size']."\n"; + echo "".$text['label-uploaded']."\n"; + } + else { + echo th_order_by('recording_description', $text['label-description'], $order_by, $order); + } echo " \n"; echo "\n"; @@ -306,25 +311,16 @@ require_once "resources/check_auth.php"; foreach($result as $row) { //playback progress bar if (permission_exists('recording_play')) { - echo "\n"; + echo "\n"; } $tr_link = (permission_exists('recording_edit')) ? "href='recording_edit.php?id=".$row['recording_uuid']."'" : null; echo "\n"; echo " ".$row['recording_name']."\n"; if ($_SESSION['recordings']['storage_type']['text'] != 'base64') { - echo " ".$row['recording_filename']."\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 " ".$file_size."\n"; + echo " ".str_replace('_', '_​', $row['recording_filename'])."\n"; } if (permission_exists('recording_play') || permission_exists('recording_download')) { - echo " "; + echo " "; 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 " \n"; } - echo " ".$row['recording_description']." \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 " ".$file_size."\n"; + $file_date = date("M d, Y H:i:s", filemtime($file_name)); + echo " ".$file_date."\n"; + } + else { + echo " ".$row['recording_description']." \n"; + } echo " "; if (permission_exists('recording_edit')) { echo "$v_link_label_edit"; diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index 7e389eba45..ddd193da7b 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -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 "\n"; + echo "\n"; $tr_link = "href=\"javascript:recording_play('".$row['voicemail_message_uuid']."');\""; echo "\n"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index ff450b39f8..0ae2504969 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -457,7 +457,7 @@ else { //recording playback if (permission_exists('recording_play') && $recording_file_path != '') { - echo "\n"; + echo "\n"; } if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { diff --git a/themes/default/css.php b/themes/default/css.php index 9063e67cf3..55cd948a83 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -738,6 +738,9 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; echo $body_top_style; ?> text-align: left; + color: ; + font-size: ; + font-family: ; } /* default body padding */