From 6b8959dc287f41b6db9c8ffa2c1b6cd1bfdf5f86 Mon Sep 17 00:00:00 2001
From: vgilc <noreply@pandorafms.org>
Date: Mon, 30 Apr 2012 14:54:25 +0000
Subject: [PATCH] 2012-04-30  Vanessa Gil  <vanessa.gil@artica.es>

	* operation/reporting/graph_viewer.php
	  operation/events: Fixed calendar.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6232 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                            | 5 +++++
 pandora_console/operation/events/events_list.php     | 2 +-
 pandora_console/operation/reporting/graph_viewer.php | 7 ++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index dde068fc81..2f168636d1 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-30  Vanessa Gil  <vanessa.gil@artica.es>
+
+	* operation/reporting/graph_viewer.php
+	  operation/events: Fixed calendar.
+
 2012-04-30  Vanessa Gil  <vanessa.gil@artica.es>
 
 	* operation/agentes/datos_agente.php: Fixed: bad layout in view data and
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 8817bbf593..e06dd7b85a 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -609,7 +609,7 @@ if ($i != 0) {
 	$table->align[$i] = 'center';
 	$table->size[$i] = '80px';
 	$i++;
-	if (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1) {
+	if (check_acl ($config["id_user"], 0, "IW") == 1) {
 		$table->head[$i] = html_print_checkbox ("allbox", "1", false, true);
 		$table->align[$i] = 'center';
 	}
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index adc9488c78..b5b0da3465 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -177,9 +177,6 @@ if ($view_graph) {
 	/* We must add javascript here. Otherwise, the date picker won't 
    work if the date is not correct because php is returning. */
 
-	ui_require_css_file ('datepicker');
-	ui_require_jquery_file ('ui.core');
-	ui_require_jquery_file ('ui.datepicker');
 	ui_require_jquery_file ('timeentry');
 	?>
 	<script language="javascript" type="text/javascript">
@@ -187,8 +184,8 @@ if ($view_graph) {
 	$(document).ready (function () {
 		$("#loading").slideUp ();
 		$("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
-		$("#text-date").datepicker ();
-		$.datepicker.regional["<?php echo $config['language']; ?>"];
+		$.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
+		$("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
 	});
 	</script>