diff --git a/app/call_block/app_languages.php b/app/call_block/app_languages.php index b3d2972834..bdacfbe529 100644 --- a/app/call_block/app_languages.php +++ b/app/call_block/app_languages.php @@ -22,26 +22,47 @@ $text['title-call-block']['ru-ru'] = "Черный список"; $text['title-call-block']['sv-se'] = "Blockera Samtal"; $text['title-call-block']['uk-ua'] = "Блокування дзвінків"; -$text['prompt-block_recent_name']['en-us'] = "Block Recent Call - Edit the Name, if desired..."; -$text['prompt-block_recent_name']['ar-eg'] = ""; -$text['prompt-block_recent_name']['de-at'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht..."; //copied from de-de -$text['prompt-block_recent_name']['de-ch'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht..."; //copied from de-de -$text['prompt-block_recent_name']['de-de'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht..."; -$text['prompt-block_recent_name']['el-gr'] = "Αποκλεισμός Πρόσφατης Κλήσης - Τροποποιήστε το όνομα εάν το επιθυμείτε..."; -$text['prompt-block_recent_name']['es-cl'] = "Bloqueo de llamadas recientes - Edite el nombre, si lo desea..."; -$text['prompt-block_recent_name']['es-mx'] = "Bloqueo de llamadas recientes - Edite el nombre, si lo desea..."; //copied from es-cl -$text['prompt-block_recent_name']['fr-ca'] = "Bloquer appels récents - modifiez le nom, si désiré..."; //copied from fr-fr -$text['prompt-block_recent_name']['fr-fr'] = "Bloquer appels récents - modifiez le nom, si désiré..."; -$text['prompt-block_recent_name']['he-il'] = ""; -$text['prompt-block_recent_name']['it-it'] = "Blocca le chiamate recenti - Inserire il Nome, se desiderato..."; -$text['prompt-block_recent_name']['nl-nl'] = "Blokkeer recente oproep - Pas de naam indien gewenst aan..."; -$text['prompt-block_recent_name']['pl-pl'] = "Zablokuj ostatnią rozmowę. Edytuj nazwę"; -$text['prompt-block_recent_name']['pt-br'] = "Bloquear chamadas recentes, edite o nome se assim desejar..."; -$text['prompt-block_recent_name']['pt-pt'] = "Bloquear Chamadas Recentes - Edite o nome, se desejar..."; -$text['prompt-block_recent_name']['ro-ro'] = "Blocare apel recent - Editați numele dacă doriți"; -$text['prompt-block_recent_name']['ru-ru'] = "Блокировать недавний вызов. Отредактируйте название, если необходимо..."; -$text['prompt-block_recent_name']['sv-se'] = "Blockera Senaste Samtal, editera namnet om nödvändigt..."; -$text['prompt-block_recent_name']['uk-ua'] = "Блокувати недавній дзвінок. Відредагуйте назву за бажанням"; +$text['heading-recent_calls']['en-us'] = "Recent Calls"; +$text['heading-recent_calls']['ar-eg'] = ""; +$text['heading-recent_calls']['de-at'] = "Kürzliche Anrufe"; //copied from de-de +$text['heading-recent_calls']['de-ch'] = "Kürzliche Anrufe"; //copied from de-de +$text['heading-recent_calls']['de-de'] = "Kürzliche Anrufe"; +$text['heading-recent_calls']['el-gr'] = "Πρόσφατες Κλήσεις"; +$text['heading-recent_calls']['es-cl'] = "Llamadas Recientes"; +$text['heading-recent_calls']['es-mx'] = "Llamadas Recientes"; //copied from es-cl +$text['heading-recent_calls']['fr-ca'] = "Appels récents"; //copied from fr-fr +$text['heading-recent_calls']['fr-fr'] = "Appels récents"; +$text['heading-recent_calls']['he-il'] = "שיחות אחרונות"; +$text['heading-recent_calls']['it-it'] = "Chiamate Recenti"; +$text['heading-recent_calls']['nl-nl'] = "Recente oproepen"; +$text['heading-recent_calls']['pl-pl'] = "Ostatnie rozmowy"; +$text['heading-recent_calls']['pt-br'] = "Chamadas recentes"; +$text['heading-recent_calls']['pt-pt'] = "Chamadas Recentes"; +$text['heading-recent_calls']['ro-ro'] = "Apeluri recente"; +$text['heading-recent_calls']['ru-ru'] = "Недавние вызовы"; +$text['heading-recent_calls']['sv-se'] = "Senaste Samtal"; +$text['heading-recent_calls']['uk-ua'] = "Останні дзвінки"; + +$text['heading-block_recent_calls']['en-us'] = "Block Recent Calls"; +$text['heading-block_recent_calls']['ar-eg'] = ""; +$text['heading-block_recent_calls']['de-at'] = "Kürzliche Anrufe Blockieren"; //copied from de-de +$text['heading-block_recent_calls']['de-ch'] = "Kürzliche Anrufe Blockieren"; //copied from de-de +$text['heading-block_recent_calls']['de-de'] = "Kürzliche Anrufe Blockieren"; +$text['heading-block_recent_calls']['el-gr'] = "Αποκλεισμός Πρόσφατης Κλήσης"; +$text['heading-block_recent_calls']['es-cl'] = "Bloqueo de llamadas recientes"; +$text['heading-block_recent_calls']['es-mx'] = "Bloqueo de llamadas recientes"; //copied from es-cl +$text['heading-block_recent_calls']['fr-ca'] = "Bloquer appels récents"; //copied from fr-fr +$text['heading-block_recent_calls']['fr-fr'] = "Bloquer appels récents"; +$text['heading-block_recent_calls']['he-il'] = ""; +$text['heading-block_recent_calls']['it-it'] = "Blocca le chiamate recenti"; +$text['heading-block_recent_calls']['nl-nl'] = "Blokkeer recente oproep"; +$text['heading-block_recent_calls']['pl-pl'] = "Zablokuj ostatnią rozmowę"; +$text['heading-block_recent_calls']['pt-br'] = "Bloquear chamadas recentes"; +$text['heading-block_recent_calls']['pt-pt'] = "Bloquear Chamadas Recentes"; +$text['heading-block_recent_calls']['ro-ro'] = "Blocare apel recent"; +$text['heading-block_recent_calls']['ru-ru'] = "Блокировать недавний вызов"; +$text['heading-block_recent_calls']['sv-se'] = "Blockera Senaste Samtal"; +$text['heading-block_recent_calls']['uk-ua'] = "Блокувати недавній дзвінок"; $text['label-update-complete']['en-us'] = "Update Complete"; $text['label-update-complete']['ar-eg'] = "اكتمال التحديث"; @@ -274,27 +295,6 @@ $text['label-edit-edit']['ru-ru'] = "Черный список"; $text['label-edit-edit']['sv-se'] = "Blockera Samtal"; $text['label-edit-edit']['uk-ua'] = "Блокування дзвінків"; -$text['label-edit-add-recent']['en-us'] = "Recent Calls"; -$text['label-edit-add-recent']['ar-eg'] = ""; -$text['label-edit-add-recent']['de-at'] = "Kürzliche Anrufe"; //copied from de-de -$text['label-edit-add-recent']['de-ch'] = "Kürzliche Anrufe"; //copied from de-de -$text['label-edit-add-recent']['de-de'] = "Kürzliche Anrufe"; -$text['label-edit-add-recent']['el-gr'] = "Πρόσφατες Κλήσεις"; -$text['label-edit-add-recent']['es-cl'] = "Llamadas Recientes"; -$text['label-edit-add-recent']['es-mx'] = "Llamadas Recientes"; //copied from es-cl -$text['label-edit-add-recent']['fr-ca'] = "Appels récents"; //copied from fr-fr -$text['label-edit-add-recent']['fr-fr'] = "Appels récents"; -$text['label-edit-add-recent']['he-il'] = "שיחות אחרונות"; -$text['label-edit-add-recent']['it-it'] = "Chiamate Recenti"; -$text['label-edit-add-recent']['nl-nl'] = "Recente oproepen"; -$text['label-edit-add-recent']['pl-pl'] = "Ostatnie rozmowy"; -$text['label-edit-add-recent']['pt-br'] = "Chamadas recentes"; -$text['label-edit-add-recent']['pt-pt'] = "Chamadas Recentes"; -$text['label-edit-add-recent']['ro-ro'] = "Apeluri recente"; -$text['label-edit-add-recent']['ru-ru'] = "Недавние вызовы"; -$text['label-edit-add-recent']['sv-se'] = "Senaste Samtal"; -$text['label-edit-add-recent']['uk-ua'] = "Останні дзвінки"; - $text['label-edit-add']['en-us'] = "Call Block"; $text['label-edit-add']['ar-eg'] = "حظر المكالمات"; $text['label-edit-add']['de-at'] = "Sperrlisten"; //copied from de-de diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php index ae174fa493..086e13bf73 100644 --- a/app/call_block/call_block_edit.php +++ b/app/call_block/call_block_edit.php @@ -288,11 +288,11 @@ echo "\n"; echo "
\n"; - echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'style'=>'margin-right: 15px;','link'=>'call_block.php']); + echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'call_block.php']); if ($action == 'update' && permission_exists('call_block_delete')) { - echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'action','value'=>'delete','style'=>'margin-right: 15px;','onclick'=>"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm').submit(); } else { this.blur(); return false; }"]); + echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'action','value'=>'delete','collapse'=>'hide-xs','style'=>'margin-right: 15px;','onclick'=>"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm').submit(); } else { this.blur(); return false; }"]); } - echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save']]); + echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'collapse'=>'hide-xs']); echo "
\n"; echo "
\n"; echo "\n"; @@ -498,9 +498,10 @@ echo "
\n"; echo "\n"; - echo "
\n"; - echo "
".$text['label-edit-add-recent']."
\n"; + echo "
\n"; + echo "
".$text['heading-recent_calls']."
\n"; echo "
\n"; + echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'margin-right: 15px; display: none;','link'=>'call_block.php']); if (permission_exists('call_block_all')) { echo " \n"; } call_block_action_select(true); - echo button::create(['type'=>'button','label'=>$text['button-block'],'icon'=>'ban','onclick'=>"if (confirm('".$text['confirm-block']."')) { list_form_submit('form_list'); } else { this.blur(); return false; }"]); + echo button::create(['type'=>'button','label'=>$text['button-block'],'icon'=>'ban','collapse'=>'hide-xs','onclick'=>"if (confirm('".$text['confirm-block']."')) { list_form_submit('form_list'); } else { this.blur(); return false; }"]); echo "
\n"; echo "
\n"; echo "
\n"; @@ -537,11 +538,11 @@ $list_row_onclick_uncheck = "if (!this.checked) { document.getElementById('checkbox_all').checked = false; }"; $list_row_onclick_toggle = "onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick_uncheck."\""; if (strlen($row['caller_id_number']) >= 7) { - if (defined('TIME_24HR') && TIME_24HR == 1) { + if ($_SESSION['domain']['time_format']['text'] == '24h') { $tmp_start_epoch = date('j M Y', $row['start_epoch'])." ".date('H:i:s', $row['start_epoch']).''; } else { - $tmp_start_epoch = date('j M Y', $row['start_epoch'])." ".date('h:i:sa', $row['start_epoch']).''; + $tmp_start_epoch = date('j M Y', $row['start_epoch'])." ".date('h:i:s a', $row['start_epoch']).''; } echo "\n"; echo " \n"; @@ -580,7 +581,7 @@ } echo " ".$row['caller_id_name']." \n"; echo " ".format_phone($row['caller_id_number'])."\n"; - echo " ".$tmp_start_epoch."\n"; + echo " ".$tmp_start_epoch."\n"; $seconds = ($row['hangup_cause'] == "ORIGINATOR_CANCEL") ? $row['duration'] : $row['billsec']; //if they cancelled, show the ring time, not the bill time. echo " ".gmdate("G:i:s", $seconds)."\n"; echo "\n"; @@ -598,6 +599,24 @@ } +//make sub action bar sticky + echo "\n"; + //include the footer require_once "resources/footer.php";