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

NIHVIVO 2465 and 2485 display and manage multiple rdfs labels

Browse source
This commit is contained in:
tworrall 2012-06-13 18:42:52 +00:00
parent 121acbc17b
commit eab35dc6b6
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -805,6 +805,15 @@
<url-pattern>/manageGrants</url-pattern> <url-pattern>/manageGrants</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>ManageLabelsForIndividualController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManageLabelsForIndividualController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ManageLabelsForIndividualController</servlet-name>
<url-pattern>/manageLabels</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>ManagePublicationsForIndividualController</servlet-name> <servlet-name>ManagePublicationsForIndividualController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManagePublicationsForIndividualController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManagePublicationsForIndividualController</servlet-class>

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

@ -4,7 +4,9 @@
<#include "individual-setup.ftl"> <#include "individual-setup.ftl">
<#import "individual-qrCodeGenerator.ftl" as qr> <#import "individual-qrCodeGenerator.ftl" as qr>
<#import "lib-vivo-properties.ftl" as vp> <#import "lib-vivo-properties.ftl" as vp>
<#if !labelCount??>
<#assign labelCount = 0 >
</#if>
<section id="individual-intro" class="vcard person" role="region"> <section id="individual-intro" class="vcard person" role="region">
<section id="share-contact" role="region"> <section id="share-contact" role="region">
@ -65,7 +67,7 @@
<#else> <#else>
<h1 class="vcard foaf-person"> <h1 class="vcard foaf-person">
<#-- Label --> <#-- Label -->
<span class="fn"><@p.label individual editable /></span> <span class="fn"><@p.label individual editable labelCount/></span>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("${core}preferredTitle")!> <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!>