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-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Jonathan 2023-03-27 16:26:28 +02:00
parent e06fc2f115 48a254c4b2
commit 52076a56c2
10 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/godmode/agentes/agent_manager.php
View File

@ -966,9 +966,9 @@ foreach ($fields as $field) {
$link_url = '';
}
$data_field[1] = '<span style="line-height: 3.5;">'.__('Link text:').'</span>';
$data_field[1] .= '<br>';
$data_field[1] .= html_print_textarea(
$customContent = '<span style="line-height: 3.5;">'.__('Link text:').'</span>';
$customContent .= '<br>';
$customContent .= html_print_textarea(
'customvalue_'.$field['id_field'].'[]',
2,
1000,
@ -976,10 +976,10 @@ foreach ($fields as $field) {
'class="min-height-30px w100p"',
true
);
$data_field[1] .= '<br>';
$data_field[1] .= '<span style="line-height: 3.5;">'.__('Link URL:').'</span>';
$data_field[1] .= '<br>';
$data_field[1] .= html_print_textarea(
$customContent .= '<br>';
$customContent .= '<span style="line-height: 3.5;">'.__('Link URL:').'</span>';
$customContent .= '<br>';
$customContent .= html_print_textarea(
'customvalue_'.$field['id_field'].'[]',
2,
1000,

16
pandora_console/godmode/agentes/configure_field.php
View File

@ -229,7 +229,6 @@ echo '</form>';
<script>
$(document).ready (function () {
if($('input[type=hidden][name=update_field]').val() == 1 && $('#textarea_combo_values').val() != ''){
console.log('entra2');
$('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
$('#configure_field-3').show();
@ -250,7 +249,6 @@ $(document).ready (function () {
}
});
} else {
console.log('entra');
$('#configure_field-3').hide();
}
@ -261,17 +259,19 @@ $(document).ready (function () {
}
$('input[type=checkbox][name=is_link_enabled]').change(function () {
if( $(this).is(":checked") ){
if( $('input[type=checkbox][name=is_link_enabled]').prop('checked') ){
$('#configure_field-2').hide();
$('#configure_field-3').hide();
} else{
$('#configure_field-2').show();
$('#configure_field-3').show();
if($('input[type=checkbox][name=is_combo_enable]').prop('checked') === true) {
$('#configure_field-3').show();
}
}
});
$('input[type=checkbox][name=is_combo_enable]').change(function () {
if( $(this).is(":checked") ){
if( $('input[type=checkbox][name=is_combo_enable]').prop('checked') ){
$('#configure_field-3').show();
dialog_message("#message_no_set_password");
$('#configure_field-1').hide();
@ -282,12 +282,14 @@ $(document).ready (function () {
}
});
$('input[type=checkbox][name=is_password_type]').change(function () {
if( $(this).is(":checked")){
if( $('input[type=checkbox][name=is_password_type]').prop('checked')){
dialog_message("#message_no_set_combo");
$('#configure_field-3').hide();
}
else{
$('#configure_field-3').show();
if($('input[type=checkbox][name=is_combo_enable]').prop('checked') === true) {
$('#configure_field-3').show();
}
}
});
});

2
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -545,7 +545,7 @@ final class ModuleGraph extends Item
'label' => __('Module Graph'),
'arguments' => [
'type' => 'radio_button',
'attributes' => 'class="btn" style="flex: 1;"',
'attributes' => 'class="btn mrgn_right_20px" style="flex: 1;"',
'name' => 'choosetype',
'value' => 'module',
'checkedvalue' => $checkedModule,

11
pandora_console/include/styles/pandora.css
View File

@ -10225,9 +10225,9 @@ button.submitButton > div {
button.buttonButton.onlyIcon,
button.submitButton.onlyIcon {
padding: 0 !important;
min-width: 1.7em !important;
width: 1.7em !important;
height: 1.7em !important;
min-width: 1.6em !important;
width: 1.6em !important;
height: 1.6em !important;
border: none;
box-shadow: none;
}
@ -10291,8 +10291,9 @@ button.submitButton.onlyIcon.auto_sla_graph_min {
button.buttonButton.onlyIcon.basic_chart_min,
button.submitButton.onlyIcon.basic_chart_min {
mask: url(../../images/event-history.svg) no-repeat right / contain;
-webkit-mask: url(../../images/event-history.svg) no-repeat right / contain;
mask: url(../../images/web-analisys-data@svg.svg) no-repeat right / contain;
-webkit-mask: url(../../images/web-analisys-data@svg.svg) no-repeat right /
contain;
}
button.buttonButton.onlyIcon.binary_min,

2
pandora_console/include/styles/visual_maps.css
View File

@ -14,6 +14,7 @@ div.external-visual-console-container {
width: 100%;
overflow-x: auto;
overflow-y: hidden;
position: relative;
z-index: 0;
}
@ -47,7 +48,6 @@ div#vc-controls .nomn #vc-refr-form {
}
div#vc-controls div.vc-title,
div#vc-controls div.vc-refr {
/*margin-top: 15px;*/
margin-left: 3px;
margin-right: 3px;
}

4
pandora_console/include/visual-console-client/vc.main.css
View File

@ -41,11 +41,11 @@
}
.visual-console-item.is-editing:hover {
border-color: #82b92e;
border-color: #2b2b2b;
}
.visual-console-item.is-editing.is-selected {
border: 2px dashed #2b2b2b;
border: 2px dashed #82b92e;
cursor: move;
z-index: 10;
}

2
pandora_console/include/visual-console-client/vc.main.css.map
View File

File diff suppressed because one or more lines are too long

20
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -540,11 +540,8 @@ $table_contact->data[] = $data;
$data_opcional = new stdClass();
$data_opcional->id = 'agent_data_main';
$data_opcional->width = '100%';
$data_opcional->class = 'floating_form';
$data_opcional->cellspacing = 0;
$data_opcional->cellpadding = 0;
$data_opcional->style[0] = 'height: 46px; width: 25%; padding-right: 5px;text-align: end;';
$data_opcional->style[1] = 'height: 46px; width: 75%; padding-left: 5px;';
// Gis and url address.
$agentAdditionalContent = '';
// Position Information.
@ -624,8 +621,6 @@ foreach ($fields as $field) {
$data = [];
$data[0] = '<b>'.$field['name'].ui_print_help_tip(__('Custom field'), true).'</b>';
$custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
if ($custom_value[0]['is_password_type']) {
$data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
} else if ($field['is_link_enabled'] === '1') {
@ -642,6 +637,7 @@ foreach ($fields as $field) {
$data[1] = '<a href="'.$link_url.'">'.$link_text.'</a>';
} else {
$custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
$data[1] = $custom_value[0]['description'];
}
@ -1056,19 +1052,13 @@ if (isset($data_opcional) === false || isset($data_opcional->data) === false ||
false,
false,
true,
'box-flat agent_details_col agent_details_toggle agent_details_first_row w100p',
'mrgn_right_20px',
'w100p'
'',
'white-box-content',
'box-flat white_table_graph w100p'
);
}
$agentIncidents = (isset($table_incident) === false) ? '' : html_print_table($table_incident, true);
/*
echo '<div class="agent_details_first_row">
<div class="box-flat agent_details_col mrgn_lft_20px mrgn_right_20px">'.$table_agent.'</div>
<div class="box-flat agent_details_col mrgn_right_20px">'.$agent_contact.'</div>
</div>'.$agent_info;
*/
html_print_div(
[

2
pandora_console/operation/visual_console/view.php
View File

@ -287,7 +287,7 @@ if ($pure === false) {
$class_nlink = 'network_link_min link-create-item';
$class_odometer = 'odometer_min link-create-item';
$class_basic_chart = 'basic_chart_min link-create-item';
$class_delete = 'delete_item delete_min';
$class_delete = 'delete_item';
$class_copy = 'copy_item';
if ($config['style'] === 'pandora_black' && is_metaconsole() === false) {
$class_camera .= ' invert_filter';

4
visual_console_client/src/main.css
View File

@ -41,11 +41,11 @@
}
.visual-console-item.is-editing:hover {
border-color: #82b92e;
border-color: #2b2b2b;
}
.visual-console-item.is-editing.is-selected {
border: 2px dashed #2b2b2b;
border: 2px dashed #82b92e;
cursor: move;
z-index: 10;
}