diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java index 532ab080b..bdba06ffe 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java @@ -81,6 +81,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel private PropertyListConfig config; private String objectKey; private String sortDirection; + private String publicDescription; private int displayLimit; ObjectPropertyTemplateModel(ObjectProperty op, Individual subject, VitroRequest vreq, @@ -92,6 +93,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel sortDirection = op.getDomainEntitySortDirection(); domainUri = op.getDomainVClassURI(); rangeUri = op.getRangeVClassURI(); + publicDescription = op.getPublicDescription(); displayLimit = op.getDomainDisplayLimit(); // Get the config for this object property @@ -182,6 +184,10 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel return displayLimit; } + public String getPublicDescription() { + return publicDescription; + } + public ConfigError checkQuery(String queryString) { if (StringUtils.isBlank(queryString)) { return ConfigError.NO_SELECT_QUERY; diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl index 3515cf16c..8c96bc2bf 100644 --- a/webapp/web/templates/freemarker/lib/lib-properties.ftl +++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl @@ -92,7 +92,7 @@ Assumes property is non-null. --> <#macro objectPropertyListing property editable template=property.template> <#local localName = property.localName> -

${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property />

+

${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property />

@@ -114,11 +114,11 @@ name will be used as the label. --> displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring properties have labels. <#if addLink?has_content || verboseDisplay?has_content> -

${label} ${addLink!} ${verboseDisplay!}

+

${label} ${addLink!} ${verboseDisplay!}

--> <#if editable> -

${label} ${addLink!} ${verboseDisplay!}

+

${label} ${addLink!} ${verboseDisplay!}

@@ -152,7 +152,7 @@ name will be used as the label. --> <#macro propertyLabel property label="${property.name?capitalize}"> -

${label} <@verboseDisplay property />

+

${label} <@verboseDisplay property />