From 4cd59ee32dadf05afef2cac7cfc93ed06f477e6b Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 22 Jul 2010 21:25:12 +0000
Subject: [PATCH] merge from nihvivo-rel-1.1-maint branch: collation by
 subclass functional when property groups are enabled. Valid markup in either
 case NIHVIVO-846

---
 webapp/web/templates/entity/entityBasic.jsp   |  9 +++++----
 .../entity/entityMergedPropsList.jsp          | 19 ++++++++++++++++++-
 .../entity/entityMergedPropsListUngrouped.jsp |  5 +++--
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index 2554152a3..409306998 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -193,9 +193,9 @@ 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 --%>
-                        <c:if test="${!empty entity.anchor}">                              
+                        <%-- Primary link --%>                             
                             <c:choose>
                                 <c:when test="${!empty entity.url}">
                                     <c:url var="entityUrl" value="${entity.url}" />
@@ -215,7 +215,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                                     <li class="primary"><span class="externalLink"><p:process>${entity.anchor}</p:process></span></li>
                                 </c:otherwise>
                             </c:choose>
-                        </c:if>
+                        
                         
                         <%-- Additional links --%>
                         <c:if test="${!empty entity.linksList }">
@@ -236,7 +236,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                                 </li>                                          
                             </c:forEach>
                         </c:if>
-                    </ul>                   
+                    </ul>
+                    </c:if>                   
                 </div> <!-- end dprop-vitro-links  -->
             </c:if>
 
diff --git a/webapp/web/templates/entity/entityMergedPropsList.jsp b/webapp/web/templates/entity/entityMergedPropsList.jsp
index e80948fe6..f798183fb 100644
--- a/webapp/web/templates/entity/entityMergedPropsList.jsp
+++ b/webapp/web/templates/entity/entityMergedPropsList.jsp
@@ -197,7 +197,23 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 								<c:if test="${objRows>0}">
 	        						<ul class='properties'>
 	    						</c:if>
-					            <c:forEach items="${objProp.objectPropertyStatements}" var="objPropertyStmt">
+	    						<c:set var="collateByClass" value="<%=op.getCollateBySubclass()%>"/>
+        					<c:if test="${collateByClass}" >
+        						<c:set var="collateClassesShownCount" value="0"/>
+        						<c:set var="collateCurrentClass" value="_none"/>				
+        					</c:if>
+					        <c:forEach items="${objProp.objectPropertyStatements}" var="objPropertyStmt">
+					        <c:if test="${ collateByClass && collateCurrentClass!=objPropertyStmt.object.VClassURI}">						   
+		            		<c:if test="${ collateClassesShownCount > 0 }">
+		            			</ul></li><!-- collateClasses -->
+		            		</c:if>
+		            		<c:set var="collateCurrentClass" value="${objPropertyStmt.object.VClassURI}" />
+		            		<c:set var="collateCurrentClassName" value="${objPropertyStmt.object.VClass.name}" />
+		            		<c:set var="collateClassesShownCount" value="${collateClassesShown + 1}"/>		            		
+		            		<li>
+		            		<h5 class="collate">${collateCurrentClassName}</h5>
+		            		<ul class='properties'><!-- collateClasses -->
+      		        </c:if>
                                     <li><span class="statementWrap">
      								<c:set var="opStmt" value="${objPropertyStmt}" scope="request"/>
            							<c:url var="propertyLink" value="/entity">
@@ -230,6 +246,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
           					                </c:if>
                                     </span></li>
                                 </c:forEach>
+                                <c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul></li><!-- collate end --></c:if>
                                 <c:if test="${objRows > 0}"></ul></c:if>
                             </div><!-- ${objProp.localName} -->
                         </c:if>
diff --git a/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp b/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
index 39185c14d..a68e2f705 100644
--- a/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
+++ b/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
@@ -162,7 +162,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 		            		<c:set var="collateCurrentClassName" value="${objPropertyStmt.object.VClass.name}" />
 		            		<c:set var="collateClassesShownCount" value="${collateClassesShown + 1}"/>		            		
 		            		<li>
-		            		${collateCurrentClassName }
+		            		<h5 class="collate">${collateCurrentClassName}</h5>
 		            		<ul class='properties'><!-- collateClasses -->
 		            	</c:if>
 
@@ -222,7 +222,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 						<c:set var="stmtCounter" value="${stmtCounter+1}"/>
 					</c:forEach>
 					<c:if test="${objRows > 0}"></ul></c:if>
-					<c:if test="${ collateClassesShownCount > 0 }"></li><!-- collateClasses 2 --></c:if>										
+					<c:if test="${ collateClassesShownCount > 0 }"></li><!-- collateClasses 2 --></c:if>
+					<c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul><!-- collate end --></c:if>										
    					<c:if test="${ stmtCounter > displayLimit}">
    					</div><%-- navlinkblock --%>
    					</div><%-- extraEntities --%></c:if>