[jboss-cvs] jboss-seam/examples/dvdstore/web/admin ...
Norman Richards
norman.richards at jboss.com
Thu Mar 22 17:13:35 EDT 2007
User: nrichards
Date: 07/03/22 17:13:35
Modified: examples/dvdstore/web/admin admin.xhtml
Added: examples/dvdstore/web/admin process.xhtml
Log:
add process status tab to clean up admin page
Revision Changes Path
1.6 +3 -44 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin.xhtml 22 Feb 2007 06:03:54 -0000 1.5
+++ admin.xhtml 22 Mar 2007 21:13:35 -0000 1.6
@@ -9,7 +9,9 @@
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
- <ui:include src="/WEB-INF/incl/admin_nav.xhtml" />
+ <ui:include src="/WEB-INF/incl/admin_nav.xhtml">
+ <ui:param name="page" value="admin" />
+ </ui:include>
</ui:define>
<ui:define name="sidebar">
@@ -19,13 +21,6 @@
</ui:define>
<ui:define name="body">
- <f:subview rendered="#{!currentUser.admin}">
- The admin screen is only administrative users. Please
- login to continue. If you are looking for the store,
- try <s:link view="/browse.xhtml" value="here" />.
- </f:subview>
-
- <f:subview rendered="#{currentUser.admin}">
<h1>Order Management</h1>
<p>
@@ -166,42 +161,6 @@
</c:otherwise>
</c:choose>
- <h2>Processes</h2>
- <c:choose>
- <c:when test="#{empty processInstanceList}">
- <p>There are no active processes.</p>
- </c:when>
- <c:otherwise>
- <h:dataTable value="#{processInstanceList}" var="process"
- styleClass="dvdtable"
- headerClass="dvdtablehead"
- rowClasses="dvdtableodd,dvdtableeven"
- columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">Process Definition</f:facet>
- #{process.processDefinition.name}
- </h:column>
- <h:column>
- <f:facet name="header">Process Start</f:facet>
- <h:outputText value="#{process.start}">
- <s:convertDateTime type="both"/>
- </h:outputText>
- </h:column>
- <h:column>
- <f:facet name="header">Current Node</f:facet>
- #{process.rootToken.node.name}
- </h:column>
- <h:column>
- <f:facet name="header">Current Node Enter</f:facet>
- <h:outputText value="#{process.rootToken.nodeEnter}">
- <s:convertDateTime type="both"/>
- </h:outputText>
- </h:column>
- </h:dataTable>
- </c:otherwise>
- </c:choose>
-
- </f:subview>
</ui:define>
</ui:composition>
</body>
1.1 date: 2007/03/22 21:13:35; author: nrichards; state: Exp;jboss-seam/examples/dvdstore/web/admin/process.xhtml
Index: process.xhtml
===================================================================
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
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">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
<ui:include src="/WEB-INF/incl/admin_nav.xhtml">
<ui:param name="page" value="process" />
</ui:include>
</ui:define>
<ui:define name="sidebar">
<ui:include src="/WEB-INF/incl/login.xhtml" />
<ui:include src="/WEB-INF/incl/stats.xhtml" />
<ui:include src="/WEB-INF/incl/processmenu.xhtml" />
</ui:define>
<ui:define name="body">
<h2>Active Process Status</h2>
<f:subview rendered="#{empty processInstanceList}">
<p>There are no active processes.</p>
</f:subview>
<h:dataTable value="#{processInstanceList}"
var="process"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol"
rendered="#{not empty processInstanceList}">
<h:column>
<f:facet name="header">Process Definition</f:facet>
#{process.processDefinition.name}
</h:column>
<h:column>
<f:facet name="header">Process Start</f:facet>
<h:outputText value="#{process.start}">
<s:convertDateTime type="both"/>
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">Current Node</f:facet>
#{process.rootToken.node.name}
</h:column>
<h:column>
<f:facet name="header">Current Node Enter</f:facet>
<h:outputText value="#{process.rootToken.nodeEnter}">
<s:convertDateTime type="both"/>
</h:outputText>
</h:column>
</h:dataTable>
</ui:define>
</ui:composition>
</body>
</html>
More information about the jboss-cvs-commits
mailing list