From e48f675935b3a75c131686aac589c74bda10fc2f Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 11 Nov 2014 17:02:52 +0100
Subject: [PATCH] Removed the un used field label_color.

---
 .../extensions/resource_exportation.php       |  3 --
 .../extensions/resource_registration.php      |  2 -
 .../pandoradb_migrate_5.1_to_6.0.mysql.sql    |  1 +
 .../pandoradb_migrate_5.1_to_6.0.oracle.sql   |  3 +-
 ...andoradb_migrate_5.1_to_6.0.postgreSQL.sql |  3 +-
 .../visual_console_builder.editor.js          | 31 +++---------
 .../visual_console_builder.elements.php       | 18 +------
 .../reporting/visual_console_builder.php      |  1 -
 .../ajax/visual_console_builder.ajax.php      |  5 --
 .../include/functions_visual_map.php          | 50 ++++++-------------
 .../include/functions_visual_map_editor.php   |  9 ----
 pandora_console/pandoradb.oracle.sql          |  1 -
 pandora_console/pandoradb.postgreSQL.sql      |  1 -
 pandora_console/pandoradb.sql                 |  1 -
 14 files changed, 30 insertions(+), 99 deletions(-)
 mode change 100644 => 100755 pandora_console/extensions/resource_exportation.php
 mode change 100644 => 100755 pandora_console/extensions/resource_registration.php
 mode change 100644 => 100755 pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
 mode change 100644 => 100755 pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
 mode change 100644 => 100755 pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
 mode change 100644 => 100755 pandora_console/godmode/reporting/visual_console_builder.editor.js
 mode change 100644 => 100755 pandora_console/godmode/reporting/visual_console_builder.elements.php
 mode change 100644 => 100755 pandora_console/include/ajax/visual_console_builder.ajax.php
 mode change 100644 => 100755 pandora_console/include/functions_visual_map_editor.php
 mode change 100644 => 100755 pandora_console/pandoradb.oracle.sql
 mode change 100644 => 100755 pandora_console/pandoradb.postgreSQL.sql
 mode change 100644 => 100755 pandora_console/pandoradb.sql

diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
old mode 100644
new mode 100755
index 528f6c112b..d64d13f6e5
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -291,9 +291,6 @@ function output_xml_visual_console($id) {
 		if ($item['parent_item'] != 0) {
 			echo "<parent_item>" . $item['parent_item'] . "</parent_item>\n";
 		}
-		if (!empty($item['label_color'])) {
-			echo "<label_color>" . $item['label_color'] . "</label_color>\n";
-		}
 		echo "</item>\n";
 	}
 	echo "</visual_map>\n";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
old mode 100644
new mode 100755
index 0a77928765..1afe93e611
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -517,8 +517,6 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 				$values['image'] = (string)$item->image;
 			if (isset($item->period))
 				$values['period'] = (string)$item->period;
