[jboss-svn-commits] JBL Code SVN: r10620 - in labs/jbossforums/branches/forums101P26/forums: src/resources/portal-forums-war/views/forums and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Mar 29 12:59:20 EDT 2007


Author: dejp
Date: 2007-03-29 12:59:20 -0400 (Thu, 29 Mar 2007)
New Revision: 10620

Modified:
   labs/jbossforums/branches/forums101P26/forums/build.xml
   labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
   labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
JBFORUMS-191

Modified: labs/jbossforums/branches/forums101P26/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/build.xml	2007-03-29 16:26:25 UTC (rev 10619)
+++ labs/jbossforums/branches/forums101P26/forums/build.xml	2007-03-29 16:59:20 UTC (rev 10620)
@@ -211,7 +211,7 @@
       <copy todir="${build.resources}/portal-forums-ear">
 			<fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
 			<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar"/>
-			<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
+			<!--fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/-->
 			<fileset dir="${apache.myfaces.lib}" includes="tomahawk.jar"/>
 	  </copy>
 	  <jar jarfile="${build.lib}/jboss-forums.ear">

Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2007-03-29 16:26:25 UTC (rev 10619)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2007-03-29 16:59:20 UTC (rev 10620)
@@ -29,7 +29,7 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
->
+>
 
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
@@ -40,856 +40,857 @@
     <!-- make sure the user is allowed to access both the specified forum and the category that this forum belongs to -->
 	<forums:isAllowed fragment="acl://readCategory" contextData="#{forum.forum.category}">
 	<forums:isAllowed fragment="acl://readForum" contextData="#{forum.forum}">
-
-    <div class="forumbread">
-        <ul>
-            <li class="first">
-            
-                <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
-                    <h:outputText value="#{shared.mainPageName}"/>
-                </h:outputLink>
-                
-                <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>
-                        
-                        <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>
-                            </li>
-                        </ul>
-                        
-                    </li>
-                </ul>
-                
-            </li>
-        </ul>
-    </div>
 
+    <div class="forumbread">
+        <ul>
+            <li class="first">
+            
+                <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+                    <h:outputText value="#{shared.mainPageName}"/>
+                </h:outputLink>
+                
+                <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>
+                        
+                        <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>
+                            </li>
+                        </ul>
+                        
+                    </li>
+                </ul>
+                
+            </li>
+        </ul>
+    </div>
+
 <h:form>	
-	
-    <c:if test="#{shared.anonymous==false}">
-        <div class="forumfloatright">
-            <c:choose>
-                <c:when test="#{forums:isWatchingForum(forum.forum) ne null}">
-                    <h:commandLink action="#{forumWatch.deActivateWatch}">
-                        <f:param name="w" value="#{forums:isWatchingForum(forum.forum)}" />
-                        <img src="#{forums:themeURL('resourceIconUnSubscribeURL')}"
-                             alt="${resource.Unsubscribe_from_forum}"
-                             name="unSubscribe"
-                             border="0"
-                             id="unSubscribe" />
-                    </h:commandLink>
-                </c:when>
-                <c:otherwise>
-                    <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}">
-                        <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
-                             alt="${resource.Subscribe_to_forum}"
-                             name="subscribe"
-                             border="0"
-                             id="subscribe" />
-                    </h:outputLink>
-                </c:otherwise>
-            </c:choose>
-        </div>
-    </c:if>
-    
-    <div class="forumtitletext">
-        <input type="hidden" name="f" value="#{forum.forum.id}" />
-        <h4>
-            ${forum.forum.name}
-        </h4>
-    </div>
-    
-    <!-- PAGINATION -->
-    <c:if test="#{forum.pageNavigator.totalPages gt 1}">
-    <div class="forumpagination">
-        <ul>
-            <li class="disablepage">
-                <h:outputFormat value="#{resource.PageNumber}">
-                    <f:param value="${forum.pageNavigator.pageNumber}"/>
-                    <f:param value="${forum.pageNavigator.totalPages}"/>
-                </h:outputFormat>
-            </li>
-            
-            <c:choose>
-                <c:when test="#{forum.pageNavigator.currentPage eq 0}">
-                    <li class="disablepage">
-                        ${resource.First}
-                    </li>
-                    <li class="disablepage">
-                        &#60; ${resource.Previous}
-                    </li>
-                </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>    
-                    </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>    
-                    </li>
-                </c:otherwise>
-            </c:choose>
-            
-            <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>  
-                </li>
-            </c:forEach>
-            
-            <li class="currentpage">
-                ${forum.pageNavigator.currentPage+1}
-            </li>
-            
-            <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>  
-                </li>
-            </c:forEach>
-            
-            <c:choose>
-                <c:when test="#{forum.pageNavigator.currentPage eq (forum.pageNavigator.totalPages-1) }">
-                    <li class="disablepage">
-                        ${resource.Next} &#62;
-                    </li>
-                    <li class="disablepage">
-                        ${resource.Last}
-                    </li>
-                </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>
-                    </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>
-                    </li>
-                </c:otherwise>
-            </c:choose>
-        </ul>
-    </div>
-    </c:if>
-
-    <forums:isAllowed fragment="acl://newTopic" contextData="#{forum.forum}">
-    <div class="actionbuttons">
-        <ul>
-            <li>
-                <h:commandLink id="newTopic" action="#{newTopic.start}">
-                    <f:param name="f" value="#{forum.forum.id}"/>
-                    <c:if test="#{forum.forum.status == forums:constantInt('FORUM_LOCKED')}">
-                        <f:verbatim>
-                            <img border="0"
-                                 src="#{forums:themeURL('resourcePostLockedURL')}"
-                                 alt="${resource.Forum_locked}"/>
-                        </f:verbatim>
-                    </c:if>
-                    <c:if test="#{forum.forum.status != forums:constantInt('FORUM_LOCKED')}">
-                        <f:verbatim>
-                            <img border="0"
-                                 src="#{forums:themeURL('resourcePostNewURL')}"
-                                 alt="${resource.Post_new_topic}" />
-                        </f:verbatim>
-                    </c:if>
-               </h:commandLink>
-            </li>
-        </ul>
-    </div>
-    </forums:isAllowed>
+	
+    <c:if test="#{shared.anonymous==false}">
+        <div class="forumfloatright">
+            <c:choose>
+                <c:when test="#{forums:isWatchingForum(forum.forum) ne null}">
+                    <h:commandLink action="#{forumWatch.deActivateWatch}">
+                        <f:param name="w" value="#{forums:isWatchingForum(forum.forum)}" />
+                        <img src="#{forums:themeURL('resourceIconUnSubscribeURL')}"
+                             alt="${resource.Unsubscribe_from_forum}"
+                             name="unSubscribe"
+                             border="0"
+                             id="unSubscribe" />
+                    </h:commandLink>
+                </c:when>
+                <c:otherwise>
+                    <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}">
+                        <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
+                             alt="${resource.Subscribe_to_forum}"
+                             name="subscribe"
+                             border="0"
+                             id="subscribe" />
+                    </h:outputLink>
+                </c:otherwise>
+            </c:choose>
+        </div>
+    </c:if>
     
