[jboss-svn-commits] JBL Code SVN: r28977 - in labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views: category and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Aug 18 14:56:13 EDT 2009


Author: sviluppatorefico
Date: 2009-08-18 14:56:13 -0400 (Tue, 18 Aug 2009)
New Revision: 28977

Modified:
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
Log:
deleted all outputLink for the navigation

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -178,11 +178,6 @@
                                 <forums:isAllowedChoose>
                                 
                                     <forums:isAllowedWhen fragment="acl://deleteCategory" contextData="#{category}">
-                                    <h:outputLink value="#{forums:outputLink('/views/admin/deleteCategory.jsf',true)}">
-                                        <f:param name="c" value="#{category.id}"/>
-                                        <img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
-                                                 alt="${resource.Delete}" name="delete" border="0" />
-                                    </h:outputLink>
                                     <h:commandLink action="deleteCategory">
                                         <f:param name="c" value="#{category.id}"/>
                                         <img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
@@ -322,12 +317,7 @@
                                 <forums:isAllowedChoose>
                                 
                                     <forums:isAllowedWhen fragment="acl://deleteForum" contextData="#{forum}">
-                                    <h:outputLink value="#{forums:outputLink('/views/admin/deleteForum.jsf',true)}">
-        			            		<f:param name="f" value="#{forum.id}"/>
-                                        <img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
-                                             alt="${resource.Delete}" name="delete" border="0" />
-                                    </h:outputLink>
-                                    <h:commandLink action="/views/admin/deleteForum.xhtml">
+                                    <h:commandLink action="deleteForum">
         			            		<f:param name="f" value="#{forum.id}"/>
                                         <img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
                                              alt="${resource.Delete}" name="delete" border="0" />

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -39,20 +39,12 @@
             <ul>
                 <li class="first">
                 
-                    <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                        <h:outputText value="#{shared.mainPageName}"/>
-                    </h:outputLink>
-                
                     <h:commandLink value="#{shared.mainPageName}" action="viewCategory"/>
                     
                     <c:if test="#{category.categories ne null and category.categorySelected eq true}" >
                     <ul>
                         <li>&gt; 
                             <c:forEach items="#{category.categories}" var="catrow">
-                            <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                                <f:param name="c" value="#{catrow.id}"/>
-                                <h:outputText value="#{catrow.title}"/>                   
-                            </h:outputLink>
                             <h:commandLink value="#{catrow.title}" action="viewCategory">
                                 <f:param name="c" value="#{catrow.id}"/>               
                             </h:commandLink>
@@ -99,10 +91,6 @@
                 <tr>
                     <td class="forumcategory" colspan="5">
                         <h3>
-                            <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                                <f:param name="c" value="#{catrow.id}"/>
-                                <h:outputText value="#{catrow.title}"/>
-                            </h:outputLink>
                             <h:commandLink value="#{catrow.title}" action="viewCategory">
                                 <f:param name="c" value="#{catrow.id}"/>
                             </h:commandLink>
@@ -120,10 +108,6 @@
                     </td>
                     <td>
                         <h3>
-                            <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                                <f:param name="f" value="#{forumrow.id}"/>
-                                <h:outputText value="#{forumrow.name}"/>
-                            </h:outputLink>
                             <h:commandLink value="#{forumrow.name}" action="viewForum">
                             	<f:param name="f" value="#{forumrow.id}"/>
                             </h:commandLink>
@@ -163,12 +147,8 @@
                                     </c:when>
                                     
                                     <c:otherwise>
-                                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
+                                        <h:commandLink value="${category.forumLastPosts[forumrow.id].poster.user.userName}" action="viewProfile">
                                             <f:param name="uid" value="#{category.forumLastPosts[forumrow.id].poster.user.id}"/>
-                                            <h:outputText value="${category.forumLastPosts[forumrow.id].poster.user.userName}"/>
-                                        </h:outputLink>
-                                        <h:commandLink value="${category.forumLastPosts[forumrow.id].poster.user.userName}" action="/views/profile/viewprofile_body.xhtml">
-                                            <f:param name="uid" value="#{category.forumLastPosts[forumrow.id].poster.user.id}"/>
                                         </h:commandLink>
                                     </c:otherwise>
                                     

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -43,24 +43,17 @@
     <ul>
     
         <li>
-            <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                ${resource.Home}
-            </h:outputLink>
             <h:commandLink value="${resource.Home}" action="viewCategory"/>
         </li>
 
         <li>
             &#160;&#160;|&#160;&#160;
-            <h:outputLink value="#{forums:outputLink(shared.links['search'],true)}">Search </h:outputLink>
             <h:commandLink value="Search " action="viewSearch"/>
         </li>
         
         <c:if test="#{shared.anonymous==false &amp;&amp; forums:isRunningInPortal()==false}">
         <li>
             &#160;&#160;|&#160;&#160;
-            <h:outputLink value="#{forums:outputLink(shared.links['pref'],true)}">
-                ${resource.Preferences}
-            </h:outputLink>
             <h:commandLink value="${resource.Preferences}" action="viewPreferences"/>
         </li>
         </c:if>
@@ -68,9 +61,6 @@
         <c:if test="#{shared.anonymous==false}">
         <li>
             &#160;&#160;|&#160;&#160;
-            <h:outputLink value="#{forums:outputLink(shared.links['myForums'],true)}">
-                ${resource.My_Forums}
-            </h:outputLink>
             <h:commandLink action="myForums" value="${resource.My_Forums}"/>
         </li>
         </c:if>
@@ -79,9 +69,6 @@
         <forums:isAllowed fragment="acl://accessAdminTool">
         <li>
             &#160;&#160;|&#160;&#160;
-            <h:outputLink value="#{forums:outputLink(shared.links['admin'],true)}">
-                ${resource.Admin_panel}
-            </h:outputLink>
             <h:commandLink action="adminPanel" value="${resource.Admin_panel}"/>
         </li>
         </forums:isAllowed>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -46,27 +46,16 @@
         <ul>
             <li class="first">
             
-                <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                    <h:outputText value="#{shared.mainPageName}"/>
-                </h:outputLink>
                 <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
                 
                 <ul>
                     <li>&gt; 
-                        <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                            <f:param name="c" value="#{forum.forum.category.id}"/>
-                            <h:outputText value="#{forum.forum.category.title}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewCategory" value="#{forum.forum.category.title}">
                             <f:param name="c" value="#{forum.forum.category.id}"/>
                         </h:commandLink>
                         
                         <ul>
                             <li>&gt; 
-                                <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                                    <f:param name="f" value="#{forum.forum.id}"/>
-                                    <h:outputText value="#{forum.forum.name}"/>
-                                </h:outputLink>
                                 <h:commandLink action="viewForum" value="#{forum.forum.name}">
                                     <f:param name="f" value="#{forum.forum.id}"/>
                                 </h:commandLink>
@@ -110,14 +99,6 @@
                     </h:commandLink>
                 </c:when>
                 <c:otherwise>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}">
-                        <f:param name="f" value="${forum.forum.id}" />
-                        <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
-                             alt="${resource.Subscribe_to_forum}"
-                             name="subscribe"
-                             border="0"
-                             id="subscribe" />
-                    </h:outputLink>
                     <h:commandLink action="forumWatch">
                         <f:param name="f" value="${forum.forum.id}" />
                         <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
@@ -160,22 +141,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${resource.First}"/>
-                        </h:outputLink>    
                         <h:commandLink action="viewForum" value="${resource.First}">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>   
                     </li>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
-                            <h:outputText value="&#60; ${resource.Previous}"/>
-                        </h:outputLink>    
                         <h:commandLink action="viewForum" value="&#60; ${resource.Previous}">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
