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:
parent
c5cca52494
commit
d797e41d01
|
@ -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>
|
2013-09-30 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
* include/functions_agents.php: added code for to delete the nodes
|
* include/functions_agents.php: added code for to delete the nodes
|
||||||
|
|
|
@ -876,17 +876,20 @@ html_print_input_hidden('id_item', $idItem);
|
||||||
</td>
|
</td>
|
||||||
<td style="" id="sql_example"></td>
|
<td style="" id="sql_example"></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<?php
|
||||||
|
if ($meta) {
|
||||||
|
?>
|
||||||
<tr id="row_servers" style="" class="datos">
|
<tr id="row_servers" style="" class="datos">
|
||||||
<td style="vertical-align: top;"><?php echo __('Server'); ?></td>
|
<td style="vertical-align: top;"><?php echo __('Server'); ?></td>
|
||||||
<td style="">
|
<td style="">
|
||||||
<?php
|
<?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);
|
html_print_select ($servers, 'combo_server', $server_name, '', __('Select server'), 0);
|
||||||
?>
|
?>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
<tr id="row_header" style="" class="datos">
|
<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="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>
|
<td style=""><?php html_print_input_text('header', $header, '', 40, 90); ?></td>
|
||||||
|
@ -1907,18 +1910,13 @@ function chooseType() {
|
||||||
case 'sql_graph_pie':
|
case 'sql_graph_pie':
|
||||||
$("#row_description").show();
|
$("#row_description").show();
|
||||||
$("#row_query").show();
|
$("#row_query").show();
|
||||||
$("#row_custom").show();
|
|
||||||
$("#row_custom_example").show();
|
|
||||||
$("#row_show_in_two_columns").show();
|
$("#row_show_in_two_columns").show();
|
||||||
$("#row_show_in_landscape").show();
|
$("#row_show_in_landscape").show();
|
||||||
$("#row_servers").show();
|
$("#row_servers").show();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'sql_graph_hbar':
|
case 'sql_graph_hbar':
|
||||||
$("#row_description").show();
|
$("#row_description").show();
|
||||||
$("#row_query").show();
|
$("#row_query").show();
|
||||||
$("#row_custom").show();
|
|
||||||
$("#row_custom_example").show();
|
|
||||||
$("#row_show_in_two_columns").show();
|
$("#row_show_in_two_columns").show();
|
||||||
$("#row_show_in_landscape").show();
|
$("#row_show_in_landscape").show();
|
||||||
$("#row_servers").show();
|
$("#row_servers").show();
|
||||||
|
@ -1926,8 +1924,6 @@ function chooseType() {
|
||||||
case 'sql_graph_vbar':
|
case 'sql_graph_vbar':
|
||||||
$("#row_description").show();
|
$("#row_description").show();
|
||||||
$("#row_query").show();
|
$("#row_query").show();
|
||||||
$("#row_custom").show();
|
|
||||||
$("#row_custom_example").show();
|
|
||||||
$("#row_show_in_two_columns").show();
|
$("#row_show_in_two_columns").show();
|
||||||
$("#row_show_in_landscape").show();
|
$("#row_show_in_landscape").show();
|
||||||
$("#row_servers").show();
|
$("#row_servers").show();
|
||||||
|
|
|
@ -316,8 +316,7 @@
|
||||||
|
|
||||||
$ID = count($Values)-1;
|
$ID = count($Values)-1;
|
||||||
|
|
||||||
// Commented due to fix bellow
|
$Values = array_reverse($Values);
|
||||||
// $Values = array_reverse($Values);
|
|
||||||
$Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
|
$Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
|
||||||
foreach($Values as $Key => $Value)
|
foreach($Values as $Key => $Value)
|
||||||
{
|
{
|
||||||
|
|
|
@ -92,7 +92,7 @@ $(document).ready (function () {
|
||||||
draggable: true,
|
draggable: true,
|
||||||
modal: true,
|
modal: true,
|
||||||
height: 350,
|
height: 350,
|
||||||
width: 610,
|
width: 650,
|
||||||
overlay: {
|
overlay: {
|
||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
background: "black"
|
background: "black"
|
||||||
|
|
Loading…
Reference in New Issue