+    <div class="forumtitletext">
+        <input type="hidden" name="f" value="#{forum.forum.id}" />
+        <h4>
+            ${forum.forum.name}
+        </h4>
+    </div>
+    
+    <!-- PAGINATION -->
+    <c:if test="#{forum.pageNavigator.totalPages gt 1}">
+    <div class="forumpagination">
+        <ul>
+            <li class="disablepage">
+                <h:outputFormat value="#{resource.PageNumber}">
+                    <f:param value="${forum.pageNavigator.pageNumber}"/>
+                    <f:param value="${forum.pageNavigator.totalPages}"/>
+                </h:outputFormat>
+            </li>
+            
+            <c:choose>
+                <c:when test="#{forum.pageNavigator.currentPage eq 0}">
+                    <li class="disablepage">
+                        ${resource.First}
+                    </li>
+                    <li class="disablepage">
+                        &#60; ${resource.Previous}
+                    </li>
+                </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>    
+                    </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>    
+                    </li>
+                </c:otherwise>
+            </c:choose>
+            
+            <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>  
+                </li>
+            </c:forEach>
+            
+            <li class="currentpage">
+                ${forum.pageNavigator.currentPage+1}
+            </li>
+            
+            <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>  
+                </li>
+            </c:forEach>
+            
+            <c:choose>
+                <c:when test="#{forum.pageNavigator.currentPage eq (forum.pageNavigator.totalPages-1) }">
+                    <li class="disablepage">
+                        ${resource.Next} &#62;
+                    </li>
+                    <li class="disablepage">
+                        ${resource.Last}
+                    </li>
+                </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>
+                    </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>
+                    </li>
+                </c:otherwise>
+            </c:choose>
+        </ul>
+    </div>
+    </c:if>
+
+    <forums:isAllowed fragment="acl://newTopic" contextData="#{forum.forum}">
+    <div class="actionbuttons">
+        <ul>
+            <li>
+                <h:commandLink id="newTopic" action="#{newTopic.start}">
+                    <f:param name="f" value="#{forum.forum.id}"/>
+                    <c:if test="#{forum.forum.status == forums:constantInt('FORUM_LOCKED')}">
+                        <f:verbatim>
+                            <img border="0"
+                                 src="#{forums:themeURL('resourcePostLockedURL')}"
+                                 alt="${resource.Forum_locked}"/>
+                        </f:verbatim>
+                    </c:if>
+                    <c:if test="#{forum.forum.status != forums:constantInt('FORUM_LOCKED')}">
+                        <f:verbatim>
+                            <img border="0"
+                                 src="#{forums:themeURL('resourcePostNewURL')}"
+                                 alt="${resource.Post_new_topic}" />
+                        </f:verbatim>
+                    </c:if>
+               </h:commandLink>
+            </li>
+        </ul>
+    </div>
+    </forums:isAllowed>
+    
     <!-- display the list of topics associated with this forum -->
-    <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+    <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
     
-        <tr class="header">
-            <td class="forumheaderfirst" colspan="2">${resource.Topics}</td>
-            <td class="forumheadercentered">${resource.Replies}</td>
-            <td class="forumheadercentered">${resource.Views}</td>
-            <td class="forumheaderlast">${resource.Last_Post}</td>
-        </tr>
-        
+        <tr class="header">
+            <td class="forumheaderfirst" colspan="2">${resource.Topics}</td>
+            <td class="forumheadercentered">${resource.Replies}</td>
+            <td class="forumheadercentered">${resource.Views}</td>
+            <td class="forumheaderlast">${resource.Last_Post}</td>
+        </tr>
+        
         <c:choose>
             <c:when test="#{forum.forum.topicCount>0}">
             <c:if test="#{forum.announcementsPresent}">