@@ -186,11 +157,6 @@
             
             <c:forEach items="#{forum.pageNavigator.currentPaginationLeft}" var="pageNumber">
                 <li>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                        <f:param name="f" value="#{forum.forum.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewForum" value="${pageNumber}">
                         <f:param name="f" value="#{forum.forum.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -204,11 +170,6 @@
             
             <c:forEach items="#{forum.pageNavigator.currentPaginationRight}" var="pageNumber">
                 <li>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                        <f:param name="f" value="#{forum.forum.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewForum" value="${pageNumber}">
                         <f:param name="f" value="#{forum.forum.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -227,22 +188,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
-                            <h:outputText value="${resource.Next} &#62;"/>
-                        </h:outputLink>
                         <h:commandLink action="viewForum" value="${resource.Next} &#62;">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
                         </h:commandLink>
                     </li>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
-                            <h:outputText value="${resource.Last}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewForum" value="${resource.Last}">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
@@ -313,10 +264,6 @@
                 <td>
                     <h3>
                         ${forums:folderType(topicrow)}&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="${topicrow.id}"/>
-                            <h:outputText value="${topicrow.subject}"/>                   
-                        </h:outputLink>   
                         <h:commandLink action="viewTopic" value="${topicrow.subject}">
                             <f:param name="t" value="${topicrow.id}"/>                 
                         </h:commandLink>   
@@ -325,32 +272,17 @@
                     <!-- mini post navigator for this topic -->
                     <c:if test="#{forum.topicNavigator[topicrow.id] ne null &amp;&amp; forum.topicNavigator[topicrow.id].totalPages gt 1}">
                         &#160;(&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${1}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${1}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>
                         &#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="1"/>
-                            <h:outputText value="${2}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="{2}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="1"/>
                         </h:commandLink>
                         <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
                             &#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                                <f:param name="t" value="#{topicrow.id}"/>
-                                <f:param name="page" value="2"/>
-                                <h:outputText value="${3}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewTopic" value="{3}">
                                 <f:param name="t" value="#{topicrow.id}"/>
                                 <f:param name="page" value="2"/>
@@ -358,11 +290,6 @@
                         </c:if>
                         <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">                        
                             &#160;&#8230;&#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                                <f:param name="t" value="#{topicrow.id}"/>
-                                <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
-                                <h:outputText value="${resource.Last_page}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewTopic" value="${resource.Last_page}">
                                 <f:param name="t" value="#{topicrow.id}"/>
                                 <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -379,10 +306,6 @@
                         </c:when>
                        
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="${topicrow.poster.user.id}"/>
-                                <h:outputText value="${topicrow.poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
                                 <f:param name="uid" value="${topicrow.poster.user.id}"/>
                             </h:commandLink>
@@ -416,10 +339,6 @@
                         </c:when>
                                     
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
-                                <h:outputText value="${forum.topicLastPosts[topicrow.id].poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${forum.topicLastPosts[topicrow.id].poster.user.userName}">
                                 <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
                             </h:commandLink>
@@ -455,10 +374,6 @@
                 <td>
                     <h3>
                         ${forums:folderType(topicrow)}&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="${topicrow.id}"/>
-                            <h:outputText value="${topicrow.subject}"/>                   
-                        </h:outputLink>   
                         <h:commandLink action="viewTopic" value="${topicrow.subject}">
                             <f:param name="t" value="${topicrow.id}"/>                  
                         </h:commandLink>   
@@ -467,32 +382,17 @@
                     <!-- mini post navigator for this topic -->
                     <c:if test="#{forum.topicNavigator[topicrow.id] ne null &amp;&amp; forum.topicNavigator[topicrow.id].totalPages gt 1}">
                         &#160;(&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${1}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${1}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>
                         &#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="1"/>
-                            <h:outputText value="${2}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${2}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="1"/>
                         </h:commandLink>
                         <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
                             &#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                                <f:param name="t" value="#{topicrow.id}"/>
-                                <f:param name="page" value="2"/>
-                                <h:outputText value="${3}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewTopic" value="${3}">
                                 <f:param name="t" value="#{topicrow.id}"/>
                                 <f:param name="page" value="2"/>
@@ -500,11 +400,6 @@
                         </c:if>
                         <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">                        
                             &#160;&#8230;&#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                                <f:param name="t" value="#{topicrow.id}"/>
-                                <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
-                                <h:outputText value="${resource.Last_page}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewTopic" value="${resource.Last_page}">
                                 <f:param name="t" value="#{topicrow.id}"/>
                                 <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -521,10 +416,6 @@
                         </c:when>
                        
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="${topicrow.poster.user.id}"/>
-                                <h:outputText value="${topicrow.poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
                                 <f:param name="uid" value="${topicrow.poster.user.id}"/>
                             </h:commandLink>
@@ -558,10 +449,6 @@
                         </c:when>
                                     
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
-                                <h:outputText value="${forum.topicLastPosts[topicrow.id].poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${forum.topicLastPosts[topicrow.id].poster.user.userName}">
                                 <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
                             </h:commandLink>
@@ -595,10 +482,6 @@
                 </td>
                 <td>
                     <h3>
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="${topicrow.id}"/>
-                            <h:outputText value="${topicrow.subject}"/>                   
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${topicrow.subject}">
                             <f:param name="t" value="${topicrow.id}"/>            
                         </h:commandLink>
@@ -607,32 +490,17 @@
                     <!-- mini post navigator for this topic -->
                     <c:if test="#{forum.topicNavigator[topicrow.id] ne null &amp;&amp; forum.topicNavigator[topicrow.id].totalPages gt 1}">
                         &#160;(&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${1}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${1}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>
                         &#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="1"/>
-                            <h:outputText value="${2}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="{2}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="1"/>
                         </h:commandLink>
                         <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
                             &#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                                <f:param name="t" value="#{topicrow.id}"/>
-                                <f:param name="page" value="2"/>
-                                <h:outputText value="${3}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewTopic" value="${3}">
                                 <f:param name="t" value="#{topicrow.id}"/>
                                 <f:param name="page" value="2"/>
@@ -640,11 +508,6 @@
                         </c:if>
                         <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">                        
                             &#160;&#8230;&#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                                <f:param name="t" value="#{topicrow.id}"/>
-                                <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
-                                <h:outputText value="${resource.Last_page}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewTopic" value="${resource.Last_page}">
                                 <f:param name="t" value="#{topicrow.id}"/>
                                 <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -661,10 +524,6 @@
                         </c:when>
                        
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="${topicrow.poster.user.id}"/>
-                                <h:outputText value="${topicrow.poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
                                 <f:param name="uid" value="${topicrow.poster.user.id}"/>
                             </h:commandLink>
@@ -698,10 +557,6 @@
                         </c:when>
                                     
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
-                                <h:outputText value="${forum.topicLastPosts[topicrow.id].poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${forum.topicLastPosts[topicrow.id].poster.user.userName}">
                                 <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
                             </h:commandLink>
@@ -752,22 +607,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${resource.First}"/>
-                        </h:outputLink>  
                         <h:commandLink action="viewForum" value="${resource.First}">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>   
                     </li>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
-                            <h:outputText value="&#60; ${resource.Previous}"/>
-                        </h:outputLink>    
                         <h:commandLink action="viewForum" value="&#60; ${resource.Previous}">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
