litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-900: on data property hierarchy, range class should be range data type

Browse source
This commit is contained in:
Tim Worrall 2014-11-18 10:56:02 -05:00
parent 3cc87ba0c6
commit adf04bd2be
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webapp/languages/es_GO/i18n/all_es_GO.properties
View file

@ -859,6 +859,7 @@ local_name = Nombre local
group_capitalized = Grupo group_capitalized = Grupo
domain_class = Clase de dominio domain_class = Clase de dominio
range_class = Clase Rango range_class = Clase Rango
range_data_type = Tipo de datos de gama
sub_properties = Subpropiedades sub_properties = Subpropiedades
subproperty = subpropiedad subproperty = subpropiedad

1
webapp/web/i18n/all.properties
View file

@ -872,6 +872,7 @@ local_name = Local Name
group_capitalized = Group group_capitalized = Group
domain_class = Domain Class domain_class = Domain Class
range_class = Range Class range_class = Range Class
range_data_type = Range Data Type
sub_properties = Subproperties sub_properties = Subproperties
subproperty = subproperty subproperty = subproperty

13
webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
View file

@ -46,6 +46,13 @@
// this.toggleSpan = $('span#propsToggle'); // this.toggleSpan = $('span#propsToggle');
// this.toggleLink = $('span#propsToggle').find('a'); // this.toggleLink = $('span#propsToggle').find('a');
noProps = new Boolean; noProps = new Boolean;
this.range = ""
if ( propertyType == "object" ) {
this.range = i18nStrings.rangeClass;
}
else {
this.range = i18nStrings.rangeDataType;
}
}, },
bindEventListeners: function() { bindEventListeners: function() {
@ -148,7 +155,7 @@
objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>"
+ (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " "; + (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>"; + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
if ( descendants.length > 1 ) { if ( descendants.length > 1 ) {
@ -209,7 +216,7 @@
childDetails += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" childDetails += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>"
+ (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " "; + (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>"; + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
if ( this.children ) { if ( this.children ) {
@ -300,7 +307,7 @@
objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>"
+ (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " "; + (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>"; + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
objectPropHierarchyUtils.classHtml += "</table>"; objectPropHierarchyUtils.classHtml += "</table>";

2
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
View file

@ -45,6 +45,7 @@
</section> </section>
<script language="javascript" type="text/javascript" > <script language="javascript" type="text/javascript" >
var json = [${jsonTree!}]; var json = [${jsonTree!}];
var propertyType = '${propType}';
var i18nStrings = { var i18nStrings = {
hideProperties: '${i18n().hide_properties}', hideProperties: '${i18n().hide_properties}',
showProperties: '${i18n().show_properties}', showProperties: '${i18n().show_properties}',
@ -52,6 +53,7 @@
groupString: '${i18n().group_capitalized}', groupString: '${i18n().group_capitalized}',
domainClass: '${i18n().domain_class}', domainClass: '${i18n().domain_class}',
rangeClass: '${i18n().range_class}', rangeClass: '${i18n().range_class}',
rangeDataType: '${i18n().range_data_type}',
expandAll: '${i18n().expand_all}', expandAll: '${i18n().expand_all}',
collapseAll: '${i18n().collapse_all}', collapseAll: '${i18n().collapse_all}',
subProperties: '${i18n().sub_properties}', subProperties: '${i18n().sub_properties}',