-            <!-- Announcement threads -->
+            <!-- Announcement threads -->
             
             <tr>
                 <td class="forumspecialized" colspan="5">
                     <h3>
                         ${resource.Announcements}
-                    </h3>
+                    </h3>
                 </td>
-            </tr>
-            
-            <c:forEach items="#{forum.announcements}" var="topicrow" varStatus="status" >
-            <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
-                <td class="forumlisticon">
-                    <img src="#{forums:folderTypeURL(topicrow,forum.anonymous)}" 
-                         width="11" height="14"
-                         alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
-                </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>   
-                    </h3>
-                    
-                    <!-- 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>
-                        &#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>
-                        <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>
-                        </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>
-                        </c:if>
-                        &#160;)
-                    </c:if>
-                    <br />
-                    ${resource.By}&#160;
-                    <c:choose>
-                        
-                        <c:when test="#{category.anonymous}">
-                            ${topicrow.poster.user.userName}
-                        </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>
-                        </c:otherwise>
-                                    
-                    </c:choose>
-                        
-                </td>
-                <td class="forumlistcentered">${topicrow.replies}</td>
-                <td class="forumlistcentered">${topicrow.viewCount}</td>
-                <td class="forumlistlast">
-                    <a href="#{forums:postPermlink(forum.topicLastPosts[topicrow.id].id)}">
-                        <c:choose>
-                        
-                            <c:when test="#{forums:isLongerThan(forum.topicLastPosts[topicrow.id].message.subject,25)}">
-                                #{forums:subString(forum.topicLastPosts[topicrow.id].message.subject,25)}&#8230;
-                            </c:when>
-                            
-                            <c:otherwise>
-                                #{forum.topicLastPosts[topicrow.id].message.subject}
-                            </c:otherwise>
-                            
-                        </c:choose>
-                    </a>
-                    <br />
-                    ${resource.By} 
-                    <c:choose>
-                    
-                        <c:when test="#{myForum.anonymous}">
-                            ${forum.topicLastPosts[topicrow.id].poster.user.userName}
-                        </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>
-                        </c:otherwise>
-                                    
-                    </c:choose>
-                    <br />
-                    #{forum.topicLastPosts[topicrow.id].createDate}
-                </td>
-            </tr>
+            </tr>
             
+            <c:forEach items="#{forum.announcements}" var="topicrow" varStatus="status" >
+            <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
+                <td class="forumlisticon">
+                    <img src="#{forums:folderTypeURL(topicrow,forum.anonymous)}" 
+                         width="11" height="14"
+                         alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
+                </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>   
+                    </h3>
+                    
+                    <!-- 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>
+                        &#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>
+                        <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>
+                        </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>
+                        </c:if>
+                        &#160;)
+                    </c:if>
+                    <br />
+                    ${resource.By}&#160;
+                    <c:choose>
+                        
+                        <c:when test="#{category.anonymous}">
+                            ${topicrow.poster.user.userName}
+                        </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>
+                        </c:otherwise>
+                                    
+                    </c:choose>
+                        
+                </td>
+                <td class="forumlistcentered">${topicrow.replies}</td>
+                <td class="forumlistcentered">${topicrow.viewCount}</td>
+                <td class="forumlistlast">
+                    <a href="#{forums:postPermlink(forum.topicLastPosts[topicrow.id].id)}">
+                        <c:choose>
+                        
+                            <c:when test="#{forums:isLongerThan(forum.topicLastPosts[topicrow.id].message.subject,25)}">
+                                #{forums:subString(forum.topicLastPosts[topicrow.id].message.subject,25)}&#8230;
+                            </c:when>
+                            
+                            <c:otherwise>
+                                #{forum.topicLastPosts[topicrow.id].message.subject}
+                            </c:otherwise>
+                            
+                        </c:choose>
+                    </a>
+                    <br />
+                    ${resource.By} 
+                    <c:choose>
+                    
+                        <c:when test="#{myForum.anonymous}">
+                            ${forum.topicLastPosts[topicrow.id].poster.user.userName}
+                        </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>
+                        </c:otherwise>
+                                    
+                    </c:choose>
+                    <br />
+                    #{forum.topicLastPosts[topicrow.id].createDate}
+                </td>
+            </tr>
+            
             </c:forEach>
-            </c:if>
+            </c:if>
             
             <c:if test="#{forum.stickyThreadsPresent}">
