[jboss-cvs] jboss-seam/trinidad/examples/seamdiscs/view ...
Peter Muir
peter at bleepbleep.org.uk
Wed Apr 18 08:06:28 EDT 2007
User: pmuir
Date: 07/04/18 08:06:28
Modified: trinidad/examples/seamdiscs/view discs.page.xml
error.xhtml login.xhtml artists.xhtml home.page.xml
artist.xhtml artists.page.xml home.xhtml disc.xhtml
discs.xhtml
Log:
Tidy up seamdiscs
Revision Changes Path
1.2 +1 -1 jboss-seam/trinidad/examples/seamdiscs/view/discs.page.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: discs.page.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/discs.page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- discs.page.xml 15 Apr 2007 17:45:41 -0000 1.1
+++ discs.page.xml 18 Apr 2007 12:06:28 -0000 1.2
@@ -6,7 +6,7 @@
<param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/>
<navigation>
<rule if-outcome="disc">
- <begin-conversation flush-mode="manual"/>
+ <begin-conversation flush-mode="manual" join="true"/>
<redirect view-id="/disc.xhtml"/>
</rule>
</navigation>
1.2 +0 -2 jboss-seam/trinidad/examples/seamdiscs/view/error.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: error.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/error.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- error.xhtml 15 Apr 2007 17:45:41 -0000 1.1
+++ error.xhtml 18 Apr 2007 12:06:28 -0000 1.2
@@ -12,7 +12,5 @@
<h1>Error</h1>
<p>Something bad happened :-(</p>
- <h:messages styleClass="message"/>
-
</ui:define>
</ui:composition>
1.2 +0 -2 jboss-seam/trinidad/examples/seamdiscs/view/login.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: login.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/login.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- login.xhtml 15 Apr 2007 17:45:41 -0000 1.1
+++ login.xhtml 18 Apr 2007 12:06:28 -0000 1.2
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages styleClass="message"/>
-
<h:form id="login">
<rich:panel>
1.2 +4 -10 jboss-seam/trinidad/examples/seamdiscs/view/artists.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: artists.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/artists.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- artists.xhtml 15 Apr 2007 17:45:41 -0000 1.1
+++ artists.xhtml 18 Apr 2007 12:06:28 -0000 1.2
@@ -11,13 +11,11 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">Artists</f:facet>
<tr:panelPartialRoot>
<tr:form>
- <tr:table value="#{artists.dataModel}" var="artist" rows="#{artists.maxResults}" rowBandingInterval="1">
+ <tr:table value="#{artists.dataModel}" var="artist" rows="#{artists.maxResults}">
<tr:column sortable="true" sortProperty="artist.name">
<f:facet name="header">
Name
@@ -33,13 +31,9 @@
</f:facet>
<tr:outputText value="Solo performer" rendered="#{artist.class.simpleName eq 'Artist'}" />
<tr:outputText value="None" rendered="#{artist.class.simpleName eq 'Band' and empty artist.bandMembers}" />
- <s:fragment rendered="#{artist.class.simpleName eq 'Band' and not empty artist.bandMembers}">
- <ul>
- <!-- <ui:repeat value="#{artist.bandMembers}" var="bandMember">
- <li><tr:outputText value="#{bandMember.name}" /></li>
- </ui:repeat>-->
- </ul>
- </s:fragment>
+ <rich:dataList value="#{artist.bandMembers}" var="bandMember" rendered="#{artist.class.simpleName eq 'Band' and not empty artist.bandMembers}">
+ <tr:outputText value="#{bandMember.name}" />
+ </rich:dataList>
</tr:column>
<f:facet name="detailStamp">
<s:div style="width: 200px">
1.2 +2 -2 jboss-seam/trinidad/examples/seamdiscs/view/home.page.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: home.page.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/home.page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- home.page.xml 15 Apr 2007 17:45:41 -0000 1.1
+++ home.page.xml 18 Apr 2007 12:06:28 -0000 1.2
@@ -7,11 +7,11 @@
<param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/>
<navigation>
<rule if-outcome="artist">
- <begin-conversation flush-mode="manual"/>
+ <begin-conversation flush-mode="manual" join="true"/>
<redirect view-id="/artist.xhtml"/>
</rule>
<rule if-outcome="disc">
- <begin-conversation flush-mode="manual"/>
+ <begin-conversation flush-mode="manual" join="true"/>
<redirect view-id="/disc.xhtml"/>
</rule>
</navigation>
1.2 +1 -3 jboss-seam/trinidad/examples/seamdiscs/view/artist.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: artist.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/artist.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- artist.xhtml 15 Apr 2007 17:45:41 -0000 1.1
+++ artist.xhtml 18 Apr 2007 12:06:28 -0000 1.2
@@ -12,10 +12,8 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
- <f:facet name="header"><tr:outputText value="#{artist.name} (#{messages[artist.class.name]})" /></f:facet>
+ <f:facet name="header"><tr:outputText value="#{artist.name} (#{messages[artist.class.name]})" rendered="#{artist.name ne null}" /></f:facet>
<tr:panelPartialRoot>
<h:form>
<tr:panelFormLayout>
1.2 +1 -1 jboss-seam/trinidad/examples/seamdiscs/view/artists.page.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: artists.page.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/artists.page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- artists.page.xml 15 Apr 2007 17:45:41 -0000 1.1
+++ artists.page.xml 18 Apr 2007 12:06:28 -0000 1.2
@@ -7,7 +7,7 @@
<param name="type" value="#{artistHome.type}"/>
<navigation>
<rule if-outcome="artist">
- <begin-conversation flush-mode="manual"/>
+ <begin-conversation flush-mode="manual" join="true"/>
<redirect view-id="/artist.xhtml"/>
</rule>
</navigation>
1.3 +18 -31 jboss-seam/trinidad/examples/seamdiscs/view/home.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: home.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/home.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- home.xhtml 16 Apr 2007 00:28:06 -0000 1.2
+++ home.xhtml 18 Apr 2007 12:06:28 -0000 1.3
@@ -11,8 +11,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">Welcome to Seam Discs!</f:facet>
<p>This application allows you to catalogue your favourite
@@ -33,37 +31,26 @@
<p>You can log in as <code>administrator</code>/<code>administrator</code>.</p>
</rich:panel>
<rich:panel>
- <f:facet name="header">All Discs</f:facet>
- <tr:panelPartialRoot>
- <tr:form>
- <tr:table value="#{discs.dataModel}" var="disc" rows="#{discs.maxResults}" >
- <tr:column sortable="true" sortProperty="disc.name">
<f:facet name="header">
- Disc
+ <tr:outputText value="Artists & Discs" />
</f:facet>
- <s:link action="disc">
- <tr:outputText value="#{disc.name}" />
- <f:param name="discId" value="#{disc.id}" />
+ <tr:panelPartialRoot>
+ <tr:form>
+ <tr:tree value="#{artistHome.tree}" var="var">
+ <f:facet name="nodeStamp">
+ <ui:fragment>
+ <s:link action="disc" rendered="#{var.class.simpleName eq 'Disc'}">
+ <tr:outputText value="#{var.name}" />
+ <tr:outputText value=" (#{var.release})" rendered="#{var.release ne null}"/>
+ <f:param name="discId" value="#{var.id}" />
</s:link>
- </tr:column>
- <tr:column sortable="true" sortProperty="disc.release">
- <f:facet name="header">
- Release
- </f:facet>
- <h:outputText value="#{disc.release}">
- <s:convertDateTime pattern="yyyy" />
- </h:outputText>
- </tr:column>
- <tr:column sortable="true" sortProperty="disc.artist">
- <f:facet name="header">
- Artist
- </f:facet>
- <s:link action="artist">
- <h:outputText value="#{disc.artist.name}" rendered="#{disc.artist ne null}" />
- <f:param name="artistId" value="#{disc.artist.id}" />
+ <s:link action="artist" rendered="#{var.class.simpleName eq 'Artist' or var.class.simpleName eq 'Band'}">
+ <tr:outputText value="#{var.name}" />
+ <f:param name="artistId" value="#{var.id}" />
</s:link>
- </tr:column>
- </tr:table>
+ </ui:fragment>
+ </f:facet>
+ </tr:tree>
</tr:form>
</tr:panelPartialRoot>
</rich:panel>
1.2 +10 -14 jboss-seam/trinidad/examples/seamdiscs/view/disc.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: disc.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/disc.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- disc.xhtml 15 Apr 2007 17:45:41 -0000 1.1
+++ disc.xhtml 18 Apr 2007 12:06:28 -0000 1.2
@@ -12,23 +12,19 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">
- <s:fragment>
+ <s:fragment rendered="#{disc.name ne null}">
<i><tr:outputText value="#{disc.name}" /></i>
<tr:outputText value=" by #{disc.artist.name}" />
</s:fragment>
</f:facet>
<tr:panelPartialRoot>
<tr:form>
- <tr:panelFormLayout>
<s:validateAll>
+ <tr:panelFormLayout>
<tr:inputText label="Disc" value="#{disc.name}" readOnly="#{not identity.loggedIn}" required="true" />
- <tr:inputText label="Release Date" value="#{disc.release}" readOnly="#{not identity.loggedIn}" columns="5">
- <s:convertDateTime pattern="yyyy"/>
- </tr:inputText>
+ <tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1" readOnly="#{not identity.loggedIn}" />
<tr:selectOneChoice value="#{disc.artist}" label="Artist" required="true" readOnly="#{not identity.loggedIn}">
<s:selectItems value="#{artists.resultList}" var="artist" label="#{artist.name}" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" />
<s:convertEntity />
@@ -42,8 +38,8 @@
<tr:outputText value="None known" rendered="#{empty disc.description}" />
</s:div>
</tr:panelLabelAndMessage>
- </s:validateAll>
</tr:panelFormLayout>
+ </s:validateAll>
<tr:panelButtonBar rendered="#{identity.loggedIn}">
<h:commandButton action="#{discHome.update}" value="Save" rendered="#{discHome.managed}" />
1.2 +0 -2 jboss-seam/trinidad/examples/seamdiscs/view/discs.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: discs.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/view/discs.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- discs.xhtml 15 Apr 2007 17:45:41 -0000 1.1
+++ discs.xhtml 18 Apr 2007 12:06:28 -0000 1.2
@@ -11,8 +11,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">Discs</f:facet>
<tr:panelPartialRoot>
More information about the jboss-cvs-commits
mailing list