From ac1a9d4cb49a2f6c4ac443a89540a97d4a50146e Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 24 Mar 2010 15:39:02 +0000
Subject: [PATCH] NIHVIVO-147 Moved citation display to a separate jsp, since
 it's used twice in entityBasic.jsp. Renamed some siteAdmin jsp files.

---
 .../controller/edit/SiteAdminController.java  |   4 +-
 .../siteAdmin/{main.jsp => siteAdminMain.jsp} |   0
 .../{scripts.jsp => siteAdminScripts.jsp}     |   0
 webapp/web/templates/entity/entityBasic.jsp   | 190 ++++++++----------
 .../web/templates/entity/entityCitation.jsp   |  27 +++
 5 files changed, 116 insertions(+), 105 deletions(-)
 rename webapp/web/siteAdmin/{main.jsp => siteAdminMain.jsp} (100%)
 rename webapp/web/siteAdmin/{scripts.jsp => siteAdminScripts.jsp} (100%)
 create mode 100644 webapp/web/templates/entity/entityCitation.jsp

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java
index 144c0f4fb..473189ac9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java
@@ -79,8 +79,8 @@ public class SiteAdminController extends BaseEditController {
         request.setAttribute("singlePortal",new Boolean(vreq.getWebappDaoFactory().getPortalDao().isSinglePortal()));
         
         RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);        