-            <!-- Sticky Threads -->
-            
-            <tr>
-                <td class="forumspecialized" colspan="5">
-                    <h3>
-                        ${resource.Sticky_Threads}
-                    </h3>
-                </td>
-            </tr>
-            
-            <c:forEach items="#{forum.stickyThreads}" var="topicrow" varStatus="status" >
-            <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
-                <td class="forumlisticon">
-                    <img src="#{forums:folderTypeURL(topicrow,forum.anonymous)}" 
-                         width="11" height="14"
-                         alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
-                </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>   
-                    </h3>
-                    
-                    <!-- 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>
-                        &#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>
-                        <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>
-                        </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>
-                        </c:if>
-                        &#160;)
-                    </c:if>
-                    <br />
-                    ${resource.By}&#160;
-                    <c:choose>
-                        
-                        <c:when test="#{category.anonymous}">
-                            ${topicrow.poster.user.userName}
-                        </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>
-                        </c:otherwise>
-                                    
-                    </c:choose>
-                        
-                </td>
-                <td class="forumlistcentered">${topicrow.replies}</td>
-                <td class="forumlistcentered">${topicrow.viewCount}</td>
-                <td class="forumlistlast">
-                    <a href="#{forums:postPermlink(forum.topicLastPosts[topicrow.id].id)}">
-                        <c:choose>
-                        
-                            <c:when test="#{forums:isLongerThan(forum.topicLastPosts[topicrow.id].message.subject,25)}">
-                                #{forums:subString(forum.topicLastPosts[topicrow.id].message.subject,25)}&#8230;
-                            </c:when>
-                            
-                            <c:otherwise>
-                                #{forum.topicLastPosts[topicrow.id].message.subject}
-                            </c:otherwise>
-                            
-                        </c:choose>
-                    </a>
-                    <br />
-                    ${resource.By} 
-                    <c:choose>
-                    
-                        <c:when test="#{category.anonymous}">
-                            ${forum.topicLastPosts[topicrow.id].poster.user.userName}
-                        </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>
-                        </c:otherwise>
-                                    
-                    </c:choose>
-                    <br />
-                    #{forum.topicLastPosts[topicrow.id].createDate}
-                </td>
-            </tr>
+            <!-- Sticky Threads -->
+            
+            <tr>
+                <td class="forumspecialized" colspan="5">
+                    <h3>
+                        ${resource.Sticky_Threads}
+                    </h3>
+                </td>
+            </tr>
+            
+            <c:forEach items="#{forum.stickyThreads}" var="topicrow" varStatus="status" >
+            <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
+                <td class="forumlisticon">
+                    <img src="#{forums:folderTypeURL(topicrow,forum.anonymous)}" 
+                         width="11" height="14"
+                         alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
+                </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>   
+                    </h3>
+                    
+                    <!-- 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>
+                        &#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>
+                        <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>
+                        </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>
+                        </c:if>
+                        &#160;)
+                    </c:if>
+                    <br />
+                    ${resource.By}&#160;
+                    <c:choose>
+                        
+                        <c:when test="#{category.anonymous}">
+                            ${topicrow.poster.user.userName}
+                        </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>
+                        </c:otherwise>
+                                    
+                    </c:choose>
+                        
+                </td>
+                <td class="forumlistcentered">${topicrow.replies}</td>
+                <td class="forumlistcentered">${topicrow.viewCount}</td>
+                <td class="forumlistlast">
+                    <a href="#{forums:postPermlink(forum.topicLastPosts[topicrow.id].id)}">
+                        <c:choose>
+                        
+                            <c:when test="#{forums:isLongerThan(forum.topicLastPosts[topicrow.id].message.subject,25)}">
+                                #{forums:subString(forum.topicLastPosts[topicrow.id].message.subject,25)}&#8230;
+                            </c:when>
+                            
+                            <c:otherwise>
+                                #{forum.topicLastPosts[topicrow.id].message.subject}
+                            </c:otherwise>
+                            
+                        </c:choose>
+                    </a>
+                    <br />
+                    ${resource.By} 
+                    <c:choose>
+                    
+                        <c:when test="#{category.anonymous}">
+                            ${forum.topicLastPosts[topicrow.id].poster.user.userName}
+                        </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>
+                        </c:otherwise>
+                                    
+                    </c:choose>
+                    <br />
+                    #{forum.topicLastPosts[topicrow.id].createDate}
+                </td>
+            </tr>
 
             </c:forEach>
-            </c:if>
+            </c:if>
             
             <c:if test="#{forum.normalThreadsPresent}">
-            <!-- Normal threads -->
-            <tr>
-                <td class="forumspecialized" colspan="5">
-                    <h3>
-                        ${resource.Normal_Threads}
-                    </h3>
-                </td>
-            </tr>
-            
+            <!-- Normal threads -->
+            <tr>
+                <td class="forumspecialized" colspan="5">
+                    <h3>
+                        ${resource.Normal_Threads}
+                    </h3>
+                </td>
+            </tr>
+            
             <c:forEach items="#{forum.normalThreads}" var="topicrow" varStatus="status" >
