From 9f59c4aec82c96e36903391c990d7f2d652f4e48 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 16 Sep 2010 20:34:14 +0000
Subject: [PATCH] Merge r5890 from nihvivo-rel-1.1-maint

---
 webapp/web/templates/entity/entityBasic.jsp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index 7f006b7d1..a5e3d873b 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -193,9 +193,10 @@ 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 --%>                             
+                        <%-- Primary link --%>
+                        <c:if test="${!empty entity.anchor}">                          
                             <c:choose>
                                 <c:when test="${!empty 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. --%>
                                     <li class="primary"><span class="externalLink"><p:process>${entity.anchor}</p:process></span></li>
                                 </c:otherwise>
-                            </c:choose>
-                        
+                            </c:choose>                        
+                        </c:if> 
                         
                         <%-- Additional links --%>
                         <c:if test="${!empty entity.linksList }">
@@ -236,8 +237,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                                 </li>                                          
                             </c:forEach>
                         </c:if>
-                    </ul>
-                    </c:if>                   
+                    </ul>                                       
                 </div> <!-- end dprop-vitro-links  -->
             </c:if>