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-12456-dashboard-widgert-colmena-de-agentes-agent-hive-se-ve-con-con-OS-description-largos' into 'develop' 

Ent 12456 dashboard widgert colmena de agentes agent hive se ve con con os description largos

See merge request artica/pandorafms!6669
This commit is contained in:
Rafael Ameijeiras 2023-12-18 14:52:02 +00:00
parent bf03440a31 7c0a2b4e97
commit e86132a89d
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pandora_console/include/lib/Dashboard/Widgets/AgentHive.php
View File

@ -431,15 +431,34 @@ class AgentHive extends Widget
$output .= '</div>';
$style = 'font-size: 6pt; display: flex; justify-content: start;
align-items: start; color: #9FA5B1; font-weight: 600;
line-height:normal; text-align:left;';
$style_div = $style.' margin-bottom: 15px;';
// OS description.
$output .= html_print_div(
[
'content' => (empty($data['os_version']) === true)
? get_os_name((int) $data['id_os'])
: $data['os_version'],
'style' => 'font-size: 6pt; display:
flex;justify-content: start;align-items: start;
color: #9FA5B1; font-weight: 600;margin-bottom: 5px',
? ui_print_truncate_text(
get_os_name((int) $data['id_os']),
32,
false,
true,
true,
'&hellip;',
$style
)
: ui_print_truncate_text(
$data['os_version'],
32,
false,
true,
true,
'&hellip;',
$style
),
'style' => $style_div,
],
true
);
@ -455,8 +474,10 @@ class AgentHive extends Widget
true,
'&hellip;',
),
'style' => 'text-align: left;min-height: 42px;
font-size: 8pt;max-height: 42px; margin-bottom: 10px',
'style' => 'text-align: left;
min-height: 42px; font-size: 8pt;
max-height: 42px; line-height: normal;
margin: 2px 0px 2px 0px',
],
true
);
@ -466,7 +487,9 @@ class AgentHive extends Widget
[
'content' => $data['direccion'],
'style' => 'font-size: 10pt;color: #14524f;
font-weight: 600; text-align: left',
font-weight: 600;
text-align: left;
margin-top: 5px',
],
true
);

4
pandora_console/include/styles/dashboards.css
View File

@ -668,9 +668,9 @@ form.modal-dashboard
justify-content: center;
align-items: start;
min-width: 150px;
max-width: 150px;
max-width: 160px;
min-height: 150px;
max-height: 150px;
max-height: 160px;
margin: 8px;
padding: 5px;
border: 1px solid #eceef2;