-            <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
-                <td class="forumlisticon">
-                    <img src="#{forums:folderTypeURL(topicrow,forum.anonymous)}" 
-                         width="11" height="14"
-                         alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
-                </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>
-                    </h3>
-                    
-                    <!-- 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>
-                        &#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>
-                        <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>
-                        </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>
-                        </c:if>
-                        &#160;)
-                    </c:if>
-                    <br />
-                    ${resource.By}&#160;
-                    <c:choose>
-                        
-                        <c:when test="#{forum.anonymous}">
-                            ${topicrow.poster.user.userName}
-                        </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>
-                        </c:otherwise>
-                                    
-                    </c:choose>
-                        
-                </td>
-                <td class="forumlistcentered">${topicrow.replies}</td>
-                <td class="forumlistcentered">${topicrow.viewCount}</td>
-                <td class="forumlistlast">
-                    <a href="#{forums:postPermlink(forum.topicLastPosts[topicrow.id].id)}">
-                        <c:choose>
-                        
-                            <c:when test="#{forums:isLongerThan(forum.topicLastPosts[topicrow.id].message.subject,25)}">
-                                #{forums:subString(forum.topicLastPosts[topicrow.id].message.subject,25)}&#8230;
-                            </c:when>
-                            
-                            <c:otherwise>
-                                #{forum.topicLastPosts[topicrow.id].message.subject}
-                            </c:otherwise>
-                            
-                        </c:choose>
-                    </a>
-                    <br />
-                    ${resource.By} 
-                    <c:choose>
-                    
-                        <c:when test="#{category.anonymous}">
-                            ${forum.topicLastPosts[topicrow.id].poster.user.userName}
-                        </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>
-                        </c:otherwise>
-                                    
-                    </c:choose>
-                    <br />
-                    #{forum.topicLastPosts[topicrow.id].createDate}
-                </td>
-            </tr>
+            <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
+                <td class="forumlisticon">
+                    <img src="#{forums:folderTypeURL(topicrow,forum.anonymous)}" 
+                         width="11" height="14"
+                         alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
+                </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>
+                    </h3>
+                    
+                    <!-- 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>
+                        &#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>
+                        <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>
+                        </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>
+                        </c:if>
+                        &#160;)
+                    </c:if>
+                    <br />
+                    ${resource.By}&#160;
+                    <c:choose>
+                        
+                        <c:when test="#{forum.anonymous}">
+                            ${topicrow.poster.user.userName}
+                        </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>
+                        </c:otherwise>
+                                    
+                    </c:choose>
+                        
+                </td>
+                <td class="forumlistcentered">${topicrow.replies}</td>
+                <td class="forumlistcentered">${topicrow.viewCount}</td>
+                <td class="forumlistlast">
+                    <a href="#{forums:postPermlink(forum.topicLastPosts[topicrow.id].id)}">
+                        <c:choose>
+                        
+                            <c:when test="#{forums:isLongerThan(forum.topicLastPosts[topicrow.id].message.subject,25)}">
+                                #{forums:subString(forum.topicLastPosts[topicrow.id].message.subject,25)}&#8230;
+                            </c:when>
+                            
+                            <c:otherwise>
+                                #{forum.topicLastPosts[topicrow.id].message.subject}
+                            </c:otherwise>
+                            
+                        </c:choose>
+                    </a>
+                    <br />
+                    ${resource.By} 
+                    <c:choose>
+                    
+                        <c:when test="#{category.anonymous}">
+                            ${forum.topicLastPosts[topicrow.id].poster.user.userName}
+                        </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>
+                        </c:otherwise>
+                                    
+                    </c:choose>
+                    <br />
+                    #{forum.topicLastPosts[topicrow.id].createDate}
+                </td>
+            </tr>
 
             </c:forEach>
-            </c:if>
+            </c:if>
             
-            </c:when>
+            </c:when>
             
             <c:otherwise>
-            <tr>
-                <td class="nonewpostRow" colspan="6">
-                    <h3>
-	            		${resource.No_topics_post_one}
-                    </h3>
-                </td>
+            <tr>
+                <td class="nonewpostRow" colspan="6">
+                    <h3>
+                        <h:outputText value="#{resource['No_topics_post_one']}" escape="false" />
+                    </h3>
+                </td>
             </tr>
 	        </c:otherwise>
         </c:choose>      
-    </table>
-    
-    <!-- PAGINATION -->
-    <c:if test="#{forum.pageNavigator.totalPages gt 1}">
-    <div class="forumpagination">
-        <ul>
-            <li class="disablepage">
-                <h:outputFormat value="#{resource.PageNumber}">
-                    <f:param value="${forum.pageNavigator.pageNumber}"/>
-                    <f:param value="${forum.pageNavigator.totalPages}"/>
-                </h:outputFormat>
-            </li>
-            
-            <c:choose>
-                <c:when test="#{forum.pageNavigator.currentPage eq 0}">
-                    <li class="disablepage">
-                        ${resource.First}
-                    </li>
-                    <li class="disablepage">
-                        &#60; ${resource.Previous}
-                    </li>
-                </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>    
-                    </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>    
-                    </li>
-                </c:otherwise>
-            </c:choose>
-            
-            <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>  
-                </li>
-            </c:forEach>
-            
-            <li class="currentpage">
-                ${forum.pageNavigator.currentPage+1}
-            </li>
-            
-            <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>  
-                </li>
-            </c:forEach>
-            
-            <c:choose>
-                <c:when test="#{forum.pageNavigator.currentPage eq (forum.pageNavigator.totalPages-1) }">
-                    <li class="disablepage">
-                        ${resource.Next} &#62;
-                    </li>
-                    <li class="disablepage">
-                        ${resource.Last}
-                    </li>
-                </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>
-                    </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>
-                    </li>
-                </c:otherwise>
-            </c:choose>
-        </ul>
-    </div>
-    </c:if>
+    </table>
     
