Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
In directory
james.mmbase.org:/tmp/cvs-serv4944/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
Modified Files:
ui-table.tag ui-tcolumn.tag ui-table-paging.tagf
Log Message:
CMSC-1008 add sorting support.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
See also: http://www.mmbase.org/jira/browse/CMSC-1008
Index: ui-table.tag
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-table.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ui-table.tag 15 Jul 2008 09:24:41 -0000 1.2
+++ ui-table.tag 15 Jul 2008 10:06:50 -0000 1.3
@@ -12,11 +12,25 @@
<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
<%@ variable name-from-attribute="var" alias="current" scope="NESTED"
variable-class="java.lang.Object" %>
+<%@ variable name-given="link" scope="NESTED"
variable-class="java.lang.String" %>
+
<jsp:useBean id="now" class="java.util.Date" scope="request"/>
<jsp:useBean id="pagingstatus" class="com.finalist.cmsc.paging.PagingUtils"
scope="request"/>
-
<cmsc:property key="repository.search.results.per.page" var="pagesize"/>
+<c:set var="page" value="${not empty param.page ? param.page : 0}"/>
+<c:set var="page" value="${not empty param.page ? param.page : 0}"
scope="request"/>
+<c:set var="pages" value="${ cmsc:ceil(size/pagesize)}"/>
+
+<c:set var="link" value="${requestURI}?"/>
+<c:forEach var="element" items="${param}" varStatus="status">
+ <c:if test="${(element.key ne 'page') and (element.key ne 'sortby') and
(element.key ne 'dir')}">
+ <c:set var="link" value="${link}${element.key}=${element.value}&"/>
+ </c:if>
+</c:forEach>
+
+<c:set var="sortlink" value="${link}" scope="request"/>
+
<c:choose>
<c:when test="${fn:length(items) > 0}">
Index: ui-tcolumn.tag
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ui-tcolumn.tag 15 Jul 2008 09:24:44 -0000 1.2
+++ ui-tcolumn.tag 15 Jul 2008 10:06:50 -0000 1.3
@@ -1,13 +1,16 @@
<%@ tag body-content="scriptless" %>
<%@ attribute name="titlekey" rtexprvalue="true" required="false" %>
<%@ attribute name="title" rtexprvalue="true" required="false" %>
+<%@ attribute name="sort" rtexprvalue="true" required="false" %>
+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<c:set var="dir" value="${param.dir ne 'asc' ? 'asc' : 'desc' }"/>
<c:choose>
<[EMAIL PROTECTED] id="tag_op_status" type="String"--%>
<c:when test="${tag_op_status eq 'header'}">
- <th>
+ <c:set var="content">
<c:choose>
<c:when test="${not empty title}">
${title}
@@ -18,10 +21,20 @@
<c:when test="${'' eq title}">
</c:when>
+ </c:choose>
+ </c:set>
+ <th>
+ <c:choose>
+ <c:when test="${not empty sort}">
+ <a
href="<%=request.getContextPath()%>${requestScope.sortlink}page=${page}&sortby=${sort}&dir=${dir}">
+ ${content}
+ </a>
+ </c:when>
<c:otherwise>
- <jsp:doBody/>
+ ${content}
</c:otherwise>
</c:choose>
+
</th>
</c:when>
<c:otherwise>
Index: ui-table-paging.tagf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-table-paging.tagf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui-table-paging.tagf 15 Jul 2008 09:25:33 -0000 1.1
+++ ui-table-paging.tagf 15 Jul 2008 10:06:50 -0000 1.2
@@ -3,9 +3,6 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %>
<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-<c:set var="page" value="${not empty param.page ? param.page : 0}"/>
-<c:set var="pages" value="${ cmsc:ceil(size/pagesize)}"/>
-
<fmt:bundle basename="cmsc">
<fmt:message key="pages.message" var="error"/>
<fmt:message key="pages.go" var="go"/>
@@ -14,14 +11,6 @@
<fmt:param>${(size>(page+1)*pagesize) ? (page+1)*pagesize : size
}</fmt:param>
<fmt:param>${size}</fmt:param>
</fmt:message>
-<c:set var="link" value="${requestURI}?"/>
-
-<c:forEach var="element" items="${param}" varStatus="status">
- <c:if test="${element.key ne 'page'}">
- <c:set var="link" value="${link}${element.key}=${element.value}&"/>
- </c:if>
-</c:forEach>
-
<script type="text/javascript">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
