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

Fixing page index on lucene based tabs. NIHVIVO-1143

Browse source 
Conflicts:

	webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java
	webapp/web/templates/entity/entityListForTabs.jsp
This commit is contained in:
bdc34 2010-10-06 20:54:29 +00:00
parent a83ea26a7b
commit c3cb7b05a2
3 changed files with 144 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

34
webapp/web/templates/entity/entityListForTabs.jsp
View file

@ -89,6 +89,40 @@
</c:choose>
</li>
</c:forEach>
<<<<<<< HEAD:webapp/web/templates/entity/entityListForTabs.jsp
</ul>
=======
</ul>
<%-- Show pages to select from --%>
<%
if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {
request.setAttribute("pageAlpha",request.getAttribute("alpha"));
}else{
request.setAttribute("pageAlpha",request.getAttribute("all"));
}
%>
<c:if test="${ requestScope.showPages }">
<div class="searchpages minimumFontMain">
Pages:
<c:forEach items='${requestScope.pages }' var='page'>
<c:url var='pageUrl' value=".${requestScope.servlet}">
<c:param name ="primary">${requestScope.tabId}</c:param>
<c:param name="page">${page.index}</c:param>
<c:if test="${not empty requestScope.pageAlpha}">
<c:param name="alpha">${requestScope.pageAlpha}</c:param>
</c:if>
</c:url>
<c:if test="${ page.selected }">
${page.text}
</c:if>
<c:if test="${ not page.selected }">
<a class="minimumFontMain" href="${pageUrl}">${page.text} </a>
</c:if>
</c:forEach>
</div>
</c:if>
>>>>>>> c91e65e... Fixing page index on lucene based tabs. NIHVIVO-1143:webapp/web/templates/entity/entityListForTabs.jsp