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

NIHVIVO-3772 Incorporate the most recent changes from Eric (2012-06-20)

Browse source
This commit is contained in:
j2blake 2012-06-24 17:51:02 +00:00
parent b9dd44aaee
commit cc3fbc28c8
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1380,11 +1380,7 @@
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>GadgetController</servlet-name> <servlet-name>GadgetController</servlet-name>
<url-pattern>/gadget</url-pattern> <url-pattern>/orng/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>GadgetController</servlet-name>
<url-pattern>/gadget/sandbox</url-pattern>
</servlet-mapping> </servlet-mapping>

2
themes/wilma/templates/head.ftl
View file

@ -13,7 +13,7 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')}
${headScripts.add('<script type="text/javascript" src="${openSocial.containerJavascriptSrc}"></script>', ${headScripts.add('<script type="text/javascript" src="${openSocial.containerJavascriptSrc}"></script>',
'<script type="text/javascript" language="javascript">${openSocial.gadgetJavascript}</script>', '<script type="text/javascript" language="javascript">${openSocial.gadgetJavascript}</script>',
'<script type="text/javascript" src="${urls.base}/js/openSocial/shindig.js"></script>')} '<script type="text/javascript" src="${urls.base}/js/openSocial/orng.js"></script>')}
</#if> </#if>
</#if> </#if>