+    <!-- PAGINATION -->
+    <c:if test="#{forum.pageNavigator.totalPages gt 1}">
+    <div class="forumpagination">
+        <ul>
+            <li class="disablepage">
+                <h:outputFormat value="#{resource.PageNumber}">
+                    <f:param value="${forum.pageNavigator.pageNumber}"/>
+                    <f:param value="${forum.pageNavigator.totalPages}"/>
+                </h:outputFormat>
+            </li>
+            
+            <c:choose>
+                <c:when test="#{forum.pageNavigator.currentPage eq 0}">
+                    <li class="disablepage">
+                        ${resource.First}
+                    </li>
+                    <li class="disablepage">
+                        &#60; ${resource.Previous}
+                    </li>
+                </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>    
+                    </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>    
+                    </li>
+                </c:otherwise>
+            </c:choose>
+            
+            <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>  
+                </li>
+            </c:forEach>
+            
+            <li class="currentpage">
+                ${forum.pageNavigator.currentPage+1}
+            </li>
+            
+            <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>  
+                </li>
+            </c:forEach>
+            
+            <c:choose>
+                <c:when test="#{forum.pageNavigator.currentPage eq (forum.pageNavigator.totalPages-1) }">
+                    <li class="disablepage">
+                        ${resource.Next} &#62;
+                    </li>
+                    <li class="disablepage">
+                        ${resource.Last}
+                    </li>
+                </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>
+                    </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>
+                    </li>
+                </c:otherwise>
+            </c:choose>
+        </ul>
+    </div>
+    </c:if>
+    
     <!-- NEWTOPIC -->
