litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1. Fix for NIHVIVO-2126

Browse source
This commit is contained in:
cdtank 2011-02-11 21:26:03 +00:00
parent 8923eaf09f
commit fb7889db10
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
productMods/images/visualization/ajax-loader-indicator.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
productMods/images/visualization/coauthorship/EgoCentric.swf
View file

Binary file not shown.

15
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
View file

@ -28,8 +28,10 @@ $(document).ready(function () {
$.blockUI.defaults.css.width = '500px'; $.blockUI.defaults.css.width = '500px';
$.blockUI.defaults.css.border = '0px'; $.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>' message: '<h3><img src="' + loadingImageLink + '" />&nbsp;Loading data for <i>${organizationLabel}</i></h3>'
}); });
@ -39,17 +41,20 @@ $(document).ready(function () {
success: function (data) { success: function (data) {
if (data.error) { if (data.error) {
$("#error-container").show();
$("#body").remove(); $("#body").remove();
$("#error-container").show();
$("div#temporal-graph-response").unblock();
} else { } else {
temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data); temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
$("#error-container").remove(); $("#error-container").remove();
$("div#temporal-graph-response").unblock();
} }
} }
}); });
// unblock when ajax activity stops // unblock when ajax activity stops
$(document).ajaxStop($("div#body").unblock());
}); });
@ -58,6 +63,8 @@ $(document).ready(function () {
<#assign currentParameterObject = grantParameter> <#assign currentParameterObject = grantParameter>
<div id="temporal-graph-response">
<#include "entityComparisonBody.ftl"> <#include "entityComparisonBody.ftl">
<#-- <#--
@ -66,3 +73,5 @@ the CSS of the #error-container is display:none; so it will be hidden unless exp
via JavaScript. via JavaScript.
--> -->
<#include "entityGrantComparisonError.ftl"> <#include "entityGrantComparisonError.ftl">
</div>

7
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
View file

@ -15,12 +15,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.google.gson.Gson; 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.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model; 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.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; 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.UtilityFunctions;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler;
/**
* @author cdtank
*
*/
public class EntityPublicationCountRequestHandler implements public class EntityPublicationCountRequestHandler implements
VisualizationRequestHandler { VisualizationRequestHandler {