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

#12647 fixed line break in event list

This commit is contained in:
Daniel Cebrian 2023-12-14 19:08:34 +01:00
parent e3d408ea44
commit 67ffe8627b
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/styles/events.css
View File

@ -109,21 +109,13 @@ td > input[id^="checkbox-multi"] {
} }
.info_table.events tr > td span:not(.invisible) { .info_table.events tr > td span:not(.invisible) {
display: block; display: inline-block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-height: 6em; max-height: 6em;
line-height: 2em; line-height: 2em;
} }
.info_table.events tr > td span:not(.invisible) {
display: block;
overflow: hidden;
text-overflow: ellipsis;
max-height: 6em;
line-height: 1.5em;
}
th.column-estado { th.column-estado {
padding: 0px 0px 0px 12px !important; padding: 0px 0px 0px 12px !important;
max-width: fit-content; max-width: fit-content;

28
pandora_console/operation/events/events.php
View File

@ -523,17 +523,6 @@ if (is_ajax() === true) {
$tmp->b64 = base64_encode(json_encode($tmp)); $tmp->b64 = base64_encode(json_encode($tmp));
$tmp->evento = $output_event_name; $tmp->evento = $output_event_name;
$tmp->evento = ui_print_truncate_text(
$tmp->evento,
(empty($compact_name_event) === true) ? 'description' : GENERIC_SIZE_TEXT,
false,
true,
false,
'…',
true,
true,
);
if (empty($tmp->module_name) === false) { if (empty($tmp->module_name) === false) {
$tmp->module_name = ui_print_truncate_text( $tmp->module_name = ui_print_truncate_text(
$tmp->module_name, $tmp->module_name,
@ -771,18 +760,31 @@ if (is_ajax() === true) {
$evn = '<a href="javascript:" onclick="show_event_dialog(\''.$tmp->b64.'\')">'; $evn = '<a href="javascript:" onclick="show_event_dialog(\''.$tmp->b64.'\')">';
} }
$number = '';
// Grouped events. // Grouped events.
if ((int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) { if ((int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) {
$counter_extra_id = event_get_counter_extraId($item, $filter); $counter_extra_id = event_get_counter_extraId($item, $filter);
if (empty($counter_extra_id) === false && $counter_extra_id > 1) { if (empty($counter_extra_id) === false && $counter_extra_id > 1) {
$evn .= '('.$counter_extra_id.') '; $number = '('.$counter_extra_id.') ';
} }
} else { } else {
if (isset($tmp->event_rep) === true && $tmp->event_rep > 1) { if (isset($tmp->event_rep) === true && $tmp->event_rep > 1) {
$evn .= '('.$tmp->event_rep.') '; $number = '('.$tmp->event_rep.') ';
} }
} }
$tmp->evento = $number.$tmp->evento;
$tmp->evento = ui_print_truncate_text(
$tmp->evento,
(empty($compact_name_event) === true) ? 'description' : GENERIC_SIZE_TEXT,
false,
true,
false,
'&hellip;',
true,
true,
);
$evn .= $tmp->evento.'</a>'; $evn .= $tmp->evento.'</a>';
// Add event severity format to itself. // Add event severity format to itself.