[seam-commits] Seam SVN: r11620 - branches/community/Seam_2_2/examples/seamspace/view.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Nov 2 04:40:46 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-11-02 04:40:46 -0500 (Mon, 02 Nov 2009)
New Revision: 11620
Modified:
branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml
branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml
branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml
branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml
branches/community/Seam_2_2/examples/seamspace/view/friendrequest.xhtml
branches/community/Seam_2_2/examples/seamspace/view/home.xhtml
branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml
branches/community/Seam_2_2/examples/seamspace/view/profile.xhtml
branches/community/Seam_2_2/examples/seamspace/view/register.xhtml
branches/community/Seam_2_2/examples/seamspace/view/template.xhtml
Log:
JBSEAM-4455
Modified: branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedMember != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
@@ -33,14 +33,14 @@
<div class="blogText"><s:formattedText value="#{memberBlog.text}"/></div>
<div class="blogFooter">
- [<s:link view="/blogentry.seam" propagation="none">
+ [<s:link view="/blogentry.xhtml" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
<f:param name="blogId" value="#{memberBlog.blogId}"/>
#{memberBlog.commentCount} Comment#{memberBlog.commentCount != 1 ? "s" : ""}
</s:link>]
<s:span rendered="#{s:hasPermission('blog','createComment')}">
- [<s:link view="/comment.seam" value="Add Comment" propagation="none">
+ [<s:link view="/comment.xhtml" value="Add Comment" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
<f:param name="blogId" value="#{memberBlog.blogId}"/>
</s:link>]
Modified: branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedBlog != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
@@ -34,7 +34,7 @@
<s:span rendered="#{s:hasPermission(selectedBlog, 'create')}">
[<s:link action="#{commentAction.createComment}" value="Add Comment"/>]
</s:span>
- [<s:link view="/blog.seam" value="View all blog entries" propagation="none">
+ [<s:link view="/blog.xhtml" value="View all blog entries" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
</s:link>]
</div>
@@ -44,7 +44,7 @@
<table class="blogComment">
<tr>
<td class="blogCommentor">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" 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"/>
@@ -54,7 +54,7 @@
<td class="blogCommentText">
<p><s:formattedText value="#{comment.comment}"/></p>
<p>Posted by
- <s:link view="/profile.seam" value="#{comment.commentor.memberName}" propagation="none">
+ <s:link view="/profile.xhtml" value="#{comment.commentor.memberName}" propagation="none">
<f:param name="name" value="#{comment.commentor.memberName}"/>
</s:link> on #{comment.formattedCommentDate}
</p>
Modified: branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedMember != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
Modified: branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -17,7 +17,7 @@
<s:div rendered="#{selectedBlog != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
Modified: branches/community/Seam_2_2/examples/seamspace/view/friendrequest.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/friendrequest.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/friendrequest.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -17,7 +17,7 @@
<s:div rendered="#{friendRequest != null}">
<s:div id="blogMemberCard">
- <s:link view="/profile.seam" value="#{friendRequest.member.memberName}" propagation="none">
+ <s:link view="/profile.xhtml" 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"/>
</s:link>
Modified: branches/community/Seam_2_2/examples/seamspace/view/home.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/home.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/home.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -74,7 +74,7 @@
<ui:repeat value="#{newMembers}" var="newMember">
<div class="newMember">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
<f:param name="name" value="#{newMember.memberName}"/>
#{newMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/>
Modified: branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -33,7 +33,7 @@
<h1>#{selectedMember.memberName}'s pictures</h1>
<div class="memberPictureCard">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
#{selectedMember.memberName}<br/>
<h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&width=90"/>
</s:link>
@@ -52,7 +52,7 @@
<a href="content/images?id=#{img.imageId}" rel="lightbox[pictureset]" title="#{img.caption}">
<h:graphicImage value="/content/images?id=#{img.imageId}&width=90" border="0"/>
</a>
- <s:button view="/imagepermissions.seam"
+ <s:button view="/imagepermissions.xhtml"
action="#{permissionSearch.search(pictureSearch.lookupImage())}"
styleClass="padlock"
rendered="#{s:hasPermission(img, 'seam.grant-permission')}">
Modified: branches/community/Seam_2_2/examples/seamspace/view/profile.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/profile.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/profile.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -44,14 +44,14 @@
<ui:repeat value="#{profile.latestBlogs}" var="latestBlog">
<div class="blogSummary">#{latestBlog.title}
- (<s:link view="/blogentry.seam" value="view more">
+ (<s:link view="/blogentry.xhtml" value="view more">
<f:param name="name" value="#{selectedMember.memberName}"/>
<f:param name="blogId" value="#{latestBlog.blogId}"/>
</s:link>)
</div>
</ui:repeat>
- [<s:link id="viewBlog" view="/blog.seam" value="View all blog entries" propagation="none">
+ [<s:link id="viewBlog" view="/blog.xhtml" value="View all blog entries" propagation="none">
<f:param name="name" value="#{selectedMember.memberName}"/>
</s:link>]
@@ -66,7 +66,7 @@
<ui:repeat value="#{profile.friends}" var="f">
<div class="friend">
- <s:link view="/profile.seam" propagation="none">
+ <s:link view="/profile.xhtml" propagation="none">
<f:param name="name" value="#{f.memberName}"/>
#{f.memberName}<br/>
<h:graphicImage value="/content/images?id=#{f.picture.imageId}&width=90"/>
@@ -78,7 +78,7 @@
<br class="clear"/>
<s:span rendered="#{selectedMember.memberId != authenticatedMember.memberId and s:hasPermission(selectedMember, 'createFriendRequest')}">
- [<s:link view="/friendrequest.seam" action="#{friendAction.createRequest}" value="Send a friend request"><f:param name="name" value="#{selectedMember.memberName}"/></s:link>]
+ [<s:link view="/friendrequest.xhtml" action="#{friendAction.createRequest}" value="Send a friend request"><f:param name="name" value="#{selectedMember.memberName}"/></s:link>]
</s:span>
</s:div>
@@ -90,7 +90,7 @@
<table class="friendComments">
<tr>
<td class="friendCommentor">
- <s:link view="/profile.seam">
+ <s:link view="/profile.xhtml">
<f:param name="name" value="#{c.friend.memberName}"/>
#{c.friend.memberName}<br/>
<h:graphicImage value="/content/images?id=#{c.friend.picture.imageId}&width=90"/>
@@ -106,7 +106,7 @@
</ui:repeat>
<s:span rendered="#{s:hasPermission(selectedMember, 'createFriendComment')}">
- [<s:link view="/friendcomment.seam" value="Add Comment"/>]
+ [<s:link view="/friendcomment.xhtml" value="Add Comment"/>]
</s:span>
</s:div>
</s:div>
Modified: branches/community/Seam_2_2/examples/seamspace/view/register.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/register.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/register.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -12,7 +12,7 @@
<div class="errors"><h:messages globalOnly="true"/></div>
<p>
- Already a member? <s:link view="/home.seam" value="Click here to log in" propagation="none"/>
+ Already a member? <s:link view="/home.xhtml" value="Click here to log in" propagation="none"/>
</p>
<div id="register">
Modified: branches/community/Seam_2_2/examples/seamspace/view/template.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/seamspace/view/template.xhtml 2009-11-02 08:32:41 UTC (rev 11619)
+++ branches/community/Seam_2_2/examples/seamspace/view/template.xhtml 2009-11-02 09:40:46 UTC (rev 11620)
@@ -32,7 +32,7 @@
</s:fragment>
<s:link id="logout" action="#{identity.logout}" value="Log out" rendered="#{identity.loggedIn}"/>
- <h:outputLink id="login" value="home.seam" rendered="#{not identity.loggedIn}">Log in</h:outputLink>
+ <h:outputLink id="login" value="home.xhtml" rendered="#{not identity.loggedIn}">Log in</h:outputLink>
</div>
<br style="clear:both"/>
<h:form>
More information about the seam-commits
mailing list