mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2026-01-06 11:43:50 +00:00
Add CDR column_overflow default setting (#7314)
* Add cdr column_overflow default setting * Update app_config.php * Update xml_cdr.php * Update default_setting_edit.php * Update template.php * Update app_languages.php * Update css.php
This commit is contained in:
@@ -413,6 +413,14 @@
|
|||||||
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
|
$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.";
|
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Limit allowed range of addresses for CDR over HTTP POST.";
|
||||||
$y++;
|
$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_uuid'] = "7b9a5a95-a964-4fa1-b1b6-7641ca478405";
|
||||||
$apps[$x]['default_settings'][$y]['default_setting_category'] = "cdr";
|
$apps[$x]['default_settings'][$y]['default_setting_category'] = "cdr";
|
||||||
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "summary_style";
|
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "summary_style";
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
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.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
@@ -658,6 +658,22 @@
|
|||||||
$param = substr($param, 1); //remove leading '&'
|
$param = substr($param, 1); //remove leading '&'
|
||||||
$param = substr($param, 0, strrpos($param, '&order_by=')); //remove trailing order by
|
$param = substr($param, 0, strrpos($param, '&order_by=')); //remove trailing order by
|
||||||
|
|
||||||
|
//column overflow setting
|
||||||
|
echo "<style>\n";
|
||||||
|
if ($settings->get('cdr', 'column_overflow', 'hidden') == 'scroll') {
|
||||||
|
echo ".hide-sm-dn, .hide-md-dn, .hide-lg-dn {\n";
|
||||||
|
echo " all: revert;\n";
|
||||||
|
echo "}\n";
|
||||||
|
echo ".list {\n";
|
||||||
|
echo " overflow-x: scroll;\n";
|
||||||
|
echo "}\n";
|
||||||
|
} else {
|
||||||
|
echo ".list {\n";
|
||||||
|
echo " overflow-x: hidden;\n";
|
||||||
|
echo "}\n";
|
||||||
|
}
|
||||||
|
echo "</style>\n";
|
||||||
|
|
||||||
//show the results
|
//show the results
|
||||||
echo "<form id='form_list' method='post'>\n";
|
echo "<form id='form_list' method='post'>\n";
|
||||||
echo "<input type='hidden' id='action' name='action' value=''>\n";
|
echo "<input type='hidden' id='action' name='action' value=''>\n";
|
||||||
|
|||||||
@@ -1514,4 +1514,57 @@ $text['label-custom']['zh-cn'] = "风俗";
|
|||||||
$text['label-custom']['ja-jp'] = "カスタム";
|
$text['label-custom']['ja-jp'] = "カスタム";
|
||||||
$text['label-custom']['ko-kr'] = "관습";
|
$text['label-custom']['ko-kr'] = "관습";
|
||||||
|
|
||||||
?>
|
$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'] = "스크롤";
|
||||||
|
|
||||||
|
|
||||||
|
?>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
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.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
if (!empty($_REQUEST['search'])) {
|
if (!empty($_REQUEST['search'])) {
|
||||||
$search = $_REQUEST['search'];
|
$search = $_REQUEST['search'];
|
||||||
}
|
}
|
||||||
|
|
||||||
//get http post variables and set them to php variables
|
//get http post variables and set them to php variables
|
||||||
if (!empty($_REQUEST)) {
|
if (!empty($_REQUEST)) {
|
||||||
$default_setting_category = strtolower($_REQUEST["default_setting_category"] ?? '');
|
$default_setting_category = strtolower($_REQUEST["default_setting_category"] ?? '');
|
||||||
@@ -720,6 +720,12 @@
|
|||||||
echo " <option value='dynamic' ".(($default_setting_value == "dynamic") ? "selected='selected'" : null).">".$text['label-dynamic']."</option>\n";
|
echo " <option value='dynamic' ".(($default_setting_value == "dynamic") ? "selected='selected'" : null).">".$text['label-dynamic']."</option>\n";
|
||||||
echo " </select>\n";
|
echo " </select>\n";
|
||||||
}
|
}
|
||||||
|
elseif ($category == "cdr" && $subcategory == "column_overflow" && $name == "text" ) {
|
||||||
|
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
|
||||||
|
echo " <option value='hidden' ".(($default_setting_value == "hidden") ? "selected='selected'" : null).">".$text['label-hidden']."</option>\n";
|
||||||
|
echo " <option value='scroll' ".(($default_setting_value == "scroll") ? "selected='selected'" : null).">".$text['label-scroll']."</option>\n";
|
||||||
|
echo " </select>\n";
|
||||||
|
}
|
||||||
elseif (is_json($default_setting_value)) {
|
elseif (is_json($default_setting_value)) {
|
||||||
echo " <textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='default_setting_value' name='default_setting_value' wrap='off'>".escape($default_setting_value)."</textarea>\n";
|
echo " <textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='default_setting_value' name='default_setting_value' wrap='off'>".escape($default_setting_value)."</textarea>\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2906,7 +2906,6 @@ else { //default: white
|
|||||||
|
|
||||||
div.card {
|
div.card {
|
||||||
margin-bottom: 15px;
|
margin-bottom: 15px;
|
||||||
overflow-x: auto;
|
|
||||||
<?php
|
<?php
|
||||||
if (isset($card_border_size) || !empty($card_border_color) || !empty($card_background_color) || !empty($card_shadow_color)) {
|
if (isset($card_border_size) || !empty($card_border_color) || !empty($card_background_color) || !empty($card_shadow_color)) {
|
||||||
if (isset($card_border_size) && !empty($card_border_color)) {
|
if (isset($card_border_size) && !empty($card_border_color)) {
|
||||||
@@ -3536,6 +3535,7 @@ else { //default: white
|
|||||||
.list {
|
.list {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
empty-cells: show;
|
empty-cells: show;
|
||||||
|
overflow-x: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.list tr {
|
.list tr {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
<link rel='stylesheet' type='text/css' href='{$project_path}/resources/bootstrap/css/bootstrap-tempusdominus.min.css.php'>
|
<link rel='stylesheet' type='text/css' href='{$project_path}/resources/bootstrap/css/bootstrap-tempusdominus.min.css.php'>
|
||||||
<link rel='stylesheet' type='text/css' href='{$project_path}/resources/bootstrap/css/bootstrap-colorpicker.min.css.php'>
|
<link rel='stylesheet' type='text/css' href='{$project_path}/resources/bootstrap/css/bootstrap-colorpicker.min.css.php'>
|
||||||
<link rel='stylesheet' type='text/css' href='{$project_path}/resources/fontawesome/css/all.min.css.php'>
|
<link rel='stylesheet' type='text/css' href='{$project_path}/resources/fontawesome/css/all.min.css.php'>
|
||||||
<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php?updated=202503121207'>
|
<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php?updated=202503130245'>
|
||||||
{*//link to custom css file *}
|
{*//link to custom css file *}
|
||||||
{if !empty($settings.theme.custom_css)}
|
{if !empty($settings.theme.custom_css)}
|
||||||
<link rel='stylesheet' type='text/css' href='{$settings.theme.custom_css}'>
|
<link rel='stylesheet' type='text/css' href='{$settings.theme.custom_css}'>
|
||||||
|
|||||||
Reference in New Issue
Block a user