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

2008-07-04 Esteban Sanchez <estebans@artica.es> 

* operation/reporting/reporting_viewer.php: Added a loading div that
        appears while the page is loading and dissapear once it's completed.

        * include/styles/pandora.css, include/styles/pandora_minimal.css,
        include/styles/pandora_width.css: Added style to loading div.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@934 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2008-07-04 10:52:27 +00:00
parent 67882ba154
commit 59d36d38d7
5 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2008-07-04 Esteban Sanchez <estebans@artica.es>
* operation/reporting/reporting_viewer.php: Added a loading div that
appears while the page is loading and dissapear once it's completed.
* include/styles/pandora.css, include/styles/pandora_minimal.css,
include/styles/pandora_width.css: Added style to loading div.
2008-07-04 Esteban Sanchez <estebans@artica.es>
* operation/reporting/reporting_viewer.php: Fixed error when showing

9
pandora_console/include/styles/pandora.css
View File

@ -730,3 +730,12 @@ div#main_pure {
.img_help {
cursor: help;
}
#loading {
position:fixed;
width: 200px;
margin-left: 250px;
text-align:center;
top:300px;
background-color: #999999;
padding: 20px;
}

9
pandora_console/include/styles/pandora_minimal.css
View File

@ -94,3 +94,12 @@ table, img {
-moz-opacity: 0.90;
opacity: 0.90;
}
#loading {
position:fixed;
width: 200px;
margin-left: 35%;
text-align:center;
top:300px;
background-color: #999999;
padding: 20px;
}

9
pandora_console/include/styles/pandora_width.css
View File

@ -719,3 +719,12 @@ div#main_pure {
.img_help {
cursor: help;
}
#loading {
position:fixed;
width: 200px;
margin-left: 35%;
text-align:center;
top:300px;
background-color: #999999;
padding: 20px;
}

10
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -79,6 +79,11 @@ print_table ($table);
print_input_hidden ('id_report', $id_report);
echo '</form>';
echo '<div id="loading">';
echo '<img src="images/wait.gif" border="0"><br />';
echo '<strong>'.lang_string ('Loading').'...</strong>';
echo '</div>';
/* We must add javascript here. Otherwise, the date picker won't
work if the date is not correct because php is returning. */
?>
@ -93,7 +98,9 @@ echo '</form>';
<script src="include/javascript/jquery.timeentry.js"></script>
<script language="javascript" type="text/javascript">
$(document).ready (function () {
$("#loading").slideUp ();
$("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
$("#text-date").datepicker ();
$.datepicker.regional["<?= $config['language'] ?>"];
@ -128,6 +135,7 @@ foreach ($contents as $content) {
$table->head = array ();
$table->style = array ();
$table->colspan = array ();
$table->rowstyle = array ();
$module_name = get_db_value ('nombre', 'tagente_modulo', 'id_agente_modulo', $content['id_agent_module']);
$agent_name = dame_nombre_agente_agentemodulo ($content['id_agent_module']);
@ -149,13 +157,13 @@ foreach ($contents as $content) {
break;
case 2:
case 'custom_graph':
$graph = get_db_row ("tgraph", "id_graph", $content['id_gs']);
$data = array ();
$data[0] = '<h4>'.lang_string ('custom_graph').'</h4>';
$data[1] = "<h4>".$graph["name"]."</h4>";
$data[2] = "<h4>".human_time_description ($content['period'])."</h4>";
array_push ($table->data, $data);
$graph = get_db_row ("tgraph", "id_graph", $content['id_gs']);
$sql2 = sprintf ('SELECT * FROM tgraph_source WHERE id_graph = %d', $content['id_gs']);
$res2 = mysql_query($sql2);
$modules = array ();