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

Merge branch 'develop' into feature/fauxEditing

Browse source
This commit is contained in:
Jim Blake 2014-12-08 15:55:32 -05:00
commit 875ba66a46
36 changed files with 1709 additions and 1058 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
View file

@ -6,11 +6,11 @@
<section class="pageBodyGroup" role="region">
<h3>${i18n().ontology_editor}</h3>
<#if ontologyEditor.pellet?has_content>
<#if ontologyEditor.tboxReasonerStatus?has_content>
<div class="notice">
<p>${ontologyEditor.pellet.error}</p>
<#if ontologyEditor.pellet.explanation?has_content>
<p>${i18n().cause} ${ontologyEditor.pellet.explanation}</p>
<p>${ontologyEditor.tboxReasonerStatus.error}</p>
<#if ontologyEditor.tboxReasonerStatus.explanation?has_content>
<p>${i18n().cause} ${ontologyEditor.tboxReasonerStatus.explanation}</p>
</#if>
</div>
</#if>