@@ -778,11 +623,6 @@
             
             <c:forEach items="#{forum.pageNavigator.currentPaginationLeft}" var="pageNumber">
                 <li>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                        <f:param name="f" value="#{forum.forum.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewForum" value="${pageNumber}">
                         <f:param name="f" value="#{forum.forum.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -796,11 +636,6 @@
             
             <c:forEach items="#{forum.pageNavigator.currentPaginationRight}" var="pageNumber">
                 <li>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                        <f:param name="f" value="#{forum.forum.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewForum" value="${pageNumber}">
                         <f:param name="f" value="#{forum.forum.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -819,22 +654,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
-                            <h:outputText value="${resource.Next} &#62;"/>
-                        </h:outputLink>
                         <h:commandLink action="viewForum" value="${resource.Next} &#62;">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
                         </h:commandLink>
                     </li>
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
-                            <h:outputText value="${resource.Last}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewForum" value="${resource.Last}">
                             <f:param name="f" value="#{forum.forum.id}"/>
                             <f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
@@ -882,17 +707,11 @@
                 ${resource.Forum_moderation}:
             </li>
             <li>
-                <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+                <h:commandLink action="viewModerator">
                     <f:param name="f" value="#{forum.forum.id}"/>
                     <f:verbatim>
                         <img src="${forums:themeURL('resourceIconModerateURL')}" alt="${resource.Moderate}" border="0" />
                     </f:verbatim>
-                </h:outputLink>
-                <h:commandLink action=viewModerator>
-                    <f:param name="f" value="#{forum.forum.id}"/>
-                    <f:verbatim>
-                        <img src="${forums:themeURL('resourceIconModerateURL')}" alt="${resource.Moderate}" border="0" />
-                    </f:verbatim>
                 </h:commandLink>
             </li>
         </ul>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -44,37 +44,22 @@
             <ul>
                 <li class="first">
                 
-                    <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                        <h:outputText value="#{shared.mainPageName}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
                     
                     <ul>
                         <li>&gt; 
-                            <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                                <f:param name="c" value="#{moderator.forum.category.id}"/>
-                                <h:outputText value="#{moderator.forum.category.title}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewCategory" value="#{moderator.forum.category.title}">
                                 <f:param name="c" value="#{moderator.forum.category.id}"/>
                             </h:commandLink>
                             
                             <ul>
                                 <li>&gt; 
-                                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                                        <f:param name="f" value="#{moderator.forum.id}"/>
-                                        <h:outputText value="#{moderator.forum.name}"/>
-                                    </h:outputLink>
                                     <h:commandLink action="viewForum" value="#{moderator.forum.name}">
                                         <f:param name="f" value="#{moderator.forum.id}"/>
                                     </h:commandLink>
                                     
                                     <ul>
                                         <li>&gt; 
-                                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                                <h:outputText value="${resource.Mod_CP}"/>
-                                            </h:outputLink>
                                             <h:commandLink action="viewModerator" value="${resource.Mod_CP}">
                                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                             </h:commandLink>
@@ -121,22 +106,12 @@
                     </c:when>
                     <c:otherwise>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{modaerator.forum.id}"/>
-                                <f:param name="page" value="0"/>
-                                <h:outputText value="${resource.First}"/>
-                            </h:outputLink>    
                             <h:commandLink action="viewModerator" value="${resource.First}">
                                 <f:param name="f" value="#{modaerator.forum.id}"/>
                                 <f:param name="page" value="0"/>
                             </h:commandLink> 
                         </li>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
-                                <h:outputText value="&#60; ${resource.Previous}"/>
-                            </h:outputLink>   
                             <h:commandLink action="viewModerator" value="&#60; ${resource.Previous}">
                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                 <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
@@ -147,11 +122,6 @@
                 
                 <c:forEach items="#{moderator.pageNavigator.currentPaginationLeft}" var="pageNumber">
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                            <f:param name="f" value="#{moderator.forum.id}"/>
-                            <f:param name="page" value="${pageNumber-1}"/>
-                            <h:outputText value="${pageNumber}"/>
-                        </h:outputLink>  
                         <h:commandLink action="viewModerator" value="${pageNumber}">
                             <f:param name="f" value="#{moderator.forum.id}"/>
                             <f:param name="page" value="${pageNumber-1}"/>
@@ -165,11 +135,6 @@
                 
                 <c:forEach items="#{moderator.pageNavigator.currentPaginationRight}" var="pageNumber">
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                            <f:param name="f" value="#{moderator.forum.id}"/>
-                            <f:param name="page" value="${pageNumber-1}"/>
-                            <h:outputText value="${pageNumber}"/>
-                        </h:outputLink>  
                         <h:commandLink action="viewModerator" value="${pageNumber}">
                             <f:param name="f" value="#{moderator.forum.id}"/>
                             <f:param name="page" value="${pageNumber-1}"/>
@@ -188,22 +153,12 @@
                     </c:when>
                     <c:otherwise>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
-                                <h:outputText value="${resource.Next} &#62;"/>
-                            </h:outputLink>
                             <h:commandLink action="viewModerator" value="${resource.Next} &#62;">
                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                 <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
                             </h:commandLink>
                         </li>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
-                                <h:outputText value="${resource.Last}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewModerator" value="${resource.Last}">
                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                 <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
@@ -237,10 +192,6 @@
                 
                 <td class='rowline ${(status.last)?"bottomline":""}'>
                     ${forums:folderType(topicrow)}&#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="${topicrow.id}"/>
-                        <h:outputText value="${topicrow.subject}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${topicrow.subject}">
                         <f:param name="t" value="${topicrow.id}"/>
                     </h:commandLink>
@@ -312,22 +263,12 @@
                     </c:when>
                     <c:otherwise>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{modaerator.forum.id}"/>
-                                <f:param name="page" value="0"/>
-                                <h:outputText value="${resource.First}"/>
-                            </h:outputLink>    
                             <h:commandLink action="viewModerator" value="${resource.First}">
                                 <f:param name="f" value="#{modaerator.forum.id}"/>
                                 <f:param name="page" value="0"/>
                             </h:commandLink>    
                         </li>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
-                                <h:outputText value="&#60; ${resource.Previous}"/>
-                            </h:outputLink>  
                             <h:commandLink action="viewModerator" value="&#60; ${resource.Previous}">
                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                 <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
@@ -338,11 +279,6 @@
                 
                 <c:forEach items="#{moderator.pageNavigator.currentPaginationLeft}" var="pageNumber">
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                            <f:param name="f" value="#{moderator.forum.id}"/>
-                            <f:param name="page" value="${pageNumber-1}"/>
-                            <h:outputText value="${pageNumber}"/>
-                        </h:outputLink>  
                         <h:commandLink action="viewModerator" value="${pageNumber}">
                             <f:param name="f" value="#{moderator.forum.id}"/>
                             <f:param name="page" value="${pageNumber-1}"/>
@@ -356,11 +292,6 @@
                 
                 <c:forEach items="#{moderator.pageNavigator.currentPaginationRight}" var="pageNumber">
                     <li>
-                        <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                            <f:param name="f" value="#{moderator.forum.id}"/>
-                            <f:param name="page" value="${pageNumber-1}"/>
-                            <h:outputText value="${pageNumber}"/>
-                        </h:outputLink>  
                         <h:commandLink action="viewModerator" value="${pageNumber}">
                             <f:param name="f" value="#{moderator.forum.id}"/>
                             <f:param name="page" value="${pageNumber-1}"/>
@@ -379,22 +310,12 @@
                     </c:when>
                     <c:otherwise>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
-                                <h:outputText value="${resource.Next} &#62;"/>
-                            </h:outputLink>
                             <h:commandLink action="viewModerator" value="${resource.Next} &#62;">
                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                 <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
                             </h:commandLink>
                         </li>
                         <li>
