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

NIHVIVO-1384 Change script and stylesheet template objects to take the entire tag as a parameter, rather than just the src/href attribute.

Browse source
This commit is contained in:
rjy7 2011-03-08 15:44:10 +00:00
parent 2031249e23
commit f0e93c468b
14 changed files with 62 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
productMods/WEB-INF/web.xml
View file

@ -983,7 +983,7 @@
<servlet>
<servlet-name>SearchController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.FreemarkerPagedSearchController</servlet-class>
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SearchController</servlet-name>
@ -1101,25 +1101,6 @@
<url-pattern>/home</url-pattern>
</servlet-mapping>
<!-- <servlet>
<servlet-name>EntityPropertyListController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>EntityPropertyListController</servlet-name>
<url-pattern>/entityPropList</url-pattern>
</servlet-mapping>
-->
<servlet>
<servlet-name>EntityMergedPropertyListController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>EntityMergedPropertyListController</servlet-name>
<url-pattern>/entityMergedPropList</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>DashboardPropertyListController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.DashboardPropertyListController</servlet-class>

22
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -140,17 +140,15 @@
<#-- Ontology properties -->
<#include "individual-properties.ftl">
${stylesheets.add("/css/individual/individual.css")}
${stylesheets.add("/css/individual/individual-vivo.css")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
'<link rel="stylesheet" href="${urls.base}/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")}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/getURLParam.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/colorAnimations.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.form.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/controls.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/toggle.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
${scripts.add("/js/individual/individualUtils.js")}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}

7
productMods/templates/freemarker/body/individual/individual.ftl
View file

@ -15,8 +15,7 @@
<#include "individual-vitro.ftl">
${stylesheets.add("/css/individual/individual-vivo.css")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />')}
${headScripts.add("/js/jquery_plugins/jquery.truncator.js")}
${scripts.add("/js/individual/individualUtils.js")}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')}

5
productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
View file

@ -25,11 +25,12 @@
<#include "menupage-browse.ftl">
${stylesheets.add("/css/menupage/menupage.css")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menupage.css" />')}
<#include "menupage-scripts.ftl">
${scripts.add("/js/menupage/browseByVClassPeople.js")}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/browseByVClassPeople.js"></script>')}
<#else>
${noDataNotification}
</#if>

8
productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
View file

@ -12,7 +12,7 @@
<#if (isAuthor || isInvestigator)>
${stylesheets.add("css/visualization/visualization.css")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/visualization/visualization.css" />')}
<#assign standardVisualizationURLRoot ="/visualization">
<section id="visualization" role="region">
@ -34,9 +34,9 @@
<div class="collaboratorship-link"><a href="${coAuthorVisUrl}">Co-Author Network</a></div>
</div>
${scripts.add(googleJSAPI)}
${scripts.add("js/visualization/visualization-helper-functions.js")}
${scripts.add("/js/visualization/sparkline.js")}
${scripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>',
'<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/visualization/sparkline.js"></script>')}
<script type="text/javascript">
var visualizationUrl = '${urls.base}/visualizationAjax?uri=${individual.uri?url}';

12
productMods/templates/freemarker/body/personHasEducationalTraining.ftl
View file

@ -99,11 +99,13 @@ var customFormData = {
</div>
${stylesheets.add("/edit/forms/css/customForm.css",
"/edit/forms/css/personHasEducationalTraining.css")}
${scripts.add("/js/utils.js",
"/js/customFormUtils.js",
"/edit/forms/js/customFormWithAutocomplete.js")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />',
'<link rel="stylesheet" href="${urls.base}/edit/forms/css/personHasEducationalTraining.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}

5
productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
View file

@ -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('<script type="text/javascript" src="${googleJSAPI}"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}
<#include "coAuthorshipSparklineContent.ftl">

5
productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
View file

@ -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('<script type="text/javascript" src="${googleJSAPI}"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}
<#include "coInvestigationSparklineContent.ftl">

4
productMods/templates/freemarker/visualization/dummyVisClient.ftl
View file

@ -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('<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>',
'<script type="text/javascript" src="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"></script>')}
This is Dummy Vis Client. For Real!
Really Re!

54
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
View file

@ -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'>
<!--[if IE]><script type="text/javascript" src="${excanvas}"></script><![endif]-->
${scripts.add(flot)}
${scripts.add(fliptext)}
${scripts.add(jqueryBlockUI)}
${scripts.add(jqueryUI)}
${scripts.add(datatable)}
${scripts.add(entityComparisonUtils)}
${scripts.add(entityComparisonConstants)}
${scripts.add(jqueryNotify)}
<!--[if IE]><script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js"></script><![endif]-->
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.blockUI.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.dataTables.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/util.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/constants.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.notify.min.js"></script>')}
<#-- 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('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />',
'<link rel="stylesheet" href="${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" />',
'<link rel="stylesheet" href="${urls.base}/css/visualization/entitycomparison/layout.css" />',
'<link rel="stylesheet" href="${urls.base}/css/visualization/visualization.css" />',
'<link rel="stylesheet" href="${urls.base}/css/jquery_plugins/ui.notify.css" />')}
${stylesheets.add(jqueryUIStyle)}
${stylesheets.add(demoTable)}
${stylesheets.add(entityComparisonStyle)}
${stylesheets.add(vizStyle)}
${stylesheets.add(jqueryNotifyStyle)}
<!--[if IE]><link href="${entityComparisonStyleIEHack}" rel="stylesheet" type="text/css" /><![endif]-->
<!--[if lt IE 8]><link href="${entityComparisonStyleIE_6_7_Hack}" rel="stylesheet" type="text/css" /><![endif]-->
<!--[if IE]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie.css" rel="stylesheet" type="text/css" /><![endif]-->
<!--[if lt IE 8]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" rel="stylesheet" type="text/css" /><![endif]-->
<#-- variables passed from server-side code -->
<script language="JavaScript" type="text/javascript">
@ -122,4 +100,4 @@ var COMPARISON_PARAMETERS_INFO = {
</script>
${headScripts.add(guiEventManager)}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/gui-event-manager.js"></script>')}

5
productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
View file

@ -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('<script type="text/javascript" src="${googleJSAPI}"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}
<#include "personGrantSparklineContent.ftl">

11
productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
View file

@ -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}";
<script type="text/javascript" src="${coAuthorPersonLevelJavaScript}"></script>
<script type="text/javascript" src="${commonPersonLevelJavaScript}"></script>
${scripts.add(visualizationHelperJavaScript)}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}
<#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" />
<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" />
<link href="${pageStyle}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="${vizStyle}" />
${stylesheets.add('<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/personlevel/page.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/visualization.css" />')}
<#assign loadingImageLink = "${urls.images}/visualization/ajax-loader.gif">

10
productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
View file

@ -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'>
<script type="text/javascript" src="${adobeFlashDetector}"></script>
<script type="text/javascript" src="${googleVisualizationAPI}"></script>
@ -52,13 +51,10 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}";
<script type="text/javascript" src="${coInvestigatorPersonLevelJavaScript}"></script>
<script type="text/javascript" src="${commonPersonLevelJavaScript}"></script>
${scripts.add(visualizationHelperJavaScript)}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}
<#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" />
<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" />
<link href="${pageStyle}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="${vizStyle}" />
${stylesheets.add('<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/personlevel/page.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/visualization.css" />')}
<#assign loadingImageLink = "${urls.images}/visualization/ajax-loader.gif">

3
productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
View file

@ -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('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}
<#include "personPublicationSparklineContent.ftl">