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

2013-09-30 Sergio Martin <sergio.martin@artica.es> 

* include/graphs/pChart/pPie.class.php: Fix reversed colors bug in
	3D pie graphs

	* godmode/reporting/reporting_builder.item_editor.php: Hide Server combo
	when metaconsole is not enabled.

	* include/javascript/jquery.pandora.js: Increase width of license
	dialog



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8831 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-09-30 13:24:09 +00:00
parent c5cca52494
commit d797e41d01
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2013-09-30 Sergio Martin <sergio.martin@artica.es>
* include/graphs/pChart/pPie.class.php: Fix reversed colors bug in
3D pie graphs
* godmode/reporting/reporting_builder.item_editor.php: Hide Server combo
when metaconsole is not enabled.
* include/javascript/jquery.pandora.js: Increase width of license
dialog
2013-09-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: added code for to delete the nodes

16
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -876,17 +876,20 @@ html_print_input_hidden('id_item', $idItem);
</td>
<td style="" id="sql_example"></td>
</tr>
<?php
if ($meta) {
?>
<tr id="row_servers" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Server'); ?></td>
<td style="">
<?php
if (!$meta)
html_print_select ($servers, 'combo_server', $server_name, '', __('Select server'), 0, false, false, true, '', true);
else
html_print_select ($servers, 'combo_server', $server_name, '', __('Select server'), 0);
?>
</td>
</tr>
<?php
}
?>
<tr id="row_header" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Serialized header') . ui_print_help_tip(__("The separator character is |"), true);?></td>
<td style=""><?php html_print_input_text('header', $header, '', 40, 90); ?></td>
@ -1907,18 +1910,13 @@ function chooseType() {
case 'sql_graph_pie':
$("#row_description").show();
$("#row_query").show();
$("#row_custom").show();
$("#row_custom_example").show();
$("#row_show_in_two_columns").show();
$("#row_show_in_landscape").show();
$("#row_servers").show();
break;
case 'sql_graph_hbar':
$("#row_description").show();
$("#row_query").show();
$("#row_custom").show();
$("#row_custom_example").show();
$("#row_show_in_two_columns").show();
$("#row_show_in_landscape").show();
$("#row_servers").show();
@ -1926,8 +1924,6 @@ function chooseType() {
case 'sql_graph_vbar':
$("#row_description").show();
$("#row_query").show();
$("#row_custom").show();
$("#row_custom_example").show();
$("#row_show_in_two_columns").show();
$("#row_show_in_landscape").show();
$("#row_servers").show();

3
pandora_console/include/graphs/pChart/pPie.class.php
View File

@ -316,8 +316,7 @@
$ID = count($Values)-1;
// Commented due to fix bellow
// $Values = array_reverse($Values);
$Values = array_reverse($Values);
$Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
foreach($Values as $Key => $Value)
{

2
pandora_console/include/javascript/jquery.pandora.js
View File

@ -92,7 +92,7 @@ $(document).ready (function () {
draggable: true,
modal: true,
height: 350,
width: 610,
width: 650,
overlay: {
opacity: 0.5,
background: "black"