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

merge from nihvivo-rel-1.1-maint branch: collation by subclass functional when property groups are enabled. Valid markup in either case NIHVIVO-846

Browse source
This commit is contained in:
nac26 2010-07-22 21:25:12 +00:00
parent 76304b76dc
commit 4cd59ee32d
3 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/web/templates/entity/entityBasic.jsp
View file

@ -193,9 +193,9 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</c:choose>
<edLnk:editLinks item="${addUrlPredicate}" icons="false" />
</c:if>
<c:if test="${!empty entity.anchor}">
<ul class="externalLinks properties">
<%-- Primary link --%>
<c:if test="${!empty entity.anchor}">
<%-- Primary link --%>
<c:choose>
<c:when test="${!empty entity.url}">
<c:url var="entityUrl" value="${entity.url}" />
@ -215,7 +215,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
<li class="primary"><span class="externalLink"><p:process>${entity.anchor}</p:process></span></li>
</c:otherwise>
</c:choose>
</c:if>
<%-- Additional links --%>
<c:if test="${!empty entity.linksList }">
@ -236,7 +236,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</li>
</c:forEach>
</c:if>
</ul>
</ul>
</c:if>
</div> <!-- end dprop-vitro-links -->
</c:if>