-                            <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                                <f:param name="f" value="#{moderator.forum.id}"/>
-                                <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
-                                <h:outputText value="${resource.Last}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewModerator" value="${resource.Last}">
                                 <f:param name="f" value="#{moderator.forum.id}"/>
                                 <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -47,37 +47,22 @@
         <ul>
             <li class="first">
             
-                <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                    <h:outputText value="#{shared.mainPageName}"/>
-                </h:outputLink>
                 <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
                 
                 <ul>
                     <li>&gt; 
-                        <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                            <f:param name="c" value="#{splitTopic.topic.forum.category.id}"/>
-                            <h:outputText value="#{splitTopic.topic.forum.category.title}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewCategory" value="#{shared.mainPageName}">
                             <f:param name="c" value="#{splitTopic.topic.forum.category.id}"/>
                         </h:commandLink>
                         
                         <ul>
                             <li>&gt; 
-                                <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                                    <f:param name="f" value="#{splitTopic.topic.forum.id}"/>
-                                    <h:outputText value="#{splitTopic.topic.forum.name}"/>
-                                </h:outputLink>
                                 <h:commandLink action="viewForum" value="#{shared.mainPageName}">
                                     <f:param name="f" value="#{splitTopic.topic.forum.id}"/>
                                 </h:commandLink>
                                 
                                 <ul>
                                     <li>&gt; 
-                                        <h:outputLink value="#{forums:outputLink(shared.links['topicSplit'],true)}">
-                                            <f:param name="t" value="#{splitTopic.topic.id}"/>
-                                            <h:outputText value="${resource.L_SPLIT_TOPIC}"/>
-                                        </h:outputLink>
                                         <h:commandLink action="viewModeratorSplit" value="${resource.L_SPLIT_TOPIC}">
                                             <f:param name="t" value="#{splitTopic.topic.id}"/>
                                         </h:commandLink>
@@ -182,10 +167,6 @@
                     </c:when>
                     
                     <c:otherwise>
-                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                            <f:param name="uid" value="${postrow.poster.user.id}"/>
-                            <h:outputText value="${postrow.poster.user.userName}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewProfile" value="${postrow.poster.user.userName}">
                             <f:param name="uid" value="${postrow.poster.user.id}"/>
                         </h:commandLink>
@@ -198,11 +179,6 @@
                     <ul>
                         <li>
                             <a name="${postrow.id}" />
-                            <h:outputLink value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
-                                <f:verbatim>
-                                    <h:outputText value="${resource.Permalink}"/>
-                                </f:verbatim>
-                            </h:outputLink>
                             <h:commandLink action="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
                                 <f:verbatim>
                                     <h:outputText value="${resource.Permalink}"/>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -70,10 +70,6 @@
             </td>
             <td>
                 <h3>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                        <f:param name="f" value="${forumrow.id}"/>
-                        <h:outputText value="${forumrow.name}"/>                   
-                    </h:outputLink>
                     <h:commandLink action="viewForum" value="${forumrow.name}">
                         <f:param name="f" value="${forumrow.id}"/>         
                     </h:commandLink>
@@ -108,10 +104,6 @@
                         </c:when>
                                     
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="#{myForumsEdit.forumsLastPosts[forumrow.id].poster.user.id}"/>
-                                <h:outputText value="${myForumsEdit.forumsLastPosts[forumrow.id].poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${myForumsEdit.forumsLastPosts[forumrow.id].poster.user.userName}">
                                 <f:param name="uid" value="#{myForumsEdit.forumsLastPosts[forumrow.id].poster.user.id}"/>
                             </h:commandLink>
@@ -190,10 +182,6 @@
             </td>
             <td>
                 <h3>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                        <f:param name="f" value="${forumrow.id}"/>
-                        <h:outputText value="${forumrow.name}"/>                   
-                    </h:outputLink>
                     <h:commandLink action="viewForum" value="${forumrow.name}">
                         <f:param name="f" value="${forumrow.id}"/>             
                     </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -42,6 +42,7 @@
     <p>${resource.MyForums_info}</p>
 </div>
 
+<h:form>
 <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
 
     <tr class="header">
@@ -62,10 +63,6 @@
         </td>
         <td>
             <h3>
-                <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                    <f:param name="t" value="${topicrow.id}"/>
-                    <h:outputText value="${topicrow.subject}"/>                   
-                </h:outputLink>
                 <h:commandLink action="viewTopic" value="${topicrow.subject}">
                     <f:param name="t" value="${topicrow.id}"/>              
                 </h:commandLink>
@@ -74,32 +71,17 @@
             <!-- mini post navigator for this topic -->
             <c:if test="#{myForums.topicNavigator[topicrow.id] ne null &amp;&amp; myForums.topicNavigator[topicrow.id].totalPages gt 1}">
                 &#160;(&#160;
-                <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                    <f:param name="t" value="#{topicrow.id}"/>
-                    <f:param name="page" value="0"/>
-                    <h:outputText value="${1}"/>
-                </h:outputLink>
                 <h:commandLink action="viewTopic" value="${1}">
                     <f:param name="t" value="#{topicrow.id}"/>
                     <f:param name="page" value="0"/>
                 </h:commandLink>
                 &#160;
-                <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                    <f:param name="t" value="#{topicrow.id}"/>
-                    <f:param name="page" value="1"/>
-                    <h:outputText value="${2}"/>
-                </h:outputLink>
                 <h:commandLink action="viewTopic" value="${2}">
                     <f:param name="t" value="#{topicrow.id}"/>
                     <f:param name="page" value="1"/>
                 </h:commandLink>
                 <c:if test="#{myForums.topicNavigator[topicrow.id].totalPages gt 2}">
                     &#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topicrow.id}"/>
-                        <f:param name="page" value="2"/>
-                        <h:outputText value="${3}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${3}">
                         <f:param name="t" value="#{topicrow.id}"/>
                         <f:param name="page" value="2"/>
@@ -107,11 +89,6 @@
                 </c:if>
                 <c:if test="#{myForums.topicNavigator[topicrow.id].totalPages gt 3}">                        
                     &#160;&#8230;&#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topicrow.id}"/>
-                        <f:param name="page" value="#{myForums.topicNavigator[topicrow.id].totalPages-1}"/>
-                        <h:outputText value="${resource.Last_page}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${resource.Last_page}">
                         <f:param name="t" value="#{topicrow.id}"/>
                         <f:param name="page" value="#{myForums.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -128,10 +105,6 @@
                 </c:when>
                
                 <c:otherwise>
-                    <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                        <f:param name="uid" value="${topicrow.poster.user.id}"/>
-                        <h:outputText value="${topicrow.poster.user.userName}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
                         <f:param name="uid" value="${topicrow.poster.user.id}"/>
                     </h:commandLink>
@@ -164,10 +137,6 @@
                 </c:when>
                             
                 <c:otherwise>
-                    <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                        <f:param name="uid" value="#{myForums.topicsLastPosts[topicrow.id].poster.user.id}"/>
-                        <h:outputText value="${myForums.topicsLastPosts[topicrow.id].poster.user.userName}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewProfile" value="${myForums.topicsLastPosts[topicrow.id].poster.user.userName}">
                         <f:param name="uid" value="#{myForums.topicsLastPosts[topicrow.id].poster.user.id}"/>
                     </h:commandLink>
@@ -209,9 +178,6 @@
     
     <tr>
         <td class="footerrow" colspan="6">
-            <h:outputLink value="#{forums:outputLink(shared.links['myForumsAll'],true)}">
-               ${resource.ViewAllSubscribed}
-            </h:outputLink>
             <h:commandLink action="myForumsAll" value="${resource.ViewAllSubscribed}"/>
         </td>
     </tr>
@@ -239,10 +205,6 @@
         </td>
         <td>
             <h3>
