Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors
In directory
james.mmbase.org:/tmp/cvs-serv12278/cmsc/edit-webapp/src/webapp/editors
Modified Files:
pages.jsp searchpage.jsp
Log Message:
CMSC-1002 - Improved paging in Content Explorer and fixed Javascript
definitions.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors
See also: http://www.mmbase.org/jira/browse/CMSC-1002
Index: pages.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/pages.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- pages.jsp 12 Feb 2008 17:11:32 -0000 1.11
+++ pages.jsp 8 Jul 2008 14:41:47 -0000 1.12
@@ -3,14 +3,10 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-
-
<!--todo : get default page size from system properties.-->
-
<c:set var="currentPage" value="${empty param.offset ? 1 : param.offset +1 }"/>
<c:set var="pagessize" value="${ cmsc:ceil(listSize/resultsPerPage)}"/>
-
<fmt:bundle basename="cmsc">
<fmt:message key="pages.message" var="error"/>
<fmt:message key="pages.go" var="go"/>
@@ -54,12 +50,9 @@
<td style="text-align:right;width:50%;">
<fmt:message key="searchpages.page"/>:
<c:if test="${currentPage > 1}">
- <a href="<%=PagingUtils.previousPage(pageContext)%>"
class="page_list_navtrue">
- <<<fmt:message key="pages.previous"/>
- </a>
+ <a href="<%=PagingUtils.previousPage(pageContext)%>"
class="page_list_navtrue"><<<fmt:message key="pages.previous"/></a>
</c:if>
-
<c:choose>
<c:when test="${pagessize>0&&pagessize<14}">
<c:forEach var="count" begin="1" end="${pagessize}">
@@ -101,9 +94,7 @@
<%=RandomStringUtils.randomAlphabetic(5)%>
</c:set>
<c:if test="${currentPage < pagessize}">
- <a href="<%=PagingUtils.nextPage(pageContext)%>"
class="page_list_navtrue">
- <fmt:message key="pages.next"/>>>
- </a>
+ <a href="<%=PagingUtils.nextPage(pageContext)%>"
class="page_list_navtrue"><fmt:message key="pages.next"/>>></a>
</c:if>
<c:if test="${pagessize>13}">
<input type="text" name="targetpage" id="${targetfield}"
size="4"
Index: searchpage.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/searchpage.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- searchpage.jsp 28 Jan 2008 09:37:14 -0000 1.1
+++ searchpage.jsp 8 Jul 2008 14:41:47 -0000 1.2
@@ -17,7 +17,7 @@
</fmt:message>
-<script language="JavaScript">
+<script type="text/javascript">
function gotopage(targetfield) {
@@ -48,18 +48,14 @@
<td style="text-align:right;width:50%;">
<fmt:message key="searchpages.page"/>:
<c:if test="${currentPage > 1}">
- <a href="javascript:setOffset('${currentPage - 2}');"
class="page_list_navtrue">
- <<<fmt:message key="pages.previous"/>
- </a>
+ <a href="javascript:setOffset('${currentPage - 2}');"
class="page_list_navtrue"><<<fmt:message key="pages.previous"/></a>
</c:if>
<c:choose>
<c:when test="${pagessize>0&&pagessize<14}">
<c:forEach var="count" begin="1" end="${pagessize}">
- <a href="javascript:setOffset('${count-1}');" class="${count
== currentPage ? 'page_list_navtrue':'page_list_navfalse'}">
- <c:out value="${count}"/>
- </a>
+ <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ?
'page_list_navfalse':'page_list_navtrue'}"><c:out value="${count}"/></a>
<c:if test="${count ne pagessize}"> | </c:if>
</c:forEach>
</c:when>
@@ -67,18 +63,14 @@
<c:when test="${pagessize>13}">
<c:set var="length_of_prefix" value="${currentPage <7 ?
currentPage+2 : 3}"/>
<c:forEach var="count" begin="1" end="${length_of_prefix}">
- <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ? 'page_list_navtrue':'page_list_navfalse'}">
- <c:out value="${count}"/>
- </a>
+ <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ?
'page_list_navfalse':'page_list_navtrue'}"><c:out value="${count}"/></a>
|
</c:forEach>
...
<c:if test="${6<currentPage&¤tPage <pagessize-5}">
<c:forEach var="count" begin="${currentPage-2}"
end="${currentPage+2}">
- <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ? 'page_list_navtrue':'page_list_navfalse'}">
- <c:out value="${count}"/>
- </a>
+ <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ?
'page_list_navfalse':'page_list_navtrue'}"><c:out value="${count}"/></a>
|
</c:forEach>
...
@@ -86,9 +78,7 @@
<c:set var="length_of_postfix"
value="${currentPage>(pagessize-6) ? currentPage-2 : (pagessize-2)}"/>
<c:forEach var="count" begin="${length_of_postfix}"
end="${pagessize}">
- <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ? 'page_list_navtrue':'page_list_navfalse'}">
- <c:out value="${count}"/>
- </a>
+ <a href="javascript:setOffset('${count-1}');"
class="${count == currentPage ?
'page_list_navfalse':'page_list_navtrue'}"><c:out value="${count}"/></a>
|
</c:forEach>
</c:when>
@@ -103,9 +93,7 @@
<%=RandomStringUtils.randomAlphabetic(5)%>
</c:set>
<c:if test="${currentPage < pagessize}">
- <a href="javascript:setOffset('${currentPage}');"
class="page_list_navtrue">
- <fmt:message key="pages.next"/>>>
- </a>
+ <a href="javascript:setOffset('${currentPage}');"
class="page_list_navtrue"><fmt:message key="pages.next"/>>></a>
</c:if>
<c:if test="${pagessize>13}">
<input type="text" name="targetpage" id="${targetfield}"
size="4"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