-			if (isset($item->label_color))
-				$values['label_color'] = (string)$item->label_color;
 			if (isset($item->parent_item)) {
 				//Hack for link the items use the <other_id>OTHER_ID</other_id>
 				// and have too <parent_item>OTHER_ID</parent_item>
diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
old mode 100644
new mode 100755
index f2bebfbf44..61ec1bc8ff
--- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
@@ -9,6 +9,7 @@ ALTER TABLE tlayout DROP COLUMN fullscreen;
 -- ---------------------------------------------------------------------
 
 ALTER TABLE tlayout_data DROP COLUMN no_link_color;
+ALTER TABLE tlayout_data DROP COLUMN label_color;
 
 
 
diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
old mode 100644
new mode 100755
index 7f8a66c676..615dfb4db2
--- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
+++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
@@ -8,4 +8,5 @@ ALTER TABLE tlayout DROP COLUMN fullscreen;
 -- Table `tlayout_data`
 -- ---------------------------------------------------------------------
 
-ALTER TABLE tlayout_data DROP COLUMN no_link_color;
\ No newline at end of file
+ALTER TABLE tlayout_data DROP COLUMN no_link_color;
+ALTER TABLE tlayout_data DROP COLUMN label_color;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
old mode 100644
new mode 100755
index 24e634274c..46d9a47fdd
--- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
+++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
@@ -8,4 +8,5 @@ ALTER TABLE "tlayout" DROP COLUMN "fullscreen";
 -- Table `tlayout_data`
 -- ---------------------------------------------------------------------
 
-ALTER TABLE "tlayout_data" DROP COLUMN "no_link_color";
\ No newline at end of file
+ALTER TABLE "tlayout_data" DROP COLUMN "no_link_color";
+ALTER TABLE "tlayout_data" DROP COLUMN "label_color";
\ No newline at end of file
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
old mode 100644
new mode 100755
index 734ae47c16..e9edf0a695
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -39,7 +39,6 @@ function toggle_advance_options_palette(close) {
 
 // Main function, execute in event documentReady
 function visual_map_main() {
-	$(".label_color").attachColorPicker();
 	
 	//Get the list of posible parents
 	parents = Base64.decode($("input[name='parents_load']").val());
@@ -134,8 +133,6 @@ function update_button_palette_callback() {
 		case 'static_graph':
 			$("#text_" + idItem).html(values['label']);
 			
-			$("#" + idItem).css('color', values['label_color']);
-			
 			if ((values['width'] != 0) && (values['height'] != 0)) {
 				$("#image_" + idItem).attr('width', values['width']);
 				$("#image_" + idItem).attr('height', values['height']);
@@ -169,8 +166,6 @@ function update_button_palette_callback() {
 			$("#simplevalue_" + idItem).html(getModuleValue(idItem,values['process_simple_value'], values['period']));
 			break;
 		case 'label':
-			$("#" + idItem).css('color', values['label_color']);
-			
 			$("#text_" + idItem).html(values['label']);
 			break;
 		case 'icon':
@@ -240,7 +235,6 @@ function readFields() {
 	values['height'] = $("input[name=height]").val();
 	values['parent'] = $("select[name=parent]").val();
 	values['map_linked'] = $("select[name=map_linked]").val();
-	values['label_color'] = $("input[name=label_color]").val();
 	values['width_percentile'] = $("input[name=width_percentile]").val();
 	values['max_percentile'] = $("input[name=max_percentile]").val();
 	values['width_module_graph'] = $("input[name=width_module_graph]").val();
@@ -562,7 +556,6 @@ function loadFieldsFromDB(item) {
 					if (key == 'height') $("input[name=height]").val(val);
 					if (key == 'parent_item') $("select[name=parent]").val(val);
 					if (key == 'id_layout_linked') $("select[name=map_linked]").val(val);
-					if (key == 'label_color') $("input[name=label_color]").val(val);
 					if (key == 'width_percentile') $("input[name=width_percentile]").val(val);
 					if (key == 'max_percentile') $("input[name=max_percentile]").val(val);
 					if (key == 'width_module_graph') $("input[name=width_module_graph]").val(val);
@@ -751,9 +744,6 @@ function hiddenFields(item) {
 	$("#map_linked_row").css('display', 'none');
 	$("#map_linked_row."  + item).css('display', '');
 	
-	$("#label_color_row").css('display', 'none');
-	$("#label_color_row."  + item).css('display', '');
-	
 	$("#module_graph_size_row").css('display', 'none');
 	$("#module_graph_size_row."  + item).css('display', '');
 	
@@ -771,7 +761,7 @@ function hiddenFields(item) {
 	if (typeof(enterprise_hiddenFields) == 'function') {
 		enterprise_hiddenFields(item);
 	}
-
+	
 	var code_control = tinyMCE.activeEditor.controlManager.controls['text-label_code'];
 	if (item == 'label') {
 		code_control.setDisabled(false);
@@ -798,7 +788,6 @@ function cleanFields(item) {
 	$("input[name=height]").val(0);
 	$("select[name=parent]").val('');
 	$("select[name=map_linked]").val('');
-	$("input[name=label_color]").val('#000000');
 	$("input[name=width_module_graph]").val(300);
 	$("input[name=height_module_graph]").val(180);
 	$("#preview").empty();
@@ -1213,8 +1202,7 @@ function createItem(type, values, id_data) {
 			
 			item = $('<div id="' + id_data
 				+ '" class="item ' + class_type + '" '
-				+ 'style="color: ' + values['label_color']
-				+ '; text-align: center; position: absolute; display: inline-block; '
+				+ 'style="text-align: center; position: absolute; display: inline-block; '
 				+ sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 				'<img id="image_' + id_data + '" class="image" src="' + img_src + '" ' + imageSize + ' /><br />' +
 				'<span id="text_' + id_data + '" class="text">' + values['label'] + '</span>' + 
@@ -1227,16 +1215,14 @@ function createItem(type, values, id_data) {
 			var imageSize = '';
 			
 			if (values['type_percentile'] == 'percentile') {
-				item = $('<div id="' + id_data + '" class="item percentile_item" style="color: ' + values['label_color'] + 
-						'; text-align: center; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+				item = $('<div id="' + id_data + '" class="item percentile_item" style="text-align: center; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 						'<span id="text_' + id_data + '" class="text">' + values['label'] + '</span><br />' + 
 						'<img class="image" id="image_' + id_data + '" src="' + getPercentileBar(id_data, values)  + '" />' +
 						'</div>'
 				);
 			}
 			else {
-				item = $('<div id="' + id_data + '" class="item percentile_item" style="color: ' + values['label_color'] +
-					'; text-align: center; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+				item = $('<div id="' + id_data + '" class="item percentile_item" style="text-align: center; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 						'<span id="text_' + id_data + '" class="text">' + values['label'] + '</span><br />' + 
 						'<img class="image" id="image_' + id_data + '" src="' + getPercentileBubble(id_data, values)  + '" />' +
 						'</div>'
@@ -1247,7 +1233,7 @@ function createItem(type, values, id_data) {
 			sizeStyle = '';
 			imageSize = '';
 			
-			item = $('<div id="' + id_data + '" class="item module_graph" style="color: ' + values['label_color'] + '; text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+			item = $('<div id="' + id_data + '" class="item module_graph" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 					'<span id="text_' + id_data + '" class="text">' + values['label'] + '</span><br />' +
 					'<img class="image" id="image_' + id_data + '" src="' + getModuleGraph(id_data)  + '" style="border:1px solid #808080;" />' +
 				'</div>'
@@ -1257,7 +1243,7 @@ function createItem(type, values, id_data) {
 			sizeStyle = '';
 			imageSize = '';
 			
-			item = $('<div id="' + id_data + '" class="item simple_value" style="color: ' + values['label_color'] + '; text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+			item = $('<div id="' + id_data + '" class="item simple_value" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 					'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' +
 				'</div>'
 			);
@@ -1265,7 +1251,7 @@ function createItem(type, values, id_data) {
 		case 'label':
 			item = $('<div id="' + id_data + '" ' +
 						'class="item label" ' +
-						'style="color: ' + values['label_color'] + '; text-align: left; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;"' +
+						'style="text-align: left; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;"' +
 					'>' +
 					'<span id="text_' + id_data + '" class="text">' +
 						values['label'] +
@@ -1301,7 +1287,7 @@ function createItem(type, values, id_data) {
 				}
 			});
 			
-			item = $('<div id="' + id_data + '" class="item icon" style="color: ' + values['label_color'] + '; text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+			item = $('<div id="' + id_data + '" class="item icon" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 				'<img id="image_' + id_data + '" class="image" src="' + img_src + '" ' + imageSize + ' /><br />' + 
 				'</div>'
 			);
@@ -1474,7 +1460,6 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 				$("#" + idElement).css('top', '0px').css('top', top + 'px');
 				$("#" + idElement).css('left', '0px').css('left', left + 'px');
 			}
-			$("#" + idElement).css('color', values['label_color']);
 			
 			//Update the lines
 			end_foreach = false;
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
old mode 100644
new mode 100755
index 68164a1913..1d3d2be19d
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -67,9 +67,6 @@ $table->size = array();
 $table->size['icon'] = '1%';
 $table->size[0] = '25%';
 
-$table->style = array();
-$table->style[1] = 'background-color: #ffffff;';
-
 $table->align = array();
 $table->align[0] = "left";
 $table->align[1] = "right";
@@ -162,17 +159,7 @@ foreach ($layoutDatas as $layoutData) {
 	//First row
 	
 	//Label and color label
-	if ($layoutData['type'] != ICON) {
-		$table->data[$i + 1][0] = '<span style="width: 150px; display: block;">' .
-			html_print_input_hidden('label_' . $idLayoutData, $layoutData['label'], true) .
-			'<a href="javascript: show_dialog_label_editor(' . $idLayoutData . ');">' . __('Edit label') .'</a>' .
-			html_print_input_text_extended ('label_color_' . $idLayoutData, $layoutData['label_color'], 'text-'.'label_color_' . $idLayoutData, '', 7, 7, false, '', 'style="visibility: hidden; width: 0px;" class="label_color"', true) . 
-			'</span>';
-	}
-	else {
-		//Icon haven't the label.
-		$table->data[$i + 1][0] = '';
-	}
+	$table->data[$i + 1][0] = '';
 	
 	
 	
@@ -395,9 +382,6 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
 
 <script type="text/javascript">
 	$(document).ready (function () {
-		$(".label_color").attachColorPicker();
-		//$(".ColorPickerDivSample").css('float', 'right');
-		
 		
 		tinymce.init({
 			selector: "#tinyMCE_editor",
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 1b86e7586f..f375ba1e92 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -197,7 +197,6 @@ switch ($activeTab) {
 					$values['id_agente_modulo'] = get_parameter('module_' . $id, 0);
 					$values['parent_item'] = get_parameter('parent_' . $id, 0);
 					$values['id_layout_linked'] = get_parameter('map_linked_' . $id, 0);
-					$values['label_color'] = get_parameter('label_color_' . $id, '#000000');
 					
 					if (enterprise_installed()) {
 						enterprise_visual_map_update_action_from_list_elements($type, $values);
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
old mode 100644
new mode 100755
index 825a06f859..ddbd8c9d82
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -56,7 +56,6 @@ $width = get_parameter('width', null);
 $height = get_parameter('height', null);
 $parent = get_parameter('parent', null);
 $map_linked = get_parameter('map_linked', null);
-$label_color = get_parameter('label_color', null);
 $width_percentile = get_parameter('width_percentile', null);
 $max_percentile = get_parameter('max_percentile', null);
 $height_module_graph = get_parameter('height_module_graph', null);
@@ -382,9 +381,6 @@ switch ($action) {
 				if ($map_linked !== null) {
 					$values['id_layout_linked'] = $map_linked;
 				}
-				if ($label_color !== null) {
-					$values['label_color'] = $label_color;
-				}
 				switch($type) {
 					case 'group_item':
 						$values['id_group'] = $id_group;
@@ -610,7 +606,6 @@ switch ($action) {
 		}
 		$values['id_agente_modulo'] = $id_module;
 		$values['id_layout_linked'] = $map_linked;
-		$values['label_color'] = $label_color;
 		$values['parent_item'] = $parent;
 		$values['enable_link'] = $enable_link;
 		
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 145387777a..3497fe64e2 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -59,7 +59,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 	$top = $layoutData['pos_y'];
 	$left = $layoutData['pos_x'];
 	$id = $layoutData['id'];
-	$color = $layoutData['label_color'];
 	$label = $layoutData['label'];
 	$id_module = $layoutData['id_agente_modulo'];
 	$type = $layoutData['type'];
@@ -684,8 +683,7 @@ function visual_map_process_wizard_add ($id_agents, $image, $id_layout, $range,
 			'id_agent' => $id_agent,
 			'width' => $width,
 			'period' => $period,
-			'height' => $value_height,
-			'label_color' => '#000000');
+			'height' => $value_height);
 		
 		db_process_sql_insert ('tlayout_data', $values);
 		
@@ -826,7 +824,6 @@ function visual_map_process_wizard_add_modules ($id_modules, $image, $id_layout,
 			'width' => $value_width,
 			'period' => $period,
 			'height' => $value_height,
-			'label_color' => '#000000',
 			'enable_link' => $enable_link,
 			'id_metaconsole' => $id_server,
 			'parent_item' => $parent_item);
@@ -975,7 +972,6 @@ function visual_map_process_wizard_add_agents ($id_agents, $image, $id_layout,
 			'width' => $value_width,
 			'period' => $period,
 			'height' => $value_height,
-			'label_color' => '#000000',
 			'enable_link' => $enable_link,
 			'id_metaconsole' => $id_server,
 			'parent_item' => $parent_item);
@@ -1432,9 +1428,9 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 				
 				// Draw image
 				if ($resizedMap)
-					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				else
-					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				
 				if ($show_links) {
 					if ((!empty($layout_data['id_agent'])
@@ -1604,11 +1600,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 				
 				html_print_image ($metaconsole_hack . $img, false, $img_style);
 				
-				// Print label if valid label_color (only testing for starting with #) otherwise print nothing
-				if ($layout_data['label_color'][0] == '#') {
-					echo "<br />";
-					echo io_safe_output($layout_data['label']);
-				}
 				echo "</div>";
 				
 				echo "</a>";
@@ -1619,28 +1610,19 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 			case LABEL:
 				$z_index = 4;
 				if ($resizedMap)
-					echo '<div style="left: 0px; top: 0px; text-align: left; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: left; z-index: '.$z_index.'; position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				else
-					echo '<div style="left: 0px; top: 0px; text-align: left; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: left; z-index: '.$z_index.'; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				
 				$endTagA = false;
 				if ($show_links) {
 					if ($layout_data['id_layout_linked'] > 0) {
 						// Link to a map
-						echo '<a style="' .
-							(
-								$layout_data['label_color'][0] == '#' ?
-									'color: '.$layout_data['label_color'].';'
-								:
-								''
-							) . '" href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
+						echo '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
 						$endTagA = true;
 					}
 				}
-				if ($layout_data['label_color'][0] == '#') {
-					echo "<br />";
-					echo io_safe_output($layout_data['label']);
-				}
+				
 				if ($endTagA) echo "</a>";
 				echo "</div>";
 				break;
@@ -1650,9 +1632,9 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 			case ICON:
 				$z_index = 4;
 				if ($resizedMap)
-					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				else
-					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				
 				$endTagA = false;
 				if ($show_links) {
@@ -1673,7 +1655,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 						if ($layout_data['enable_link']) {
 							$url_icon = strip_tags($matches[1]);
 							
-							echo '<a style="' . ($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '') . '" href="' . $url_icon .'">';
+							echo '<a href="' . $url_icon .'">';
 							$endTagA = true;
 						}
 					}
@@ -1682,7 +1664,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 						if ($layout_data['enable_link']) {
 							$url_icon = strip_tags($layout_data['label']);
 							
-							echo '<a style="' . ($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '') . '" href="' . $url_icon .'">';
+							echo '<a href="' . $url_icon .'">';
 							$endTagA = true;
 						}
 					}
@@ -1759,9 +1741,9 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 				$unit_text = trim(io_safe_output($unit_text));
 				
 				if ($resizedMap)
-					echo '<div style="left: 0px; top: 0px; z-index: 1; color: '.$layout_data['label_color'].'; position: absolute; margin-left: '.((integer)($proportion *$layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion *$layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; z-index: 1; position: absolute; margin-left: '.((integer)($proportion *$layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion *$layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				else
-					echo '<div style="left: 0px; top: 0px; z-index: 1; color: '.$layout_data['label_color'].'; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; z-index: 1; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				
 				$endTagA = false;
 				
@@ -1973,9 +1955,9 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 				
 				
 				if ($resizedMap)
-					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; color: '.$layout_data['label_color'].'; position: absolute; margin-left: '.((integer)($proportion *$layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion *$layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; position: absolute; margin-left: '.((integer)($proportion *$layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion *$layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				else
-					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; color: '.$layout_data['label_color'].'; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+					echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				
 				
 				//Metaconsole db connection
@@ -2149,7 +2131,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 						((integer)($proportion * $layout_data['pos_y']));
 				}
 				
-				echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; color: '.$layout_data['label_color'].'; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
+				echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
 				
 				echo io_safe_output($layout_data['label']);
 				echo "<br>";
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
old mode 100644
new mode 100755
index 39a0b364c0..35eb0b93c5
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -404,15 +404,6 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				WHERE id != ' . $visualConsole_id, 'map_linked', '', '', 'None', '0', true) .
 				'</td>';
 			
-			$form_items_advance['label_color_row'] = array();
-			$form_items_advance['label_color_row']['items'] = array(
-				'static_graph', 'percentile_bar', 'percentile_item',
-				'module_graph', 'simple_value', 'label', 'datos');
-			$form_items_advance['label_color_row']['html'] = '<td align="left">' .
-				__('Label color') . '</td>
-				<td align="left">' . html_print_input_text_extended ('label_color', '#000000', 'text-'.'label_color', '', 7, 7, false, '', 'class="label_color"', true) .
-				'</td>';
-			
 			//Insert and modify before the buttons to create or update.
 			if (enterprise_installed()) {
 				enterprise_visual_map_editor_modify_form_items_advance_palette($form_items_advance);
diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql
old mode 100644
new mode 100755
index 0815e9e22e..a97ba1e163
--- a/pandora_console/pandoradb.oracle.sql
+++ b/pandora_console/pandoradb.oracle.sql
@@ -1245,7 +1245,6 @@ CREATE TABLE tlayout_data (
 	id_agent NUMBER(10, 0) default 0 NOT NULL,
 	id_layout_linked NUMBER(10, 0) default 0 NOT NULL,
 	parent_item NUMBER(10, 0) default 0 NOT NULL,
-	label_color varchar(20) DEFAULT '',
 	enable_link NUMBER(5, 0) default 1 NOT NULL,
 	id_metaconsole NUMBER(10, 0) default 0 NOT NULL,
 	id_group NUMBER(10, 0) default 0 NOT NULL,
diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql
old mode 100644
new mode 100755
index ea657f2e8b..744c275c87
--- a/pandora_console/pandoradb.postgreSQL.sql
+++ b/pandora_console/pandoradb.postgreSQL.sql
@@ -1097,7 +1097,6 @@ CREATE TABLE "tlayout_data" (
 	"id_agent" INTEGER NOT NULL default 0,
 	"id_layout_linked" INTEGER NOT NULL default 0,
 	"parent_item" INTEGER NOT NULL default 0,
-	"label_color" varchar(20) DEFAULT '',
 	"enable_link" SMALLINT NOT NULL default 1,
 	"id_metaconsole" INTEGER NOT NULL default 0,
 	"id_group" INTEGER NOT NULL default 0,
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
old mode 100644
new mode 100755
index 7092281a43..54db5dcb75
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1185,7 +1185,6 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
 	`id_agent` int(10) unsigned NOT NULL default 0,
 	`id_layout_linked` INTEGER unsigned NOT NULL default '0',
 	`parent_item` INTEGER UNSIGNED NOT NULL default 0,
-	`label_color` varchar(20) DEFAULT "",
 	`enable_link` tinyint(1) UNSIGNED NOT NULL default 1,
 	`id_metaconsole` int(10) NOT NULL default 0,
 	`id_group` INTEGER UNSIGNED NOT NULL default 0,