From 108164812630b79dc15859417e390930ffbe9305 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 19 Mar 2010 15:50:43 +0000
Subject: [PATCH] NIHVIVO-200 Redid previous commit so span tag is not in the
 custom tag itself, since it messes up other front end links. Just test the
 value in the JSP before outputting the span tag.

---
 .../webapp/web/jsptags/PropertyEditLinks.java |  5 +--
 webapp/web/templates/entity/entityBasic.jsp   | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
index 199fd6753..32c2179cd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
@@ -146,15 +146,12 @@ public class PropertyEditLinks extends TagSupport{
         } else {
             try{    
                 JspWriter out = pageContext.getOut();
-                if( links != null && links.length > 0){
-                    // Include the wrapping span here, rather than in the JSP, so if there are no links we don't get the span.
-                    out.print("<span class=\"editLinks\">");
+                if( links != null){
                     for( LinkStruct ln : links ){
                         if( ln != null ){
                             out.print( makeElement( ln ) + '\n' );
                         }
                     }
-                    out.print("</span>");
                 }               
             } catch(IOException ioe){
                 log.error( ioe );
diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index 1f42cb822..a665f16c8 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -114,8 +114,8 @@ RY Description not working - FIX
                             <div class="statementWrap">
                                <h2><p:process>${entity.name}</p:process></h2> 
                                <c:if test="${showEdits}">
-                                   <%--  <span class="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.LABEL %>" data="${entity.name}" icons="false"/></span> --%>   
-                                   <edLnk:editLinks item="<%= VitroVocabulary.LABEL %>" data="${entity.name}" icons="false"/>   
+                                   <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.LABEL %>" data="${entity.name}" icons="false"/></c:set>
+                                   <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                    
                                </c:if> 
                             </div>
                         </div>
@@ -125,7 +125,8 @@ RY Description not working - FIX
                                     <div class="statementWrap">
                                         <p:process><em class="moniker">${entity.moniker}</em></p:process>
                                         <c:if test="${showEdits}">
-                                            <edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" data="${entity.moniker}" icons="false"/>         
+                                            <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" data="${entity.moniker}" icons="false"/></c:set>
+                                            <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                                           
                                         </c:if>                         
                                     </div>
                                 </div>
@@ -153,7 +154,8 @@ RY Description not working - FIX
                                </c:choose>
                                <%--
                                <c:if test="${showEdits}">
-                                   <edLnk:editLinks item="<%= VitroVocabulary.LINK_ANCHOR %>" data="${entity.anchor}" icons="false"/>         
+                                   <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.LINK_ANCHOR %>" data="${entity.anchor}" icons="false"/></c:set>
+                                   <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                           
                                </c:if>
                                --%> 
                            </c:if>
@@ -185,9 +187,11 @@ RY Description not working - FIX
                     <div class="datatypePropertyValue">
                         <div class="statementWrap">
                             <div class="citation">${entity.citation}</div>
+                            <%-- 
                             <c:if test="${showEdits}">
-                                <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/>        
-                            </c:if> 
+                                <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set>
+                                <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                                       
+                            </c:if> --%> 
                         </div>
                     </div>
                 </c:if>
@@ -197,9 +201,11 @@ RY Description not working - FIX
                     <div class="datatypePropertyValue">
                         <div class="statementWrap">
                             <div class="description">${entity.blurb}</div>
+                            <%-- 
                             <c:if test="${showEdits}">
-                                <edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/>         
-                            </c:if> 
+                                <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/></c:set>
+                                <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
+                            </c:if> --%>
                         </div>
                     </div>
                 </c:if>                              
@@ -207,9 +213,11 @@ RY Description not working - FIX
                     <div class="datatypePropertyValue">
                         <div class="statementWrap">
                             <div class="description">${entity.description}</div>
+                            <%-- 
                             <c:if test="${showEdits}">
-                                <edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/>    
-                            </c:if> 
+                                <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set>
+                                <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                               
+                            </c:if> --%> 
                         </div>
                     </div>
                 </c:if>
@@ -236,9 +244,11 @@ RY Description not working - FIX
                     <div class="datatypePropertyValue">
                         <div class="statementWrap">
                             <div class="citation">${entity.citation}</div>
+                            <%-- 
                             <c:if test="${showEdits}">
-                                <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/>         
-                            </c:if> 
+                                <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set>
+                                <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
+                            </c:if> --%>
                         </div>
                     </div>
                 </c:if>