-    <forums:isAllowed fragment="acl://newTopic" contextData="#{forum.forum}">
-    <div class="actionbuttons">
-        <ul>
-            <li>
-                <h:commandLink id="newTopic" action="#{newTopic.start}">
-                    <f:param name="f" value="#{forum.forum.id}"/>
-                    <c:if test="#{forum.forum.status == forums:constantInt('FORUM_LOCKED')}">
-                        <f:verbatim>
-                            <img border="0"
-                                 src="#{forums:themeURL('resourcePostLockedURL')}"
-                                 alt="${resource.Forum_locked}"/>
-                        </f:verbatim>
-                    </c:if>
-                    <c:if test="#{forum.forum.status != forums:constantInt('FORUM_LOCKED')}">
-                        <f:verbatim>
-                            <img border="0"
-                                 src="#{forums:themeURL('resourcePostNewURL')}"
-                                 alt="${resource.Post_new_topic}" />
-                        </f:verbatim>
-                    </c:if>
-               </h:commandLink>
-            </li>
-        </ul>
-    </div>
-    </forums:isAllowed>
-    
-    <!-- MODERATION -->
-    <c:if test="#{shared.anonymous==false}">
-    <forums:isAllowed fragment="acl://moderateForum" contextData="#{forum.forum}">
-    <div class="modtools">
-        <ul>
-            <li>
-                ${resource.Forum_moderation}:
-            </li>
-            <li>
-                <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
-                    <f:param name="f" value="#{forum.forum.id}"/>
-                    <f:verbatim>
-                        <img src="${forums:themeURL('resourceIconModerateURL')}" alt="${resource.Moderate}" border="0" />
-                    </f:verbatim>
-                </h:outputLink>
-            </li>
-        </ul>
-    </div>
-    </forums:isAllowed>
-    </c:if>
-    
-    <!-- ADMINISTRATION -->
-    <c:if test="#{shared.anonymous==false}">
-    <forums:isAllowed fragment="acl://lockForums" contextData="#{forum.forum}" >
-    <div class="admintools">
-        <ul>
-            <li>${resource.Forum_administration}:</li>
-            <li>
-                <c:choose>
-                
-                    <c:when test="#{forum.forum.status eq forums:constantInt('FORUM_LOCKED')}">
-                        <h:commandLink action="#{adminController.unlockForum}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="c" value="#{forum.forum.category.id}"/>
-                            <f:verbatim>
-                                <img src="${forums:themeURL('resourceIconUnlockURL')}" alt="${resource.Forum_unlock}" border="0"/>
-                            </f:verbatim>
-                        </h:commandLink>
-                    </c:when>
-                    
-                    <c:otherwise>
-                        <h:commandLink action="#{adminController.lockForum}">
-                            <f:param name="f" value="#{forum.forum.id}"/>
-                            <f:param name="c" value="#{forum.forum.category.id}"/>
-                            <f:verbatim>
-                                <img src="${forums:themeURL('resourceIconLockURL')}" alt="${resource.Forum_lock}" border="0"/>
-                            </f:verbatim>
-                        </h:commandLink>
-                    </c:otherwise>
-                
-                </c:choose>
-            </li>
-        </ul>
-    </div>
-    </forums:isAllowed>
-    </c:if>
-        
-
-    <hr class="forumdashedHR" />
-        <div class="forumthreadlegend">
-            <ul>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderNewURL')}"
-                         alt="${resource.New_posts}" width="11" height="14" />
-                    ${resource.New_posts}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderHotNewURL')}"
-                         alt="${resource.New_posts_hot}" width="11" height="14" />
-                    ${resource.New_posts_hot}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderLockedNewURL')}"
-                         alt="${resource.New_posts_locked}" width="11" height="14" />
-                    ${resource.New_posts_locked}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderStickyNewURL')}"
-                         alt="${resource.Post_Sticky}" width="11" height="14" />
-                    ${resource.New_posts_sticky}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderAnnounceNewURL')}"
-                         alt="${resource.Post_Announcement}" width="11" height="14" />
-                    ${resource.New_posts_annoucement}
-                </li>
-            </ul>
-        </div>
-        <div class="forumthreadlegend">
-            <ul>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderURL')}"
-                         alt="${resource.No_new_posts}" width="11" height="14" />
-                    ${resource.No_new_posts}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderHotURL')}"
-                         alt="${resource.No_new_posts_hot}" width="11" height="14" />
-                    ${resource.No_new_posts_hot}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderLockedURL')}"
-                         alt="${resource.No_new_posts_locked}" width="11" height="14" />
-                    ${resource.No_new_posts_locked}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderStickyURL')}"
-                         alt="${resource.Post_Sticky}" width="11" height="14" />
-                    ${resource.No_new_posts_sticky}
-                </li>
-                <li>
-                    <img src="#{forums:themeURL('resourceFolderAnnounceURL')}"
-                         alt="${resource.Post_Announcement}" width="11" height="14" />
-                    ${resource.No_new_posts_annoucement}
-                </li>
-            </ul>
-        </div>
-        <div class="forumthreadlegendtext">
-        
-            <!-- post new topics link -->
-            <forums:isAllowedChoose>
-                <forums:isAllowedWhen fragment="acl://newTopic">
-                    ${resource.Rules_post_can}
-                </forums:isAllowedWhen>
-                <forums:isAllowedOtherwise>
-                    ${resource.Rules_post_cannot}
-                </forums:isAllowedOtherwise>
-            </forums:isAllowedChoose>
-            <br />
-            
-            <!-- manage poll link -->
-            <forums:isAllowedChoose>
-                <forums:isAllowedWhen fragment="acl://managePoll">
-                    ${resource.Rules_poll_can}
-                </forums:isAllowedWhen>
-                <forums:isAllowedOtherwise>
-                    ${resource.Rules_poll_cannot}
-                </forums:isAllowedOtherwise>
-            </forums:isAllowedChoose>
-            <br />
-                        
-            <!-- votePoll link -->
-            <forums:isAllowedChoose>
-                <forums:isAllowedWhen fragment="acl://votePoll">
-                    ${resource.Rules_vote_can}
-                </forums:isAllowedWhen>
-                <forums:isAllowedOtherwise>
-                    ${resource.Rules_vote_cannot}
-                </forums:isAllowedOtherwise>
-            </forums:isAllowedChoose>
-            <br />
-                        
-            <!-- moderate forum link -->
-            <forums:isAllowedChoose>
-                <forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{forum.forum}">
-                    ${resource.Rules_moderate_0}${resource.Rules_moderate_2}
-                </forums:isAllowedWhen>
-                <forums:isAllowedOtherwise>
-                    ${resource.Rules_moderate_1}${resource.Rules_moderate_2}
-                </forums:isAllowedOtherwise>
-            </forums:isAllowedChoose>
-            
-        </div>
+    <forums:isAllowed fragment="acl://newTopic" contextData="#{forum.forum}">
+    <div class="actionbuttons">
+        <ul>
+            <li>
+                <h:commandLink id="newTopic" action="#{newTopic.start}">
+                    <f:param name="f" value="#{forum.forum.id}"/>
+                    <c:if test="#{forum.forum.status == forums:constantInt('FORUM_LOCKED')}">
+                        <f:verbatim>
+                            <img border="0"
+                                 src="#{forums:themeURL('resourcePostLockedURL')}"
+                                 alt="${resource.Forum_locked}"/>
+                        </f:verbatim>
+                    </c:if>
+                    <c:if test="#{forum.forum.status != forums:constantInt('FORUM_LOCKED')}">
+                        <f:verbatim>
+                            <img border="0"
+                                 src="#{forums:themeURL('resourcePostNewURL')}"
+                                 alt="${resource.Post_new_topic}" />
+                        </f:verbatim>
+                    </c:if>
+               </h:commandLink>
+            </li>
+        </ul>
+    </div>
+    </forums:isAllowed>
+    
+    <!-- MODERATION -->
+    <c:if test="#{shared.anonymous==false}">
+    <forums:isAllowed fragment="acl://moderateForum" contextData="#{forum.forum}">
+    <div class="modtools">
+        <ul>
+            <li>
+                ${resource.Forum_moderation}:
+            </li>
+            <li>
+                <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+                    <f:param name="f" value="#{forum.forum.id}"/>
+                    <f:verbatim>
+                        <img src="${forums:themeURL('resourceIconModerateURL')}" alt="${resource.Moderate}" border="0" />
+                    </f:verbatim>
+                </h:outputLink>
+            </li>
+        </ul>
+    </div>
+    </forums:isAllowed>
+    </c:if>
+    
+    <!-- ADMINISTRATION -->
+    <c:if test="#{shared.anonymous==false}">
+    <forums:isAllowed fragment="acl://lockForums" contextData="#{forum.forum}" >
+    <div class="admintools">
+        <ul>
+            <li>${resource.Forum_administration}:</li>
+            <li>
+                <c:choose>
+                
+                    <c:when test="#{forum.forum.status eq forums:constantInt('FORUM_LOCKED')}">
+                        <h:commandLink action="#{adminController.unlockForum}">
+                            <f:param name="f" value="#{forum.forum.id}"/>
+                            <f:param name="c" value="#{forum.forum.category.id}"/>
+                            <f:verbatim>
+                                <img src="${forums:themeURL('resourceIconUnlockURL')}" alt="${resource.Forum_unlock}" border="0"/>
+                            </f:verbatim>
+                        </h:commandLink>
+                    </c:when>
+                    
+                    <c:otherwise>
+                        <h:commandLink action="#{adminController.lockForum}">
+                            <f:param name="f" value="#{forum.forum.id}"/>
+                            <f:param name="c" value="#{forum.forum.category.id}"/>
+                            <f:verbatim>
+                                <img src="${forums:themeURL('resourceIconLockURL')}" alt="${resource.Forum_lock}" border="0"/>
+                            </f:verbatim>
+                        </h:commandLink>
+                    </c:otherwise>
+                
+                </c:choose>
+            </li>
+        </ul>
+    </div>
+    </forums:isAllowed>
+    </c:if>
         
