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

This commit is contained in:
Jon Corson-Rikert 2013-12-06 16:57:45 -05:00
commit 9bbe7ec11d
2 changed files with 2 additions and 2 deletions

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>

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>