diff --git a/productMods/images/visualization/ajax-loader-indicator.gif b/productMods/images/visualization/ajax-loader-indicator.gif
new file mode 100644
index 00000000..5b33f7e5
Binary files /dev/null and b/productMods/images/visualization/ajax-loader-indicator.gif differ
diff --git a/productMods/images/visualization/coauthorship/EgoCentric.swf b/productMods/images/visualization/coauthorship/EgoCentric.swf
index f9487cc9..cd8f8941 100644
Binary files a/productMods/images/visualization/coauthorship/EgoCentric.swf and b/productMods/images/visualization/coauthorship/EgoCentric.swf differ
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
index e699811e..2a55dd91 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
+++ b/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: '
Loading data for ${organizationLabel}
'
});
@@ -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>
+
+
<#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">
\ No newline at end of file
+<#include "entityGrantComparisonError.ftl">
+
+
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
index 116212a2..cce0ae42 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
@@ -15,12 +15,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.google.gson.Gson;
-import com.hp.hpl.jena.iri.IRI;
-import com.hp.hpl.jena.iri.IRIFactory;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
-import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
@@ -36,10 +33,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryR
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler;
-/**
- * @author cdtank
- *
- */
public class EntityPublicationCountRequestHandler implements
VisualizationRequestHandler {