-                <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
-                    <f:param name="f" value="#{forumrow.id}"/>
-                    <h:outputText value="#{forumrow.name}"/>
-                </h:outputLink>
                 <h:commandLink action="viewForum" value="#{forumrow.name}">
                     <f:param name="f" value="#{forumrow.id}"/>
                 </h:commandLink>
@@ -277,10 +239,6 @@
                         </c:when>
                         
                         <c:otherwise>
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="#{myForums.forumsLastPosts[forumrow.id].poster.user.id}"/>
-                                <h:outputText value="${myForums.forumsLastPosts[forumrow.id].poster.user.userName}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${myForums.forumsLastPosts[forumrow.id].poster.user.userName}">
                                 <f:param name="uid" value="#{myForums.forumsLastPosts[forumrow.id].poster.user.id}"/>
                             </h:commandLink>
@@ -300,7 +258,6 @@
             </c:choose>
         </td>
         <td class="forumlistcentered">
-        <h:form>
             <div class="actionbuttons">
                 <ul>
                     <li>
@@ -315,7 +272,6 @@
                     </li>
                 </ul>
             </div>
-        </h:form>
         </td>
     </tr>
     </forums:isAllowed>
@@ -323,9 +279,6 @@
     
     <tr>
         <td class="footerrow" colspan="6">
-            <h:outputLink value="#{forums:outputLink(shared.links['myForumsEdit'],true)}">
-               ${resource.EditAllSubscribed}
-            </h:outputLink>
             <h:commandLink action="myForumsEdit" value="${resource.EditAllSubscribed}"/>
         </td>
     </tr>
@@ -334,6 +287,7 @@
     </tr>
     
 </table>
+        </h:form>
 
 <div class="forumlegend">
     <hr class="forumdashedHR" />

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -66,10 +66,6 @@
             </td>
             <td>
                 <h3>
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="${topicrow.id}"/>
-                        <h:outputText value="${topicrow.subject}"/>                   
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${topicrow.subject}">
                         <f:param name="t" value="${topicrow.id}"/>              
                     </h:commandLink>
@@ -78,32 +74,17 @@
                 <!-- mini post navigator for this topic -->
                 <c:if test="#{myForumsAll.topicNavigator[topicrow.id] ne null &amp;&amp; myForumsAll.topicNavigator[topicrow.id].totalPages gt 1}">
                     &#160;(&#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topicrow.id}"/>
-                        <f:param name="page" value="0"/>
-                        <h:outputText value="${1}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${1}">
                         <f:param name="t" value="#{topicrow.id}"/>
                         <f:param name="page" value="0"/>
                     </h:commandLink>
                     &#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topicrow.id}"/>
-                        <f:param name="page" value="1"/>
-                        <h:outputText value="${2}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${2}">
                         <f:param name="t" value="#{topicrow.id}"/>
                         <f:param name="page" value="1"/>
                     </h:commandLink>
                     <c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 2}">
                         &#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="2"/>
-                            <h:outputText value="${3}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="{3}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="2"/>
@@ -111,11 +92,6 @@
                     </c:if>
                     <c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 3}">                        
                         &#160;&#8230;&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
-                            <h:outputText value="${resource.Last_page}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${resource.Last_page}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -132,10 +108,6 @@
                     </c:when>
                    
                     <c:otherwise>
-                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                            <f:param name="uid" value="${topicrow.poster.user.id}"/>
-                            <h:outputText value="${topicrow.poster.user.userName}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
                             <f:param name="uid" value="${topicrow.poster.user.id}"/>
                         </h:commandLink>
@@ -166,10 +138,6 @@
                     </c:when>
                                 
                     <c:otherwise>
-                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                            <f:param name="uid" value="#{myForumsAll.topicsLastPosts[topicrow.id].poster.user.id}"/>
-                            <h:outputText value="${myForumsAll.topicsLastPosts[topicrow.id].poster.user.userName}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewProfile" value="${myForumsAll.topicsLastPosts[topicrow.id].poster.user.userName}">
                             <f:param name="uid" value="#{myForumsAll.topicsLastPosts[topicrow.id].poster.user.id}"/>
                         </h:commandLink>
@@ -237,10 +205,6 @@
             </td>
             <td>
                 <h3>
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="${topicrow.id}"/>
-                        <h:outputText value="${topicrow.subject}"/>                   
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${topicrow.subject}">
                         <f:param name="t" value="${topicrow.id}"/>            
                     </h:commandLink>
@@ -248,32 +212,17 @@
                 <!-- mini post navigator for this topic -->
                 <c:if test="#{myForumsAll.topicNavigator[topicrow.id] ne null &amp;&amp; myForumsAll.topicNavigator[topicrow.id].totalPages gt 1}">
                     &#160;(&#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topicrow.id}"/>
-                        <f:param name="page" value="0"/>
-                        <h:outputText value="${1}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${1}">
                         <f:param name="t" value="#{topicrow.id}"/>
                         <f:param name="page" value="0"/>
                     </h:commandLink>
                     &#160;
-                    <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topicrow.id}"/>
-                        <f:param name="page" value="1"/>
-                        <h:outputText value="${2}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewTopic" value="${2}">
                         <f:param name="t" value="#{topicrow.id}"/>
                         <f:param name="page" value="1"/>
                     </h:commandLink>
                     <c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 2}">
                         &#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="2"/>
-                            <h:outputText value="${3}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${3}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="2"/>
@@ -281,11 +230,6 @@
                     </c:if>
                     <c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 3}">                        
                         &#160;&#8230;&#160;
-                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topicrow.id}"/>
-                            <f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
-                            <h:outputText value="${resource.Last_page}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" value="${resource.Last_page}">
                             <f:param name="t" value="#{topicrow.id}"/>
                             <f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -302,10 +246,6 @@
                     </c:when>
                    
                     <c:otherwise>
-                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                            <f:param name="uid" value="${topicrow.poster.user.id}"/>
-                            <h:outputText value="${topicrow.poster.user.userName}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
                             <f:param name="uid" value="${topicrow.poster.user.id}"/>
                         </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -41,18 +41,11 @@
             <ul>
                 <li class="first">
                     
-                    <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                        <h:outputText value="#{shared.mainPageName}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
                     
                     <ul>
                         <li>
                             &#62;&#160;
-                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid" value="${profile.poster.user.id}"/>
-                                <h:outputText value="${resource.L_VIEWING_PROFILE}"/>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" value="${resource.L_VIEWING_PROFILE}">
                                 <f:param name="uid" value="${profile.poster.user.id}"/>
                             </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -67,19 +67,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="0"/>
-			                            <h:outputText value="${resource.First}"/>
-			                        </h:outputLink> 
 			                        <h:commandLink action="viewSearchResults" value="${resource.First}">
 			                            <f:param name="page" value="0"/>
 			                        </h:commandLink>    
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
-			                            <h:outputText value="&#60; ${resource.Previous}"/>
-			                        </h:outputLink>  
 			                        <h:commandLink action="viewSearchResults" value="&#60; ${resource.Previous}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
 			                        </h:commandLink>    
@@ -89,10 +81,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationLeft}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink>  
@@ -105,10 +93,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationRight}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink> 
@@ -126,19 +110,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
-			                            <h:outputText value="${resource.Next} &#62;"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Next} &#62;">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
 			                        </h:commandLink>
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
-			                            <h:outputText value="${resource.Last}"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Last}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
 			                        </h:commandLink>
@@ -167,10 +143,6 @@
 				                    </c:when>
 				                    
 				                    <c:otherwise>
