From 16496437c9cf3a5bd7f62b49dd50b972bd9b04d8 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 14 Apr 2010 15:09:12 +0000
Subject: [PATCH] NIHVIVO-379 Merge vitro nihvivo-rel-1.0 r4753, vitro
 rel-1.0-maint r477: Remove front end editing capabilities from moniker,
 blurb, and citation.

---
 webapp/web/templates/entity/entityBasic.jsp   | 94 +++++--------------
 .../web/templates/entity/entityCitation.jsp   | 37 ++------
 2 files changed, 34 insertions(+), 97 deletions(-)

diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index 6e562202d..3b19a9aac 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -117,30 +117,16 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                             </div>
                         </div>
 
-                        <%-- Moniker. Wrap in the div only if editing. If not editing, displays inline next to label. --%>
-                        <c:if test="${showEdits}">
-                        	<c:set var="monikerAddLinks"><edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" icons="false"/></c:set>
-                        	<c:if test="${!empty monikerAddLinks }">
-                            	<div id="dprop-vitro-moniker" class="propsItem ${editingClass}">                              
-                                	<h3 class="propertyName">moniker</h3>${monikerAddLinks}
-                            </c:if>
-                        </c:if>
-                        
+                        <%-- Moniker--%>                       
                         <c:if test="${!empty entity.moniker}">
                             <div class="datatypeProperties">
                                 <div class="datatypePropertyValue" id="moniker">
                                     <div class="statementWrap">
-                                        <p:process><em class="moniker">${entity.moniker}</em></p:process>
-                                        <c:if test="${showEdits}">
-                                            <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>                         
+                                        <p:process><em class="moniker">${entity.moniker}</em></p:process>                       
                                     </div>
                                 </div>
                             </div>
-                        </c:if>
-                        
-                        <c:if test="${showEdits && !empty monikerEditLinks}"></div></c:if> <%-- end dprop-vitro-moniker --%>                             
+                        </c:if>                             
                                   
                     </c:otherwise>
                 </c:choose>
@@ -240,44 +226,11 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
 	                    </div> 
                 
 	                    <%-- Citation --%>
-                        <jsp:include page="entityCitation.jsp">
-                            <jsp:param name="showEdits" value="${showEdits}" />
-                        </jsp:include>
+                        <jsp:include page="entityCitation.jsp" />
                         
 	                </c:if>
 	            </div>
-            </c:if>
-            
-           	
-            <%-- Blurb --%>
-            <c:if test="${showEdits || !empty entity.blurb}">	             								
-				<c:if test="${not empty entity.blurb }">                          	 
-           	 	 	<c:set var="editLinksForExistingBlurb"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/></c:set>
-				</c:if>
-				<c:set var="editLinksForNewBlurb"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" icons="false"/></c:set>
-				<c:set var="mayEditBlurb" value="${showEdits && (( empty entity.blurb and not empty editLinksForNewBlurb) or ( not empty entity.blurb and not empty editLinksForExistingBlurb)) }"/>
-								          	
-				<c:if test="${ mayEditBlurb || ! empty entity.blurb }">
-					<div id="dprop-vitro-blurb" class="propsItem ${editingClass}">
-					<h3 class="propertyName">blurb</h3> ${editLinksForNewBlurb}
-				</c:if>
-				                 
-                <c:if test="${!empty entity.blurb}">
-                     <div class="datatypeProperties">
-                         <div class="datatypePropertyValue">
-                             <div class="statementWrap">
-                                 <div class="description"><p:process>${entity.blurb}</p:process></div>                        
-                                 <c:if test="${showEdits && !empty editLinksForExistingBlurb}">	                                   
-                                		<span class="editLinks">${editLinksForExistingBlurb}</span>                                                                     
-                                 </c:if> 
-                             </div>
-                         </div>
-                     </div>
-                </c:if>     
-                <c:if test="${ mayEditBlurb || ! empty entity.blurb }">
-             		</div>
-             	</c:if>
-            </c:if>
+            </c:if>  
 
             <%-- Description --%>              
             <c:if test="${ showEdits || !empty entity.description}">
