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

Changes to individual templates and associated queries

Browse source
This commit is contained in:
rjy7 2011-01-21 17:39:03 +00:00
parent 04d6764eb3
commit 53ad28c770
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -7,16 +7,12 @@
<section id="individual-intro-person" class="vcard" role="region"> <section id="individual-intro-person" class="vcard" role="region">
<section id="share-contact" role="region"> <section id="share-contact" role="region">
<#-- Image --> <#-- Image -->
<@p.imageLinks individual propertyGroups editable "${urls.images}/placeholders/person.thumbnail.jpg" /> <@p.imageLinks individual propertyGroups namespaces editable "${urls.images}/placeholders/person.thumbnail.jpg" />
<nav role="navigation"> <nav role="navigation">
<ul id ="individual-tools-people" role="list"> <ul id ="individual-tools-people" role="list">
<#assign uriUrl = individual.uri> <li role="listitem"><a title="Individual URI" href="${individual.uri}"><img class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon" /></a></li>
<#if uriUrl??>
<li role="listitem"><a title="Individual uri" href="${uriUrl}"><img class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon" /></a></li>
</#if>
<#assign rdfUrl = individual.rdfUrl> <#assign rdfUrl = individual.rdfUrl>
<#if rdfUrl??> <#if rdfUrl??>
@ -58,7 +54,7 @@
</#if> </#if>
<#-- Links --> <#-- Links -->
<@p.vitroLinks propertyGroups editable "individual-urls-people" /> <@p.vitroLinks propertyGroups namespaces editable "individual-urls-people" />
</section> </section>
<section id="individual-info" role="region"> <section id="individual-info" role="region">
@ -73,9 +69,7 @@
<#else> <#else>
<h1 class="fn foaf-person"> <h1 class="fn foaf-person">
<#-- Label --> <#-- Label -->
<#assign label = individual.nameStatement> <@p.label individual editable />
${label.value}
<#-- <@p.editingLinks label label editable /> -->
<#-- Moniker --> <#-- Moniker -->
<#if individual.moniker?has_content> <#if individual.moniker?has_content>
@ -87,7 +81,7 @@
<#-- Positions --> <#-- Positions -->
<#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<h2>Positions <@p.addLink positions editable /></h2> <h2 id="${positions.localName}">${positions.name?capitalize} <@p.addLink positions editable /></h2>
<#if positions.statements?has_content> <#-- if there are any statements --> <#if positions.statements?has_content> <#-- if there are any statements -->
<ul id ="individual-positions" role="list"> <ul id ="individual-positions" role="list">
<@p.objectPropertyList positions positions.statements positions.template editable /> <@p.objectPropertyList positions positions.statements positions.template editable />
@ -102,9 +96,7 @@
<#-- Research Areas --> <#-- Research Areas -->
<#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!>
<#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<h2>Research Areas <@p.addLink researchAreas editable /></h2> <h2 id="${researchAreas.localName}">${researchAreas.name?capitalize} <@p.addLink researchAreas editable /></h2>
<#--<@p.addLinkWithLabel researchAreas editable />-->
<#if researchAreas.statements?has_content> <#-- if there are any statements --> <#if researchAreas.statements?has_content> <#-- if there are any statements -->
<ul id="individual-areas" role="list"> <ul id="individual-areas" role="list">
<@p.simpleObjectPropertyList researchAreas editable/> <@p.simpleObjectPropertyList researchAreas editable/>

1
productMods/templates/freemarker/body/individual/individual.ftl
View file

@ -1,6 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Default VIVO individual profile page template (extends individual.ftl in vitro) --> <#-- Default VIVO individual profile page template (extends individual.ftl in vitro) -->
<#include "individual-setup.ftl"> <#include "individual-setup.ftl">
<#assign individualProductExtension> <#assign individualProductExtension>