From 51e424e99376109f004e8c12c1c65827332b1b95 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 11 Feb 2011 22:46:12 +0000
Subject: [PATCH] 1. Minor improvement in the "loading..." mechanism for
 temporal graoh vis.

---
 productMods/css/visualization/entitycomparison/layout.css  | 4 ++++
 .../entityComparisonOnGrantsStandalone.ftl                 | 7 ++-----
 .../entityComparisonOnPublicationsStandalone.ftl           | 6 ++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css
index 3b6921ee..3bc807ad 100644
--- a/productMods/css/visualization/entitycomparison/layout.css
+++ b/productMods/css/visualization/entitycomparison/layout.css
@@ -9,6 +9,10 @@
     overflow: hidden;
 }
 
+#body {
+    display: none;
+}
+
 #error-container {
     display: none;
 }
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
index 2a55dd91..016084d5 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
@@ -29,7 +29,6 @@ $(document).ready(function () {
     $.blockUI.defaults.css.width = '500px';
     $.blockUI.defaults.css.border = '0px';
     $.blockUI.defaults.css.top = '15%';
-     
     
     $("div#temporal-graph-response").block({
         message: '<h3><img src="' + loadingImageLink + '" />&nbsp;Loading data for <i>${organizationLabel}</i></h3>'
@@ -46,15 +45,13 @@ $(document).ready(function () {
                 $("div#temporal-graph-response").unblock();
                 
             } else {
-                temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
+                $("#body").show();
                 $("#error-container").remove();
+                temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
                 $("div#temporal-graph-response").unblock();
             }
         }
     });
-    
-
-    // unblock when ajax activity stops    
 
 });
 
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
index c23ec40f..5ecbbe84 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
@@ -45,16 +45,14 @@ $(document).ready(function () {
                 $("div#temporal-graph-response").unblock();
                 
             } else {
-                temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
+                $("#body").show();
                 $("#error-container").remove();
+                temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
                 $("div#temporal-graph-response").unblock();
             }
         }
     });
 
-    // unblock when ajax activity stops    
-    //$(document).ajaxStop($("div#temporal-graph-response").unblock());
-
 });
 
 // -->