litvinovg/vitro
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:05 +00:00
parent b33b6bc21e
commit 8b89cad590
32 changed files with 108 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/templates/freemarker/widgets/widget-SelectList.ftl
View file

@ -4,8 +4,8 @@
<#macro assets>
<#--
${stylesheets.add("/css/something.css")}
${scripts.add("/js/somejavascript.js")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/something.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/somejavascript.js"></script>')}
-->
</#macro>

4
webapp/web/templates/freemarker/widgets/widget-browse.ftl
View file

@ -5,8 +5,8 @@
<#macro assets>
<#--
Are there stylesheets or scripts needed?
${stylesheets.add("/css/browse.css")}
${scripts.add("/js/browse.js")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browse.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/browse.js"></script>'}
-->
</#macro>

4
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -8,9 +8,9 @@
because we don't have the user in the template data model when we generate the assets. This can also be fixed by
NIHVIVO-1357.
<#if ! user.loggedIn> -->
${stylesheets.add("/css/login.css")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/login.css" />')}
<#-- ${scripts.add("")} -->
${headScripts.add("/js/login/loginUtils.js")}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/login/loginUtils.js"></script>')}
<#-- </#if> -->
</#macro>

6
webapp/web/templates/freemarker/widgets/widget-test.ftl
View file

@ -3,9 +3,9 @@
<#-- Test widget -->
<#macro assets>
${stylesheets.add("/css/test.css")}
${scripts.add("/js/testscript.js")}
${headScripts.add("/js/testheadscript.js")}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/test.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/testscript.js"></script>')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/testheadscript.js"></script>')}
</#macro>
<#macro loggedIn>