tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop' 

Added compact mode to show timestamp - #4233

See merge request artica/pandorafms!2688
This commit is contained in:
Daniel Rodriguez 2019-12-16 11:48:09 +01:00
parent 79cad3eaa9 b38c396837
commit 24838cad0f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1196,16 +1196,23 @@ $row++;
if ($config['prominent_time'] == 'comparation') {
$timestamp = false;
$comparation = true;
$compact = false;
} else if ($config['prominent_time'] == 'timestamp') {
$timestamp = true;
$comparation = false;
$compact = false;
} else if ($config['prominent_time'] == 'compact') {
$timestamp = false;
$comparation = false;
$compact = true;
}
$table_other->data[$row][0] = __('Timestamp or time comparation');
$table_other->data[$row][1] = __('Comparation in rollover').' ';
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', '', $comparation, true);
$table_other->data[$row][1] .= '<br />'.__('Timestamp in rollover').' ';
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', '', $timestamp, true);
$table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode');
$table_other->data[$row][1] = '<div class="switch_radio_button">';
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true);
$table_other->data[$row][1] .= '</div>';
$row++;

4
pandora_console/include/functions_ui.php
View File

@ -545,6 +545,10 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
date2strftime_format($config['date_format']),
$unixtime
);
} else if ($prominent == 'compact') {
$units = 'tiny';
$title = date($config['date_format'], $unixtime);
$data = human_time_comparation($unixtime, $units);
} else {
$title = date($config['date_format'], $unixtime);
$units = 'large';