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

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

Browse source
This commit is contained in:
hudajkhan 2013-12-09 11:25:26 -05:00
commit bf04a4ab6f
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -61,7 +61,7 @@
<@p.verboseDisplay title />
</#if>
<#list title.statements as statement>
<span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
<span class="display-title<#if editable>-editable<#else>-not-editable</#if>">${statement.preferredTitle}</span>
<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
</#list>
</#if>

2
productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file

@ -69,7 +69,7 @@
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#if (title.statements?size < 1) >
<@p.addLinkWithLabel title editable />
<#else>
<#elseif editable>
<h2 id="preferredTitle">${title.name?capitalize!}</h2>
<@p.verboseDisplay title />
</#if>

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

@ -1211,7 +1211,7 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://purl.org/ontology/bibo/translator -->
<owl:ObjectProperty rdf:about="http://purl.org/ontology/bibo/translator">
<owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#translatorOf"/>
</owl:ObjectProperty>
@ -1407,7 +1407,7 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://vivoweb.org/ontology/core#offeredBy -->
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#offeredBy">
<owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#offers"/>
</owl:ObjectProperty>
@ -1415,7 +1415,7 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://vivoweb.org/ontology/core#offers -->
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#offers">
<owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#offeredBy"/>
</owl:ObjectProperty>
@ -1522,6 +1522,7 @@ there is a measurement process p that has specified output m, a measurement datu
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#translatorOf">
<rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
<owl:inverseOf rdf:resource="http://purl.org/ontology/bibo/translator"/>
</owl:ObjectProperty>

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

@ -25,7 +25,8 @@ vivo:pmcid
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0000071
rdfs:label "Software"@en-US .
rdfs:label "Software"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> .
bibo:Note
rdfs:label "Note"@en-US ;
@ -400,7 +401,7 @@ obo:OBI_0000643
obo:OBI_0000272
rdfs:label "Protocol"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupresearch> .
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> .
vcard:Identification
rdfs:label "Identification"@en-US .
@ -6460,7 +6461,7 @@ obo:ERO_0001716
rdfs:label "Database"@en-US .
<http://vivoweb.org/ontology/scientific-research#documentationFor>
rdfs:label "documentation for service"@en-US ;
rdfs:label "documentation for project or resource"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot