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

Merge r2677-2678 from rel-1.2-maint

Browse source
This commit is contained in:
rjy7 2011-02-15 15:11:48 +00:00
parent f9a83bee66
commit 12c2b4785d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
View file

@ -2,7 +2,7 @@
<#assign standardVisualizationURLRoot ="/visualization"> <#assign standardVisualizationURLRoot ="/visualization">
<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI?url}"> <#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI}">
<#assign temporalGraphURL = '${urls.base}${standardVisualizationURLRoot}?vis=${otherVisType}&uri=${organizationURI}&labelField=label'> <#assign temporalGraphURL = '${urls.base}${standardVisualizationURLRoot}?vis=${otherVisType}&uri=${organizationURI}&labelField=label'>
<div id="error-container"> <div id="error-container">

2
themes/vivo-basic/templates/page-home.ftl
View file

@ -14,7 +14,7 @@
<#include "menu.ftl"> <#include "menu.ftl">
<#-- vivo-basic continues to display home tab content on the home page --> <#-- vivo-basic continues to display home tab content on the home page -->
${homeTabContent} ${homeTabContent!}
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>