1. Fix for NIHVIVO-2126

productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl

@@ -28,8 +28,10 @@ $(document).ready(function () {
     
     $.blockUI.defaults.css.width = '500px';
     $.blockUI.defaults.css.border = '0px';
+    $.blockUI.defaults.css.top = '15%';
      
-    $("div#body").block({
+    
+    $("div#temporal-graph-response").block({
         message: '<h3><img src="' + loadingImageLink + '" />&nbsp;Loading data for <i>${organizationLabel}</i></h3>'
     });
 
@@ -39,17 +41,20 @@ $(document).ready(function () {
         success: function (data) {
 
             if (data.error) {
-                $("#error-container").show();
                 $("#body").remove();
+                $("#error-container").show();
+                $("div#temporal-graph-response").unblock();
+                
             } else {
                 temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
                 $("#error-container").remove();
+                $("div#temporal-graph-response").unblock();
             }
         }
     });
+    
 
     // unblock when ajax activity stops    
-    $(document).ajaxStop($("div#body").unblock());
 
 });
 
@@ -58,6 +63,8 @@ $(document).ready(function () {
 
 <#assign currentParameterObject = grantParameter>
 
+<div id="temporal-graph-response">
+
 <#include "entityComparisonBody.ftl">
 
 <#-- 
@@ -65,4 +72,6 @@ Right now we include the error message by default becuae currently I could not d
 the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in 
 via JavaScript.
 -->
-<#include "entityGrantComparisonError.ftl">
+<#include "entityGrantComparisonError.ftl">
+
+</div>