From 3fdc17d16dc87dd0e2ba98d497f1feafc7f103d2 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Fri, 10 Jul 2015 12:18:32 -0400
Subject: [PATCH] No Jira issue. Add tooltips to object property labels by
 pulling in the public description of th eproperty.

---
 .../individual/ObjectPropertyTemplateModel.java           | 6 ++++++
 webapp/web/templates/freemarker/lib/lib-properties.ftl    | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

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>
-    <h2 id="${localName}" class="mainPropGroup">${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property /></h2>    
+    <h2 id="${localName}" class="mainPropGroup" title="${property.publicDescription!}">${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property /></h2>    
     <ul id="individual-${localName}" role="list">
         <@objectProperty property editable />
     </ul>
@@ -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>
-        <h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>         
+        <h2 id="${property.localName}" title="${property.publicDescription!}">${label}  ${addLink!} ${verboseDisplay!}</h2>         
     </#if>
     -->
     <#if editable> 
-        <h2 id="${property.localName!}">${label} ${addLink!} ${verboseDisplay!}</h2>         
+        <h2 id="${property.localName!}" title="${property.publicDescription!}">${label}  ${addLink!} ${verboseDisplay!}</h2>         
     </#if>
 </#macro>
 
@@ -152,7 +152,7 @@ name will be used as the label. -->
 </#macro>
 
 <#macro propertyLabel property label="${property.name?capitalize}">
-    <h2 id="${property.localName}">${label} <@verboseDisplay property /></h2>     
+    <h2 id="${property.localName}" title="${property.publicDescription!}">${label}  <@verboseDisplay property /></h2>     
 </#macro>