diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php index c01ea17d31..7d0753c8d4 100644 --- a/app/xml_cdr/app_config.php +++ b/app/xml_cdr/app_config.php @@ -413,6 +413,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Limit allowed range of addresses for CDR over HTTP POST."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4750feaf-70d0-4425-af37-036060ce7d37"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "cdr"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "column_overflow"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "hidden"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Hide overflowing columns or use horizontal scroll bar"; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7b9a5a95-a964-4fa1-b1b6-7641ca478405"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "cdr"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "summary_style"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 3d0c019940..e886af0094 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2024 + Portions created by the Initial Developer are Copyright (C) 2008-2025 the Initial Developer. All Rights Reserved. Contributor(s): @@ -658,6 +658,22 @@ $param = substr($param, 1); //remove leading '&' $param = substr($param, 0, strrpos($param, '&order_by=')); //remove trailing order by +//column overflow setting + echo "\n"; + //show the results echo "
\n"; echo "\n"; diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php index 129f90f951..405a9938c5 100644 --- a/core/default_settings/app_languages.php +++ b/core/default_settings/app_languages.php @@ -1514,4 +1514,57 @@ $text['label-custom']['zh-cn'] = "风俗"; $text['label-custom']['ja-jp'] = "カスタム"; $text['label-custom']['ko-kr'] = "관습"; -?> \ No newline at end of file +$text['label-hidden']['en-us'] = "Hidden"; +$text['label-hidden']['en-gb'] = "Hidden"; +$text['label-hidden']['ar-eg'] = "مخفي"; +$text['label-hidden']['de-at'] = "Versteckt"; +$text['label-hidden']['de-ch'] = "Versteckt"; +$text['label-hidden']['de-de'] = "Versteckt"; +$text['label-hidden']['el-gr'] = "Κρυφό"; +$text['label-hidden']['es-cl'] = "Oculto"; +$text['label-hidden']['es-mx'] = "Oculto"; +$text['label-hidden']['fr-ca'] = "Caché"; +$text['label-hidden']['fr-fr'] = "Caché"; +$text['label-hidden']['he-il'] = "הסתר"; +$text['label-hidden']['it-it'] = "Nascosto"; +$text['label-hidden']['ka-ge'] = "დამალული"; +$text['label-hidden']['nl-nl'] = "Verborgen"; +$text['label-hidden']['pl-pl'] = "Ukryty"; +$text['label-hidden']['pt-br'] = "Oculto"; +$text['label-hidden']['pt-pt'] = "Oculto"; +$text['label-hidden']['ro-ro'] = "Ascuns"; +$text['label-hidden']['ru-ru'] = "Скрыто"; +$text['label-hidden']['sv-se'] = "Dold"; +$text['label-hidden']['uk-ua'] = "Сховано"; +$text['label-hidden']['zh-cn'] = "隐藏"; +$text['label-hidden']['ja-jp'] = "隠し"; +$text['label-hidden']['ko-kr'] = "숨겨짐"; + +$text['label-scroll']['en-us'] = "Scroll"; +$text['label-scroll']['en-gb'] = "Scroll"; +$text['label-scroll']['ar-eg'] = "تمرير"; +$text['label-scroll']['de-at'] = "Scrollen"; +$text['label-scroll']['de-ch'] = "Scrollen"; +$text['label-scroll']['de-de'] = "Scrollen"; +$text['label-scroll']['el-gr'] = "Κύλιση"; +$text['label-scroll']['es-cl'] = "Desplazar"; +$text['label-scroll']['es-mx'] = "Desplazar"; +$text['label-scroll']['fr-ca'] = "Faire défiler"; +$text['label-scroll']['fr-fr'] = "Faire défiler"; +$text['label-scroll']['he-il'] = "גלול"; +$text['label-scroll']['it-it'] = "Scorrere"; +$text['label-scroll']['ka-ge'] = "გადატანა"; +$text['label-scroll']['nl-nl'] = "Scrollen"; +$text['label-scroll']['pl-pl'] = "Przewiń"; +$text['label-scroll']['pt-br'] = "Deslocar"; +$text['label-scroll']['pt-pt'] = "Deslocar"; +$text['label-scroll']['ro-ro'] = "Derulați"; +$text['label-scroll']['ru-ru'] = "Прокрутить"; +$text['label-scroll']['sv-se'] = "Rulla"; +$text['label-scroll']['uk-ua'] = "Прокрутити"; +$text['label-scroll']['zh-cn'] = "滚动"; +$text['label-scroll']['ja-jp'] = "スクロール"; +$text['label-scroll']['ko-kr'] = "스크롤"; + + +?> diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index cb2b3e718a..0a7f540f1a 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2023 + Portions created by the Initial Developer are Copyright (C) 2008-2025 the Initial Developer. All Rights Reserved. Contributor(s): @@ -67,7 +67,7 @@ if (!empty($_REQUEST['search'])) { $search = $_REQUEST['search']; } - + //get http post variables and set them to php variables if (!empty($_REQUEST)) { $default_setting_category = strtolower($_REQUEST["default_setting_category"] ?? ''); @@ -720,6 +720,12 @@ echo " \n"; echo " \n"; } + elseif ($category == "cdr" && $subcategory == "column_overflow" && $name == "text" ) { + echo " \n"; + } elseif (is_json($default_setting_value)) { echo " \n"; } diff --git a/themes/default/css.php b/themes/default/css.php index 5a49932170..eda404db3a 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -2906,7 +2906,6 @@ else { //default: white div.card { margin-bottom: 15px; - overflow-x: auto; - + {*//link to custom css file *} {if !empty($settings.theme.custom_css)}