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

#10685 changed in system fav, tips and Tactical group view

This commit is contained in:
Daniel Cebrian 2023-03-15 12:41:10 +01:00
parent 00a5e8e84b
commit c346aefeaa
9 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -827,12 +827,6 @@ if ($id_agente) {
'link' => '', 'link' => '',
'label' => $tab_name, 'label' => $tab_name,
], ],
],
[
'id_element' => $id_agente,
'url' => 'godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agente,
'label' => agents_get_alias($id_agente),
'section' => 'Agents',
] ]
); );
} }

5
pandora_console/godmode/groups/group_list.php
View File

@ -718,7 +718,7 @@ if ($is_management_allowed === true
'tfavmenu_user', 'tfavmenu_user',
[ [
'id_element' => $id_group, 'id_element' => $id_group,
'section' => 'Tactic_group', 'section' => 'Groups',
'id_user' => $config['id_user'], 'id_user' => $config['id_user'],
] ]
); );
@ -906,7 +906,6 @@ if ($tab == 'tree') {
foreach ($groups as $key => $group) { foreach ($groups as $key => $group) {
$url_edit = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo']; $url_edit = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo'];
$url_tactical = 'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$group['id_grupo'];
if (is_metaconsole()) { if (is_metaconsole()) {
$url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups'; $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups';
} else { } else {
@ -915,7 +914,7 @@ if ($tab == 'tree') {
$table->data[$key][0] = $group['id_grupo']; $table->data[$key][0] = $group['id_grupo'];
if ($is_management_allowed === true) { if ($is_management_allowed === true) {
$table->data[$key][1] = '<a href="'.$url_tactical.'">'.$group['nombre'].'</a>'; $table->data[$key][1] = '<a href="'.$url_edit.'">'.$group['nombre'].'</a>';
} else { } else {
$table->data[$key][1] = $group['nombre']; $table->data[$key][1] = $group['nombre'];
} }

7
pandora_console/godmode/groups/tactical.php
View File

@ -72,14 +72,14 @@ if (is_metaconsole() === false) {
], ],
[ [
'link' => '', 'link' => '',
'label' => __('Tactic group'), 'label' => __('Tactical group view'),
], ],
], ],
[ [
'id_element' => $id_group, 'id_element' => $id_group,
'url' => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group, 'url' => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group,
'label' => groups_get_name($id_group), 'label' => groups_get_name($id_group),
'section' => 'Tactic_group', 'section' => 'Groups',
] ]
); );
} }
@ -187,7 +187,7 @@ try {
[ [
'id' => 'list_agents_tactical', 'id' => 'list_agents_tactical',
'class' => 'info_table', 'class' => 'info_table',
'style' => 'width: 100%', 'style' => 'width: 99%',
'columns' => $columns, 'columns' => $columns,
'column_names' => $columnNames, 'column_names' => $columnNames,
'return' => true, 'return' => true,
@ -196,6 +196,7 @@ try {
'method' => 'getAgentsByGroup', 'method' => 'getAgentsByGroup',
'id_group' => $id_group, 'id_group' => $id_group,
], ],
'dom_elements' => 'lpfti',
'no_sortable_columns' => [-1], 'no_sortable_columns' => [-1],
'order' => [ 'order' => [
'field' => 'alias', 'field' => 'alias',

1
pandora_console/include/class/TipsWindow.class.php
View File

@ -162,6 +162,7 @@ class TipsWindow
'url' => $initialTip['url'], 'url' => $initialTip['url'],
'files' => $initialTip['files'], 'files' => $initialTip['files'],
'id' => $initialTip['id'], 'id' => $initialTip['id'],
'totalTips' => $this->getTotalTipsShowUser(),
] ]
); );
} }

3
pandora_console/include/styles/tactical_groups.css
View File

@ -29,3 +29,6 @@ rect {
.graph-distribution-so { .graph-distribution-so {
margin-top: 55px; margin-top: 55px;
} }
#list_agents_tactical_wrapper .dataTables_length {
margin-bottom: 10px;
}

9
pandora_console/include/styles/tips_window.css
View File

@ -12,7 +12,7 @@
padding: 0px; padding: 0px;
} }
.window { .window {
background-image: linear-gradient(180deg, #fffce8 0%, #ffffff 100%); background-image: white;
width: 640px; width: 640px;
width: 100%; width: 100%;
border-radius: 5px; border-radius: 5px;
@ -145,9 +145,6 @@
color: #14524f; color: #14524f;
font-weight: 600; font-weight: 600;
} }
#url_tip .arrow_tips {
font-size: 20px;
}
span.count-round-tip { span.count-round-tip {
width: 6px !important; width: 6px !important;
height: 6px !important; height: 6px !important;
@ -211,3 +208,7 @@ span.disable {
.buttons_actions input { .buttons_actions input {
width: 32px; width: 32px;
} }
.hide-button {
opacity: 0;
pointer-events: none;
}

2
pandora_console/operation/agentes/group_view.php
View File

@ -321,7 +321,7 @@ if (empty($result_groups) === false) {
$link = "<a href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']."'>"; $link = "<a href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']."'>";
} else { } else {
$deep = groups_get_group_deep($data['_id_']); $deep = groups_get_group_deep($data['_id_']);
$link = "<a href='index.php?sec=view&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>"; $link = "<a href='index.php?sec=view&sec2=godmode/groups/tactical&id_group=".$data['_id_']."'>";
} }
$group_name = '<b><span>'.ui_print_truncate_text($data['_name_'], 50).'</span></b>'; $group_name = '<b><span>'.ui_print_truncate_text($data['_name_'], 50).'</span></b>';

6
pandora_console/operation/agentes/ver_agente.php
View File

@ -1940,6 +1940,12 @@ if ((bool) $config['pure'] === false) {
'link' => '', 'link' => '',
'label' => $tab_name, 'label' => $tab_name,
], ],
],
[
'id_element' => $id_agente,
'url' => 'operation/agentes/ver_agente&id_agente='.$id_agente,
'label' => agents_get_alias($id_agente),
'section' => 'Agents',
] ]
); );
} }

7
pandora_console/views/dashboard/tipsWindow.php
View File

@ -73,10 +73,13 @@ $output .= '<p id="text_tip">';
$output .= $text; $output .= $text;
$output .= '</p>'; $output .= '</p>';
$link_class = 'invisible';
if (empty($url) === false && $url !== '') { if (empty($url) === false && $url !== '') {
$output .= '<a href="'.$url.'" target="_blank" id="url_tip">'.__('See more info').'<span class="arrow_tips">→</span></a>'; $link_class = '';
} }
$output .= '<a href="'.$url.'" class="'.$link_class.'" target="_blank" id="url_tip">'.__('See more info').'</a>';
$output .= '</div>'; $output .= '</div>';
$output .= '<div class="ui-dialog-buttonset">'; $output .= '<div class="ui-dialog-buttonset">';
@ -116,7 +119,7 @@ if ($preview === true) {
'', '',
[ [
'onclick' => 'next_tip()', 'onclick' => 'next_tip()',
'class' => 'mini', 'class' => ($totalTips === '1') ? 'mini hide-button' : 'mini',
], ],
true true
); );