Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
In directory
james.mmbase.org:/tmp/cvs-serv4231/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
Modified Files:
ui-table.tag ui-tcolumn.tag ui-tabs.tag ui-tab.tag
ui-singletab.tag
Added Files:
ui-table-paging-link.tagf
Log Message:
CMSC-1008 tags moved to edit-webapp,mve preference to new tag.
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
ui-table-paging-link.tagf is new
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui-table.tag 14 Jul 2008 08:36:24 -0000 1.1
+++ ui-table.tag 15 Jul 2008 09:24:41 -0000 1.2
@@ -1,23 +1,47 @@
<%@ tag body-content="scriptless" %>
-<%@ attribute name="items" rtexprvalue="true" required="true" %>
-<%@ attribute name="var" rtexprvalue="true" required="false" %>
+
+<%@ attribute name="items" rtexprvalue="true" required="true"
type="java.util.Collection" %>
+<%@ attribute name="var" rtexprvalue="false" required="true"
type="java.lang.String" %>
+<%@ attribute name="size" rtexprvalue="true" required="false"
type="java.lang.Integer" %>
+<%@ attribute name="requestURI" rtexprvalue="true" required="false"
type="java.lang.String" %>
+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<table>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %>
+<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
+
+<%@ variable name-from-attribute="var" alias="current" scope="NESTED"
variable-class="java.lang.Object" %>
+<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:choose>
+ <c:when test="${fn:length(items) > 0}">
+ <%@ include file="ui-table-paging.tagf" %>
+ <table>
<thead class="listheader">
<c:set var="tag_op_status" value="header" scope="request"/>
<jsp:doBody/>
</thead>
<tbody class="hover">
<c:set var="tag_op_status" value="body" scope="request"/>
- <c:set var="useSwapStyle">true</c:set>
- <c:forEach var="current" items="${items}">
- <tr <c:if test="${useSwapStyle}">class="swap"</c:if>>
+ <c:forEach varStatus="status" var="current" items="${items}">
+ <tr <c:if test="${status.count % 2 != 0}">class="swap"</c:if>>
<jsp:doBody/>
</tr>
- <c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</c:forEach>
</tbody>
-</table>
+ </table>
+ <%@ include file="ui-table-paging.tagf" %>
+ </c:when>
+ <c:when test="${not empty items}">
+ <div class="empty"/>
+ <fmt:message key="resultset.blank"/>
+ </div>
+ </c:when>
+</c:choose>
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui-tcolumn.tag 14 Jul 2008 08:36:24 -0000 1.1
+++ ui-tcolumn.tag 15 Jul 2008 09:24:44 -0000 1.2
@@ -9,11 +9,14 @@
<c:when test="${tag_op_status eq 'header'}">
<th>
<c:choose>
+ <c:when test="${not empty title}">
+ ${title}
+ </c:when>
<c:when test="${not empty titlekey}">
<fmt:message key="${titlekey}"/>
</c:when>
- <c:when test="${not empty title}">
- <fmt:message key="${title}"/>
+ <c:when test="${'' eq title}">
+
</c:when>
<c:otherwise>
<jsp:doBody/>
Index: ui-tabs.tag
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tabs.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui-tabs.tag 14 Jul 2008 08:36:24 -0000 1.1
+++ ui-tabs.tag 15 Jul 2008 09:24:44 -0000 1.2
@@ -1,6 +1,5 @@
<%@ tag body-content="scriptless" %>
<div class="tabs">
-
-
+ <jsp:doBody/>
</div>
\ No newline at end of file
Index: ui-tab.tag
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tab.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui-tab.tag 14 Jul 2008 08:36:24 -0000 1.1
+++ ui-tab.tag 15 Jul 2008 09:24:44 -0000 1.2
@@ -3,6 +3,7 @@
<%@ attribute name="active" rtexprvalue="true" required="false" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<c:set var="class" value="${active ? 'tab_active' : 'tab'}"/>
Index: ui-singletab.tag
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-singletab.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui-singletab.tag 14 Jul 2008 08:36:24 -0000 1.1
+++ ui-singletab.tag 15 Jul 2008 09:24:44 -0000 1.2
@@ -1,7 +1,7 @@
<%@ tag body-content="scriptless" %>
<%@ attribute name="key" rtexprvalue="true" required="true" %>
-<%@ taglib prefix="cmsc-ui" uri="http://finalist.com/cmsc-ui"; %>
-<cmsc-ui:tabs>
- <cmsc-ui:tab key="${key}" active="true"/>
-</cmsc-ui:tabs>
+<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
+<edit:ui-tabs>
+ <edit:ui-tab key="${key}" active="true"/>
+</edit:ui-tabs>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
