tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-01-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/reporting/visual_console_builder.editor.js
	 godmode/reporting/visual_console_builder.editor.php: Added optional 
	 grid in visual console editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-01-30 12:40:01 +00:00
parent 8f0066dc89
commit abb14c3120
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-01-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/visual_console_builder.editor.js
godmode/reporting/visual_console_builder.editor.php: Added optional
grid in visual console editor.
2012-01-27 Vanessa Gil <vanessa.gil@artica.es>
* extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql

28
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -396,6 +396,7 @@ function actionClick() {
activeToolboxButton('edit_item', false);
activeToolboxButton('delete_item', false);
activeToolboxButton('show_grid', false);
if (creationItem != null) {
//Create a item
@ -1163,6 +1164,7 @@ function eventsItems() {
idItem = $(divParent).attr('id');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', true);
activeToolboxButton('show_grid', false);
}
if ($(divParent).hasClass('percentile_bar')) {
creationItem = null;
@ -1170,6 +1172,7 @@ function eventsItems() {
idItem = $(divParent).attr('id');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', true);
activeToolboxButton('show_grid', false);
}
if ($(divParent).hasClass('module_graph')) {
creationItem = null;
@ -1177,6 +1180,7 @@ function eventsItems() {
idItem = $(divParent).attr('id');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', true);
activeToolboxButton('show_grid', false);
}
if ($(divParent).hasClass('simple_value')) {
creationItem = null;
@ -1184,6 +1188,7 @@ function eventsItems() {
idItem = $(divParent).attr('id');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', true);
activeToolboxButton('show_grid', false);
}
if ($(divParent).hasClass('label')) {
creationItem = null;
@ -1191,6 +1196,7 @@ function eventsItems() {
idItem = $(divParent).attr('id');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', true);
activeToolboxButton('show_grid', false);
}
if ($(divParent).hasClass('icon')) {
creationItem = null;
@ -1198,6 +1204,7 @@ function eventsItems() {
idItem = $(divParent).attr('id');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', true);
activeToolboxButton('show_grid', false);
}
}
});
@ -1329,6 +1336,9 @@ function eventsBackground() {
original_height = ui.originalSize['height'];
move_elements_resize(original_width, original_height, width, height);
$('#background_grid').css('width', width);
$('#background_grid').css('height', height);
}
});
@ -1340,6 +1350,7 @@ function eventsBackground() {
$("#background").css('border', '2px blue dotted');
activeToolboxButton('edit_item', true);
activeToolboxButton('delete_item', false);
activeToolboxButton('show_grid', true);
idItem = 0;
creationItem = null;
@ -1393,6 +1404,9 @@ function click2(id) {
case 'delete_item':
deleteItem();
break;
case 'show_grid':
showGrid();
break;
}
}
@ -1459,3 +1473,17 @@ function showPreviewIcon(icon) {
});
}
}
function showGrid() {
var display = $("#background_grid").css('display');
if (display == 'none'){
$("#background_grid").css('display', '');
$("#background_img").css('opacity', '0.55');
$("#background_img").css('filter', 'alpha(opacity=55)');
$("#background_grid").css('background', 'url("images/console/background/white_boxed.jpg")');
}else{
$("#background_grid").css('display', 'none');
$("#background_img").css('opacity', '1');
$("#background_img").css('filter', 'alpha(opacity=100)');
}
}

3
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -68,6 +68,7 @@ echo '<div id="editor" style="margin-top: -10px;">';
visual_map_print_button_editor('label', __('Label'), 'left', false, 'label_min', true);
visual_map_print_button_editor('icon', __('Icon'), 'left', false, 'icon_min', true);
visual_map_print_button_editor('show_grid', __('Show grid'), 'right', true, 'grid_min', true);
visual_map_print_button_editor('edit_item', __('Edit item'), 'right', true, 'config_min', true);
visual_map_print_button_editor('delete_item', __('Delete item'), 'right', true, 'delete_min', true);
echo '</div>';
@ -264,6 +265,8 @@ echo '<div id="frame_view" style="width: 100%; height: 500px; overflow: scroll;"
// border: 2px black solid; width: ' . $widthBackground . 'px; height: ' . $heightBackground . 'px;">';
echo '<div id="background" class="ui-widget-content" style="
border: 2px black solid; width: ' . $widthBackground . 'px; height: ' . $heightBackground . 'px;">';
//echo "<img style='opacity:.5' id='background_img' src='images/console/background/white_boxed.jpg' width='100%' height='100%' />";
echo "<div id='background_grid' style='position:absolute; display:none; overflow:none; background:url(images/console/background/white_boxed.jpg) x-repeat y-repeat; width: " . $widthBackground . "px; height: " . $heightBackground . "px;'></div>"; //<img id='background_grid' style='display:none' src='images/console/background/white_boxed.jpg' width='100%' height='100%' /></div>";
echo "<img id='background_img' src='images/console/background/" . $background . "' width='100%' height='100%' />";
foreach ($layoutDatas as $layoutData) {