From 4dcad0134a92f303ee2b97e95afe0d3362259150 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 31 Jan 2011 20:52:12 +0000 Subject: [PATCH] Fix comments --- .../individual/IndividualTemplateModel.java | 9 +++------ .../body/partials/individual/lib-properties.ftl | 9 +++++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java index 35c499d2f..0d4eafd09 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java @@ -123,7 +123,6 @@ public class IndividualTemplateModel extends BaseTemplateModel { } // http://some.other.namespace/n2345?format=rdfxml - // ** RY Not sure it is correct to return this for the element return UrlBuilder.addParams(profileUrl, "format", "rdfxml"); } @@ -132,11 +131,9 @@ public class IndividualTemplateModel extends BaseTemplateModel { return urlBuilder.getPortalUrl(Route.INDIVIDUAL_EDIT, "uri", getUri()); } - // RY We should not have references to a specific ontology in the vitro code! - // Figure out how to move this out of here. - // We could subclass IndividualTemplateModel in the VIVO code and add the isPerson() - // and getVisualizationUrl() methods there, but we still need to know whether to - // instantiate the IndividualTemplateModel or the VivoIndividualTemplateModel class. + // RY We should not have references to a specific ontology in the vitro code. + // We should subclass IndividualTemplateModel in the VIVO code and add the isPerson() + // and getVisualizationUrl() methods there. public boolean isPerson() { return isVClass("http://xmlns.com/foaf/0.1/Person"); } diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl index 17af8804a..b51044388 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -127,6 +127,7 @@ name will be used as the label. --> ------------------------------------------------------------------------------> <#-- Vitro namespace links + 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. @@ -154,8 +155,12 @@ name will be used as the label. --> -<#-- Main image links --> -<#-- Values for showPlaceholder: "always", "never", "with_add_link" --> +<#-- Image + + 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=""> <#local mainImage = propertyGroups.getPropertyAndRemoveFromList("${namespaces.vitroPublic}mainImage")!> <#local thumbUrl = individual.thumbUrl!>