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

Fix comments

Browse source
This commit is contained in:
rjy7 2011-01-31 20:52:12 +00:00
parent 99daffa6de
commit 4dcad0134a
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,6 @@ public class IndividualTemplateModel extends BaseTemplateModel {
} }
// http://some.other.namespace/n2345?format=rdfxml // http://some.other.namespace/n2345?format=rdfxml
// ** RY Not sure it is correct to return this for the <link> element
return UrlBuilder.addParams(profileUrl, "format", "rdfxml"); return UrlBuilder.addParams(profileUrl, "format", "rdfxml");
} }
@ -132,11 +131,9 @@ public class IndividualTemplateModel extends BaseTemplateModel {
return urlBuilder.getPortalUrl(Route.INDIVIDUAL_EDIT, "uri", getUri()); return urlBuilder.getPortalUrl(Route.INDIVIDUAL_EDIT, "uri", getUri());
} }
// RY We should not have references to a specific ontology in the vitro code! // RY We should not have references to a specific ontology in the vitro code.
// Figure out how to move this out of here. // We should subclass IndividualTemplateModel in the VIVO code and add the isPerson()
// We could subclass IndividualTemplateModel in the VIVO code and add the isPerson() // and getVisualizationUrl() methods there.
// and getVisualizationUrl() methods there, but we still need to know whether to
// instantiate the IndividualTemplateModel or the VivoIndividualTemplateModel class.
public boolean isPerson() { public boolean isPerson() {
return isVClass("http://xmlns.com/foaf/0.1/Person"); return isVClass("http://xmlns.com/foaf/0.1/Person");
} }

9
webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
View file

@ -127,6 +127,7 @@ name will be used as the label. -->
------------------------------------------------------------------------------> ------------------------------------------------------------------------------>
<#-- Vitro namespace links <#-- Vitro namespace links
Currently the page displays the vitro namespace links properties. Future versions Currently the page displays the vitro namespace links properties. Future versions
will use the vivo core ontology links property, eliminating the need for special handling. will use the vivo core ontology links property, eliminating the need for special handling.
@ -154,8 +155,12 @@ name will be used as the label. -->
</#if> </#if>
</#macro> </#macro>
<#-- Main image links --> <#-- Image
<#-- Values for showPlaceholder: "always", "never", "with_add_link" -->
Values for showPlaceholder: "always", "never", "with_add_link"
Note that this macro has a side-effect in the call to propertyGroups.getPropertyAndRemoveFromList().
-->
<#macro image individual propertyGroups namespaces editable showPlaceholder="never" placeholder=""> <#macro image individual propertyGroups namespaces editable showPlaceholder="never" placeholder="">
<#local mainImage = propertyGroups.getPropertyAndRemoveFromList("${namespaces.vitroPublic}mainImage")!> <#local mainImage = propertyGroups.getPropertyAndRemoveFromList("${namespaces.vitroPublic}mainImage")!>
<#local thumbUrl = individual.thumbUrl!> <#local thumbUrl = individual.thumbUrl!>