[jboss-cvs] jboss-seam/examples/seamspace/view ...
Shane Bryzak
Shane_Bryzak at symantec.com
Thu Feb 8 04:42:12 EST 2007
User: sbryzak2
Date: 07/02/08 04:42:12
Modified: examples/seamspace/view blog.xhtml blogentry.xhtml
comment.xhtml createBlog.xhtml friendrequest.xhtml
home.xhtml profile.xhtml
Log:
JBSEAM-792 use page params
Revision Changes Path
1.9 +14 -10 jboss-seam/examples/seamspace/view/blog.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: blog.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/blog.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- blog.xhtml 31 Jan 2007 07:17:42 -0000 1.8
+++ blog.xhtml 8 Feb 2007 09:42:12 -0000 1.9
@@ -1,6 +1,7 @@
<!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">
@@ -16,10 +17,10 @@
<s:div rendered="#{selectedMember != null}">
<s:div id="blogMemberCard">
- <h:outputLink value="profile.seam?name=#{selectedMember.memberName}">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
<br style="clear:both"/>
</s:div>
@@ -31,13 +32,16 @@
<div class="blogTitle">#{memberBlog.title}</div>
<div class="blogText"><s:formattedText value="#{memberBlog.text}"/></div>
<div class="blogFooter">
- [<h:outputLink value="blogentry.seam?name=#{selectedMember.memberName}&blogId=#{memberBlog.blogId}">
+
+ [<s:link view="/blogentry.seam" propagation="none">
+ <f:param name="blogId" value="#{memberBlog.blogId}"/>
#{memberBlog.commentCount} Comment#{memberBlog.commentCount != 1 ? "s" : ""}
- </h:outputLink>]
+ </s:link>]
+
<s:span rendered="#{s:hasPermission('blog','createComment', null)}">
- [<h:outputLink value="comment.seam?name=#{selectedMember.memberName}&blogId=#{memberBlog.blogId}">
- Add Comment
- </h:outputLink>]
+ [<s:link view="/comment.seam" value="Add Comment" propagation="none">
+ <f:param name="blogId" value="#{memberBlog.blogId}"/>
+ </s:link>]
</s:span>
</div>
</div>
1.9 +15 -15 jboss-seam/examples/seamspace/view/blogentry.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: blogentry.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/blogentry.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- blogentry.xhtml 31 Jan 2007 07:17:42 -0000 1.8
+++ blogentry.xhtml 8 Feb 2007 09:42:12 -0000 1.9
@@ -2,6 +2,7 @@
<html 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">
<ui:composition template="template.xhtml">
@@ -16,10 +17,10 @@
<s:div rendered="#{selectedBlog != null}">
<s:div id="blogMemberCard">
- <h:outputLink value="profile.seam?name=#{selectedMember.memberName}">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
<br style="clear:both"/>
</s:div>
@@ -31,11 +32,9 @@
<div class="blogText"><s:formattedText value="#{selectedBlog.text}"/></div>
<div class="blogFooter">
<s:span rendered="#{s:hasPermission('blog','createComment', null)}">
- [<h:outputLink value="comment.seam?name=#{selectedMember.memberName}&blogId=#{selectedBlog.blogId}">
- Add Comment
- </h:outputLink>]
+ [<s:link view="/comment.seam" value="Add Comment" propagation="none"/>]
</s:span>
- [<h:outputLink value="blog.seam?name=#{selectedMember.memberName}">View all blog entries</h:outputLink>]
+ [<s:link view="/blog.seam" value="View all blog entries" propagation="none"/>]
</div>
</div>
@@ -43,18 +42,19 @@
<table class="blogComment">
<tr>
<td class="blogCommentor">
- <h:outputLink value="profile.seam?name=#{comment.commentor.memberName}">
+ <s:link view="/profile.seam" propagation="none">
+ <f:param name="name" value="#{comment.commentor.memberName}"/>
#{comment.commentor.memberName}<br/>
<h:graphicImage value="/content/images?id=#{comment.commentor.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
</td>
<td class="blogCommentText">
<p><s:formattedText value="#{comment.comment}"/></p>
<p>Posted by
- <h:outputLink value="profile.seam?name=#{comment.commentor.memberName}">
- #{comment.commentor.memberName}
- </h:outputLink> on #{comment.formattedCommentDate}
+ <s:link view="/profile.seam" value="#{comment.commentor.memberName}" propagation="none">
+ <f:param name="name" value="#{comment.commentor.memberName}"/>
+ </s:link> on #{comment.formattedCommentDate}
</p>
</td>
</tr>
1.6 +25 -25 jboss-seam/examples/seamspace/view/comment.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: comment.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/comment.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- comment.xhtml 27 Jan 2007 14:06:01 -0000 1.5
+++ comment.xhtml 8 Feb 2007 09:42:12 -0000 1.6
@@ -16,10 +16,10 @@
<s:div rendered="#{selectedMember != null}">
<s:div id="blogMemberCard">
- <h:outputLink value="profile.seam?name=#{selectedMember.memberName}">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
<br style="clear:both"/>
</s:div>
@@ -46,7 +46,7 @@
<h:form>
<h:outputLabel for="comment">Please type your comment</h:outputLabel><br/>
- <h:inputTextarea name="comment" value="#{comment.comment}"/><br/>
+ <h:inputTextarea id="comment" value="#{comment.comment}"/><br/>
<div class="buttons">
<h:commandButton action="#{blog.saveComment}" value="Add comment" styleClass="action"/>
1.3 +6 -6 jboss-seam/examples/seamspace/view/createBlog.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: createBlog.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/createBlog.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- createBlog.xhtml 26 Jan 2007 10:20:11 -0000 1.2
+++ createBlog.xhtml 8 Feb 2007 09:42:12 -0000 1.3
@@ -16,10 +16,10 @@
<s:div rendered="#{selectedBlog != null}">
<s:div id="blogMemberCard">
- <h:outputLink value="profile.seam?name=#{selectedMember.memberName}">
+ <s:link view="/profile.seam" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
<br style="clear:both"/>
</s:div>
@@ -35,12 +35,12 @@
<div class="formRow">
<h:outputLabel for="title">Please type a title for your blog entry</h:outputLabel><br/>
- <h:inputText name="title" value="#{selectedBlog.title}" styleClass="title"/>
+ <h:inputText id="title" value="#{selectedBlog.title}" styleClass="title"/>
</div>
<div class="formRow">
<h:outputLabel for="text">Type your blog entry here</h:outputLabel><br/>
- <h:inputTextarea name="text" value="#{selectedBlog.text}"/>
+ <h:inputTextarea id="text" value="#{selectedBlog.text}"/>
</div>
<div class="buttons">
1.2 +8 -7 jboss-seam/examples/seamspace/view/friendrequest.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: friendrequest.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/friendrequest.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- friendrequest.xhtml 31 Jan 2007 02:56:14 -0000 1.1
+++ friendrequest.xhtml 8 Feb 2007 09:42:12 -0000 1.2
@@ -2,6 +2,7 @@
<html 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">
<ui:composition template="template.xhtml">
@@ -16,10 +17,10 @@
<s:div rendered="#{friendRequest != null}">
<s:div id="blogMemberCard">
- <h:outputLink value="profile.seam?name=#{friendRequest.member.memberName}">
- #{friendRequest.member.memberName}<br/>
+ <s:link view="/profile.seam" value="#{friendRequest.member.memberName}" propagation="none">
+ <f:param name="name" value="#{friendRequest.member.memberName}"/>
<h:graphicImage value="/content/images?id=#{friendRequest.member.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
<br style="clear:both"/>
</s:div>
@@ -34,8 +35,8 @@
<h:form>
- <h:outputLabel for="comment">Please type an introduction message</h:outputLabel><br/>
- <h:inputTextarea name="comment" value="#{friendRequest.introduction}"/><br/>
+ <h:outputLabel for="introduction">Please type an introduction message</h:outputLabel><br/>
+ <h:inputTextarea name="introduction" value="#{friendRequest.introduction}"/><br/>
<div class="buttons">
<h:commandButton action="#{friend.saveRequest}" value="Send request" styleClass="action"/>
1.15 +5 -3 jboss-seam/examples/seamspace/view/home.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: home.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/home.xhtml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- home.xhtml 1 Feb 2007 08:26:37 -0000 1.14
+++ home.xhtml 8 Feb 2007 09:42:12 -0000 1.15
@@ -2,6 +2,7 @@
<html 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">
<ui:composition template="template.xhtml">
@@ -68,10 +69,11 @@
<ui:repeat value="#{newMembers}" var="newMember">
<div class="newMember">
- <h:outputLink value="profile.seam?name=#{newMember.memberName}">
+ <s:link view="/profile.seam">
+ <f:param name="name" value="#{newMember.memberName}"/>
#{newMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
</div>
</ui:repeat>
1.19 +16 -15 jboss-seam/examples/seamspace/view/profile.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: profile.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/view/profile.xhtml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- profile.xhtml 31 Jan 2007 15:00:52 -0000 1.18
+++ profile.xhtml 8 Feb 2007 09:42:12 -0000 1.19
@@ -2,6 +2,7 @@
<html 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">
<ui:composition template="template.xhtml">
@@ -40,14 +41,14 @@
<ui:repeat value="#{profile.latestBlogs}" var="latestBlog">
<div class="blogSummary">#{latestBlog.title}
- (<h:outputLink value="blogentry.seam?name=#{selectedMember.memberName}&blogId=#{latestBlog.blogId}">view more</h:outputLink>)
+ (<s:link view="/blogentry.seam" value="view more"/>)
</div>
</ui:repeat>
- [<h:outputLink value="blog.seam?name=#{selectedMember.memberName}">View all blog entries</h:outputLink>]
+ [<s:link view="/blog.seam" value="View all blog entries" propagation="none"/>]
<s:span rendered="#{s:hasPermission('blog', 'create', selectedMember)}">
- [<s:link action="#{blog.createEntry}" value="Create new blog entry"/>]
+ [<s:link action="#{blog.createEntry}" value="Create new blog entry" propagation="none"/>]
</s:span>
</s:div>
@@ -57,10 +58,11 @@
<ui:repeat value="#{profile.friends}" var="f">
<div class="friend">
- <h:outputLink value="profile.seam?name=#{f.memberName}">
+ <s:link view="/profile.seam" propagation="none">
+ <f:param name="name" value="#{f.memberName}"/>
#{f.memberName}<br/>
<h:graphicImage value="/content/images?id=#{f.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
</div>
</ui:repeat>
@@ -68,9 +70,7 @@
<br class="clear"/>
<s:span rendered="#{selectedMember.memberId != authenticatedMember.memberId and s:hasPermission('friendRequest', 'create', selectedMember.friends)}">
- [<h:outputLink value="friendrequest.seam?name=#{selectedMember.memberName}">
- Send a friend request
- </h:outputLink>]
+ [<s:link view="/friendrequest.seam" value="Send a friend request" propagation="none"/>]
</s:span>
</s:div>
@@ -82,10 +82,11 @@
<table class="friendComments">
<tr>
<td class="friendCommentor">
- <h:outputLink value="profile.seam?name=#{c.friend.memberName}">
+ <s:link view="/profile.seam">
+ <f:param name="name" value="#{c.friend.memberName}"/>
#{c.friend.memberName}<br/>
<h:graphicImage value="/content/images?id=#{c.friend.picture.imageId}&width=90"/>
- </h:outputLink>
+ </s:link>
</td>
<td style="text-align: left">
@@ -97,7 +98,7 @@
</ui:repeat>
<s:span rendered="#{s:hasPermission('friendComment', 'create', selectedMember.friends)}">
- [<h:outputLink value="friendcomment.seam?name=#{selectedMember.memberName}">Add Comment</h:outputLink>]
+ [<s:link view="/friendcomment.seam" value="Add Comment"/>]
</s:span>
</s:div>
</s:div>
More information about the jboss-cvs-commits
mailing list