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

Merge r5890 from nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-09-16 20:34:14 +00:00
parent 7e46f1ed02
commit 9f59c4aec8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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