[jboss-cvs] jboss-seam/examples/dvdstore/web/admin ...
Norman Richards
norman.richards at jboss.com
Thu Mar 22 17:50:00 EDT 2007
User: nrichards
Date: 07/03/22 17:50:00
Modified: examples/dvdstore/web/admin admin.xhtml process.xhtml
Log:
remove last of JSTL
Revision Changes Path
1.7 +96 -104 jboss-seam/examples/dvdstore/web/admin/admin.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: admin.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/admin/admin.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- admin.xhtml 22 Mar 2007 21:13:35 -0000 1.6
+++ admin.xhtml 22 Mar 2007 21:50:00 -0000 1.7
@@ -4,8 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:s="http://jboss.com/products/seam/taglib"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:s="http://jboss.com/products/seam/taglib">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
@@ -56,12 +55,12 @@
</ul>
<h2>Task Assignment</h2>
- <c:choose>
- <c:when test="#{empty pooledTaskInstanceList}">
+
+ <f:subview rendered="#{empty pooledTaskInstanceList}">
<p>There are no pooled tasks to be assigned.</p>
- </c:when>
- <c:otherwise>
- <h:dataTable value="#{pooledTaskInstanceList}"
+ </f:subview>
+
+ <h:dataTable rendered="#{not empty pooledTaskInstanceList}"
var="task"
styleClass="dvdtable"
headerClass="dvdtablehead"
@@ -90,16 +89,15 @@
value="Assign"/>
</h:column>
</h:dataTable>
- </c:otherwise>
- </c:choose>
+
<h2>Order Acceptance</h2>
- <c:choose>
- <c:when test="#{empty taskInstanceListForType['approve']}">
+ <f:subview rendered="#{empty taskInstanceListForType['approve']}">
<p>There are no orders to be accepted.</p>
- </c:when>
- <c:otherwise>
- <h:dataTable value="#{taskInstanceListForType['approve']}"
+ </f:subview>
+
+ <h:dataTable rendered="#{not empty taskInstanceListForType['approve']}"
+ value="#{taskInstanceListForType['approve']}"
var="task"
styleClass="dvdtable"
headerClass="dvdtablehead"
@@ -124,16 +122,13 @@
value="Review"/>
</h:column>
</h:dataTable>
- </c:otherwise>
- </c:choose>
<h2>Shipping</h2>
- <c:choose>
- <c:when test="#{empty taskInstanceListForType['ship']}">
+ <f:subview rendered="#{empty taskInstanceListForType['ship']}">
<p>There are no orders to be shipped.</p>
- </c:when>
- <c:otherwise>
- <h:dataTable value="#{taskInstanceListForType['ship']}"
+ </f:subview>
+ <h:dataTable rendered="#{not empty taskInstanceListForType['ship']}"
+ value="#{taskInstanceListForType['ship']}"
var="task"
styleClass="dvdtable"
headerClass="dvdtablehead"
@@ -158,9 +153,6 @@
value="Ship"/>
</h:column>
</h:dataTable>
- </c:otherwise>
- </c:choose>
-
</ui:define>
</ui:composition>
</body>
1.2 +1 -2 jboss-seam/examples/dvdstore/web/admin/process.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: process.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/admin/process.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- process.xhtml 22 Mar 2007 21:13:35 -0000 1.1
+++ process.xhtml 22 Mar 2007 21:50:00 -0000 1.2
@@ -4,8 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:s="http://jboss.com/products/seam/taglib"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:s="http://jboss.com/products/seam/taglib">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
More information about the jboss-cvs-commits
mailing list