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-21 12:39:48 -05:00
commit 7b6075d359
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,12 @@
<!--postindividual overiew ftl-->
</#assign>
<#if individual.conceptSubclass() >
<#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#broader")!>
<#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#narrower")!>
<#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#related")!>
</#if>
<#include "individual-vitro.ftl">
<script>
var i18nStrings = {

13
src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
View file

@ -31,6 +31,11 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
private static final String FOAF = "http://xmlns.com/foaf/0.1/";
private static final String PERSON_CLASS = FOAF + "Person";
private static final String AWARD_CLASS = "http://vivoweb.org/ontology/core#Award";
private static final String DEGREE_CLASS = "http://vivoweb.org/ontology/core#AcademicDegree";
private static final String CONTACT_CLASS = "http://purl.obolibrary.org/obo/ARG_2000376";
private static final String CREDENTIAL_CLASS = "http://vivoweb.org/ontology/core#Credential";
private static final String DTP_CLASS = "http://vivoweb.org/ontology/core#DateTimeValuePrecision";
private static final String ORGANIZATION_CLASS = FOAF + "Organization";
private static final String BASE_VISUALIZATION_URL =
UrlBuilder.getUrl(Route.VISUALIZATION_SHORT.path());
@ -147,6 +152,14 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
}
/* Template methods (for efficiency, not pre-computed) */
public boolean conceptSubclass() {
if ( isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) ||isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS) ) {
return true;
}
else {
return false;
}
}
public boolean person() {
return isVClass(PERSON_CLASS);