[jboss-svn-commits] JBL Code SVN: r18550 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: java/org/jboss/labs/admin/action and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 21 09:50:43 EST 2008
Author: wrzep
Date: 2008-02-21 09:50:43 -0500 (Thu, 21 Feb 2008)
New Revision: 18550
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/breadcrumbs.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml
Log:
JBLAB-904 breadcrumbs
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-02-21 14:47:51 UTC (rev 18549)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-02-21 14:50:43 UTC (rev 18550)
@@ -45,4 +45,6 @@
public static final String JOIN_TICKET_PAGE = USER_PREFIX + "/joinTicket.seam";
public static final String EMAIL_JIRA_REQUEST = EMAIL_PREFIX + "/jiraRequest.xhtml";
+
+ public static final String NOTIFICATIONS_PAGE = "/notifications.seam";
}
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java 2008-02-21 14:50:43 UTC (rev 18550)
@@ -0,0 +1,28 @@
+package org.jboss.labs.admin.action;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.core.Conversation;
+import org.jboss.labs.admin.Pages;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("showNotifications")
+public class ShowNotifications {
+
+ @In private Conversation conversation;
+
+ @Begin
+ public String show() {
+ conversation.setDescription("Notifications");
+ return Pages.NOTIFICATIONS_PAGE;
+ }
+
+ @Begin(nested=true)
+ public String continueConv() {
+ conversation.setDescription("Continue");
+ return Pages.NOTIFICATIONS_PAGE;
+ }
+}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-02-21 14:47:51 UTC (rev 18549)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-02-21 14:50:43 UTC (rev 18550)
@@ -9,49 +9,14 @@
template="layout/template.xhtml">
<ui:define name="body">
-
- <h:messages globalOnly="true" styleClass="message"/>
-
- <rich:panel>
- <f:facet name="header">Welcome!</f:facet>
- <h:form id="mainForm">
- <h:commandButton action="#{createProject.create}" value="Request New Project" />
- <br/>
- <h:dataTable value="#{pooledTaskInstanceList}"
- rendered="#{! empty pooledTaskInstanceList}"
- var="task">
- <f:facet name="header">Notifications</f:facet>
- <h:column>
- <f:facet name="header">Id</f:facet>
- #{task.id}
- </h:column>
- <h:column>
- <f:facet name="header">Description</f:facet>
- <h:commandLink value="#{task.description} (CP)"
- action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
- rendered="#{not empty (task.variables['projectRequestId'])}"/>
- <h:commandLink value="#{task.description} (JP)"
- action="#{reviewJoinRequest.select(task.id, task.variables['joinRequestId'])}"
- rendered="#{not empty (task.variables['joinRequestId'])}"/>
- </h:column>
- </h:dataTable>
-
- <h:dataTable value="#{projectManager.projects}"
- rendered="#{! empty projectManager.projects}"
- var="project">
- <f:facet name="header">Projects</f:facet>
- <h:column>
- <f:facet name="header">Project ID</f:facet>
- #{project.projectId}
- </h:column>
- <h:column>
- <f:facet name="header">Name</f:facet>
- <h:commandLink value="#{project.name}" action="#{viewProject.view(project.projectId)}"/>
- </h:column>
- </h:dataTable>
-
- </h:form>
- </rich:panel>
-
+ <h2>Welcome</h2>
+ <h:form id="mainForm">
+ <ul>
+ <li>
+ <s:link value="Notifications" action="#{showNotifications.show}" />
+ </li>
+ <li><h:commandLink value="Projects" action="/project/projects.seam"/></li>
+ </ul>
+ </h:form>
</ui:define>
</ui:composition>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/breadcrumbs.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/breadcrumbs.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/breadcrumbs.xhtml 2008-02-21 14:50:43 UTC (rev 18550)
@@ -0,0 +1,14 @@
+<h:form id="breadcrumbsForm"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+ <s:link view="/home.xhtml" value="Home">
+ <s:conversationPropagation type="none"/>
+ </s:link>
+ <ui:repeat value="#{conversationStack}" var="entry">
+ >
+ <h:commandLink value="#{entry.description}" action="#{entry.select}"/>
+ </ui:repeat>
+</h:form>
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml 2008-02-21 14:47:51 UTC (rev 18549)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml 2008-02-21 14:50:43 UTC (rev 18550)
@@ -7,7 +7,9 @@
xmlns:rich="http://richfaces.org/rich">
<rich:toolBarGroup>
<h:outputText value="#{projectName}:"/>
- <s:link view="/home.xhtml" value="Home"/>
+ <s:link view="/home.xhtml" value="Home">
+ <s:conversationPropagation type="none"/>
+ </s:link>
</rich:toolBarGroup>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-02-21 14:47:51 UTC (rev 18549)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-02-21 14:50:43 UTC (rev 18550)
@@ -21,7 +21,9 @@
</ui:include>
<div class="body">
- <ui:insert name="body"/>
+ <ui:include src="breadcrumbs.xhtml"/>
+ <h:messages globalOnly="true" styleClass="message"/>
+ <ui:insert name="body"/>
</div>
<div class="footer">
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml 2008-02-21 14:50:43 UTC (rev 18550)
@@ -0,0 +1,37 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ 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:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+ <h2>Notifications</h2>
+ <s:link value="Dalej" action="#{showNotifications.continueConv}" >
+ <s:conversationName value="Ctnd"/>
+ </s:link>
+ <h:form id="mainForm">
+ <h:dataTable value="#{pooledTaskInstanceList}"
+ rendered="#{! empty pooledTaskInstanceList}"
+ var="task">
+ <f:facet name="header">Notifications</f:facet>
+ <h:column>
+ <f:facet name="header">Id</f:facet>
+ #{task.id}
+ </h:column>
+ <h:column>
+ <f:facet name="header">Description</f:facet>
+ <h:commandLink value="#{task.description} (CP)"
+ action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
+ rendered="#{not empty (task.variables['projectRequestId'])}"/>
+ <h:commandLink value="#{task.description} (JP)"
+ action="#{reviewJoinRequest.select(task.id, task.variables['joinRequestId'])}"
+ rendered="#{not empty (task.variables['joinRequestId'])}"/>
+ </h:column>
+ </h:dataTable>
+ </h:form>
+</ui:define>
+</ui:composition>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml 2008-02-21 14:50:43 UTC (rev 18550)
@@ -0,0 +1,31 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ 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:rich="http://richfaces.org/rich"
+ template="../layout/template.xhtml">
+
+<ui:define name="body">
+ <h2>Projects</h2>
+ <h:form id="mainForm">
+ <h:commandButton action="#{createProject.create}" value="Request New Project" />
+ <br/>
+ <h:dataTable value="#{projectManager.projects}"
+ rendered="#{! empty projectManager.projects}"
+ var="project">
+ <f:facet name="header">Projects</f:facet>
+ <h:column>
+ <f:facet name="header">Project ID</f:facet>
+ #{project.projectId}
+ </h:column>
+ <h:column>
+ <f:facet name="header">Name</f:facet>
+ <h:commandLink value="#{project.name}" action="#{viewProject.view(project.projectId)}"/>
+ </h:column>
+ </h:dataTable>
+ </h:form>
+</ui:define>
+</ui:composition>
More information about the jboss-svn-commits
mailing list