From adf04bd2bebeab767e81efdcb547a3e8e56bee07 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Tue, 18 Nov 2014 10:56:02 -0500
Subject: [PATCH] VIVO-900: on data property hierarchy, range class should be
 range data type

---
 webapp/languages/es_GO/i18n/all_es_GO.properties    |  1 +
 webapp/web/i18n/all.properties                      |  1 +
 .../js/siteAdmin/objectPropertyHierarchyUtils.js    | 13 ++++++++++---
 .../siteAdmin/siteAdmin-objectPropHierarchy.ftl     |  2 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
index 0b9247a61..fb56a2344 100644
--- a/webapp/languages/es_GO/i18n/all_es_GO.properties
+++ b/webapp/languages/es_GO/i18n/all_es_GO.properties
@@ -859,6 +859,7 @@ local_name = Nombre local
 group_capitalized = Grupo
 domain_class = Clase de dominio
 range_class = Clase Rango
+range_data_type = Tipo de datos de gama
 sub_properties = Subpropiedades
 subproperty = subpropiedad
 
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 1a532f434..3f7c0ef3c 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -872,6 +872,7 @@ local_name = Local Name
 group_capitalized = Group
 domain_class = Domain Class
 range_class = Range Class
+range_data_type = Range Data Type
 sub_properties = Subproperties
 subproperty = subproperty
 
diff --git a/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js b/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
index e9ab0a1d5..f1da38900 100644
--- a/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
+++ b/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
@@ -46,6 +46,13 @@
 //        this.toggleSpan = $('span#propsToggle');
 //        this.toggleLink = $('span#propsToggle').find('a');
         noProps = new Boolean;
+		this.range = ""
+		if ( propertyType == "object" ) {
+			this.range = i18nStrings.rangeClass;
+		}
+		else {
+			this.range = i18nStrings.rangeDataType;
+		}
     },
 
     bindEventListeners: function() {
@@ -148,7 +155,7 @@
             objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" 
                                                + (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " ";
 
-            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + i18nStrings.rangeClass + ":</span>" 
+            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>" 
                                                + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
             if ( descendants.length > 1 ) {
@@ -209,7 +216,7 @@
             childDetails += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" 
                                                + (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " ";
 
-            childDetails += "<span class='rangeClass'>" + i18nStrings.rangeClass + ":</span>" 
+            childDetails += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>" 
                                                + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
             if ( this.children ) {
@@ -300,7 +307,7 @@
             objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" 
                                          + (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " ";
 
-            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + i18nStrings.rangeClass + ":</span>" 
+            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>" 
                                          + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
             objectPropHierarchyUtils.classHtml += "</table>";
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
index f969ad013..b0f60fa25 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
@@ -45,6 +45,7 @@
 </section>
 <script language="javascript" type="text/javascript" >
     var json = [${jsonTree!}];
+	var propertyType = '${propType}';
     var i18nStrings = {
         hideProperties: '${i18n().hide_properties}',
         showProperties: '${i18n().show_properties}',
@@ -52,6 +53,7 @@
         groupString: '${i18n().group_capitalized}',
         domainClass: '${i18n().domain_class}',
         rangeClass: '${i18n().range_class}',
+        rangeDataType: '${i18n().range_data_type}',
         expandAll: '${i18n().expand_all}',
         collapseAll: '${i18n().collapse_all}',
         subProperties: '${i18n().sub_properties}',