From f0e93c468b00364d0069d6ce4571cbd11b78ee31 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 8 Mar 2011 15:44:10 +0000 Subject: [PATCH] NIHVIVO-1384 Change script and stylesheet template objects to take the entire tag as a parameter, rather than just the src/href attribute. --- productMods/WEB-INF/web.xml | 21 +------- .../individual/individual--foaf-person.ftl | 26 +++++---- .../freemarker/body/individual/individual.ftl | 7 ++- .../menupage/menupage--classgroup-people.ftl | 5 +- .../individual-visualizationFoafPerson.ftl | 10 ++-- .../body/personHasEducationalTraining.ftl | 12 +++-- .../coAuthorshipStandaloneActivator.ftl | 5 +- .../coInvestigationStandaloneActivator.ftl | 5 +- .../visualization/dummyVisClient.ftl | 4 +- .../entityComparisonSetup.ftl | 54 ++++++------------- .../personGrantCountStandaloneActivator.ftl | 5 +- .../personlevel/coAuthorPersonLevel.ftl | 11 ++-- .../personlevel/coPIPersonLevel.ftl | 10 ++-- ...sonPublicationCountStandaloneActivator.ftl | 3 +- 14 files changed, 62 insertions(+), 116 deletions(-) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index 8b4bed3f..7fe92b77 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -983,7 +983,7 @@ SearchController - edu.cornell.mannlib.vitro.webapp.search.controller.FreemarkerPagedSearchController + edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController SearchController @@ -1100,25 +1100,6 @@ HomePageController /home - - - - - EntityMergedPropertyListController - edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController - - - EntityMergedPropertyListController - /entityMergedPropList - DashboardPropertyListController diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 0e4ab9d6..d50c6f28 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -140,17 +140,15 @@ <#-- Ontology properties --> <#include "individual-properties.ftl"> -${stylesheets.add("/css/individual/individual.css")} -${stylesheets.add("/css/individual/individual-vivo.css")} - -<#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> -${headScripts.add("/js/jquery_plugins/getURLParam.js", - "/js/jquery_plugins/colorAnimations.js", - "/js/jquery_plugins/jquery.form.js", - "/js/tiny_mce/tiny_mce.js", - "/js/controls.js", - "/js/toggle.js", - "/js/jquery_plugins/jquery.truncator.js")} - -${scripts.add("/js/imageUpload/imageUploadUtils.js")} -${scripts.add("/js/individual/individualUtils.js")} +${stylesheets.add('', + '')} + +${headScripts.add('', + '', + '', + '', + '', + '', + '')} + +${scripts.add('')} diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index b6ea87d9..1ff67185 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -15,8 +15,7 @@ <#include "individual-vitro.ftl"> -${stylesheets.add("/css/individual/individual-vivo.css")} +${stylesheets.add('')} -${headScripts.add("/js/jquery_plugins/jquery.truncator.js")} - -${scripts.add("/js/individual/individualUtils.js")} \ No newline at end of file +${headScripts.add('')} +${scripts.add('')} diff --git a/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl b/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl index db62e535..df593a94 100644 --- a/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl +++ b/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl @@ -25,11 +25,12 @@ <#include "menupage-browse.ftl"> - ${stylesheets.add("/css/menupage/menupage.css")} + ${stylesheets.add('')} <#include "menupage-scripts.ftl"> - ${scripts.add("/js/menupage/browseByVClassPeople.js")} + ${scripts.add('')} + <#else> ${noDataNotification} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl index 5385ca7c..586eaeb6 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl @@ -11,8 +11,8 @@ p.hasStatements(propertyGroups, "${core}hasCo-PrincipalInvestigatorRole") ) > <#if (isAuthor || isInvestigator)> - - ${stylesheets.add("css/visualization/visualization.css")} + + ${stylesheets.add('')} <#assign standardVisualizationURLRoot ="/visualization">
@@ -34,9 +34,9 @@
Co-Author Network
- ${scripts.add(googleJSAPI)} - ${scripts.add("js/visualization/visualization-helper-functions.js")} - ${scripts.add("/js/visualization/sparkline.js")} + ${scripts.add('', + '', + '')} ', + '', + '')} + \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl index aa1c16e8..d6f10275 100644 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl @@ -1,9 +1,8 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#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%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> -<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> -${headScripts.add(googleJSAPI)} -${scripts.add(visualizationHelperJavaScript)} +${headScripts.add('')} +${scripts.add('')} <#include "coAuthorshipSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl index 3e7d8cb2..48cfafb7 100644 --- a/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl @@ -1,9 +1,8 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#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%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> -<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> -${headScripts.add(googleJSAPI)} -${scripts.add(visualizationHelperJavaScript)} +${headScripts.add('')} +${scripts.add('')} <#include "coInvestigationSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/dummyVisClient.ftl b/productMods/templates/freemarker/visualization/dummyVisClient.ftl index 4bc614b1..ffd790b0 100644 --- a/productMods/templates/freemarker/visualization/dummyVisClient.ftl +++ b/productMods/templates/freemarker/visualization/dummyVisClient.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -${headScripts.add("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js")} -${headScripts.add("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")} +${headScripts.add('', + '')} This is Dummy Vis Client. For Real! Really Re! diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index 2b25320e..f785be3d 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -41,48 +41,26 @@ build version is stable enough. If in next couple of days we feel that there are we will default to using the stable version unless the request comes from IE 9 in which case we will use rev 293 (dev build version) of the flot & excanvas files. --> -<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js'> -<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js'> - -<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> -<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> -<#assign jqueryBlockUI = 'js/jquery_plugins/jquery.blockUI.min.js'> -<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js'> -<#assign datatable = 'js/jquery_plugins/jquery.dataTables.min.js'> -<#assign entityComparisonUtils = 'js/visualization/entitycomparison/util.js'> -<#assign entityComparisonConstants = 'js/visualization/entitycomparison/constants.js'> -<#assign guiEventManager = 'js/visualization/entitycomparison/gui-event-manager.js'> - - - - -${scripts.add(flot)} -${scripts.add(fliptext)} -${scripts.add(jqueryBlockUI)} -${scripts.add(jqueryUI)} -${scripts.add(datatable)} -${scripts.add(entityComparisonUtils)} -${scripts.add(entityComparisonConstants)} -${scripts.add(jqueryNotify)} + +${scripts.add('', + '', + '', + '', + '', + '', + '')} <#-- CSS files --> -<#assign demoTable = "js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> -<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" /> -<#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> -<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> -<#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> -<#assign entityComparisonStyleIE_6_7_Hack = "${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" /> -<#assign vizStyle = "css/visualization/visualization.css" /> +${stylesheets.add('', + '', + '', + '', + '')} -${stylesheets.add(jqueryUIStyle)} -${stylesheets.add(demoTable)} -${stylesheets.add(entityComparisonStyle)} -${stylesheets.add(vizStyle)} -${stylesheets.add(jqueryNotifyStyle)} - - + + <#-- variables passed from server-side code --> -${headScripts.add(guiEventManager)} \ No newline at end of file +${scripts.add('')} diff --git a/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl index b68156d7..c1f06a87 100644 --- a/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl @@ -1,9 +1,8 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#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%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> -<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> -${headScripts.add(googleJSAPI)} -${scripts.add(visualizationHelperJavaScript)} +${headScripts.add('')} +${scripts.add('')} <#include "personGrantSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl index d3c4d187..0272f96d 100644 --- a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl +++ b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl @@ -17,7 +17,6 @@ <#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 coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> -<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> <#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'> @@ -53,14 +52,10 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}"; -${scripts.add(visualizationHelperJavaScript)} +${scripts.add('')} - -<#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" /> -<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" /> - - - +${stylesheets.add('', + '')} <#assign loadingImageLink = "${urls.images}/visualization/ajax-loader.gif"> diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl index 46dca49d..dd9a38b8 100644 --- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl +++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl @@ -19,7 +19,6 @@ <#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 coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> -<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> @@ -52,13 +51,10 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}"; -${scripts.add(visualizationHelperJavaScript)} +${scripts.add('')} -<#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" /> -<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" /> - - - +${stylesheets.add('', + '')} <#assign loadingImageLink = "${urls.images}/visualization/ajax-loader.gif"> diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl index 49a7c345..7a863dad 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl @@ -1,9 +1,8 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#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%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> -<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> ${headScripts.add(googleJSAPI)} -${scripts.add(visualizationHelperJavaScript)} +${scripts.add('')} <#include "personPublicationSparklineContent.ftl"> \ No newline at end of file