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

Initial work moving individual profile page to Freemarker. Includes temporary servlet mappings for new Freemarker page. Allow adding script tags to the page head element.

Browse source
This commit is contained in:
rjy7 2010-09-08 20:37:28 +00:00
parent ad37668ed4
commit 3269252aaa
9 changed files with 151 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/web/templates/entity/entityBasic.jsp
View file

@ -314,4 +314,5 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</div> <!-- personWrap -->
</div> <!-- content -->
<script type="text/javascript" src="<c:url value="/js/imageUpload/imageUploadUtils.js"/>"></script>
<script type="text/javascript" src="<c:url value="/js/imageUpload/imageUploadUtils.js"/>"></script>

24
webapp/web/templates/freemarker/body/individual.ftl
View file

@ -1 +1,23 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for individual profile page -->
<h2>${title}</h2>
test
${stylesheets.addFromTheme("/css/entity.css",
"/css/visualization/visualization.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.js",
"/js/jquery_plugins/getUrlParam.js",
"/js/jquery_plugins/colorAnimations.js",
"/js/propertyGroupSwitcher.js",
"/js/jquery_plugins/jquery.form.js",
"/js/tiny_mce/tiny_mce.js",
"/js/controls.js",
"http://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",
"/js/toggle.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}

1
webapp/web/templates/freemarker/page/partials/head.ftl
View file

@ -3,4 +3,5 @@
<head>
<#include "title.ftl">
<#include "stylesheets.ftl">
<#include "headScripts.ftl">
</head>

5
webapp/web/templates/freemarker/page/partials/headScripts.ftl Normal file
View file

@ -0,0 +1,5 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for scripts that must be loaded in the head -->
${headScripts.tags}

2
webapp/web/templates/freemarker/page/partials/scripts.ftl
View file

@ -1,5 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for scripts loaded at the end of the body element -->
${scripts.tags}
<#include "googleAnalytics.ftl">

2
webapp/web/templates/freemarker/page/partials/stylesheets.ftl
View file

@ -1,5 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for loading stylesheets in the head -->
<link rel="stylesheet" type="text/css" href="${stylesheetPath}/screen.css" media="screen"/>
<link rel="stylesheet" type="text/css" href="${stylesheetPath}/print.css" media="print"/>