merge 5911 from nihvivo-rel-1.1-maint to trunk

This commit is contained in:
bdc34 2010-10-06 20:02:20 +00:00
parent 4549e8e610
commit f0d55d6875
10 changed files with 683 additions and 232 deletions

View file

@ -10,7 +10,7 @@
request attributres:
'alpha' - set to currently displaying alpha, 'none' or 'all'
'tabParam' - parameter for tab
'controllerParam' - parameter for controller
'count' - count of entites in the index
'letters' - List of STrings, letters for index.
'servlet' - name of servlet to put in links.
@ -32,17 +32,28 @@
portalId=portal.getPortalId();
}
/**************************************************/
%>
%>
<c:set var="portalId" value="<%=portalId%>" />
<c:if test="${requestScope.alpha != 'none'}">
<c:if test="${ requestScope.showAlpha == 1 }">
<div class='alphaIndex'>
<c:forEach items='${requestScope.letters}' var='letter'>
<a <c:if test="${letter == requestScope.alpha}">class='selected' </c:if> href='<c:url value=".${requestScope.servlet}?home=${portalId}&amp;alpha=${letter}&amp;${requestScope.tabParam}"/>'>${letter} </a>
</c:forEach>
<c:if test='${not empty requestScope.count}'>
(${requestScope.count})
</c:if>
<c:forEach items='${requestScope.letters}' var='letter'>
<c:if test="${letter == requestScope.alpha}"> ${requestScope.alpha }&nbsp;</c:if>
<c:if test="${letter != requestScope.alpha}">
<c:url var="url" value=".${requestScope.servlet}">
<c:param name="alpha">${letter}</c:param>
</c:url>
<a href='<c:url value="${url}&amp;${requestScope.controllerParam}"/>'>${letter} </a>
</c:if>
</c:forEach>
<% if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) { %>
<a href='<c:url value=".${requestScope.servlet}?&amp;alpha=all&amp;${requestScope.controllerParam}"/>'>all </a>
<c:if test='${not empty requestScope.count }'>
(${requestScope.count} that start with ${requestScope.alpha })
</c:if>
<% }else{ %>
(${requestScope.count})
<% } %>
</div>
</c:if>