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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,9 +193,9 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</c:choose> </c:choose>
<edLnk:editLinks item="${addUrlPredicate}" icons="false" /> <edLnk:editLinks item="${addUrlPredicate}" icons="false" />
</c:if> </c:if>
<c:if test="${!empty entity.anchor}">
<ul class="externalLinks properties"> <ul class="externalLinks properties">
<%-- Primary link --%> <%-- Primary link --%>
<c:if test="${!empty entity.anchor}">
<c:choose> <c:choose>
<c:when test="${!empty entity.url}"> <c:when test="${!empty entity.url}">
<c:url var="entityUrl" value="${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> <li class="primary"><span class="externalLink"><p:process>${entity.anchor}</p:process></span></li>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if>
<%-- Additional links --%> <%-- Additional links --%>
<c:if test="${!empty entity.linksList }"> <c:if test="${!empty entity.linksList }">
@ -237,6 +237,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</c:forEach> </c:forEach>
</c:if> </c:if>
</ul> </ul>
</c:if>
</div> <!-- end dprop-vitro-links --> </div> <!-- end dprop-vitro-links -->
</c:if> </c:if>

17
webapp/web/templates/entity/entityMergedPropsList.jsp
View file

@ -197,7 +197,23 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:if test="${objRows>0}"> <c:if test="${objRows>0}">
<ul class='properties'> <ul class='properties'>
</c:if> </c:if>
<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: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"> <li><span class="statementWrap">
<c:set var="opStmt" value="${objPropertyStmt}" scope="request"/> <c:set var="opStmt" value="${objPropertyStmt}" scope="request"/>
<c:url var="propertyLink" value="/entity"> <c:url var="propertyLink" value="/entity">
@ -230,6 +246,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
</c:if> </c:if>
</span></li> </span></li>
</c:forEach> </c:forEach>
<c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul></li><!-- collate end --></c:if>
<c:if test="${objRows > 0}"></ul></c:if> <c:if test="${objRows > 0}"></ul></c:if>
</div><!-- ${objProp.localName} --> </div><!-- ${objProp.localName} -->
</c:if> </c:if>

3
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="collateCurrentClassName" value="${objPropertyStmt.object.VClass.name}" />
<c:set var="collateClassesShownCount" value="${collateClassesShown + 1}"/> <c:set var="collateClassesShownCount" value="${collateClassesShown + 1}"/>
<li> <li>
${collateCurrentClassName } <h5 class="collate">${collateCurrentClassName}</h5>
<ul class='properties'><!-- collateClasses --> <ul class='properties'><!-- collateClasses -->
</c:if> </c:if>
@ -223,6 +223,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
</c:forEach> </c:forEach>
<c:if test="${objRows > 0}"></ul></c:if> <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}"> <c:if test="${ stmtCounter > displayLimit}">
</div><%-- navlinkblock --%> </div><%-- navlinkblock --%>
</div><%-- extraEntities --%></c:if> </div><%-- extraEntities --%></c:if>