tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

Browse Source
This commit is contained in:
fermin831 2015-07-01 13:39:19 +02:00
commit b6e77bbf78
8 changed files with 66191 additions and 36033 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/include/languages/es.mo
View File

Binary file not shown.

52439
pandora_console/include/languages/es.po
View File

File diff suppressed because it is too large Load Diff

49915
pandora_console/include/languages/index.pot
View File

File diff suppressed because it is too large Load Diff

BIN
pandora_console/include/languages/zh_CN.mo
View File

Binary file not shown.

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

@ -1380,7 +1380,6 @@ table.databox {
-webkit-border-radius: 0px; -webkit-border-radius: 0px;
border-radius: 0px; border-radius: 0px;
border: 0px none #E2E2E2; border: 0px none #E2E2E2;
} }
.databox th { .databox th {

5
pandora_console/operation/agentes/alerts_status.php
View File

@ -392,11 +392,6 @@ $table->width = '100%';
$table->class = "databox data"; $table->class = "databox data";
$table->cellpadding = '0'; $table->cellpadding = '0';
$table->cellspacing = '0'; $table->cellspacing = '0';
if(defined('METACONSOLE')) {
$table->class = "databox";
$table->cellpadding = '0';
$table->cellspacing = '0';
}
$table->size = array (); $table->size = array ();
$table->head = array (); $table->head = array ();
$table->align = array (); $table->align = array ();

19
pandora_console/operation/agentes/status_monitor.php
View File

@ -408,20 +408,14 @@ if (defined('METACONSOLE')) {
if ($key_group_all !== false) if ($key_group_all !== false)
unset($groups_select[$key_group_all]); unset($groups_select[$key_group_all]);
} }
if(defined("METACONSOLE")) {
$table->style[0] = 'vertical-align:middle; font-weight: bold;';
$table->style[1] = 'vertical-align:middle; font-weight: bold;';
$table->style[2] = 'vertical-align:middle; font-weight: bold;';
$table->style[3] = 'vertical-align:middle; font-weight: bold;';
$table->style[4] = 'vertical-align:middle; font-weight: bold;';
}
else {
$table->style[0] = 'font-weight: bold;'; $table->style[0] = 'font-weight: bold;';
$table->style[1] = 'font-weight: bold;'; $table->style[1] = 'font-weight: bold;';
$table->style[2] = 'font-weight: bold;'; $table->style[2] = 'font-weight: bold;';
$table->style[3] = 'font-weight: bold;'; $table->style[3] = 'font-weight: bold;';
$table->style[4] = 'font-weight: bold;'; $table->style[4] = 'font-weight: bold;';
}
$table->data[0][0] = __('Group'); $table->data[0][0] = __('Group');
$table->data[0][1] = html_print_select_groups($config['id_user'], "AR", true, "ag_group", $table->data[0][1] = html_print_select_groups($config['id_user'], "AR", true, "ag_group",
@ -496,6 +490,7 @@ else {
$table_custom_fields = new stdClass(); $table_custom_fields = new stdClass();
$table_custom_fields->class = 'filters'; $table_custom_fields->class = 'filters';
$table_custom_fields->width = '100%'; $table_custom_fields->width = '100%';
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$table_custom_fields->width = '100%'; $table_custom_fields->width = '100%';
$table_custom_fields->class = 'filters'; $table_custom_fields->class = 'filters';
@ -908,12 +903,6 @@ $table->cellpadding = 0;
$table->cellspacing = 0; $table->cellspacing = 0;
$table->width = "100%"; $table->width = "100%";
$table->class = "databox data"; $table->class = "databox data";
if(defined('METACONSOLE')) {
$table->width = "100%";
$table->cellpadding = '0';
$table->cellspacing = '0';
$table->class = "databox";
}
$table->head = array (); $table->head = array ();
$table->data = array (); $table->data = array ();
$table->size = array (); $table->size = array ();

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

@ -21,9 +21,6 @@ $table->id = "eventtable";
$table->cellpadding = 4; $table->cellpadding = 4;
$table->cellspacing = 4; $table->cellspacing = 4;
if(!isset($table->class)) { if(!isset($table->class)) {
if (defined("METACONSOLE"))
$table->class = "databox";
else
$table->class = "databox data"; $table->class = "databox data";
} }
$table->head = array (); $table->head = array ();