litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from nihvivo-rel-1.1-maint branch: collation by subclass functional when property groups are enabled. Valid markup in either case NIHVIVO-846

Browse source
This commit is contained in:
nac26 2010-07-22 21:25:12 +00:00
parent 76304b76dc
commit 4cd59ee32d
3 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
View file

@ -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>