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-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop' 

Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles

See merge request artica/pandorafms!2598
This commit is contained in:
Daniel Rodriguez 2019-07-12 10:26:05 +02:00
parent fe98189779 46f55c6d65
commit 24cbe3bd8e
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/massive/massive_add_profiles.php
View File

@ -84,7 +84,9 @@ if ($create_profiles) {
);
}
html_print_table($table);
if ($table !== null) {
html_print_table($table);
}
unset($table);

4
pandora_console/godmode/massive/massive_delete_profiles.php
View File

@ -92,7 +92,9 @@ if ($delete_profiles) {
);
}
html_print_table($table);
if ($table !== null) {
html_print_table($table);
}
unset($table);

21
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -774,14 +774,14 @@ switch ($action) {
$table->head[1] = __('Description');
$table->head[2] = __('HTML');
$table->head[3] = __('XML');
$table->size[0] = '60%';
$table->size[0] = '50%';
$table->size[1] = '20%';
$table->size[2] = '2%';
$table->headstyle[2] = 'min-width: 35px;text-align: center;';
$table->headstyle[2] = 'min-width: 35px;text-align: left;';
$table->size[3] = '2%';
$table->headstyle[3] = 'min-width: 35px;text-align: center;';
$table->headstyle[3] = 'min-width: 35px;text-align: left;';
$table->size[4] = '2%';
$table->headstyle[4] = 'min-width: 35px;text-align: center;';
$table->headstyle[4] = 'min-width: 35px;text-align: left;';
$next = 4;
// Calculate dinamically the number of the column.
@ -790,15 +790,16 @@ switch ($action) {
}
$table->size[$next] = '2%';
$table->style[$next] = 'text-align: center;';
$table->style[$next] = 'text-align: left;';
$table->headstyle[($next + 2)] = 'min-width: 100px;';
$table->style[($next + 2)] = 'text-align: center;';
$table->headstyle[($next + 2)] = 'min-width: 130px; text-align:right;';
$table->style[($next + 2)] = 'text-align: right;';
// Admin options only for RM flag.
if (check_acl($config['id_user'], 0, 'RM')) {
$table->head[$next] = __('Private');
$table->headstyle[$next] = 'min-width: 40px;text-align: left;';
$table->size[$next] = '2%';
if (defined('METACONSOLE')) {
$table->align[$next] = '';
@ -808,7 +809,9 @@ switch ($action) {
$next++;
$table->head[$next] = __('Group');
$table->size[$next] = '15%';
$table->headstyle[$next] = 'min-width: 40px;text-align: left;';
$table->size[$next] = '2%';
$table->align[$next] = 'left';
$next++;
$op_column = false;
@ -826,7 +829,7 @@ switch ($action) {
// $table->size = array ();
$table->size[$next] = '10%';
$table->align[$next] = 'left';
$table->align[$next] = 'right';
}
$columnview = false;

2
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1505,7 +1505,7 @@ $(document).ready (function () {
.prop('checked');
display_custom_report_front(custom_report,$(this).parent().parent().parent().parent().parent().attr('id'));
});
$(".databox.filters").css('margin-bottom','-10px');
$(".databox.filters").css('margin-bottom','0px');
});
// Change the favicon preview when is changed

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

@ -235,11 +235,12 @@ pre {
font-family: courier, serif;
}
fieldset {
background-color: #f9faf9;
background-color: #fff;
border: 1px solid #e2e2e2;
padding: 0.5em;
margin-bottom: 20px;
position: relative;
border-radius: 5px;
}
fieldset legend {
font-size: 1.1em;
@ -5791,7 +5792,6 @@ div#status_pie {
grid-template-columns: 50px auto;
}
/*
* ---------------------------------------------------------------------
* - IMAGES FOR STATUS. This replaces the images of /images/status_sets/default/
@ -5834,7 +5834,6 @@ div#status_pie {
* ---------------------------------------------------------------------
*/
/* Table for show more info in events and config menu in modules graphs. (This class exists in events.css too) */
.table_modal_alternate {
border-spacing: 0;

6
pandora_console/operation/agentes/pandora_networkmap.editor.php
View File

@ -383,14 +383,14 @@ if ($not_found) {
html_print_table($table);
echo "<div style='width: ".$table->width."; text-align: right;'>";
echo "<div style='width: ".$table->width."; text-align: right; margin-top:20px;'>";
if ($new_networkmap) {
html_print_input_hidden('save_networkmap', 1);
html_print_submit_button(
__('Save networkmap'),
'crt',
false,
'class="sub"'
'class="sub next"'
);
}
@ -401,7 +401,7 @@ if ($not_found) {
__('Update networkmap'),
'crt',
false,
'class="sub"'
'class="sub upd"'
);
}