-				                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-				                            <f:param name="uid" value="${postrow.poster.user.id}"/>
-				                            <h:outputText value="${postrow.poster.user.userName}"/>
-				                        </h:outputLink>
 				                        <h:commandLink action="viewProfile" value="${postrow.poster.user.userName}">
 				                            <f:param name="uid" value="${postrow.poster.user.id}"/>
 				                        </h:commandLink>
@@ -186,11 +158,6 @@
 				                    <ul>
 				                        <li>
 				                            <a name="${postrow.id}" />
-				                            <h:outputLink value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
-				                                <f:verbatim>
-				                                    <h:outputText value="${resource.Permalink}"/>
-				                                </f:verbatim>
-				                            </h:outputLink>
 				                            <h:commandLink action="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
 				                                <f:verbatim>
 				                                    <h:outputText value="${resource.Permalink}"/>
@@ -254,15 +221,6 @@
 				            <td class="forumthreaduserinfo">
 				                <ul>
 				                    <li>
-				                        <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-				                            <f:param name="uid"
-				                                     value="#{postrow.poster.user.id}"/>
-				                            <f:verbatim>
-				                                <img border="0"
-				                                     src="#{forums:themeURL('resourceIconProfileURL')}"
-				                                     alt="${resource.Read_profile}"/>
-				                            </f:verbatim>
-				                        </h:outputLink>
 				                        <h:commandLink action="viewProfile">
 				                            <f:param name="uid"
 				                                     value="#{postrow.poster.user.id}"/>
@@ -322,15 +280,6 @@
 				                    </c:if>
 				                    <c:if test="${forums:userProperty(postrow.poster.user,'INFO_USER_IM_MSNM') ne null}">
 				                        <li>
-				                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-				                                <f:param name="uid"
-				                                         value="#{postrow.poster.user.id}"/>
-				                                <f:verbatim>
-				                                    <img border="0"
-				                                         src="#{forums:themeURL('resourceIconMSNMURL')}"
-				                                         alt="${resource.Read_profile}"/>
-				                                </f:verbatim>
-				                            </h:outputLink>
 				                            <h:commandLink action="viewProfile">
 				                                <f:param name="uid"
 				                                         value="#{postrow.poster.user.id}"/>
@@ -387,19 +336,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="0"/>
-			                            <h:outputText value="${resource.First}"/>
-			                        </h:outputLink>   
 			                        <h:commandLink action="viewSearchResults" value="${resource.First}">
 			                            <f:param name="page" value="0"/>
 			                        </h:commandLink>   
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
-			                            <h:outputText value="&#60; ${resource.Previous}"/>
-			                        </h:outputLink>    
 			                        <h:commandLink action="viewSearchResults" value="&#60; ${resource.Previous}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
 			                        </h:commandLink>   
@@ -409,10 +350,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationLeft}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink>  
@@ -425,10 +362,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationRight}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink>  
@@ -446,19 +379,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
-			                            <h:outputText value="${resource.Next} &#62;"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Next} &#62;">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
 			                        </h:commandLink>
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
-			                            <h:outputText value="${resource.Last}"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Last}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
 			                        </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -67,19 +67,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="0"/>
-			                            <h:outputText value="${resource.First}"/>
-			                        </h:outputLink>    
 			                        <h:commandLink action="viewSearchResults" value="${resource.First}">
 			                            <f:param name="page" value="0"/>
 			                        </h:commandLink>    
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
-			                            <h:outputText value="&#60; ${resource.Previous}"/>
-			                        </h:outputLink>  
 			                        <h:commandLink action="viewSearchResults" value="&#60; ${resource.Previous}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
 			                        </h:commandLink>    
@@ -89,10 +81,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationLeft}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink>  
@@ -105,10 +93,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationRight}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink> 
@@ -126,19 +110,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
-			                            <h:outputText value="${resource.Next} &#62;"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Next} &#62;">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
 			                        </h:commandLink>
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
-			                            <h:outputText value="${resource.Last}"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Last}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
 			                        </h:commandLink>
@@ -170,10 +146,6 @@
 
 				                <td>
 				                    <h3>
-				                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-				                            <f:param name="t" value="${topicrow.id}"/>
-				                            <h:outputText value="${topicrow.subject}"/>                   
-				                        </h:outputLink>
 				                        <h:commandLink action="viewTopic" value="${topicrow.subject}">
 				                            <f:param name="t" value="${topicrow.id}"/>             
 				                        </h:commandLink>
@@ -182,32 +154,17 @@
 				                    <!-- mini post navigator for this topic -->
 				                    <c:if test="#{forum.topicNavigator[topicrow.id] ne null &amp;&amp; forum.topicNavigator[topicrow.id].totalPages gt 1}">
 				                        &#160;(&#160;
-				                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-				                            <f:param name="t" value="#{topicrow.id}"/>
-				                            <f:param name="page" value="0"/>
-				                            <h:outputText value="${1}"/>
-				                        </h:outputLink>
 				                        <h:commandLink action="viewTopic" value="${1}">
 				                            <f:param name="t" value="#{topicrow.id}"/>
 				                            <f:param name="page" value="0"/>
 				                        </h:commandLink>
 				                        &#160;
-				                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-				                            <f:param name="t" value="#{topicrow.id}"/>
-				                            <f:param name="page" value="1"/>
-				                            <h:outputText value="${2}"/>
-				                        </h:outputLink>
 				                        <h:commandLink action="viewTopic" value="${2}">
 				                            <f:param name="t" value="#{topicrow.id}"/>
 				                            <f:param name="page" value="1"/>
 				                        </h:commandLink>
 				                        <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
 				                            &#160;
-				                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-				                                <f:param name="t" value="#{topicrow.id}"/>
-				                                <f:param name="page" value="2"/>
-				                                <h:outputText value="${3}"/>
-				                            </h:outputLink>
 				                            <h:commandLink action="viewTopic" value="{3}">
 				                                <f:param name="t" value="#{topicrow.id}"/>
 				                                <f:param name="page" value="2"/>
@@ -215,11 +172,6 @@
 				                        </c:if>
 				                        <c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">                        
 				                            &#160;&#8230;&#160;
-				                            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-				                                <f:param name="t" value="#{topicrow.id}"/>
-				                                <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
-				                                <h:outputText value="${resource.Last_page}"/>
-				                            </h:outputLink>
 				                            <h:commandLink action="viewTopic" value="${resource.Last_page}">
 				                                <f:param name="t" value="#{topicrow.id}"/>
 				                                <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
@@ -236,10 +188,6 @@
 				                        </c:when>
 				                       
 				                        <c:otherwise>
-				                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-				                                <f:param name="uid" value="${topicrow.poster.user.id}"/>
-				                                <h:outputText value="${topicrow.poster.user.userName}"/>
-				                            </h:outputLink>
 				                            <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
 				                                <f:param name="uid" value="${topicrow.poster.user.id}"/>
 				                            </h:commandLink>
@@ -274,10 +222,6 @@
 				                        </c:when>
 				                                    
 				                        <c:otherwise>
-				                            <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
-				                                <f:param name="uid" value="#{viewSearch.topicLastPosts[topicrow.id].poster.user.id}"/>
-				                                <h:outputText value="${viewSearch.topicLastPosts[topicrow.id].poster.user.userName}"/>
-				                            </h:outputLink>
 				                            <h:commandLink action="viewProfile" value="${viewSearch.topicLastPosts[topicrow.id].poster.user.userName}">
 				                                <f:param name="uid" value="#{viewSearch.topicLastPosts[topicrow.id].poster.user.id}"/>
 				                            </h:commandLink>
@@ -316,19 +260,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
+			                        <h:commandLink action="viewSearchResults" value="${resource.First}">
 			                            <f:param name="page" value="0"/>