-        request.setAttribute("bodyJsp","/siteAdmin/main.jsp");
-        request.setAttribute("scripts","/siteAdmin/scripts.jsp");
+        request.setAttribute("bodyJsp","/siteAdmin/siteAdminMain.jsp");
+        request.setAttribute("scripts","/siteAdmin/siteAdminScripts.jsp");
         request.setAttribute("title",((Portal)request.getAttribute("portalBean")).getAppName() + " Site Administration");
         request.setAttribute("epoKey",epo.getKey());
         try {
diff --git a/webapp/web/siteAdmin/main.jsp b/webapp/web/siteAdmin/siteAdminMain.jsp
similarity index 100%
rename from webapp/web/siteAdmin/main.jsp
rename to webapp/web/siteAdmin/siteAdminMain.jsp
diff --git a/webapp/web/siteAdmin/scripts.jsp b/webapp/web/siteAdmin/siteAdminScripts.jsp
similarity index 100%
rename from webapp/web/siteAdmin/scripts.jsp
rename to webapp/web/siteAdmin/siteAdminScripts.jsp
diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index a56689170..449b6fce7 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -60,8 +60,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
     <c:set var="showCuratorEdits" value="${true}"/>
 </c:if>
 
-<c:set var="showEdits" value="${showSelfEdits || showCuratorEdits}" />
-<c:set var="editingClass" value="${showEdits ? 'editing' : ''}" />
+<c:set var="showEdits" value="${showSelfEdits || showCuratorEdits}" scope="request"/>
+<c:set var="editingClass" value="${showEdits ? 'editing' : ''}" scope="request"/>
 
 <c:set var='imageDir' value='images' />
 <c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set>
@@ -125,7 +125,7 @@ RY Description not working - FIX
 
                         <%-- Moniker. Wrap in the div only if editing. If not editing, displays inline next to label. --%>
                         <c:if test="${showEdits}">
-                            <div id="dprop-vitro-moniker" class="propsItem editing">                              
+                            <div id="dprop-vitro-moniker" class="propsItem ${editingClass}">                              
                                 <h3 class="propertyName">moniker</h3>
                                 <edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" icons="false"/>
                         </c:if>
@@ -149,91 +149,86 @@ RY Description not working - FIX
             </div> <!-- end labelAndMoniker -->
             
             <%-- Links --%>
-            <c:if test="${ (!empty entity.anchor) || (!empty entity.linksList) }">
-                <div class="datatypePropertyValue">
-                    <div class="statementWrap">
-                        <ul class="externalLinks">
-                           <c:if test="${!empty entity.anchor}">
-                               <c:choose>
-                                   <c:when test="${!empty entity.url}">
-                                       <c:url var="entityUrl" value="${entity.url}" />
-                                       <li class="primary"><a class="externalLink" href="<c:out value="${entityUrl}"/>"><p:process>${entity.anchor}</p:process></a></li>
-                                   </c:when>
-                                   <c:otherwise>
-                                       <li class="primary"><span class="externalLink"><p:process>${entity.anchor}</p:process></span></li>
-                                   </c:otherwise>
-                               </c:choose>
-                               <%--
-                               <c:if test="${showEdits}">
-                                   <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>
-                           <c:if test="${!empty entity.linksList }">
-                               <c:forEach items="${entity.linksList}" var='link' varStatus="count">
-                                   <c:url var="linkUrl" value="${link.url}" />
-                                   <c:choose>
-                                       <c:when test="${empty entity.url && count.first==true}"><li class="first"></c:when>
-                                       <c:otherwise><li></c:otherwise>
-                                   </c:choose>
-                                   <a class="externalLink" href="<c:out value="${linkUrl}"/>"><p:process>${link.anchor}</p:process></a></li>
-                               </c:forEach>
-                           </c:if>
-                        </ul>
+            <c:if test="${ showEdits || !empty entity.anchor || !empty entity.linksList }"> 
+                <div id="dprop-vitro-link" class="propsItem ${editingClass}">
+                    <c:if test="${showEdits}">
+                        <h3 class="propertyName">links</h3>
+                        <edLnk:editLinks item="<%= VitroVocabulary.LINK_ANCHOR %>" icons="false" />
+                    </c:if>
+                    <div class="datatypeProperties">
+                        <div class="datatypePropertyValue">
+                            <div class="statementWrap">
+                                <ul class="externalLinks">
+                                    <c:if test="${!empty entity.anchor}">
+                                        <c:choose>
+                                            <c:when test="${!empty entity.url}">
+                                                <c:url var="entityUrl" value="${entity.url}" />
+                                                <li class="primary"><a class="externalLink" href="<c:out value="${entityUrl}"/>"><p:process>${entity.anchor}</p:process></a></li>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <li class="primary"><span class="externalLink"><p:process>${entity.anchor}</p:process></span></li>
+                                            </c:otherwise>
+                                        </c:choose>
+                                        <%--
+                                        <c:if test="${showEdits}">
+                                            <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>
+                                    <c:if test="${!empty entity.linksList }">
+                                        <c:forEach items="${entity.linksList}" var='link' varStatus="count">
+                                            <c:url var="linkUrl" value="${link.url}" />
+                                            <c:choose>
+                                                <c:when test="${empty entity.url && count.first==true}"><li class="first"></c:when>
+                                                <c:otherwise><li></c:otherwise>
+                                            </c:choose>
+                                            <a class="externalLink" href="<c:out value="${linkUrl}"/>"><p:process>${link.anchor}</p:process></a></li>
+                                        </c:forEach>
+                                    </c:if>
+                                </ul>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </c:if>   
             
             <%-- Thumbnail (with citation) --%>
-            <div id="dprop-vitro-image" class="propsItem ${editingClass}"> 
-                <c:if test="${showEdits}">
-                    <h3 class="propertyName">image</h3>
-                    <edLnk:editLinks item="<%= VitroVocabulary.IMAGETHUMB %>" icons="false" />
-                </c:if>
-                <c:if test="${!empty entity.imageThumb}">
-                    <div class="datatypeProperties">
-                        <div class="datatypePropertyValue">
-                            <div class="statementWrap thumbnail"> 
-                            <c:set var="imageTitle" value="${entity.name}" />              
-                                <c:if test="${!empty entity.imageFile}">
-                                    <c:url var="imageUrl" value="/${imageDir}/${entity.imageFile}" />
-                                    <a class="image" href="${imageUrl}">
-                                    <c:set var="imageTitle" value="click to view larger image in new window" />
-                                </c:if>
-                                <c:url var="imageSrc" value='/${imageDir}/${entity.imageThumb}'/>
-                                <img src="<c:out value="${imageSrc}"/>" title="${imageTitle}" alt="" width="150"/>
-                                <c:if test="${!empty entity.imageFile}"></a></c:if>
-                                <c:if test="${showEdits}">
-                                    <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.IMAGETHUMB %>" data="${entity.imageThumb}" icons="false"/></c:set>
-                                    <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
-                                </c:if>                                   
-                            </div>
-                        </div>
-                    </div> 
+            <c:if test="${showEdits || !empty entity.imageThumb}">
+	            <div id="dprop-vitro-image" class="propsItem ${editingClass}"> 
+	                <c:if test="${showEdits}">
+	                    <h3 class="propertyName">image</h3>
+	                    <edLnk:editLinks item="<%= VitroVocabulary.IMAGETHUMB %>" icons="false" />
+	                </c:if>
+	                <c:if test="${!empty entity.imageThumb}">
+	                    <div class="datatypeProperties">
+	                        <div class="datatypePropertyValue">
+	                            <div class="statementWrap thumbnail"> 
+	                            <c:set var="imageTitle" value="${entity.name}" />              
+	                                <c:if test="${!empty entity.imageFile}">
+	                                    <c:url var="imageUrl" value="/${imageDir}/${entity.imageFile}" />
+	                                    <a class="image" href="${imageUrl}">
+	                                    <c:set var="imageTitle" value="click to view larger image in new window" />
+	                                </c:if>
+	                                <c:url var="imageSrc" value='/${imageDir}/${entity.imageThumb}'/>
+	                                <img src="<c:out value="${imageSrc}"/>" title="${imageTitle}" alt="" width="150"/>
+	                                <c:if test="${!empty entity.imageFile}"></a></c:if>
+	                                <c:if test="${showEdits}">
+	                                    <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.IMAGETHUMB %>" data="${entity.imageThumb}" icons="false"/></c:set>
+	                                    <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
+	                                </c:if>                                   
+	                            </div>
+	                        </div>
+	                    </div> 
                 
-                    <%-- Citation --%>
-                    <div id="dprop-vitro-citation" class="propsItem ${editingClass}">   
-                        <c:if test="${showEdits}">                           
-                            <h3 class="propertyName">citation</h3>
-                            <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
-                        </c:if>
-                        <c:if test="${!empty entity.citation}">
-                            <div class="datatypeProperties">
-                                <div class="datatypePropertyValue">
-                                    <div class="statementWrap">
-                                        ${entity.citation}
-                                        <c:if test="${showEdits}">
-                                            <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>
-                            </div>
-                        </c:if>     
-                    </div>
-                </c:if>
-            </div>
+	                    <%-- Citation --%>
+                        <jsp:include page="entityCitation.jsp">
+                            <jsp:param name="showEdits" value="${showEdits}" />
+                        </jsp:include>
+                        
+	                </c:if>
+	            </div>
+            </c:if>
             
             <p:process>
 
@@ -295,31 +290,20 @@ RY Description not working - FIX
 
             <p:process>
                 <%-- Citation, if no thumbnail --%>
-                <c:if test="${empty entity.imageThumb}">
-                    <div id="dprop-vitro-citation" class="propsItem ${editingClass}">   
-                        <c:if test="${showEdits}">                           
-                            <h3 class="propertyName">citation</h3>
-                            <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
-                        </c:if>
-                        <c:if test="${!empty entity.citation}">
-                            <div class="datatypeProperties">
-                                <div class="datatypePropertyValue">
-                                    <div class="statementWrap">
-                                        ${entity.citation}
-                                        <c:if test="${showEdits}">
-                                            <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>
-                            </div>
-                        </c:if>     
-                    </div>
-                </c:if>
+                <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>
+            
             ${requestScope.servletButtons}
+            
         </div> <!--  contents -->
     </div> <!-- content -->
diff --git a/webapp/web/templates/entity/entityCitation.jsp b/webapp/web/templates/entity/entityCitation.jsp
new file mode 100644
index 000000000..2706211e1
--- /dev/null
+++ b/webapp/web/templates/entity/entityCitation.jsp
@@ -0,0 +1,27 @@
+<%-- $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://java.sun.com/jstl/core" prefix="c" %>
+
+<c:if test="${showEdits || !empty entity.citation}">
+    <div id="dprop-vitro-citation" class="propsItem ${editingClass}">   
+        <c:if test="${showEdits}">                           
+            <h3 class="propertyName">citation</h3>
+            <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
+        </c:if>
+        <c:if test="${!empty entity.citation}">
+            <div class="datatypeProperties">
+                <div class="datatypePropertyValue">
+                    <div class="statementWrap">
+                        ${entity.citation}
+                        <c:if test="${showEdits}">
+                            <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>
+            </div>
+        </c:if>     
+    </div>
+</c:if>
\ No newline at end of file