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

Addding paged resutls to index pages. NIHVIVO-1145

Browse source
This commit is contained in:
bdc34 2010-10-06 21:52:10 +00:00
parent 23bc237950
commit c08c2fba9b
6 changed files with 215 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,11 +88,7 @@
</c:otherwise>
</c:choose>
</li>
</c:forEach>
<<<<<<< HEAD:webapp/web/templates/entity/entityListForTabs.jsp
</ul>
=======
</c:forEach>
</ul>
<%-- Show pages to select from --%>
@ -124,5 +120,6 @@ if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)re
</c:forEach>
</div>
</c:if>
>>>>>>> c91e65e... Fixing page index on lucene based tabs. NIHVIVO-1143:webapp/web/templates/entity/entityListForTabs.jsp
<jsp:include page="/templates/entity/entityListPages.jsp"/>