-			                            <h:outputText value="${resource.First}"/>
-			                        </h:outputLink>    
-			                        <h:commandLink action="" value="${resource.First}">
-			                            <f:param name="page" value="0"/>
 			                        </h:commandLink>  
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
-			                            <h:outputText value="&#60; ${resource.Previous}"/>
-			                        </h:outputLink>   
 			                        <h:commandLink action="viewSearchResults" value="&#60; ${resource.Previous}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
 			                        </h:commandLink>   
@@ -338,10 +274,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationLeft}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink>  
@@ -354,10 +286,6 @@
 			            
 			            <c:forEach items="#{viewSearch.pageNavigator.currentPaginationRight}" var="pageNumber">
 			                <li>
-			                    <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                        <f:param name="page" value="${pageNumber-1}"/>
-			                        <h:outputText value="${pageNumber}"/>
-			                    </h:outputLink>  
 			                    <h:commandLink action="viewSearchResults" value="${pageNumber}">
 			                        <f:param name="page" value="${pageNumber-1}"/>
 			                    </h:commandLink>  
@@ -375,19 +303,11 @@
 			                </c:when>
 			                <c:otherwise>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
-			                            <h:outputText value="${resource.Next} &#62;"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Next} &#62;">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
 			                        </h:commandLink>
 			                    </li>
 			                    <li>
-			                        <h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
-			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
-			                            <h:outputText value="${resource.Last}"/>
-			                        </h:outputLink>
 			                        <h:commandLink action="viewSearchResults" value="${resource.Last}">
 			                            <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
 			                        </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -42,9 +42,6 @@
             <ul>
                 <li class="first">
                 
-                    <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                        <h:outputText value="#{shared.mainPageName}"/>
-                    </h:outputLink>
                     <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
                     
                 </li>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -38,10 +38,7 @@
 <div class="forumbread">
     <ul>
         <li class="first">
-            <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                <h:outputText value="#{shared.mainPageName}"/>  					
-            </h:outputLink>
-            <h:commandLink value="#{shared.mainPageName}"/>
+            <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
         </li>
     </ul>
 </div>
@@ -59,10 +56,6 @@
     <c:forEach items="#{summary.topics}" var="topicrow" varStatus="status" >
     <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
         <td class='${status.last?"bottomline":""}' >
-            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" id="_${status.index}">
-                <f:param name="t" value="#{topicrow.id}"/>
-                <h:outputText value="#{topicrow.subject}"/>  					
-            </h:outputLink>
             <h:commandLink action="viewTopic" value="#{topicrow.subject}" id="_${status.index}">
                 <f:param name="t" value="#{topicrow.id}"/>					
             </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -50,10 +50,6 @@
             ${attachment.comment}
         </td>
         <td rowspan="3" class="downloadCell">
-            <h:outputLink value="#{forums:contextPath()}/downloadAttachment">
-                <f:param name="id" value="${attachment.id}"/>
-                ${resource.Download}
-            </h:outputLink>
             <h:commandLink action="#{forums:contextPath()}/downloadAttachment" value="${resource.Download}">
                 <f:param name="id" value="${attachment.id}"/>
             </h:commandLink>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -48,27 +48,16 @@
         <ul>
             <li class="first">
             
-                <h:outputLink id="outputLink1" value="#{forums:outputLink(shared.links['category'],true)}">
-                    <h:outputText value="#{shared.mainPageName}"/>
-                </h:outputLink>
                 <h:commandLink action="viewCategory" id="outputLink1" value="#{shared.mainPageName}"/>
                 
                 <ul>
                     <li>&gt; 
-                        <h:outputLink id="outputLink2" value="#{forums:outputLink(shared.links['category'],true)}">
-                            <f:param name="c" value="#{topic.topic.forum.category.id}"/>
-                            <h:outputText value="#{topic.topic.forum.category.title}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewCategory" id="outputLink2" value="#{topic.topic.forum.category.title}">
                             <f:param name="c" value="#{topic.topic.forum.category.id}"/>
                         </h:commandLink>
                         
                         <ul>
                             <li>&gt; 
-                                <h:outputLink id="outputLink3" value="#{forums:outputLink(shared.links['forum'],true)}">
-                                    <f:param name="f" value="#{topic.topic.forum.id}"/>
-                                    <h:outputText value="#{topic.topic.forum.name}"/>
-                                </h:outputLink>
                                 <h:commandLink action="viewForum" id="outputLink3" value="#{topic.topic.forum.name}">
                                     <f:param name="f" value="#{topic.topic.forum.id}"/>
                                     <h:outputText value="#{topic.topic.forum.name}"/>
@@ -76,11 +65,6 @@
                                 
                                 <ul>
                                     <li>&gt; 
-                                        <h:outputLink id="outputLink4" value="#{forums:outputLink(shared.links['topic'],true)}">
-                                            <f:param name="f" value="#{topic.topic.forum.id}"/>
-                                            <f:param name="t" value="#{topic.topic.id}"/>
-                                            <h:outputText value="#{topic.topic.subject}"/>
-                                        </h:outputLink>  
                                         <h:commandLink action="viewTopic" id="outputLink4" value="#{topic.topic.subject}">
                                             <f:param name="f" value="#{topic.topic.forum.id}"/>
                                             <f:param name="t" value="#{topic.topic.id}"/>
@@ -133,14 +117,6 @@
             </c:when>
             
             <c:otherwise>
-                <h:outputLink id="outputLink5" value="#{forums:outputLink(shared.links['topicWatch'],true)}">
-                    <f:param name="t" value="#{topic.topic.id}"/>
-                    <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
-                         alt="${resource.Subscribe_to_topic}"
-                         name="subscribe"
-                         border="0"
-                         id="subscribe" />
-                    </h:outputLink>
                 <h:commandLink action="topicWatch" id="outputLink5">
                     <f:param name="t" value="#{topic.topic.id}"/>
                     <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
@@ -185,22 +161,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink id="outputLink6" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${resource.First}"/>
-                        </h:outputLink>    
                         <h:commandLink action="viewTopic" id="outputLink6" value="${resource.First}">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>    
                     </li>
                     <li>
-                        <h:outputLink id="outputLink7" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
-                            <h:outputText value="&#60; ${resource.Previous}"/>
-                        </h:outputLink>  
                         <h:commandLink action="viewTopic" id="outputLink7" value="&#60; ${resource.Previous}">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
@@ -211,11 +177,6 @@
             
             <c:forEach items="#{topic.pageNavigator.currentPaginationLeft}" var="pageNumber">
                 <li>
-                    <h:outputLink id="_${pageNumber-1}outputLink8" value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topic.topic.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink8" value="${pageNumber}">
                         <f:param name="t" value="#{topic.topic.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -229,11 +190,6 @@
             
             <c:forEach items="#{topic.pageNavigator.currentPaginationRight}" var="pageNumber">
                 <li>
-                    <h:outputLink id="_${pageNumber-1}outputLink9" value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topic.topic.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink9" value="${pageNumber}">
                         <f:param name="t" value="#{topic.topic.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -252,22 +208,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink id="outputLink10" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
-                            <h:outputText value="${resource.Next} &#62;"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" id="outputLink10" value="${resource.Next} &#62;">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
                         </h:commandLink>
                     </li>
                     <li>
-                        <h:outputLink id="outputLink11" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
-                            <h:outputText value="${resource.Last}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" id="outputLink11" value="${resource.Last}">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
@@ -387,10 +333,6 @@
                     </c:when>
                     
                     <c:otherwise>
