diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 2432becda1..b38f1cb566 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -1500,6 +1500,26 @@ $text['label-extension']['ru-ru'] = "Внутренний номер"; $text['label-extension']['sv-se'] = "Anknytning"; $text['label-extension']['uk-ua'] = "Розширення (Extention)"; +$text['label-ext']['en-us'] = "Ext."; +$text['label-ext']['ar-eg'] = ""; +$text['label-ext']['de-at'] = "Dur"; //copied from de-de +$text['label-ext']['de-ch'] = "Dur"; //copied from de-de +$text['label-ext']['de-de'] = "Dur"; +$text['label-ext']['es-cl'] = "Ext"; +$text['label-ext']['es-mx'] = "Ext"; //copied from es-cl +$text['label-ext']['fr-ca'] = "Ext"; //copied from fr-fr +$text['label-ext']['fr-fr'] = "Ext"; +$text['label-ext']['he-il'] = ""; +$text['label-ext']['it-it'] = "Int"; +$text['label-ext']['nl-nl'] = ""; +$text['label-ext']['pl-pl'] = "Num"; +$text['label-ext']['pt-br'] = "Ram"; +$text['label-ext']['pt-pt'] = "Ext"; +$text['label-ext']['ro-ro'] = ""; +$text['label-ext']['ru-ru'] = "Вну"; +$text['label-ext']['sv-se'] = "Ank"; +$text['label-ext']['uk-ua'] = "Роз"; + $text['label-end_stamp']['en-us'] = "End"; $text['label-end_stamp']['ar-eg'] = ""; $text['label-end_stamp']['de-at'] = "Ende"; //copied from de-de diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 070b63ee17..141e92061a 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -490,11 +490,11 @@ //column headings if (permission_exists('xml_cdr_direction')) { - echo " \n"; + echo " \n"; $col_count++; } if (permission_exists('xml_cdr_extension')) { - echo "".$text['label-extension']."\n"; + echo "".$text['label-ext']."\n"; $col_count++; } if (permission_exists('xml_cdr_all') && $_REQUEST['show'] == "all") { @@ -502,7 +502,7 @@ $col_count++; } if (permission_exists('xml_cdr_caller_id_name')) { - echo "".$text['label-caller_id_name']."\n"; + echo "".$text['label-caller_id_name']."\n"; $col_count++; } if (permission_exists('xml_cdr_caller_id_number')) { @@ -510,7 +510,7 @@ $col_count++; } if (permission_exists('xml_cdr_caller_destination')) { - echo "".$text['label-caller_destination']."\n"; + echo "".$text['label-caller_destination']."\n"; $col_count++; } if (permission_exists('xml_cdr_destination')) { @@ -518,7 +518,7 @@ $col_count++; } if (permission_exists('xml_cdr_recording') && (permission_exists('recording_play') || permission_exists('recording_download'))) { - echo "".$text['label-recording']."\n"; + echo "".$text['label-recording']."\n"; $col_count++; } if (permission_exists('xml_cdr_custom_fields')) { @@ -536,8 +536,9 @@ } } if (permission_exists('xml_cdr_start')) { - echo "".$text['label-start']."\n"; - $col_count++; + echo "".$text['label-date']."\n"; + echo "".$text['label-time']."\n"; + $col_count += 2; } if (permission_exists('xml_cdr_tta')) { echo "".$text['label-tta']."\n"; @@ -556,7 +557,7 @@ $col_count++; } if (permission_exists('xml_cdr_hangup_cause')) { - echo "".$text['label-hangup_cause']."\n"; + echo "".$text['label-hangup_cause']."\n"; $col_count++; } else { @@ -594,7 +595,13 @@ $tmp_year = date("Y", strtotime($row['start_stamp'])); $tmp_month = date("M", strtotime($row['start_stamp'])); $tmp_day = date("d", strtotime($row['start_stamp'])); - $tmp_start_epoch = ($_SESSION['domain']['time_format']['text'] == '12h') ? escape(date("j M Y", $row['start_epoch']))." ".escape(date("g:i:sa", $row['start_epoch']))."" : escape(date("j M Y", $row['start_epoch']))." ".escape(date("H:i:s", $row['start_epoch'])).""; + $tmp_start_epoch_date = escape(date("j M Y", $row['start_epoch'])); + if ($_SESSION['domain']['time_format']['text'] == '12h') { + $tmp_start_epoch_time = escape(date("g:i:sa", $row['start_epoch'])); + } + else { + $tmp_start_epoch_time = escape(date("H:i:s", $row['start_epoch'])); + } //get the hangup cause $hangup_cause = $row['hangup_cause']; @@ -678,7 +685,7 @@ } //caller id name if (permission_exists('xml_cdr_caller_id_name')) { - $content .= " ".escape($row['caller_id_name'])." \n"; + $content .= " ".escape($row['caller_id_name'])."\n"; } //source if (permission_exists('xml_cdr_caller_id_number')) { @@ -785,7 +792,8 @@ } //start if (permission_exists('xml_cdr_start')) { - $content .= " ".$tmp_start_epoch."\n"; + $content .= " ".$tmp_start_epoch_date."\n"; + $content .= " ".$tmp_start_epoch_time."\n"; } //tta (time to answer) if (permission_exists('xml_cdr_tta')) { diff --git a/resources/app_languages.php b/resources/app_languages.php index f99a2ea534..3a8513e4cb 100644 --- a/resources/app_languages.php +++ b/resources/app_languages.php @@ -1987,6 +1987,26 @@ $text['label-end_date_time']['sv-se'] = "Slut Datum/Tid"; $text['label-end_date_time']['uk-ua'] = ""; $text['label-end_date_time']['tr-tr'] = "Bitiş Tarihi/Zamanı"; +$text['label-date']['en-us'] = "Date"; +$text['label-date']['ar-eg'] = "وقت"; +$text['label-date']['de-at'] = "Datum"; //copied from de-de +$text['label-date']['de-ch'] = "Datum"; //copied from de-de +$text['label-date']['de-de'] = "Datum"; +$text['label-date']['es-cl'] = "Fecha"; +$text['label-date']['es-mx'] = "Fecha"; //copied from es-cl +$text['label-date']['fr-ca'] = "Date"; //copied from fr-fr +$text['label-date']['fr-fr'] = "Date"; +$text['label-date']['he-il'] = "תאריך שעה"; +$text['label-date']['it-it'] = "Data"; +$text['label-date']['nl-nl'] = ""; +$text['label-date']['pl-pl'] = "Data"; +$text['label-date']['pt-br'] = "Data"; +$text['label-date']['pt-pt'] = "Data"; +$text['label-date']['ro-ro'] = "Data"; +$text['label-date']['ru-ru'] = "Дата"; +$text['label-date']['sv-se'] = "Datum"; +$text['label-date']['uk-ua'] = "Дата"; + $text['label-time']['en-us'] = "Time"; $text['label-time']['ar-eg'] = ""; $text['label-time']['de-at'] = "Zeit"; //copied from de-de diff --git a/resources/paging.php b/resources/paging.php index e789cdd6d1..b674df7db9 100644 --- a/resources/paging.php +++ b/resources/paging.php @@ -96,21 +96,21 @@ function paging($num_rows, $param, $rows_per_page, $mini = false, $result_count if ($page_number > 0) { $page = $page_number - 1; - $prev = button::create(['type'=>'button','label'=>(!$mini ? $text['button-back'] : null),'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]); - $first = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=1".$sanitized_parameters]); + $prev = button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]); + $first = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=1".$sanitized_parameters]); } else { - $prev = button::create(['type'=>'button','label'=>(!$mini ? $text['button-back'] : null),'icon'=>($mini ? 'chevron-left' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']); + $prev = button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>($mini ? 'chevron-left' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']); } if (($page_number + 1) < $max_page) { $page = $page_number + 1; - $next = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]); - $last = button::create(['type'=>'button','label'=>(!$mini ? $text['button-back'] : null),'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]); + $next = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]); + $last = button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]); } else { - $last = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]); - $next = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-right' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']); + $last = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]); + $next = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-right' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']); } //if the result count is less than the rows per page then this is the last page of results diff --git a/themes/default/app_config.php b/themes/default/app_config.php index e3ca281429..4c76c0eb21 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -590,6 +590,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the hover color (and opacity) of text links outside tables."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4e01bde9-7fa3-4a60-a1ff-113b1d2b9e0a"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_heading_padding"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "4px 7px"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the padding of table column headings."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fdb84692-190e-4e54-83e4-5d7c8e288d43"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_heading_text_font"; @@ -630,6 +638,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the bottom border color (and opacity) of table header rows."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "515cda7e-01f5-4fb6-9838-a6fb1396647d"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_padding"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "4px 7px"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the padding of table row cells."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8d756015-05b1-43fb-9de6-85b901b44f3e"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_text_font"; diff --git a/themes/default/css.php b/themes/default/css.php index 1e596170ba..363c9ec869 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -2215,7 +2215,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; } .list-header > th { - padding: 4px 7px; + padding: ; text-align: left; color: ; font-size: ; @@ -2224,6 +2224,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; border-bottom: 1px solid ; } + .list-header > th.shrink { + width: 1px; + } + .list-row:nth-child(odd) > :not(.action-button) { background: ; } @@ -2242,7 +2246,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; } .list-row > :not(.checkbox) { - padding: ; + padding: ; } .list-row > td.description {