NIHVIVO-1332 Display property title on untitled properties like phone, email if there is an add link to display. Changed a Java class name.

webapp/web/templates/freemarker/body/individual/individual.ftl

@@ -39,9 +39,12 @@
         <#-- Overview -->
         <#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> 
         <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
+            <@p.showLabelAndAddLink overview showEditingLinks />
             <#list overview.statements as statement>
-                <@p.editingLinks statement showEditingLinks />
-                <p class="individual-overview">${statement.value}</p>
+                <p class="individual-overview">
+                    <@p.editingLinks statement showEditingLinks />
+                    ${statement.value}
+                </p>
             </#list>
         </#if>
         

webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl

@@ -24,8 +24,7 @@
         <#list group.properties as property>
             <article class="property" role="article">
                 <#-- Property display name -->
-                <h3>${property.name} <@p.addLink property showEditingLinks /></h3> 
-
+                <h3>${property.name} <@p.addLink property showEditingLinks /></h3>
                 <#-- List the statements for each property -->   
                 <ul class="property-list" role="list"> 
                     <#-- data property -->  

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

@@ -32,6 +32,15 @@
     </#list>
 </#macro>
 
+<#-- Some properties usually display without a label. But if there's an add link, 
+we need to also show the property label. -->
+<#macro showLabelAndAddLink property showEditingLinks>
+    <#local addLink><@addLink property showEditingLinks /></#local>
+    <#if addLink?has_content>
+        <h3>${property.name?capitalize} ${addLink}</h3> 
+    </#if>
+</#macro>
+
 <#macro addLink property showEditingLinks>
     <#if showEditingLinks>
         <#local url = property.addUrl>