-                        <h:outputLink id="_#{postrow.id}outputLink12" value="#{forums:outputLink(shared.links['profile'],true)}">
-                            <f:param name="uid" value="${postrow.poster.user.id}"/>
-                            <h:outputText value="${postrow.poster.user.userName}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewProfile" id="_#{postrow.id}outputLink12" value="${postrow.poster.user.userName}">
                             <f:param name="uid" value="${postrow.poster.user.id}"/>
                         </h:commandLink>
@@ -449,14 +391,6 @@
                         <!-- add the delete post link -->                        
                         <forums:isAllowed fragment="acl://deletePost" contextData="#{postrow}">
                         <li>
-                            <h:outputLink id="_#{postrow.id}outputLink14" value="#{forums:outputLink('/views/topics/delete_post.jsf',true)}">
-                                <f:param name="p" value="#{postrow.id}"/>
-                                <f:param name="t" value="#{topic.topic.id}"/>
-                                <f:param name="f" value="#{topic.topic.forum.id}"/>
-                                <f:verbatim>
-                                    <img border="0" src="#{forums:themeURL('resourceIconDelpostURL')}"/>
-                                </f:verbatim>
-                            </h:outputLink>
                             <h:commandLink action="deletePost" id="_#{postrow.id}outputLink14">
                                 <f:param name="p" value="#{postrow.id}"/>
                                 <f:param name="t" value="#{topic.topic.id}"/>
@@ -476,9 +410,6 @@
                     <ul>
                         <li>
                             <a name="${postrow.id}" />
-                            <h:outputLink id="_${postrow.id}outputLink15" value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
-                                <h:outputText value="${resource.Permalink}"/>
-                            </h:outputLink>
                             <h:commandLink action="#{forums:postPermlink(postrow.id)}" id="_${postrow.id}outputLink15" value="${resource.Permalink}" style="text-decoration: none;"/>
                         </li>
                         <li>${resource.Posted}:&#160;#{forums:dateStr(postrow.createDate)}</li>
@@ -538,15 +469,6 @@
             <td class="forumthreaduserinfo">
                 <ul>
                     <li>
-                        <h:outputLink id="_${postrow.id}outputLink16" value="#{forums:outputLink(shared.links['profile'],true)}">
-                            <f:param name="uid"
-                                     value="#{postrow.poster.user.id}"/>
-                            <f:verbatim>
-                                <img border="0"
-                                     src="#{forums:themeURL('resourceIconProfileURL')}"
-                                     alt="${resource.Read_profile}"/>
-                            </f:verbatim>
-                        </h:outputLink>
                         <h:commandLink action="viewProfile" id="_${postrow.id}outputLink16">
                             <f:param name="uid"
                                      value="#{postrow.poster.user.id}"/>
@@ -620,15 +542,6 @@
                     </c:if>
                     <c:if test="${forums:userProperty(postrow.poster.user,'INFO_USER_IM_MSNM') ne null}">
                         <li>
-                            <h:outputLink id="_${postrow.id}outputLink17" value="#{forums:outputLink(shared.links['profile'],true)}">
-                                <f:param name="uid"
-                                         value="#{postrow.poster.user.id}"/>
-                                <f:verbatim>
-                                    <img border="0"
-                                         src="#{forums:themeURL('resourceIconMSNMURL')}"
-                                         alt="${resource.Read_profile}"/>
-                                </f:verbatim>
-                            </h:outputLink>
                             <h:commandLink action="viewProfile" id="_${postrow.id}outputLink17">
                                 <f:param name="uid"
                                          value="#{postrow.poster.user.id}"/>
@@ -725,22 +638,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink id="outputLink18" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="0"/>
-                            <h:outputText value="${resource.First}"/>
-                        </h:outputLink>    
                         <h:commandLink action="viewTopic" id="outputLink18" value="${resource.First}">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="0"/>
                         </h:commandLink>  
                     </li>
                     <li>
-                        <h:outputLink id="outputLink19" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
-                            <h:outputText value="&#60; ${resource.Previous}"/>
-                        </h:outputLink>    
                         <h:commandLink action="viewTopic" id="outputLink19" value="&#60; ${resource.Previous}">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
@@ -751,11 +654,6 @@
             
             <c:forEach items="#{topic.pageNavigator.currentPaginationLeft}" var="pageNumber">
                 <li>
-                    <h:outputLink id="_${pageNumber-1}outputLink20" value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topic.topic.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink20" value="${pageNumber}">
                         <f:param name="t" value="#{topic.topic.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -769,11 +667,6 @@
             
             <c:forEach items="#{topic.pageNavigator.currentPaginationRight}" var="pageNumber">
                 <li>
-                    <h:outputLink id="_${pageNumber-1}outputLink21" value="#{forums:outputLink(shared.links['topic'],true)}">
-                        <f:param name="t" value="#{topic.topic.id}"/>
-                        <f:param name="page" value="${pageNumber-1}"/>
-                        <h:outputText value="${pageNumber}"/>
-                    </h:outputLink>  
                     <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink21" value="${pageNumber}">
                         <f:param name="t" value="#{topic.topic.id}"/>
                         <f:param name="page" value="${pageNumber-1}"/>
@@ -792,22 +685,12 @@
                 </c:when>
                 <c:otherwise>
                     <li>
-                        <h:outputLink id="outputLink22" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
-                            <h:outputText value="${resource.Next} &#62;"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" id="outputLink22" value="${resource.Next} &#62;">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
                         </h:commandLink>
                     </li>
                     <li>
-                        <h:outputLink id="outputLink23" value="#{forums:outputLink(shared.links['topic'],true)}">
-                            <f:param name="t" value="#{topic.topic.id}"/>
-                            <f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
-                            <h:outputText value="${resource.Last}"/>
-                        </h:outputLink>
                         <h:commandLink action="viewTopic" id="outputLink23" value="${resource.Last}">
                             <f:param name="t" value="#{topic.topic.id}"/>
                             <f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
@@ -1025,14 +908,6 @@
             
             <forums:isAllowed fragment="acl://splitTopic" contextData="#{forum.forum},#{topic.topic}">
             <li>
-                <h:outputLink id="outputLink24" value="#{forums:outputLink(shared.links['topicSplit'],true)}">
-                    <f:param name="t" value="#{topic.topic.id}"/>
-                    <f:verbatim>
-                        <img width="17" height="17" border="0"
-                             src="#{forums:themeURL('resourceTopicModSplitURL')}"
-                             alt="${resource.Split_topic}"/>
-                    </f:verbatim>
-                </h:outputLink>
                 <h:commandLink action="viewModeratorSplit" id="outputLink24">
                     <f:param name="t" value="#{topic.topic.id}"/>
                     <f:verbatim>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -65,11 +65,6 @@
         <tr>
             <td class="linkCell" colspan="2">
                 <!-- view results link -->
-                <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                    <f:param name="t" value="${t}"/>
-                    <f:param name="results" value="1"/>
-                    <h:outputText value="${resource.View_results}"/>
-                </h:outputLink>
                 <h:commandLink action="viewTopic" value="${resource.View_results}">
                     <f:param name="t" value="${t}"/>
                     <f:param name="results" value="1"/>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml	2009-08-18 17:08:00 UTC (rev 28976)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml	2009-08-18 18:56:13 UTC (rev 28977)
@@ -76,10 +76,6 @@
     <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
     <tr>
         <td class="linkCell" colspan="6">
-            <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-                <f:param name="t" value="${t}"/>
-                <h:outputText value="${resource.View_ballot}"/>
-            </h:outputLink>
             <h:commandLink action="viewTopic" value="${resource.View_ballot}">
                 <f:param name="t" value="${t}"/>
             </h:commandLink>



More information about the jboss-svn-commits mailing list