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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-20 13:28:44 -05:00
commit b5244693bf
2 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
View file

@ -10,7 +10,7 @@
<#assign moreDisplayed = false> <#assign moreDisplayed = false>
<#list departmentsResults as resultRow> <#list departmentsResults as resultRow>
<li class="raLink"> <li class="raLink">
<a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${resultRow["dept"]}&raURI=${individual.uri}" title="${i18n().organization}"> <a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${resultRow["dept"]?url}&raURI=${individual.uri?url}" title="${i18n().organization}">
${resultRow["deptLabel"]} ${resultRow["deptLabel"]}
</a> </a>
</li> </li>

2
productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
View file

@ -15,7 +15,7 @@
<#assign moreDisplayed = false> <#assign moreDisplayed = false>
<#list researchAreaResults as resultRow> <#list researchAreaResults as resultRow>
<li class="raLink"> <li class="raLink">
<a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${individual.uri}&raURI=${resultRow["ra"]}" title="${i18n().research_area}"> <a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${individual.uri?url}&raURI=${resultRow["ra"]?url}" title="${i18n().research_area}">
${resultRow["raLabel"]} ${resultRow["raLabel"]}
</a> </a>
</li> </li>