@@ -309,9 +262,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
             	</c:if>
             </c:if>
                             
-        
             
-            <%-- Properties --%>
+            <%-- Ontology properties --%>
             <c:import url="${entityMergedPropsListJsp}">
                 <c:param name="mode" value="${showEdits ? 'edit' : ''}"/>
                 <c:param name="grouped" value="false"/>
@@ -319,21 +271,27 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                 <c:param name="unassignedPropsGroupName" value=""/>
             </c:import>
 
-            <p:process>
-                <%-- Citation, if no thumbnail --%>
-                <c:if test="${empty entity.imageThumb}"> 
-                    <jsp:include page="entityCitation.jsp">
-                        <jsp:param name="showEdits" value="${showEdits}" />
-                    </jsp:include>
-	            </c:if>
-                
-                <%-- Keywords --%>
-                <c:if test="${!empty entity.keywordString}">
-                    <p id="keywords">Keywords: ${entity.keywordString}</p>
-                </c:if>
-                
-            </p:process>
+            <%-- Blurb --%>                              
+            <c:if test="${!empty entity.blurb}">
+                 <div class="datatypeProperties">
+                     <div class="datatypePropertyValue">
+                         <div class="statementWrap">
+                             <p:process><div class="description">${entity.blurb}</div></p:process>                        
+                         </div>
+                     </div>
+                 </div>
+            </c:if>   
+                      
+            <%-- Citation, if no thumbnail --%>
+            <c:if test="${empty entity.imageThumb}"> 
+                <jsp:include page="entityCitation.jsp" />
+            </c:if>
             
+            <%-- Keywords --%>
+            <c:if test="${!empty entity.keywordString}">
+                <p:process><p id="keywords">Keywords: ${entity.keywordString}</p></p:process>
+            </c:if>
+                               
             ${requestScope.servletButtons}
         
         <!-- 
diff --git a/webapp/web/templates/entity/entityCitation.jsp b/webapp/web/templates/entity/entityCitation.jsp
index 453ff2b21..2b3a41854 100644
--- a/webapp/web/templates/entity/entityCitation.jsp
+++ b/webapp/web/templates/entity/entityCitation.jsp
@@ -1,35 +1,14 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %>
-<%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/PropertyEditLink" prefix="edLnk" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<c:if test="${showEdits || !empty entity.citation}">
 	
-		<c:if test="${not empty entity.citation }">                          	 
-			<c:set var="editLinksForExisting"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set>
-		</c:if>
-		<c:set var="editLinksForNew"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/></c:set>            	              	 
-		<c:set var="mayEditCitation" value="${showEdits and (( empty entity.citation and !empty editLinksForNew) or ( ! empty entity.citation and !empty editLinksForExisting)) }"/>
-		
-		<c:if test="${ !empty entity.citation || mayEditCitation }">
-			<div id="dprop-vitro-citation" class="propsItem ${editingClass}">		                           
-			<h3 class="propertyName">citation</h3> ${editLinksForNew}
-		</c:if>                 
-		
-		<c:if test="${!empty entity.citation}">
-			<div class="datatypeProperties">
-				<div class="datatypePropertyValue">
-					<div class="statementWrap">
-						<p:process>${entity.citation}</p:process>                        
-						<c:if test="${showEdits && !empty editLinksForExisting}">
-							<span class="editLinks">${editLinksForExisting}</span>
-						</c:if> 
-					</div>
-				</div>
+<c:if test="${!empty entity.citation}">
+	<div class="datatypeProperties">
+		<div class="datatypePropertyValue">
+			<div class="statementWrap">
+				<p:process><div class="citation">${entity.citation}</div></p:process>                        
 			</div>
-		</c:if>     
-		<c:if test="${ !empty entity.citation || mayEditCitation }">
-			</div>
-		</c:if>
-</c:if>
\ No newline at end of file
+		</div>
+	</div>
+</c:if>