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-7194-varios-bugs-visuales-metaconsola' into 'develop' 

fixed visual error

See merge request artica/pandorafms!3945
This commit is contained in:
Daniel Rodriguez 2021-03-26 13:40:56 +00:00
parent 48b299ba67 9dd17acb57
commit e6be5e61f9
13 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/events/event_responses.editor.php
View File

@ -201,7 +201,7 @@ if ($event_response_id == 0) {
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=create_response&amp;pure='.$config['pure'].'">';
html_print_table($table);
if (!defined('METACONSOLE')) {
echo '<div class="w100p right">';
echo '<div class="w100p right_align">';
} else {
echo '<div class="w100p right">';
}
@ -213,7 +213,7 @@ if ($event_response_id == 0) {
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=update_response&amp;pure='.$config['pure'].'">';
html_print_table($table);
if (!defined('METACONSOLE')) {
echo '<div class="w100p right">';
echo '<div class="w100p right_align">';
} else {
echo '<div class="w100p right">';
}

2
pandora_console/godmode/events/event_responses.list.php
View File

@ -86,7 +86,7 @@ foreach ($event_responses as $response) {
html_print_table($table);
echo '<div class="w100p right">';
echo '<div class="w100p right_align">';
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&amp;pure='.$config['pure'].'">';
html_print_submit_button(
__('Create response'),

4
pandora_console/godmode/reporting/map_builder.php
View File

@ -515,9 +515,9 @@ if (!$maps && !is_metaconsole()) {
if ($maps) {
if (!is_metaconsole()) {
echo '<div class="action-buttons w100p right">';
echo '<div class="action-buttons w100p right_align">';
} else {
echo '<div class="w100p right_align">';
echo '<div class="w100p right right_align">';
}
}

2
pandora_console/godmode/reporting/reporting_builder.list_items.php
View File

@ -664,7 +664,7 @@ if (defined('METACONSOLE')) {
if (check_acl($config['id_user'], 0, 'RM')) {
html_print_input_hidden('ids_items_to_delete', '');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right"');
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px"');
}
echo '</div>';

2
pandora_console/include/functions_treeview.php
View File

@ -473,7 +473,7 @@ function treeview_printAlertsTable($id_module, $server_data=[], $no_head=false)
if ($user_access_node && check_acl($config['id_user'], $id_group, 'LW')) {
// Actions table
echo '<div class="w100p right mw300px">';
echo '<div class="w100p right mw300px right_align">';
echo '<a target=_blank href="'.$console_url.'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&search=1&module_name='.$module_name.'&id_agente='.$agent_id.$url_hash.'" target="_blank">';
html_print_submit_button(__('Go to alerts edition'), 'upd_button', false, 'class="sub search"');
echo '</a>';

2
pandora_console/include/functions_ui.php
View File

@ -333,7 +333,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
$output .= '</td>
</tr>
<tr>
<td class="black pdd_t_10px">'.$text_message.'</td>
<td class="black pdd_t_10px" style="color: #000">'.$text_message.'</td>
<td></td>
</tr>
</table>';

12
pandora_console/include/javascript/tree/TreeController.js
View File

@ -69,6 +69,10 @@ var TreeController = {
messageLength = childGroupsLength + controller.tree.length;
}
group_message = controller.foundMessage + ": " + messageLength;
if (controller.foundMessage == "") {
group_message = "";
}
$group
.addClass("tree-root")
.hide()
@ -78,9 +82,7 @@ var TreeController = {
(controller.baseURL.length > 0 ? controller.baseURL : "") +
'images/pandora.png" />' +
"<span class='margin-left-1'>" +
(controller.tree.length > 0
? controller.foundMessage + ": " + messageLength
: "") +
(controller.tree.length > 0 ? group_message : "") +
"</div>"
);
} else {
@ -1222,7 +1224,9 @@ var TreeController = {
if (typeof data.auth_hash !== "undefined") {
this.auth_hash = data.auth_hash;
}
if (data.tree[0]["rootType"] == "services") {
this.foundMessage = "";
}
this.load();
},
remove: function() {

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

@ -266,7 +266,7 @@ $table->data[] = $data;
$table->rowclass[] = '';
$form_table = html_print_table($table, true);
$form_table .= '<div class="w100p right">';
$form_table .= '<div class="w100p right right_align">';
$form_table .= html_print_submit_button(
__('Reload'),
'submit',

2
pandora_console/operation/agentes/pandora_networkmap.view.php
View File

@ -265,7 +265,7 @@ if (is_ajax()) {
$return['correct'] = true;
$return['content'] = '<div class="border_1px_black">
<div class="w100p right"><a class="no_decoration black" href="javascript: hide_tooltip();">X</a></div>
<div class="w100p right right_align"><a class="no_decoration black" href="javascript: hide_tooltip();">X</a></div>
<div class="mrgn_5px">
';

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

@ -386,7 +386,7 @@ ui_print_message_dialog(
);
$form_table = html_print_table($table, true);
$form_table .= '<div class="w100p right mrgn_top_15px">';
$form_table .= '<div class="w100p right mrgn_top_15px right_align">';
$form_table .= html_print_submit_button(
__('Reload'),
'submit',

2
pandora_console/operation/events/events.build_table.php
View File

@ -994,7 +994,7 @@ if ($group_rep == 2) {
if (check_acl($config['id_user'], 0, 'EW')) {
if ($config['event_replication'] != 1) {
echo '<div class="w100p right">';
echo '<div class="w100p right right_align">';
echo '<form method="post" id="form_event_response">';
html_print_select($array_events_actions, 'response_id', '', '', '', 0, false, false, false);
echo '&nbsp&nbsp';

2
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -238,7 +238,7 @@ if (reporting_get_description($id_report)) {
$table->data[0][1] = '<div class="float-left">'.reporting_get_name($id_report).'</div>';
}
$table->data[0][1] .= '<div class="right w100p mrgn_right_50px">'.__('Set initial date').html_print_checkbox('enable_init_date', 1, $enable_init_date, true);
$table->data[0][1] .= '<div class="right w100p mrgn_right_50px right_align">'.__('Set initial date').html_print_checkbox('enable_init_date', 1, $enable_init_date, true);
$html_enterprise = enterprise_hook(
'reporting_print_button_PDF',
[$id_report]

4
pandora_plugins/message_app_connectors/.vscode/settings.json vendored
View File

@ -1,3 +1,3 @@
{
"python.pythonPath": "slack/venv/bin/python"
}
"python.pythonPath": "slack/venv/bin/python"
}