diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 6bccd80797..e058d9120a 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -130,6 +130,11 @@ function update_button_palette_callback() {
idElement = 0;
break;
case 'box_item':
+ $("#" + idItem + " div").css('background-color', values['fill_color']);
+ $("#" + idItem + " div").css('border-color', values['border_color']);
+ $("#" + idItem + " div").css('border-width', values['border_width'] + "px");
+ $("#" + idItem + " div").css('height', values['height_box'] + "px");
+ $("#" + idItem + " div").css('width', values['width_box'] + "px");
break;
case 'group_item':
case 'static_graph':
@@ -624,12 +629,18 @@ function loadFieldsFromDB(item) {
$("input[name='width_box']").val(val);
if (key == 'height_box')
$("input[name='height_box']").val(val);
- if (key == 'border_color')
+ if (key == 'border_color') {
$("input[name='border_color']").val(val);
+ $("#border_color_row .ColorPickerDivSample")
+ .css('background-color', val);
+ }
if (key == 'border_width')
$("input[name='border_width']").val(val);
- if (key == 'fill_color')
+ if (key == 'fill_color') {
$("input[name='fill_color']").val(val);
+ $("#fill_color_row .ColorPickerDivSample")
+ .css('background-color', val);
+ }
});
if (data.type == 1) {
@@ -1191,6 +1202,29 @@ function createItem(type, values, id_data) {
switch (type) {
case 'box_item':
+ item = $(''
+ + ''
+ );
break;
case 'group_item':
case 'static_graph':
@@ -1359,7 +1393,8 @@ function createItem(type, values, id_data) {
}
$("#background").append(item);
- $(".item").css('z-index', '1');
+ $(".item").css('z-index', '2');
+ $(".box_item").css('z-index', '1');
if (values['parent'] != 0) {
var line = {"id": id_data,
@@ -1434,9 +1469,15 @@ function updateDB_visual(type, idElement , values, event, top, left) {
&& (event != 'dragstop')) {
var element_status= null;
var parameter = Array();
- parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
- parameter.push ({name: "get_element_status", value: "1"});
- parameter.push ({name: "id_element", value: idElement});
+ parameter.push ({
+ name: "page",
+ value: "include/ajax/visual_console_builder.ajax"});
+ parameter.push ({
+ name: "get_element_status",
+ value: "1"});
+ parameter.push ({
+ name: "id_element",
+ value: idElement});
if (metaconsole != 0) {
parameter.push ({name: "metaconsole", value: 1});
diff --git a/pandora_console/images/box_item.disabled.png b/pandora_console/images/box_item.disabled.png
new file mode 100755
index 0000000000..4701027fe3
Binary files /dev/null and b/pandora_console/images/box_item.disabled.png differ
diff --git a/pandora_console/images/box_item.png b/pandora_console/images/box_item.png
new file mode 100755
index 0000000000..b3bdbefe9b
Binary files /dev/null and b/pandora_console/images/box_item.png differ
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 50e8adfddd..cdf07eb622 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -389,6 +389,14 @@ switch ($action) {
$values['id_layout_linked'] = $map_linked;
}
switch($type) {
+ case 'box_item':
+ $values['border_width'] = $border_width;
+ $values['border_color'] = $border_color;
+ $values['fill_color'] = $fill_color;
+ $values['period'] = $period;
+ $values['width'] = $width_box;
+ $values['height'] = $height_box;
+ break;
case 'group_item':
$values['id_group'] = $id_group;
break;
@@ -454,8 +462,18 @@ switch ($action) {
// Don't change the label because only change the positions
unset($values['label']);
// Don't change background color in graphs when move
- if ($type == 'module_graph') {
- unset($values['image']);
+
+ switch($type) {
+ case 'module_graph':
+ unset($values['image']);
+ break;
+ case 'box_item':
+ unset($values['border_width']);
+ unset($values['border_color']);
+ unset($values['fill_color']);
+ unset($values['period']);
+ unset($values['width']);
+ unset($values['height']);
}
}
@@ -471,9 +489,13 @@ switch ($action) {
case 'load':
switch ($type) {
case 'background':
- $backgroundFields = db_get_row_filter('tlayout', array('id' => $id_visual_console), array('background', 'height', 'width'));
+ $backgroundFields = db_get_row_filter(
+ 'tlayout',
+ array('id' => $id_visual_console),
+ array('background', 'height', 'width'));
echo json_encode($backgroundFields);
break;
+ case 'box_item':
case 'percentile_bar':
case 'percentile_item':
case 'static_graph':
@@ -556,6 +578,13 @@ switch ($action) {
$elementFields['width_module_graph'] = $elementFields['width'];
$elementFields['height_module_graph'] = $elementFields['height'];
break;
+ case 'box_item':
+ $elementFields['width_box'] = $elementFields['width'];
+ $elementFields['height_box'] = $elementFields['height'];
+ $elementFields['border_color'] = $elementFields['border_color'];
+ $elementFields['border_width'] = $elementFields['border_width'];
+ $elementFields['fill_color'] = $elementFields['fill_color'];
+ break;
}
//Support for max, min and svg process on simple value items
@@ -726,10 +755,15 @@ switch ($action) {
$return['id_data'] = $idData;
$return['text'] = $text;
$return['type'] = visual_map_type_in_js($values['type']);
+
+ switch ($values['type']) {
+ case BOX_ITEM:
+ $return['values']['width_box'] = $values['width'];
+ $return['values']['height_box'] = $values['height'];
+ break;
+ }
}
- html_debug_print($return, true);
-
echo json_encode($return);
break;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 26b5163074..ff680b952e 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -2030,6 +2030,9 @@ function visual_map_type_in_js($type) {
case GROUP_ITEM:
return 'group_item';
break;
+ case BOX_ITEM:
+ return 'box_item';
+ break;
}
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 742cc6732e..b926b31e5d 100755
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -759,10 +759,10 @@ input.icon_min[disabled] {
background: #fefefe url(../../images/photo.disabled.png) no-repeat center !important;
}
input.box_item {
- background: #fefefe url(../../images/photo.png) no-repeat center !important;
+ background: #fefefe url(../../images/box_item.png) no-repeat center !important;
}
input.box_item[disabled] {
- background: #fefefe url(../../images/photo.disabled.png) no-repeat center !important;
+ background: #fefefe url(../../images/box_item.disabled.png) no-repeat center !important;
}
input.copy_item {
background: #fefefe url(../../images/copy_visualmap.png) no-repeat center !important;
diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql
index 744c275c87..20fd07b0ae 100755
--- a/pandora_console/pandoradb.postgreSQL.sql
+++ b/pandora_console/pandoradb.postgreSQL.sql
@@ -1100,7 +1100,10 @@ CREATE TABLE "tlayout_data" (
"enable_link" SMALLINT NOT NULL default 1,
"id_metaconsole" INTEGER NOT NULL default 0,
"id_group" INTEGER NOT NULL default 0,
- "id_custom_graph" INTEGER NOT NULL default 0
+ "id_custom_graph" INTEGER NOT NULL default 0,
+ "border_width" INTEGER NOT NULL default 0,
+ "border_color" varchar(200) DEFAULT "",
+ "fill_color" varchar(200) DEFAULT ""
);
-- ---------------------------------------------------------------------
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 54db5dcb75..376ae670aa 100755
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1189,6 +1189,9 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
`id_metaconsole` int(10) NOT NULL default 0,
`id_group` INTEGER UNSIGNED NOT NULL default 0,
`id_custom_graph` INTEGER UNSIGNED NOT NULL default 0,
+ `border_width` INTEGER UNSIGNED NOT NULL default 0,
+ `border_color` varchar(200) DEFAULT "",
+ `fill_color` varchar(200) DEFAULT "",
PRIMARY KEY(`id`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index c8dd19bf14..92dadb9d91 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('graph_res','5'),
('step_compact','1'),
('db_scheme_version','6.0dev'),
-('db_scheme_build','PD141120'),
+('db_scheme_build','PD141119'),
('show_unknown','0'),
('show_lastalerts','1'),
('style','pandora'),