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

…to develop
pandorafms · Jul 1, 2015 · b6e77bb · b6e77bb
2 parents 19307d8 + 86010c8
commit b6e77bb
Show file tree

Hide file tree

Showing 8 changed files with 59,628 additions and 29,470 deletions.
diff --git a/pandora_console/include/languages/es.mo b/pandora_console/include/languages/es.mo
diff --git a/pandora_console/include/languages/es.po b/pandora_console/include/languages/es.po
diff --git a/pandora_console/include/languages/index.pot b/pandora_console/include/languages/index.pot
diff --git a/pandora_console/include/languages/zh_CN.mo b/pandora_console/include/languages/zh_CN.mo
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
@@ -1380,7 +1380,6 @@ table.databox {
 	-webkit-border-radius: 0px;
 	border-radius: 0px;
 	border: 0px none #E2E2E2;
-
 }
 
 .databox th {

diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
@@ -392,11 +392,6 @@
 $table->class = "databox data";
 $table->cellpadding = '0';
 $table->cellspacing = '0';
-if(defined('METACONSOLE')) {
-	$table->class = "databox";
-	$table->cellpadding = '0';
-	$table->cellspacing = '0';
-}
 $table->size = array ();
 $table->head = array ();
 $table->align = array ();

diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
@@ -408,20 +408,14 @@
 	if ($key_group_all !== false)
 		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[1] = 'font-weight: bold;';
-	$table->style[2] = 'font-weight: bold;';
-	$table->style[3] = 'font-weight: bold;';
-	$table->style[4] = 'font-weight: bold;';
-}
+
+
+$table->style[0] = 'font-weight: bold;';
+$table->style[1] = 'font-weight: bold;';
+$table->style[2] = 'font-weight: bold;';
+$table->style[3] = 'font-weight: bold;';
+$table->style[4] = 'font-weight: bold;';
+
 $table->data[0][0] = __('Group');
 
 $table->data[0][1] = html_print_select_groups($config['id_user'], "AR", true, "ag_group",
@@ -496,6 +490,7 @@
 $table_custom_fields = new stdClass();
 $table_custom_fields->class = 'filters';
 $table_custom_fields->width = '100%';
+
 if (defined('METACONSOLE')) {
 		$table_custom_fields->width = '100%';
 		$table_custom_fields->class = 'filters';
@@ -908,12 +903,6 @@
 $table->cellspacing = 0;
 $table->width = "100%";
 $table->class = "databox data";
-if(defined('METACONSOLE')) {
-	$table->width = "100%";
-	$table->cellpadding = '0';
-	$table->cellspacing = '0';
-	$table->class = "databox";
-}
 $table->head = array ();
 $table->data = array ();
 $table->size = array ();

diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
@@ -21,10 +21,7 @@
 $table->cellpadding = 4;
 $table->cellspacing = 4;
 if(!isset($table->class)) {
-	if (defined("METACONSOLE"))
-		$table->class = "databox";
-	else
-		$table->class = "databox data";
+	$table->class = "databox data";
 }
 $table->head = array ();
 $table->data = array ();