-    </h:form>
-    
-    <div class="forumlegendjumpboxclear">
-        <ui:include src="/views/jumpbox.xhtml" />
-    </div>
+
+    <hr class="forumdashedHR" />
+        <div class="forumthreadlegend">
+            <ul>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderNewURL')}"
+                         alt="${resource.New_posts}" width="11" height="14" />
+                    ${resource.New_posts}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderHotNewURL')}"
+                         alt="${resource.New_posts_hot}" width="11" height="14" />
+                    ${resource.New_posts_hot}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderLockedNewURL')}"
+                         alt="${resource.New_posts_locked}" width="11" height="14" />
+                    ${resource.New_posts_locked}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderStickyNewURL')}"
+                         alt="${resource.Post_Sticky}" width="11" height="14" />
+                    ${resource.New_posts_sticky}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderAnnounceNewURL')}"
+                         alt="${resource.Post_Announcement}" width="11" height="14" />
+                    ${resource.New_posts_annoucement}
+                </li>
+            </ul>
+        </div>
+        <div class="forumthreadlegend">
+            <ul>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderURL')}"
+                         alt="${resource.No_new_posts}" width="11" height="14" />
+                    ${resource.No_new_posts}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderHotURL')}"
+                         alt="${resource.No_new_posts_hot}" width="11" height="14" />
+                    ${resource.No_new_posts_hot}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderLockedURL')}"
+                         alt="${resource.No_new_posts_locked}" width="11" height="14" />
+                    ${resource.No_new_posts_locked}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderStickyURL')}"
+                         alt="${resource.Post_Sticky}" width="11" height="14" />
+                    ${resource.No_new_posts_sticky}
+                </li>
+                <li>
+                    <img src="#{forums:themeURL('resourceFolderAnnounceURL')}"
+                         alt="${resource.Post_Announcement}" width="11" height="14" />
+                    ${resource.No_new_posts_annoucement}
+                </li>
+            </ul>
+        </div>
+        <div class="forumthreadlegendtext">
+
+            <!-- post new topics link -->
+            <forums:isAllowedChoose>
+                <forums:isAllowedWhen fragment="acl://newTopic">
+                    <h:outputText value="#{resource['Rules_post_can']}" escape="false" />
+                </forums:isAllowedWhen>
+                <forums:isAllowedOtherwise>
+                    <h:outputText value="#{resource['Rules_post_cannot']}" escape="false" />
+                </forums:isAllowedOtherwise>
+            </forums:isAllowedChoose>
+            <br/>
+
+            <!-- manage poll link -->
+            <forums:isAllowedChoose>
+                <forums:isAllowedWhen fragment="acl://managePoll">
+                    <h:outputText value="#{resource['Rules_poll_can']}" escape="false" />
+                </forums:isAllowedWhen>
+                <forums:isAllowedOtherwise>
+                    <h:outputText value="#{resource['Rules_poll_cannot']}" escape="false" />
+                </forums:isAllowedOtherwise>
+            </forums:isAllowedChoose>
+            <br/>
+
+            <!-- votePoll link -->
+            <forums:isAllowedChoose>
+                <forums:isAllowedWhen fragment="acl://votePoll">
+                    <h:outputText value="#{resource['Rules_vote_can']}" escape="false" />
+                </forums:isAllowedWhen>
+                <forums:isAllowedOtherwise>
+                    <h:outputText value="#{resource['Rules_vote_cannot']}" escape="false" />
+                </forums:isAllowedOtherwise>
+            </forums:isAllowedChoose>
+            <br/>
+
+            <!-- moderate forum link -->
+            <forums:isAllowedChoose>
+                <forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{forum.forum}">
+                    <h:outputText value="#{resource['Rules_moderate_0']}" escape="false" /><h:outputText value="#{resource['Rules_moderate_2']}" escape="false" />
+                </forums:isAllowedWhen>
+                <forums:isAllowedOtherwise>
+                    <h:outputText value="#{resource['Rules_moderate_1']}" escape="false" /><h:outputText value="#{resource['Rules_moderate_2']}" escape="false" />
+                </forums:isAllowedOtherwise>
+            </forums:isAllowedChoose>
+            <br/>
+
+        </div>
+        
+    </h:form>
     
+    <div class="forumlegendjumpboxclear">
+        <ui:include src="/views/jumpbox.xhtml" />
+    </div>
+    
     </forums:isAllowed>
     </forums:isAllowed>
-	</c:if>
+	</c:if>
     
     <c:if test="#{forum.forum==null}">
         <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">

Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2007-03-29 16:26:25 UTC (rev 10619)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2007-03-29 16:59:20 UTC (rev 10620)
@@ -421,9 +421,9 @@
         <tr>
             <td class="forumpostleftcolumn">&#160;</td>
             <td class="forumpostcontent">
-            
+
                 <p>
-                    #{forums:formatMessage(postrow.message.text,false)}
+                    <h:outputText value="#{forums:formatMessage(postrow.message.text,false)}" escape="false" />
                     <br /><br />
                     ${forums:userProperty(postrow.poster.user,'INFO_USER_SIGNATURE')}
                 </p>




More information about the jboss-svn-commits mailing list