Author: mgencur(a)redhat.com Date: 2010-01-20 06:33:10 -0500 (Wed, 20 Jan 2010) New Revision: 11973 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/home.xhtml branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml branches/community/Seam_2_2/examples/seamspace/view/register.xhtml Log: JBSEAM-4526 other files fixed as well Modified: branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml =================================================================== --- branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/blog.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -17,7 +17,7 @@ <s:div rendered="#{selectedMember != null}"> <s:div id="blogMemberCard"> - <s:link view="/profile.xhtml" propagation="none"> + <s:link view="/profile.seam" propagation="none"> #{selectedMember.memberName}<br/> <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&amp;width=90"/> </s:link> @@ -33,14 +33,14 @@ <div class="blogText"><s:formattedText value="#{memberBlog.text}"/></div> <div class="blogFooter"> - [<s:link view="/blogentry.xhtml" propagation="none"> + [<s:link view="/blogentry.seam" 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.xhtml" value="Add Comment" propagation="none"> + [<s:link view="/comment.seam" 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 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/blogentry.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -17,7 +17,7 @@ <s:div rendered="#{selectedBlog != null}"> <s:div id="blogMemberCard"> - <s:link view="/profile.xhtml" propagation="none"> + <s:link view="/profile.seam" propagation="none"> #{selectedMember.memberName}<br/> <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&amp;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.xhtml" value="View all blog entries" propagation="none"> + [<s:link view="/blog.seam" 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.xhtml" propagation="none"> + <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}&amp;width=90"/> @@ -54,7 +54,7 @@ <td class="blogCommentText"> <p><s:formattedText value="#{comment.comment}"/></p> <p>Posted by - <s:link view="/profile.xhtml" value="#{comment.commentor.memberName}" propagation="none"> + <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> Modified: branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml =================================================================== --- branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/comment.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -17,7 +17,7 @@ <s:div rendered="#{selectedMember != null}"> <s:div id="blogMemberCard"> - <s:link view="/profile.xhtml" propagation="none"> + <s:link view="/profile.seam" propagation="none"> #{selectedMember.memberName}<br/> <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&amp;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 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/createBlog.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -17,7 +17,7 @@ <s:div rendered="#{selectedBlog != null}"> <s:div id="blogMemberCard"> - <s:link view="/profile.xhtml" propagation="none"> + <s:link view="/profile.seam" propagation="none"> #{selectedMember.memberName}<br/> <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&amp;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 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/home.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -74,7 +74,7 @@ <ui:repeat value="#{newMembers}" var="newMember"> <div class="newMember"> - <s:link view="/profile.xhtml" propagation="none"> + <s:link view="/profile.seam" propagation="none"> <f:param name="name" value="#{newMember.memberName}"/> #{newMember.memberName}<br/> <h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&amp;width=90"/> Modified: branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml =================================================================== --- branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/pictures.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -33,7 +33,7 @@ <h1>#{selectedMember.memberName}'s pictures</h1> <div class="memberPictureCard"> - <s:link view="/profile.xhtml" propagation="none"> + <s:link view="/profile.seam" propagation="none"> #{selectedMember.memberName}<br/> <h:graphicImage value="/content/images?id=#{selectedMember.picture.imageId}&amp;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}&amp;width=90" border="0"/> </a> - <s:button view="/imagepermissions.xhtml" + <s:button view="/imagepermissions.seam" action="#{permissionSearch.search(pictureSearch.lookupImage())}" styleClass="padlock" rendered="#{s:hasPermission(img, 'seam.grant-permission')}"> Modified: branches/community/Seam_2_2/examples/seamspace/view/register.xhtml =================================================================== --- branches/community/Seam_2_2/examples/seamspace/view/register.xhtml 2010-01-20 11:00:44 UTC (rev 11972) +++ branches/community/Seam_2_2/examples/seamspace/view/register.xhtml 2010-01-20 11:33:10 UTC (rev 11973) @@ -12,7 +12,7 @@ <div class="errors"><h:messages globalOnly="true"/></div> <p> - Already a member? <s:link view="/home.xhtml" value="Click here to log in" propagation="none"/> + Already a member? <s:link view="/home.seam" value="Click here to log in" propagation="none"/> </p> <div id="register">