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-11-22 12:50:45 -05:00
commit 126a9c6295
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
productMods/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl Normal file
View file

@ -0,0 +1,14 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- List of research areas for the individual -->
<#assign geographicFoci = propertyGroups.pullProperty("${core}geographicFocus")!>
<#if geographicFoci?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = geographicFoci.localName>
<h2 id="${localName}" class="mainPropGroup" style="clear:left">
${geographicFoci.name?capitalize}
<@p.addLink geographicFoci editable /> <@p.verboseDisplay geographicFoci />
</h2>
<ul id="individual-hasResearchArea" role="list" >
<@p.objectProperty geographicFoci editable />
</ul>
</#if>

3
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -96,6 +96,9 @@
<!-- Research Areas --> <!-- Research Areas -->
<#include "individual-researchAreas.ftl"> <#include "individual-researchAreas.ftl">
<!-- Geographic Focus -->
<#include "individual-geographicFocus.ftl">
<#include "individual-openSocial.ftl"> <#include "individual-openSocial.ftl">
</section> </section>