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

Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6

Browse source 
Conflicts:
	rdf/tbox/firsttime/initialTBoxAnnotations.n3
This commit is contained in:
Jon Corson-Rikert 2013-12-06 13:47:09 -05:00
commit ea93eea861
4 changed files with 4 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
productMods/js/homePageUtils.js
View file

@ -60,7 +60,7 @@ $(document).ready(function(){
getFacultyMembers(); getFacultyMembers();
} }
else { else {
individualList = "<p><li>" + i18nStrings.noFacultyFound + "</li></p>"; individualList = "<p><li style='padding-left:1.2em'>" + i18nStrings.noFacultyFound + "</li></p>";
$('div#tempSpacing').hide(); $('div#tempSpacing').hide();
$('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
} }
@ -95,7 +95,7 @@ $(document).ready(function(){
}); });
} }
else { else {
individualList = "<p><li>" + i18nStrings.noFacultyFound + "</li></p>"; individualList = "<p><li style='padding-left:1.2em'>" + i18nStrings.noFacultyFound + "</li></p>";
$('div#tempSpacing').hide(); $('div#tempSpacing').hide();
$('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
$('div#research-faculty-mbrs ul#facultyThumbs').css("padding", "1.0em 0 0.825em 0.75em"); $('div#research-faculty-mbrs ul#facultyThumbs').css("padding", "1.0em 0 0.825em 0.75em");

2
productMods/templates/freemarker/lib/lib-home-page.ftl
View file

@ -141,7 +141,7 @@
</#if> </#if>
</#list> </#list>
<#if !foundClassGroup> <#if !foundClassGroup>
<p><li>${i18n().no_research_content_found}</li></p> <p><li style="padding-left:1.2em">${i18n().no_research_content_found}</li></p>
</#if> </#if>
</ul> </ul>
</section> </section>

123
rdf/tbox/filegraph/object-properties.owl
View file

@ -351,61 +351,6 @@
<!-- http://purl.obolibrary.org/obo/ERO_0000076 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000076">
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Imaging processing software that requires .jpg format files for analysis.</obo:IAO_0000112>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Carlo Torniai</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000119>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Software data input format.</obo:IAO_0000115>
<obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">has input format</obo:IAO_0000111>
<rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0001554"/>
<obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
<rdfs:domain>
<owl:Class>
<owl:unionOf rdf:parseType="Collection">
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000071"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0001716"/>
</owl:unionOf>
</owl:Class>
</rdfs:domain>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0000077 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000077">
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Microsoft Excel arranges and saves data in .xlsx format.</obo:IAO_0000112>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Carlo Torniai</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000119>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Software data output type.</obo:IAO_0000115>
<obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">has output format</obo:IAO_0000111>
<rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ERO_0000071"/>
<rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0001554"/>
<obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0000078 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000078">
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ImageJ software measures characteristics of digital images.</obo:IAO_0000112>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Carlo Torniai</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000119>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Transformation objective of the software.</obo:IAO_0000115>
<obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">achieves objective</obo:IAO_0000111>
<rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ERO_0000071"/>
<obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
<rdfs:range rdf:resource="http://purl.obolibrary.org/obo/OBI_0200166"/>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0000390 --> <!-- http://purl.obolibrary.org/obo/ERO_0000390 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000390"> <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000390">
@ -631,24 +576,6 @@
<!-- http://purl.obolibrary.org/obo/ERO_0001057 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0001057">
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000119>
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Paraffin embedding of tissue.</obo:IAO_0000112>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Technique used to prepare the biological specimen.</obo:IAO_0000115>
<obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">has preparation technique</obo:IAO_0000111>
<rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ERO_0000020"/>
<rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/ERO_0000543"/>
<rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0001707"/>
<obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0001518 --> <!-- http://purl.obolibrary.org/obo/ERO_0001518 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0001518"> <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0001518">
@ -699,48 +626,6 @@
<!-- http://purl.obolibrary.org/obo/ERO_0001811 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0001811">
<rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ERO_0001554"/>
<rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000098"/>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0001824 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0001824">
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Is a legal instrument (usually by way of contract law) governing the usage or redistribution of software.</obo:IAO_0000115>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Scott Hoffmann</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wikipedia.org/wiki/Software_license</obo:IAO_0000119>
<rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ERO_0000071"/>
<rdfs:range rdf:resource="http://www.ebi.ac.uk/swo/SWO_0000002"/>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0001908 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0001908">
<rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Links an objective to a software operation whise execution achieves the objective. Is different from OBI:objective_achieved_by which links an objective to the process that achieves it.</rdfs:comment>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON:Matthew Brush</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON:Matthew Brush</obo:IAO_0000119>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">a relation between a software objective (data transformation objective) and an operation whose execution in a software tool achieves the objective</obo:IAO_0000115>
<obo:IAO_0000116 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">software relation expanding to something like:
objective_achieved_by some (&apos;software/algorithm execution&apos; and (specified_by some &apos;data processing operation&apos;))</obo:IAO_0000116>
<rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0100287"/>
<rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/OBI_0200166"/>
</owl:ObjectProperty>
<!-- http://purl.obolibrary.org/obo/IAO_0000039 --> <!-- http://purl.obolibrary.org/obo/IAO_0000039 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000039"> <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000039">
@ -1935,14 +1820,6 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://www.w3.org/2006/vcard/ns#hasRole -->
<owl:ObjectProperty rdf:about="http://www.w3.org/2006/vcard/ns#hasRole">
<rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Role"/>
</owl:ObjectProperty>
<!-- http://www.w3.org/2006/vcard/ns#hasSound --> <!-- http://www.w3.org/2006/vcard/ns#hasSound -->

46
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -25,8 +25,7 @@ vivo:pmcid
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0000071 obo:ERO_0000071
rdfs:label "Software"@en-US ; rdfs:label "Software"@en-US .
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> .
bibo:Note bibo:Note
rdfs:label "Note"@en-US ; rdfs:label "Note"@en-US ;
@ -557,13 +556,6 @@ geo:territory
vcard:OrganizationName vcard:OrganizationName
rdfs:label "Organization Name"@en-US . rdfs:label "Organization Name"@en-US .
obo:ERO_0000076
rdfs:label "has input type"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vivo:researchAreaOf vivo:researchAreaOf
rdfs:label "research area of"@en-US ; rdfs:label "research area of"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
@ -706,13 +698,6 @@ obo:IAO_0000142
vivo:submitted vivo:submitted
rdfs:label "submitted"@en-US . rdfs:label "submitted"@en-US .
obo:ERO_0000077
rdfs:label "has output type"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
bibo:Issue bibo:Issue
rdfs:label "Issue"@en-US ; rdfs:label "Issue"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
@ -798,9 +783,6 @@ vitro:moniker
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#editor> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#editor> .
obo:ERO_0000078
rdfs:label "achieves objective"@en-US .
geo:codeFAOSTAT geo:codeFAOSTAT
rdfs:label "codeFAOSTAT"@en-US ; rdfs:label "codeFAOSTAT"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -1009,9 +991,6 @@ vivo:Continent
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0001908
rdfs:label "objective achieved by operation"@en-US .
geo:nameOfficialRU geo:nameOfficialRU
rdfs:label "nameOfficialRU"@en-US ; rdfs:label "nameOfficialRU"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -1373,9 +1352,6 @@ vivo:PopulatedPlace
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0001811
rdfs:label "has format"@en-US .
vivo:FacultyAdministrativePosition vivo:FacultyAdministrativePosition
rdfs:label "Faculty Administrative Position"@en-US ; rdfs:label "Faculty Administrative Position"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
@ -2659,23 +2635,6 @@ bibo:Website
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0001057
rdfs:label "has preparation technique"@en-US ;
# vitro:displayLimitAnnot
# "2"^^xsd:int ;
# vitro:displayRankAnnot
# "53"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
# vitro:inPropertyGroupAnnot
# <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
# vitro:selectFromExistingAnnot
# "true"^^xsd:boolean ;
# vitro:offerCreateNewOptionAnnot
# "true"^^xsd:boolean .
obo:BFO_0000003 obo:BFO_0000003
rdfs:label "Occurrent" . rdfs:label "Occurrent" .
@ -4236,9 +4195,6 @@ vivo:Screenplay
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0001824
rdfs:label "has software license"@en-US .
geo:nameOfficialAR geo:nameOfficialAR
rdfs:label "nameOfficialAR"@en-US ; rdfs:label "nameOfficialAR"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot