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

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
This commit is contained in:
vgilc 2012-04-30 14:54:25 +00:00
parent 4bb6c612dd
commit 6b8959dc28
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -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> 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/datos_agente.php: Fixed: bad layout in view data and * operation/agentes/datos_agente.php: Fixed: bad layout in view data and

2
pandora_console/operation/events/events_list.php
View File

@ -609,7 +609,7 @@ if ($i != 0) {
$table->align[$i] = 'center'; $table->align[$i] = 'center';
$table->size[$i] = '80px'; $table->size[$i] = '80px';
$i++; $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->head[$i] = html_print_checkbox ("allbox", "1", false, true);
$table->align[$i] = 'center'; $table->align[$i] = 'center';
} }

7
pandora_console/operation/reporting/graph_viewer.php
View File

@ -177,9 +177,6 @@ if ($view_graph) {
/* We must add javascript here. Otherwise, the date picker won't /* We must add javascript here. Otherwise, the date picker won't
work if the date is not correct because php is returning. */ 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'); ui_require_jquery_file ('timeentry');
?> ?>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
@ -187,8 +184,8 @@ if ($view_graph) {
$(document).ready (function () { $(document).ready (function () {
$("#loading").slideUp (); $("#loading").slideUp ();
$("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]}); $("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
$("#text-date").datepicker (); $.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
$.datepicker.regional["<?php echo $config['language']; ?>"]; $("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
}); });
</script> </script>