From c7b9c208ef99263cfa84840492166171ed9e7674 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 12 Jan 2011 19:59:20 +0000
Subject: [PATCH] 1. Made changes to the URLs in the repository to use
 /visualization instead of /visualizationfm

---
 .../js/visualization/entitycomparison/util.js |  2 +-
 .../individual-sparklineVisualization.ftl     |  2 +-
 .../visualization/dummyVisClient.ftl          |  2 +-
 .../entityComparisonStandaloneActivator.ftl   |  2 +-
 .../personlevel/coAuthorPersonLevel.ftl       |  2 +-
 .../personlevel/coPIPersonLevel.ftl           |  2 +-
 .../personlevel/personLevelInjectHead.ftl     | 53 -------------------
 .../VisualizationFrameworkConstants.java      |  2 +-
 8 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl

diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js
index 781200a4..714051fc 100644
--- a/productMods/js/visualization/entitycomparison/util.js
+++ b/productMods/js/visualization/entitycomparison/util.js
@@ -474,7 +474,7 @@ function getTemporalVisURL(entity) {
 function getVIVOProfileURL(given_uri) {
 	
 	finalURL = $.ajax({
-		url: contextPath + "/visualizationfm",
+		url: contextPath + "/visualization",
 		data: ({vis: "utilities", vis_mode: "PROFILE_URL", uri: given_uri}),
 		dataType: "text",
 		async: false,
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
index 65ced6dd..bcba8680 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
@@ -6,7 +6,7 @@
 
 <#assign coAuthorIcon = '${urls.images}/visualization/co_author_icon.png'>
 <#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'>
-<#assign standardVisualizationURLRoot ="/visualizationfm">
+<#assign standardVisualizationURLRoot ="/visualization">
 <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D'>
 <#assign coAuthorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=coauthor'>
 <#assign coInvestigatorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=copi'>
diff --git a/productMods/templates/freemarker/visualization/dummyVisClient.ftl b/productMods/templates/freemarker/visualization/dummyVisClient.ftl
index a31dcd73..4bc614b1 100644
--- a/productMods/templates/freemarker/visualization/dummyVisClient.ftl
+++ b/productMods/templates/freemarker/visualization/dummyVisClient.ftl
@@ -12,7 +12,7 @@ ${urls.base}
 <#assign loadingImageLink = '/${themeDir}site_icons/visualization/ajax-loader.gif'>
 
 <#assign uri="http://vivo-trunk.indiana.edu/individual/n6079">
-<#assign testURL = '${urls.base}/visualizationfm?vis=person_pub_count&container=ajax_recipient&render_mode=dynamic&vis_mode=wth&uri=${uri?url}'>
+<#assign testURL = '${urls.base}/visualization?vis=person_pub_count&container=ajax_recipient&render_mode=dynamic&vis_mode=wth&uri=${uri?url}'>
 
 <style type="text/css">
 	.get_vis {
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
index 78d170a2..b2082105 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#assign standardVisualizationURLRoot ="/visualizationfm">
+<#assign standardVisualizationURLRoot ="/visualization">
 <#assign ajaxVisualizationURLRoot ="/visualizationAjax">
 <#assign dataVisualizationURLRoot ="/visualizationData">
 
diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
index c684c32f..501739e5 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#assign standardVisualizationURLRoot ="/visualizationfm">
+<#assign standardVisualizationURLRoot ="/visualization">
 <#assign ajaxVisualizationURLRoot ="/visualizationAjax">
 <#assign dataVisualizationURLRoot ="/visualizationData">
 
diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
index 3caffdbc..1b1cdc36 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#assign standardVisualizationURLRoot ="/visualizationfm">
+<#assign standardVisualizationURLRoot ="/visualization">
 <#assign ajaxVisualizationURLRoot ="/visualizationAjax">
 <#assign dataVisualizationURLRoot ="/visualizationData">
 
diff --git a/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl b/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl
deleted file mode 100644
index d033a7a6..00000000
--- a/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl
+++ /dev/null
@@ -1,53 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#assign standardVisualizationURLRoot ="/visualizationfm">
-<#assign ajaxVisualizationURLRoot ="/visualizationAjax">
-<#assign dataVisualizationURLRoot ="/visualizationData">
-<#assign egoURI ="${egoURIParam?url}">
-<#assign egoCoAuthorshipDataFeederURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&labelField=label'>
-<#assign egoCoPIDataFeederURL = '${urls.base}${dataVisualizationURLRoot}?vis=coprincipalinvestigator&uri=${egoURI}&labelField=label'>
-<#assign egoCoAuthorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=person_level&uri=${egoURI}&vis_mode=coauthors'>
-<#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'>
-<#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'>
-<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
-<#assign coAuthorShipJavaScript = '${urls.base}/js/visualization/personlevel/person_level.js'>
-
-
-<script type="text/javascript" src="${adobeFlashDetector}"></script>
-<script type="text/javascript" src="${jquery}"></script>
-<script type="text/javascript" src="${googleVisualizationAPI}"></script>
-
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Globals
-// Major version of Flash required
-var requiredMajorVersion = 10;
-// Minor version of Flash required
-var requiredMinorVersion = 0;
-// Minor version of Flash required
-var requiredRevision = 0;
-// -----------------------------------------------------------------------------
-
-
-var swfLink = "${swfLink}";
-var egoURI = "${egoURI}";
-var egoCoAuthorshipDataFeederURL = "${egoCoAuthorshipDataFeederURL}";
-var egoCoAuthorsListDataFileURL = "${egoCoAuthorsListDataFileURL}";
-var egoCoPIDataFeederURL = "${egoCoPIDataFeederURL}";
-var domainParam = "${completeURL}";
-var visMode = "${visMode}";
-
-// -->
-</script>
-
-<script type="text/javascript" src="${coAuthorShipJavaScript}"></script>
-
-
-<c:url var="coAuthorStyle" value="/${themeDir}css/visualization/personlevel/coauthor_style.css" />
-<c:url var="pageStyle" value="/${themeDir}css/visualization/personlevel/page.css" />
-<c:url var="vizStyle" value="/${themeDir}css/visualization/visualization.css" />
-
-<link href="${coAuthorStyle}" rel="stylesheet" type="text/css" />
-<link href="${pageStyle}" rel="stylesheet" type="text/css" />
-<link rel="stylesheet" type="text/css" href="${vizStyle}" />
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java
index c4176367..ff799464 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java
@@ -24,7 +24,7 @@ public class VisualizationFrameworkConstants {
 	 * Vis URL prefix that is seen by all the users
 	 */
 	public static final String VISUALIZATION_URL_PREFIX = "/visualization";
-	public static final String FREEMARKERIZED_VISUALIZATION_URL_PREFIX = "/visualizationfm";
+	public static final String FREEMARKERIZED_VISUALIZATION_URL_PREFIX = "/visualization";
 	public static final String AJAX_VISUALIZATION_SERVICE_URL_PREFIX = "/visualizationAjax";
 	public static final String DATA_VISUALIZATION_SERVICE_URL_PREFIX = "/visualizationData";