[jboss-svn-commits] JBL Code SVN: r10065 - in labs/jbossforums/branches/forums101P24/forums/src: main/org/jboss/portlet/forums/theme and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Mar 8 08:03:37 EST 2007


Author: unibrew
Date: 2007-03-08 08:03:37 -0500 (Thu, 08 Mar 2007)
New Revision: 10065

Modified:
   labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
   labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java
   labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
   labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
   labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
[JBFORUMS-170] TopicView is now rewritten to new L&F but still few issues need to be solved.

Modified: labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css	2007-03-08 12:39:33 UTC (rev 10064)
+++ labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css	2007-03-08 13:03:37 UTC (rev 10065)
@@ -384,7 +384,9 @@
 	padding-right: 4px;
 	vertical-align: text-bottom;
 	}
-
+.forumlegendCentered {
+	text-align:center;
+}
 .forumthreadlegend {
 	float:left;
  	margin-right: 30px;
@@ -424,6 +426,9 @@
 	float:right;
 	margin-bottom: 10px;
 }
+.forumlegendjumpboxclear select {
+	margin: 0px; 
+}
 
 
 /* ----------------------- forum pagination ------------------------ */

Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java	2007-03-08 12:39:33 UTC (rev 10064)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java	2007-03-08 13:03:37 UTC (rev 10065)
@@ -356,6 +356,11 @@
    /**
     * DOCUMENT_ME
     */
+   public String resourceSpacerURL;
+   
+   /**
+    * DOCUMENT_ME
+    */
    public String resourceHeadStylesheetURL;
    private XProperties xprops;
 
@@ -452,6 +457,7 @@
       resourceIconUnlockURL = xprops.getResourceURL("unlock");
       resourceIconLockURL = xprops.getResourceURL("lock");
       resourceIconModerateURL = xprops.getResourceURL("moderate");
+      resourceSpacerURL = xprops.getResourceURL("spacer");
       resourceHeadStylesheetURL = xprops.getResourceURL("head_stylesheet");
       resourceIconSpacerURL = xprops.getResourceURL("spacer");
 

Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties	2007-03-08 12:39:33 UTC (rev 10064)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties	2007-03-08 13:03:37 UTC (rev 10065)
@@ -438,6 +438,7 @@
 # Last edited by me on 12 Oct 2001; edited 2 times in total
 Edited_times_total=Last edited by {0} on {1}; edited {2} times in total.
 
+Thread_moderation=Thread Moderation
 Lock_topic=Lock this topic
 Unlock_topic=Unlock this topic
 Move_topic=Move this topic

Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties	2007-03-08 12:39:33 UTC (rev 10064)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties	2007-03-08 13:03:37 UTC (rev 10065)
@@ -7,6 +7,8 @@
 forum_unsubscribe=images/forum_but_unsubscribe.gif
 post_new=images/forum_but_newtopic.gif
 post_locked=images/forum_but_closed.gif
+reply_new=images/forum_but_postreply.gif
+reply_locked=images/forum_but_closed.gif
 folder=images/forum_ico_nonew_open.gif
 folder_new=images/forum_ico_new_open.gif
 folder_hot=images/forum_ico_nonew_pop.gif
@@ -20,25 +22,43 @@
 moderate=images/forum_but_moderate.gif
 lock=images/forum_ico_adminlock.gif
 unlock=images/forum_ico_adminunlock.gif
+icon_quote=images/forum_but_quote.gif
+icon_delpost=images/forum_but_delete.gif
+icon_edit=images/forum_but_edit.gif
+icon_profile=images/forum_but_profile.gif
+icon_email=images/forum_but_email.gif
+icon_www=images/forum_but_website.gif
+icon_aim=images/forum_but_aim.gif
+icon_yim=images/forum_but_yim.gif
+icon_skype=images/forum_but_skype.gif
+icon_msnm=images/forum_but_msnm.gif
+icon_icq=images/forum_but_icq.gif
+spacer=images/spacer.gif
+topic_mod_lock=images/forum_ico_adminlock.gif
+topic_mod_unlock=images/forum_ico_adminunlock.gif
+topic_mod_split=images/forum_ico_adminsplit.gif
+topic_mod_move=images/forum_ico_adminmove.gif
+topic_mod_delete=images/forum_ico_admindelete.gif
 
 
+
 #OLD
 
-icon_quote=images/lang_english/icon_quote.gif
-icon_edit=images/lang_english/icon_edit.gif
+#icon_quote=images/lang_english/icon_quote.gif
+#icon_edit=images/lang_english/icon_edit.gif
 icon_repost=images/lang_english/icon_repost.gif
 icon_search=images/lang_english/icon_search.gif
-icon_profile=images/lang_english/icon_profile.gif
+#icon_profile=images/lang_english/icon_profile.gif
 icon_pm=images/lang_english/icon_pm.gif
-icon_email=images/lang_english/icon_email.gif
-icon_delpost=images/icon_delete.gif
+#icon_email=images/lang_english/icon_email.gif
+#icon_delpost=images/icon_delete.gif
 icon_ip=images/lang_english/icon_ip.gif
-icon_www=images/lang_english/icon_www.gif
-icon_icq=images/lang_english/icon_icq_add.gif
-icon_aim=images/lang_english/icon_aim.gif
-icon_skype=images/lang_english/icon_skype.gif
-icon_yim=images/lang_english/icon_yim.gif
-icon_msnm=images/lang_english/icon_msnm.gif
+#icon_www=images/lang_english/icon_www.gif
+#icon_icq=images/lang_english/icon_icq_add.gif
+#icon_aim=images/lang_english/icon_aim.gif
+#icon_skype=images/lang_english/icon_skype.gif
+#icon_yim=images/lang_english/icon_yim.gif
+#icon_msnm=images/lang_english/icon_msnm.gif
 icon_minipost=images/icon_minipost.gif
 icon_gotopost=images/icon_minipost.gif
 icon_minipost_new=images/icon_minipost_new.gif
@@ -63,8 +83,8 @@
 
 #post_new=images/lang_english/post.gif
 #post_locked=images/lang_english/reply-locked.gif
-reply_new=images/lang_english/reply.gif
-reply_locked=images/lang_english/reply-locked.gif
+#reply_new=images/lang_english/reply.gif
+#reply_locked=images/lang_english/reply-locked.gif
 
 pm_inbox=images/msg_inbox.gif
 pm_outbox=images/msg_outbox.gif
@@ -81,11 +101,11 @@
 
 topic_watch=
 topic_un_watch=
-topic_mod_lock=images/topic_lock.gif
-topic_mod_unlock=images/topic_unlock.gif
-topic_mod_split=images/topic_split.gif
-topic_mod_move=images/topic_move.gif
-topic_mod_delete=images/topic_delete.gif
+#topic_mod_lock=images/topic_lock.gif
+#topic_mod_unlock=images/topic_unlock.gif
+#topic_mod_split=images/topic_split.gif
+#topic_mod_move=images/topic_move.gif
+#topic_mod_delete=images/topic_delete.gif
 
 voting_graphic_0=images/voting_bar.gif
 voting_graphic_1=images/voting_bar.gif

Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2007-03-08 12:39:33 UTC (rev 10064)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2007-03-08 13:03:37 UTC (rev 10065)
@@ -27,822 +27,944 @@
      xmlns:c="http://java.sun.com/jstl/core"
      xmlns:h="http://java.sun.com/jsf/html"
      xmlns:f="http://java.sun.com/jsf/core"
-     xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
+     xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
+     class="forumscontainer">
      
-   <ui:composition template="/views/common/common.xhtml">
-   <ui:define name="mainContent">
-   
-   <c:choose> 
-   <c:when test="#{topic.initialized &amp;&amp; topic.topic!=null &amp;&amp; topic.topic.id!=-1}">
+<ui:composition template="/views/common/common.xhtml">
+<ui:define name="mainContent">
+
+<c:choose> 
+
+    <c:when test="#{topic.initialized &amp;&amp; topic.topic!=null &amp;&amp; topic.topic.id!=-1}">
+    
     <!-- make sure the user is allowed to access both the forum and the category that the specified topic belongs to -->
-	<forums:isAllowed fragment="acl://readCategory" contextData="#{topic.topic.forum.category}">
-	<forums:isAllowed fragment="acl://readForum" contextData="#{topic.topic.forum}">
-   
-      <table width="100%" cellspacing="2" cellpadding="2" border="0">
-         <tr>
-            <td align="left" valign="bottom" colspan="2">
-               <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
-                             styleClass="maintitle">
-                  <f:param name="t" value="#{topic.topic.id}"/>
-                  <h:outputText value="#{topic.topic.subject}"/>
-               </h:outputLink>
-            </td>
-            <!-- page navigation --> 
-            <c:if test="#{topic.pageNavigator.totalPages gt 1}">        
-	         <td align="right" valign="middle" nowrap="nowrap">
-	         	<span class="gensmall"></span><br/>
-	         	<span class="nav">
-	         		${resource.Goto_page}      
-	         		<!-- previous link -->
-	         		<c:if test="#{topic.pageNavigator.pageNumber gt 1}">   	
-		         		&#160;&#160;
-		         		<h:outputLink 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.Previous}"/>
-		         		</h:outputLink>         			         		
-	         			&#160;&#160;	
-	         		</c:if>
-	         		<!-- actual pages -->
-	         		<c:forEach items="#{topic.pageNavigator.pages}" var="page" varStatus="idx">
-	         		    <c:choose> 
-	         		    	<c:when test="#{topic.pageNavigator.pageNumber==page}">
-		         				<b>${page}</b>
-		         			</c:when>
-		         			<c:otherwise>
-		       					<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-		       						<f:param name="t" value="#{topic.topic.id}"/>
-		       						<f:param name="page" value="#{page-1}"/>
-		       						<h:outputText value="${page}"/>
-		       					</h:outputLink>
-		       				</c:otherwise>		       						       				
-		       			</c:choose>
-		       			<c:if test="${idx.index-1 ne topic.pageNavigator.totalPages-1}">
-		       				<f:verbatim>,</f:verbatim>
-		       			</c:if>
-	       			</c:forEach>
-	       			<!-- Next link -->  
-	       			<c:if test="#{topic.pageNavigator.pageNumber lt topic.pageNavigator.totalPages}">     			
-		         		&#160;&#160;
-		         		<h:outputLink 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}"/>
-		         		</h:outputLink>         		
-		         		&#160;&#160;
-	         		</c:if>
-	         	</span>
-	         </td>
-	      </c:if>
-         </tr>
-         <tr>         
-         	<!-- insert the newTopic and replyTopic buttons here -->         	
-            <td align="left" valign="bottom" nowrap="nowrap" class="nav" >
-               <h:form>
-               
-                  <c:choose>
-               
-                     <c:when test="#{topic.topic.forum.status == forums:constantInt('FORUM_LOCKED')}">
-               
+    <forums:isAllowed fragment="acl://readCategory" contextData="#{topic.topic.forum.category}">
+    <forums:isAllowed fragment="acl://readForum" contextData="#{topic.topic.forum}">
+    
+    <a name="top" />
+    
+    <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="#{topic.topic.forum.category.id}"/>
+                            <h:outputText value="#{topic.topic.forum.category.title}"/>
+                        </h:outputLink>
+                        
+                        <ul>
+                            <li>&gt; 
+                                <h:outputLink 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>
+                                
+                                <ul>
+                                    <li>
+                                        <h:outputLink 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>                                        
+                                    </li>
+                                </ul>                                
+                                
+                            </li>
+                        </ul>
+                        
+                    </li>
+                </ul>
+                
+            </li>
+        </ul>
+    </div>
+    
+    <c:if test="#{shared.anonymous==false}">
+    <div class="forumfloatright">
+        <h:form>
+        <c:choose>
+        
+            <c:when test="#{topicWatch.watched}">
+                <h:commandLink id="deActivateWatch" action="#{topicWatch.deActivateWatch}">
+                    <f:param name="t" value="#{topic.topic.id}"/>
+                    <f:verbatim>
+                        <img src="#{forums:themeURL('resourceIconUnSubscribeURL')}"
+                             alt="${resource.Unsubscribe_from_topic}"
+                             name="unSubscribe"
+                             border="0"
+                             id="unSubscribe" />
+                    </f:verbatim>
+                </h:commandLink>
+            </c:when>
+            
+            <c:otherwise>
+                <h:commandLink id="activateWatch" action="#{topicWatch.activateWatch}">
+                    <f:param name="t" value="#{topic.topic.id}"/>
+                    <f:verbatim>
+                        <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
+                             alt="${resource.Subscribe_to_topic}"
+                             name="subscribe"
+                             border="0"
+                             id="subscribe" />
+                    </f:verbatim>
+                </h:commandLink>
+            </c:otherwise>
+                            
+        </c:choose>
+        </h:form>
+    </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="#{topic.pageNavigator.totalPages gt 1}">
+    <div class="forumpagination">
+        <ul>
+            <li class="disablepage">
+                <h:outputFormat value="#{resource.PageNumber}">
+                    <f:param value="${topic.pageNavigator.pageNumber}"/>
+                    <f:param value="${topic.pageNavigator.totalPages}"/>
+                </h:outputFormat>
+            </li>
+            
+            <c:choose>
+                <c:when test="#{topic.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['topic'],true)}">
+                            <f:param name="t" value="#{topic.topic.id}"/>
+                            <f:param name="page" value="0"/>
+                            <h:outputText value="${resource.First}"/>
+                        </h:outputLink>    
+                    </li>
+                    <li>
+                        <h:outputLink 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>    
+                    </li>
+                </c:otherwise>
+            </c:choose>
+            
+            <c:forEach items="#{topic.pageNavigator.currentPaginationLeft}" var="pageNumber">
+                <li>
+                    <h:outputLink 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>  
+                </li>
+            </c:forEach>
+            
+            <li class="currentpage">
+                ${topic.pageNavigator.currentPage+1}
+            </li>
+            
+            <c:forEach items="#{topic.pageNavigator.currentPaginationRight}" var="pageNumber">
+                <li>
+                    <h:outputLink 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>  
+                </li>
+            </c:forEach>
+            
+            <c:choose>
+                <c:when test="#{topic.pageNavigator.currentPage eq (topic.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['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>
+                    </li>
+                    <li>
+                        <h:outputLink 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>
+                    </li>
+                </c:otherwise>
+            </c:choose>
+        </ul>
+    </div>
+    </c:if>
+
+    <!-- insert the newTopic and replyTopic buttons here -->
+    <div class="actionbuttons">
+    <h:form>
+    <c:choose>
+    
+        <c:when test="#{topic.topic.forum.status == forums:constantInt('FORUM_LOCKED')}">
+        
+            <!-- new topic -->
+            <img border="0"
+                 src="#{forums:themeURL('resourcePostLockedURL')}"
+                 alt="${resource.Forum_locked}" />
+                 
+            <!-- reply -->
+            <img border="0"
+                 src="#{forums:themeURL('resourceReplyLockedURL')}"
+                 alt="${resource.Forum_locked}" />
+        </c:when>
+        
+        <c:when test="#{(topic.topic.status == forums:constantInt('TOPIC_LOCKED'))
+                      &amp;&amp; (topic.topic.forum.status != forums:constantInt('FORUM_LOCKED'))}">
+                      
+            <!-- new topic -->
+            <forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">
+            <h:commandLink id="newTopic" action="#{newTopic.start}">
+                <f:param name="f" value="#{topic.topic.forum.id}"/>
+                <f:verbatim>
+                    <img border="0"
+                         src="#{forums:themeURL('resourcePostNewURL')}"
+                         alt="${resource.Post_new_topic}"/>
+                </f:verbatim>
+            </h:commandLink>
+            </forums:isAllowed>
+
+            <!-- reply -->
+            <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">
+            <img border="0"
+                 src="#{forums:themeURL('resourceReplyLockedURL')}"
+                 alt="${resource.Topic_locked}" />
+            </forums:isAllowed>
+        </c:when>
+        
+        <c:otherwise>
+
+            <!-- new topic -->
+            <forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">
+                <h:commandLink id="newTopic" action="#{newTopic.start}">
+                    <f:param name="f" value="#{topic.topic.forum.id}"/>
+                    <f:verbatim>
                         <img border="0"
-                             src="#{forums:themeURL('resourcePostLockedURL')}"
-                             alt="${resource.Forum_locked}" />
+                             src="#{forums:themeURL('resourcePostNewURL')}"
+                             alt="${resource.Post_new_topic}"/>
+                    </f:verbatim>
+                </h:commandLink> 
+            </forums:isAllowed>
+                        
+            <!-- reply -->
+            <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">
+                <h:commandLink id="replyTopic" action="#{replyTopic.start}">
+                    <f:param name="f" value="#{topic.topic.forum.id}"/>
+                    <f:param name="t" value="#{topic.topic.id}"/>
+                    <f:verbatim>
                         <img border="0"
-                             src="#{forums:themeURL('resourceReplyLockedURL')}"
-                             alt="${resource.Forum_locked}" />
+                             src="#{forums:themeURL('resourceReplyNewURL')}"
+                             alt="${resource.Reply_to_topic}" />
+                    </f:verbatim>
+                </h:commandLink>
+            </forums:isAllowed>
+            
+        </c:otherwise>
+        
+    </c:choose>
+    </h:form>
+    </div>
+
+    <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+
+        <tr>
+            <!-- POLL DISPLAY -->
+            <c:if test="#{topic.pollPresent &amp;&amp; topic.ballotView}">
+                <ui:include src="/views/topics/viewtopic_poll_ballot.xhtml">
+                    <ui:param name="t" value="#{topic.topic.id}"/>
+                    <ui:param name="poll" value="#{topic.topic.poll}"/>
+                </ui:include>
+            </c:if>
+            <c:if test="#{topic.pollPresent &amp;&amp; !topic.ballotView}">
+                <ui:include src="/views/topics/viewtopic_poll_result.xhtml">
+                    <ui:param name="t" value="#{topic.topic.id}"/>
+                    <ui:param name="poll" value="#{topic.topic.poll}"/>
+                </ui:include>
+            </c:if>
+        </tr>
+        
+        <tr class="header">
+            <td class="forumheaderfirst">${resource.Author}</td>
+            <td class="forumheaderopen">${resource.Message}</td>
+        </tr>
+        
+        <!-- iterate and display each post on this topic in the forum -->
+        <c:forEach items="#{topic.page}" var="postrow" varStatus="status" >
+        <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
+            <td class="forumpostleftcolumn">
+                <c:choose>
                     
-                     </c:when>
-                 
-                     <c:when test="#{(topic.topic.status == forums:constantInt('TOPIC_LOCKED'))
-                     &amp;&amp; (topic.topic.forum.status != forums:constantInt('FORUM_LOCKED'))}">
-                	<forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">            
-                	<!-- new topic -->
-                        <h:commandLink id="newTopic" action="#{newTopic.start}" style="text-decoration: none;">
-                           <f:param name="f" value="#{topic.topic.forum.id}"/>
-                           <f:verbatim>
-                              <img border="0"
-                                   src="#{forums:themeURL('resourcePostNewURL')}"
-                                   alt="${resource.Post_new_topic}"/>
-                           </f:verbatim>
-                        </h:commandLink>
-                        </forums:isAllowed>
-                        <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">            
+                    <c:when test="#{category.anonymous}">
+                        ${postrow.poster.user.userName}
+                    </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>
+                    </c:otherwise>
+                    
+                </c:choose>
                 
-                        <!-- reply -->
-                        <img border="0" style="text-decoration: none;"
-                             src="#{forums:themeURL('resourceReplyLockedURL')}"
-                             alt="${resource.Topic_locked}" />
-                        </forums:isAllowed>                    
-                     </c:when>
-              
-                     <c:otherwise>
-               	
-                	<!-- new topic -->
-               		<forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">            
-                        <h:commandLink id="newTopic" action="#{newTopic.start}" style="text-decoration: none;">
-                           <f:param name="f" value="#{topic.topic.forum.id}"/>
-                           <f:verbatim>
-                              <img border="0"
-                                   src="#{forums:themeURL('resourcePostNewURL')}"
-                                   alt="${resource.Post_new_topic}"/>
-                           </f:verbatim>
-                        </h:commandLink> 
+                <!-- TODO: NEED TO BE REIMPLEMENTED
+                <span class="postdetails">
+                    ${POSTER_RANK}
+                    <br />
+                    ${RANK_IMAGE}${POSTER_AVATAR}
+                    <br />
+                    ${POSTER_JOINED}
+                    <br />
+                    ${POSTER_POSTS}
+                    <br />
+                    ${POSTER_FROM}
+                </span>
+                -->
+            </td>
+            <td class="forumpostspacer">
+            
+                <a name="${postrow.id}" />
+            
+                <div class="forumpostactions">
+                <h:form>
+                    <ul>
+                    
+                        <!-- add the quote link -->
+                        <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">
+                        <li>
+                            <h:commandLink action="#{replyTopic.startQuote}">
+                                <f:param name="f" value="#{topic.topic.forum.id}"/>
+                                <f:param name="t" value="#{topic.topic.id}"/>
+                                <f:param name="p" value="#{postrow.id}"/>
+                                <f:verbatim>
+                                    <img border="0" src="#{forums:themeURL('resourceIconQuoteURL')}"/>
+                                </f:verbatim>
+                            </h:commandLink>
+                        </li>
                         </forums:isAllowed>
+
+                        <!-- add the edit post link -->
+                        <forums:isAllowed fragment="acl://editPost" contextData="#{postrow}">
+                        <li>
+                            <h:commandLink action="#{editPost.start}">
+                                <f:param name="p" value="#{postrow.id}"/>
+                                <f:verbatim>
+                                    <img border="0" src="#{forums:themeURL('resourceIconEditURL')}"/>
+                                </f:verbatim>
+                            </h:commandLink>
+                        </li>
+                        </forums:isAllowed>
+
+                        <!-- add the delete post link -->                        
+                        <forums:isAllowed fragment="acl://deletePost" contextData="#{postrow}">
+                        <li>
+                            <h:outputLink 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>
+                        </li>
+                        </forums:isAllowed>
                         
-                        <!-- reply -->
-                        <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">            
-                        <h:commandLink id="replyTopic" action="#{replyTopic.start}" style="text-decoration: none;">
-                           <f:param name="f" value="#{topic.topic.forum.id}"/>
-                           <f:param name="t" value="#{topic.topic.id}"/>
-                           <f:verbatim>
-                              <img border="0"
-                                   src="#{forums:themeURL('resourceReplyNewURL')}"
-                                   alt="${resource.Reply_to_topic}" />
-                           </f:verbatim>
-                        </h:commandLink> 
-                        </forums:isAllowed>                   
-                     </c:otherwise>
-                 
-                  </c:choose>
-                  
-               </h:form>
+                    </ul>
+                </h:form>
+                </div>
+                
+                <div class="forumpostinfo">
+                    <ul>
+                    
+<!-- TODO: MISSING MINIPOSTICON FOR PERMALINK
+                        <li>
+                            <a name="${postrow.id}" />
+                            <h:outputLink value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
+                                <f:verbatim>
+                                    <img width="12" height="9"
+                                         src="#{forums:themeURL('resourceIconMinipostURL')}"
+                                         alt='${resource.Posts}'
+                                         title='${resource.Posts}' border="0"/>
+                                </f:verbatim>
+                            </h:outputLink>
+                        </li>
+-->
+
+                        <li>${resource.Posted}:&#160;#{forums:dateStr(postrow.createDate)}</li>
+                        <li>${resource.Post_subject}:&#160;${postrow.message.subject}</li>
+                    </ul>
+                </div>
             </td>
+        </tr>
+        <tr>
+            <td class="forumpostleftcolumn">&#160;</td>
+            <td class="forumpostcontent">
             
-            
-            <td align="left" valign="middle" class="nav" width="100%">
-                  &#160;&#160;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}"
-                                styleClass="nav">
-                     <h:outputText value="#{shared.mainPageName}"/>
-                  </h:outputLink>
-                  -&gt;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}"
-                                styleClass="nav">
-                     <f:param name="c"
-                              value="#{topic.topic.forum.category.id}"/>
-                     <h:outputText value="#{topic.topic.forum.category.title}"/>
-                  </h:outputLink>
-                  -&gt;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
-                                styleClass="nav">
-                     <f:param name="f" value="#{topic.topic.forum.id}"/>
-                     <h:outputText value="#{topic.topic.forum.name}"/>
-                  </h:outputLink>
-                  -&gt;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
-                                styleClass="nav">
-                     <f:param name="t" value="#{topic.topic.id}"/>
-                     <f:param name="f" value="#{topic.topic.forum.id}"/>
-                     <h:outputText value="#{topic.topic.subject}"/>
-                  </h:outputLink>
+                <p>
+                    #{forums:formatMessage(postrow.message.text,false)}
+                    <br /><br />
+                    ${forums:userProperty(postrow.poster.user.properties,'INFO_USER_SIGNATURE')}
+                </p>
+
+                <!-- show the attachments of this post here -->
+<!-- TODO: MISSING VIEW FOR ATTACHMENTS
+                <p>
+                    <c:if test="#{postrow.attachments!=null}">
+                        <ui:include src="/views/topics/attachmentsview.xhtml">
+                            <ui:param name="attachments" value="#{postrow.attachments}"/>
+                        </ui:include>
+                    </c:if>
+                </p>
+-->
+
+                <c:if test="${postrow.editCount gt 0}">
+                <p>
+                    <em>
+                        <c:choose>
+                            <c:when test="${postrow.editCount eq 1}">
+                                <h:outputFormat value="#{resource.Edited_time_total}">
+                                    <f:param value="${postrow.poster.user.userName}"/>
+                                    <f:param value="${postrow.editDate}"/>
+                                    <f:param value="${postrow.editCount}"/>
+                                </h:outputFormat>
+                            </c:when>
+                            <c:otherwise>
+                                <h:outputFormat value="#{resource.Edited_times_total}">
+                                    <f:param value="${postrow.poster.user.userName}"/>
+                                    <f:param value="${postrow.editDate}"/>
+                                    <f:param value="${postrow.editCount}"/>
+                                </h:outputFormat>
+                            </c:otherwise>
+                        </c:choose>
+                    </em>
+                </p>
+                </c:if>
+                
             </td>
-            
-            <c:if test="#{shared.anonymous==false}">
-	            <td align="right" valign="middle" class="nav" width="100%">
-	            	<h:form id="topicWatchFormId" >
-			            <c:choose>
-				         		<!-- TODO: PLACE FOR UNSUBSCRIBE BUTTON -->
-				    	    <c:when test="#{topicWatch.watched}">
-					    		<h:commandLink id="deActivateWatch" action="#{topicWatch.deActivateWatch}">
-				       				<f:param name="t" value="#{topic.topic.id}"/>
-				       				<f:verbatim>
-				       					<h:outputText  value="TopicUnWatch" />
-				       				</f:verbatim>
-				       			</h:commandLink>
-		         			</c:when>
-				         	<c:otherwise>
-				         		<!-- TODO: PLACE FOR SUBSCRIBE BUTTON -->
-					    		<h:commandLink id="activateWatch" action="#{topicWatch.activateWatch}">
-				       				<f:param name="t" value="#{topic.topic.id}"/>
-				       				<f:verbatim>
-				       					<h:outputText  value="TopicWatch" />
-				       				</f:verbatim>
-				       			</h:commandLink>
-				       		</c:otherwise>		       						       				
-				       	</c:choose>
-			       	</h:form>
-			    </td>
-		    </c:if>
-		    
-         </tr>
-         
-      </table>
-      
-      <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
-         <!-- TODO: hook in the previous/next topic function -->
-         <!--tr align="right">
-    		<td class="catHead" colspan="2" height="28"><span class="nav"><a href="${U_VIEW_OLDER_TOPIC}" class="nav">${resource.View_previous_topic}</a> :: <a href="${U_VIEW_NEWER_TOPIC}" class="nav">${resource.View_next_topic}</a> &nbsp;</span></td>
-	      </tr-->                 
-         <!-- POLL DISPLAY -->
-         <c:if test="#{topic.pollPresent &amp;&amp; topic.ballotView}">
-         	<ui:include src="/views/topics/viewtopic_poll_ballot.xhtml">
-         	    <ui:param name="t" value="#{topic.topic.id}"/>
-         		<ui:param name="poll" value="#{topic.topic.poll}"/>
-         	</ui:include>
-         </c:if>
-         <c:if test="#{topic.pollPresent &amp;&amp; !topic.ballotView}">
-         	<ui:include src="/views/topics/viewtopic_poll_result.xhtml">
-         	    <ui:param name="t" value="#{topic.topic.id}"/>
-         		<ui:param name="poll" value="#{topic.topic.poll}"/>
-         	</ui:include>
-         </c:if>
-         
-         
-         <tr>
-           <th class="thLeft" width="150" height="26" nowrap="nowrap">${resource.Author}</th>
-           <th class="thRight" nowrap="nowrap">${resource.Message}</th>
-         </tr>
-            
-            <!-- iterate and display each post on this topic in the forum -->
-            <c:forEach items="#{topic.page}" var="postrow" varStatus="status" >
-               <tr>
-                  <td width='150' align='left' valign='top' class='${(status.index%2==0)?"row1":"row2"}'>
-                     <!-- insert security check to make sure "posting" is allowed -->
-                     <span class="name">${postrow.poster.user.userName}</span>
-                     <br/>
-                     <!-- TODO: NEED TO BE REIMPLEMENTED
-                     <span class="postdetails">                        
-                        ${POSTER_RANK}
-                        <br />
-                        ${RANK_IMAGE}${POSTER_AVATAR}
-                        <br />
-                        ${POSTER_JOINED}
-                        <br />
-                        ${POSTER_POSTS}
-                        <br />
-                        ${POSTER_FROM}
-                     </span>
-                     -->
-                     <br/>
-                  </td>
-                  <td width="100%" height="28" valign="top" class='${(status.index%2==0)?"row1":"row2"}'>
-                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                        <tr>
-                           <td width="100%">
-                              <a name="${postrow.id}" />
-                              <h:outputLink value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
-                                  <f:verbatim>
-                                      <img width="12" height="9"
-                                           src="#{forums:themeURL('resourceIconMinipostURL')}"
-                                           alt='${resource.Posts}'
-                                           title='${resource.Posts}' border="0"/>
-                                  </f:verbatim>
-                              </h:outputLink>
-                              <span class="postdetails">
-                                 ${resource.Posted}:&#160;
-                                 #{forums:dateStr(postrow.createDate)}
-                                 <span class="gen">&#160;</span>
-                                 &#160;&#160;
-                                 ${resource.Post_subject}
-                                 &#160;:&#160;
-                                 ${postrow.message.subject}
-                              </span>
-                           </td>                           
-                           <!-- "Quote", "Edit", and "Delete" buttons -->
-                           <td valign="top" nowrap="">
-                                <h:form>
-                           		<!-- add the quote link -->
-                           		<forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">            
-                           		<h:commandLink action="#{replyTopic.startQuote}" style="text-decoration: none;">
-			                      <f:param name="f" value="#{topic.topic.forum.id}"/>
-			                      <f:param name="t" value="#{topic.topic.id}"/>
-			                      <f:param name="p" value="#{postrow.id}"/>                      				
-			                      <f:verbatim>
-			                        <img border="0" src="#{forums:themeURL('resourceIconQuoteURL')}"/>
-			                      </f:verbatim>
-			                    </h:commandLink>
-			                    </forums:isAllowed>
-                          		<!-- add the edit post link -->
-                          		<forums:isAllowed fragment="acl://editPost" contextData="#{postrow}">            
-                          		<h:commandLink action="#{editPost.start}" style="text-decoration: none;">
-                      				<f:param name="p" value="#{postrow.id}"/>                      				
-                      				<f:verbatim>
-                        				<img border="0" src="#{forums:themeURL('resourceIconEditURL')}"/>
-                      				</f:verbatim>
-                    			</h:commandLink>
-                    			</forums:isAllowed>
-                    			<!-- add the delete post link -->
-                    			<forums:isAllowed fragment="acl://deletePost" contextData="#{postrow}">
-                          		<h:outputLink value="#{forums:outputLink('/views/topics/delete_post.jsf',true)}" style="text-decoration: none;">                          		    
-                          		    <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>
-                    			</forums:isAllowed>
-                                 </h:form>
-                            </td>
-                        </tr>
-                        <tr>
-                           <td colspan="2">
-                              <hr/>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td colspan="2">
-                              <span class="postbody">
-                                    #{forums:formatMessage(postrow.message.text,false)}
-                                    <br /><br />
-                                    ${postrow.poster.user.signature}
-                              </span>
-                              
-                              <!-- show the attachments of this post here -->
-                              <c:if test="#{postrow.attachments!=null}">
-                                 <ui:include src="/views/topics/attachmentsview.xhtml">
-                                    <ui:param name="attachments" value="#{postrow.attachments}"/>
-                                 </ui:include>
-                              </c:if>
-                              
-                              <c:if test="${postrow.editCount gt 0}">
-                                 <br/>
-                                 <br/>
-                                 <span class="postbody">
-                                    <span class="gensmall">
-                                      <c:choose>
-                                        <c:when test="${postrow.editCount eq 1}">
-                                           <h:outputFormat value="#{resource.Edited_time_total}">
-                                              <f:param value="${postrow.poster.user.userName}"/>
-                                              <f:param value="${postrow.editDate}"/>
-                                              <f:param value="${postrow.editCount}"/>
-                                           </h:outputFormat>
-                                        </c:when>
-                                        <c:otherwise>
-                                           <h:outputFormat value="#{resource.Edited_times_total}">
-                                              <f:param value="${postrow.poster.user.userName}"/>
-                                              <f:param value="${postrow.editDate}"/>
-                                              <f:param value="${postrow.editCount}"/>
-                                           </h:outputFormat>                                            
-                                        </c:otherwise>
-                                      </c:choose>
-                                    </span>
-                                 </span>
-                              </c:if>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-               </tr>
-               <tr>
-                  <td width="150" align="left" valign="middle" class='${(status.index%2==0)?"row1":"row2"}'>
-                     <span class="nav">
-                        <a href="#top" class="nav">${resource.Back_to_top}</a>
-                     </span>
-                  </td>
-                  <td width="100%" height="28" valign="bottom" nowrap="nowrap" class='${(status.index%2==0)?"row1":"row2"}'> 
-                     <table cellspacing="0" cellpadding="0" border="0"
-                            height="18" width="18">
-                        <tr>
-                           <td valign="middle" nowrap="nowrap">
-                            
-                              <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}" style="text-decoration: none;">
-                                 <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>
-                              <!-- TODO: WAITING FOR MISSING FUNCTIONALITY --> 
-                              <!-- <h:outputLink value="#{forums:outputLink(shared.links['message'],true)}" style="text-decoration: none;">
-                                <f:param name="uid" value="#{postrow.poster.user.id}"/>
+        </tr>
+        <tr>
+            <td class="forumpostleftcolumn">
+                <a href="#top">${resource.Back_to_top}</a>
+            </td>
+            <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>
+                    </li>
+                    
+                    <!-- TODO: WAITING FOR MISSING FUNCTIONALITY -->
+                    <!--
+                    <li>
+                        <h:outputLink value="#{forums:outputLink(shared.links['message'],true)}">
+                            <f:param name="uid" value="#{postrow.poster.user.id}"/>
+                            <f:verbatim>
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconPMURL')}"
+                                     alt="${resource.Private_Message}"/>
+                            </f:verbatim>
+                        </h:outputLink>
+                    </li>
+                    -->
+                    
+                    <c:if test="${postrow.poster.user.fakeEmail ne null}">
+                        <li>
+                            <a href="mailto:${postrow.poster.user.fakeEmail}">
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconEmailURL')}"
+                                     alt="${resource.Send_email}"/>
+                            </a>
+                        </li>
+                    </c:if>
+                    <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_HOMEPAGE') ne null}">
+                        <li>
+                            <a href="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_HOMEPAGE')}">
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconWWWURL')}"
+                                     alt="${resource.Visit_website}"/>
+                            </a>
+                        </li>
+                    </c:if>
+                    <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_AIM') ne null}">
+                        <li>
+                            <a href="aim:goim?screenname=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_AIM')}&amp;message=Hello+Are+you+there?">
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconAIMURL')}"
+                                     alt="${resource.AIM}"/>
+                            </a>
+                        </li>
+                    </c:if>
+                    <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_YIM') ne null}">
+                        <li>
+                            <a href="http://edit.yahoo.com/config/send_webmesg?.target=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_YIM')}&amp;.src=pg">
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconYIMURL')}"
+                                     alt="${resource.YIM}"/>
+                            </a>
+                        </li>
+                    </c:if>
+                    <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE') ne null}">
+                        <li>
+                            <!-- TODO: some more functionality may be added. Like automatic skype instalation and status checker.-->
+                            <a href="skype:#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE')}?add">
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconSkypeURL')}"
+                                     alt="${resource.L_SKYPE}"/>
+                            </a>
+                        </li>
+                    </c:if>
+                    <c:if test="${forums:userProperty(postrow.poster.user.properties,'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('resourceIconPMURL')}"
-                                         alt="${resource.Private_Message}"/>
-                                 </f:verbatim>
-                              </h:outputLink> -->
-                              
-                              <c:if test="${postrow.poster.user.fakeEmail ne null}">
-                                 <a href="mailto:${postrow.poster.user.fakeEmail}" style="text-decoration: none;">
-                                        <img border="0"
-                                             src="#{forums:themeURL('resourceIconEmailURL')}"
-                                             alt="${resource.Send_email}"/>
-                                 </a>
-                              </c:if>
-                              <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_HOMEPAGE') ne null}">
-                                 <a href="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_HOMEPAGE')}" style="text-decoration: none;">
-                                        <img border="0"
-                                             src="#{forums:themeURL('resourceIconWWWURL')}"
-                                             alt="${resource.Visit_website}"/>
-                                 </a>
-                              </c:if>
-                              <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_AIM') ne null}">
-                                 <a href="aim:goim?screenname=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_AIM')}&amp;message=Hello+Are+you+there?" style="text-decoration: none;">
-                                     <img border="0"
-                                          src="#{forums:themeURL('resourceIconAIMURL')}"
-                                          alt="${resource.AIM}"/>
-                                 </a>
-                              </c:if>
-                              <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_YIM') ne null}">
-                                 <a href="http://edit.yahoo.com/config/send_webmesg?.target=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_YIM')}&amp;.src=pg" style="text-decoration: none;">
-                                     <img border="0"
-                                          src="#{forums:themeURL('resourceIconYIMURL')}"
-                                          alt="${resource.YIM}"/>
-                                 </a>
-                              </c:if>
-                              <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE') ne null}">
-                                <!-- TODO: some more functionality may be added. Like automatic skype instalation and status checker.-->
-                                 <a href="skype:#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE')}?add" style="text-decoration: none;">
-                                     <img border="0"
-                                          src="#{forums:themeURL('resourceIconSkypeURL')}"
-                                          alt="${resource.L_SKYPE}"/>
-                                 </a>
-                              </c:if>
-                              <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_MSNM') ne null}">
-                                 <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}" style="text-decoration: none;">
-                                     <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>
-                              </c:if>
-                              <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ') ne null}">
-                                 <a href="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;">
-                                     <img border="0"
-                                          src="#{forums:themeURL('resourceIconICQURL')}"
-                                          alt="${resource.ICQ}"/>
-                                 </a>
-                              </c:if>
-                              <!-- TODO: Status for ICQ. Might be cool for other communicators too.-->
-                              <!--<script language="JavaScript"
-                              type="text/javascript">-->
-                              <!--
+                                         src="#{forums:themeURL('resourceIconMSNMURL')}"
+                                         alt="${resource.Read_profile}"/>
+                                </f:verbatim>
+                            </h:outputLink>
+                         </li>
+                    </c:if>
+                    <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ') ne null}">
+                        <li>
+                            <a href="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ')}">
+                                <img border="0"
+                                     src="#{forums:themeURL('resourceIconICQURL')}"
+                                     alt="${resource.ICQ}"/>
+                            </a>
+                        </li>
+                    </c:if>
+                    
+                    <!-- TODO: Status for ICQ. Might be cool for other communicators too.-->
+                    <!-- <script language="JavaScript" type="text/javascript"> -->
+                    <!--
 
-								if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 && navigator.userAgent.indexOf('6.') == -1 )
-									document.write(' ${ICQ_IMG}');
-								else
-									document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">${ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${ICQ_STATUS_IMG}</div></div>');
-				
-							  //-->
-                              <!--</script>
-                                 <noscript>${ICQ_IMG}</noscript>-->
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-               </tr>
-               <tr>
-                  <td class="spaceRow" colspan="2" height="1">
-                     <img src="/subSilver/images/spacer.gif" width="1" height="1"></img>
-                  </td>
-               </tr>
-         </c:forEach>
+                    if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 && navigator.userAgent.indexOf('6.') == -1 )
+                        document.write(' ${ICQ_IMG}');
+                    else
+                        document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">${ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${ICQ_STATUS_IMG}</div></div>');
+                    </script>
+                    <noscript>${ICQ_IMG}</noscript> -->
+                </ul>
+            </td>
+        </tr> 
+        <tr>
+            <td colspan="2" class="forumthreadfooter">
+                <img src="#{forums:themeURL('resourceSpacerURL')}" />
+            </td>
+        </tr>
+        </c:forEach>
                   
-         <!-- TODO: THIS PART OF CODE IS WAITING FOR FORUMSMODULE METHODS NEEDED FOR THIS FEATURE -->
-         <!--tr align="center">
+        <!-- TODO: THIS PART OF CODE IS WAITING FOR FORUMSMODULE METHODS NEEDED FOR THIS FEATURE -->
+        <!--
+        <tr align="center">
             <td class="catBottom" colspan="2" height="28">
                 <table cellspacing="0" cellpadding="0" border="0">
                     <tr>
-                          <h:form>
-				<td align="center">
-                                    <span class="gensmall">
-                                        ${resource.Display_posts}:
-                                        <h:selectOneMenu value="#{topic.postDays}">
-                                            <f:selectItem itemValue="0" itemLabel="All Posts" />
-                                            <f:selectItem itemValue="86400000" itemLabel="#{resource.period_1_Day}" />
-                                            <f:selectItem itemValue="604800000" itemLabel="#{resource.period_7_Days}" />
-                                            <f:selectItem itemValue="1209600000" itemLabel="#{resource.period_2_Weeks}" />
-                                            <f:selectItem itemValue="2592000000" itemLabel="#{resource.period_1_Month}" />
-                                            <f:selectItem itemValue="7776000000" itemLabel="#{resource.period_3_Months}" />
-                                            <f:selectItem itemValue="15552000000" itemLabel="#{resource.period_6_Months}" />
-                                            <f:selectItem itemValue="31104000000" itemLabel="#{resource.period_1_Year}" />
-                                        </h:selectOneMenu>
-                                        <h:selectOneMenu>
-                                            <f:selectItem itemValue="0" itemLabel="#{resource.L_ASCENDING}" />
-                                            <f:selectItem itemValue="1" itemLabel="#{resource.L_DESCENDING}" />
-                                        </h:selectOneMenu>
-                                        
-                                        <input type="button" value="${resource.Go}" class="liteoption"  />
-                                        
-                                    </span>
-                                </td>
-                            </h:form>
-                        </tr>
-                    </table>
+                        <h:form>
+                            <td align="center">
+                                <span class="gensmall">
+                                    ${resource.Display_posts}:
+                                    <h:selectOneMenu value="#{topic.postDays}">
+                                        <f:selectItem itemValue="0" itemLabel="All Posts" />
+                                        <f:selectItem itemValue="86400000" itemLabel="#{resource.period_1_Day}" />
+                                        <f:selectItem itemValue="604800000" itemLabel="#{resource.period_7_Days}" />
+                                        <f:selectItem itemValue="1209600000" itemLabel="#{resource.period_2_Weeks}" />
+                                        <f:selectItem itemValue="2592000000" itemLabel="#{resource.period_1_Month}" />
+                                        <f:selectItem itemValue="7776000000" itemLabel="#{resource.period_3_Months}" />
+                                        <f:selectItem itemValue="15552000000" itemLabel="#{resource.period_6_Months}" />
+                                        <f:selectItem itemValue="31104000000" itemLabel="#{resource.period_1_Year}" />
+                                    </h:selectOneMenu>
+                                    <h:selectOneMenu>
+                                        <f:selectItem itemValue="0" itemLabel="#{resource.L_ASCENDING}" />
+                                        <f:selectItem itemValue="1" itemLabel="#{resource.L_DESCENDING}" />
+                                    </h:selectOneMenu>
+                                    <input type="button" value="${resource.Go}" class="liteoption"  />
+                                </span>
+                            </td>
+                        </h:form>
+                    </tr>
+                </table>
             </td>
- 	   </tr>-->
- 	   
- 	   
+        </tr>-->
+        
     </table>   
-   
-   <table width="100%" cellspacing="2" cellpadding="2" border="0"
-          align="center">
-      <tr>
-        	<!-- insert the newTopic and replyTopic buttons here -->         	
-            <td align="left" valign="bottom" nowrap="nowrap" class="nav" >
-               <h:form>
-               
-                  <c:choose>
-               
-                     <c:when test="#{topic.topic.forum.status == forums:constantInt('FORUM_LOCKED')}">
-               
+
+    <!-- PAGINATION -->
+    <c:if test="#{topic.pageNavigator.totalPages gt 1}">
+    <div class="forumpagination">
+        <ul>
+            <li class="disablepage">
+                <h:outputFormat value="#{resource.PageNumber}">
+                    <f:param value="${topic.pageNavigator.pageNumber}"/>
+                    <f:param value="${topic.pageNavigator.totalPages}"/>
+                </h:outputFormat>
+            </li>
+            
+            <c:choose>
+                <c:when test="#{topic.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['topic'],true)}">
+                            <f:param name="t" value="#{topic.topic.id}"/>
+                            <f:param name="page" value="0"/>
+                            <h:outputText value="${resource.First}"/>
+                        </h:outputLink>    
+                    </li>
+                    <li>
+                        <h:outputLink 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>    
+                    </li>
+                </c:otherwise>
+            </c:choose>
+            
+            <c:forEach items="#{topic.pageNavigator.currentPaginationLeft}" var="pageNumber">
+                <li>
+                    <h:outputLink 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>  
+                </li>
+            </c:forEach>
+            
+            <li class="currentpage">
+                ${topic.pageNavigator.currentPage+1}
+            </li>
+            
+            <c:forEach items="#{topic.pageNavigator.currentPaginationRight}" var="pageNumber">
+                <li>
+                    <h:outputLink 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>  
+                </li>
+            </c:forEach>
+            
+            <c:choose>
+                <c:when test="#{topic.pageNavigator.currentPage eq (topic.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['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>
+                    </li>
+                    <li>
+                        <h:outputLink 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>
+                    </li>
+                </c:otherwise>
+            </c:choose>
+        </ul>
+    </div>
+    </c:if>
+
+    <!-- insert the newTopic and replyTopic buttons here -->
+    <div class="actionbuttons">
+    <h:form>
+    <c:choose>
+    
+        <c:when test="#{topic.topic.forum.status == forums:constantInt('FORUM_LOCKED')}">
+        
+            <!-- new topic -->
+            <img border="0"
+                 src="#{forums:themeURL('resourcePostLockedURL')}"
+                 alt="${resource.Forum_locked}" />
+                 
+            <!-- reply -->
+            <img border="0"
+                 src="#{forums:themeURL('resourceReplyLockedURL')}"
+                 alt="${resource.Forum_locked}" />
+        </c:when>
+        
+        <c:when test="#{(topic.topic.status == forums:constantInt('TOPIC_LOCKED'))
+                      &amp;&amp; (topic.topic.forum.status != forums:constantInt('FORUM_LOCKED'))}">
+                      
+            <!-- new topic -->
+            <forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">
+            <h:commandLink id="newTopic" action="#{newTopic.start}">
+                <f:param name="f" value="#{topic.topic.forum.id}"/>
+                <f:verbatim>
+                    <img border="0"
+                         src="#{forums:themeURL('resourcePostNewURL')}"
+                         alt="${resource.Post_new_topic}"/>
+                </f:verbatim>
+            </h:commandLink>
+            </forums:isAllowed>
+
+            <!-- reply -->
+            <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">
+            <img border="0"
+                 src="#{forums:themeURL('resourceReplyLockedURL')}"
+                 alt="${resource.Topic_locked}" />
+            </forums:isAllowed>
+        </c:when>
+        
+        <c:otherwise>
+
+            <!-- new topic -->
+            <forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">
+                <h:commandLink id="newTopic" action="#{newTopic.start}">
+                    <f:param name="f" value="#{topic.topic.forum.id}"/>
+                    <f:verbatim>
                         <img border="0"
-                             src="#{forums:themeURL('resourcePostLockedURL')}"
-                             alt="${resource.Forum_locked}" />
+                             src="#{forums:themeURL('resourcePostNewURL')}"
+                             alt="${resource.Post_new_topic}"/>
+                    </f:verbatim>
+                </h:commandLink> 
+            </forums:isAllowed>
+                        
+            <!-- reply -->
+            <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">
+                <h:commandLink id="replyTopic" action="#{replyTopic.start}">
+                    <f:param name="f" value="#{topic.topic.forum.id}"/>
+                    <f:param name="t" value="#{topic.topic.id}"/>
+                    <f:verbatim>
                         <img border="0"
-                             src="#{forums:themeURL('resourceReplyLockedURL')}"
-                             alt="${resource.Forum_locked}" />
-                    
-                     </c:when>
-                 
-                     <c:when test="#{(topic.topic.status == forums:constantInt('TOPIC_LOCKED'))
-                     &amp;&amp; (topic.topic.forum.status != forums:constantInt('FORUM_LOCKED'))}">
-                	<forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">            
-                	<!-- new topic -->
-                        <h:commandLink id="newTopic" action="#{newTopic.start}" style="text-decoration: none;">
-                           <f:param name="f" value="#{topic.topic.forum.id}"/>
-                           <f:verbatim>
-                              <img border="0"
-                                   src="#{forums:themeURL('resourcePostNewURL')}"
-                                   alt="${resource.Post_new_topic}"/>
-                           </f:verbatim>
-                        </h:commandLink>
-                        </forums:isAllowed>
-                        <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">            
-                
-                        <!-- reply -->
-                        <img border="0" style="text-decoration: none;"
-                             src="#{forums:themeURL('resourceReplyLockedURL')}"
-                             alt="${resource.Topic_locked}" />
-                        </forums:isAllowed>                    
-                     </c:when>
-              
-                     <c:otherwise>
-               	
-                	<!-- new topic -->
-               		<forums:isAllowed fragment="acl://newTopic" contextData="#{topic.topic.forum}">            
-                        <h:commandLink id="newTopic" action="#{newTopic.start}" style="text-decoration: none;">
-                           <f:param name="f" value="#{topic.topic.forum.id}"/>
-                           <f:verbatim>
-                              <img border="0"
-                                   src="#{forums:themeURL('resourcePostNewURL')}"
-                                   alt="${resource.Post_new_topic}"/>
-                           </f:verbatim>
-                        </h:commandLink> 
-                        </forums:isAllowed>
-                        
-                        <!-- reply -->
-                        <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">            
-                        <h:commandLink id="replyTopic" action="#{replyTopic.start}" style="text-decoration: none;">
-                           <f:param name="f" value="#{topic.topic.forum.id}"/>
-                           <f:param name="t" value="#{topic.topic.id}"/>
-                           <!-- add this reply and navigate to the page that will have this reply -->
-                           <input type="hidden" name="page" value="#{topic.pageNavigator.pageAfterAdd}"/>
-                           <f:verbatim>
-                              <img border="0"
-                                   src="#{forums:themeURL('resourceReplyNewURL')}"
-                                   alt="${resource.Reply_to_topic}" />
-                           </f:verbatim>
-                        </h:commandLink> 
-                        </forums:isAllowed>                   
-                     </c:otherwise>
-                 
-                  </c:choose>
-                  
-               </h:form>
-            </td>
-         
-           <td align="left" valign="middle" class="nav" width="100%">
-                  &#160;&#160;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}"
-                                styleClass="nav">
-                     <h:outputText value="#{shared.mainPageName}"/>
-                  </h:outputLink>
-                  -&gt;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}"
-                                styleClass="nav">
-                     <f:param name="c"
-                              value="#{topic.topic.forum.category.id}"/>
-                     <h:outputText value="#{topic.topic.forum.category.title}"/>
-                  </h:outputLink>
-                  -&gt;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
-                                styleClass="nav">
-                     <f:param name="f" value="#{topic.topic.forum.id}"/>
-                     <h:outputText value="#{topic.topic.forum.name}"/>
-                  </h:outputLink>
-                  -&gt;&#160;
-                  <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
-                                styleClass="nav">
-                     <f:param name="t" value="#{topic.topic.id}"/>
-                     <h:outputText value="#{topic.topic.subject}"/>
-                  </h:outputLink>
-            </td>
-            <!-- page navigation --> 
-            <c:if test="#{topic.pageNavigator.totalPages gt 1}">        
-	         <td align="right" valign="middle" nowrap="nowrap">
-	         	<span class="gensmall"></span><br/>
-	         	<span class="nav">
-	         		${resource.Goto_page}      
-	         		<!-- previous link -->
-	         		<c:if test="#{topic.pageNavigator.pageNumber gt 1}">   	
-		         		&#160;&#160;
-		         		<h:outputLink 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.Previous}"/>
-		         		</h:outputLink>         			         		
-	         			&#160;&#160;	
-	         		</c:if>
-	         		<!-- actual pages -->
-	         		<c:forEach items="#{topic.pageNavigator.pages}" var="page" varStatus="idx">
-	         		    <c:choose> 
-	         		    	<c:when test="#{topic.pageNavigator.pageNumber==page}">
-		         				<b>${page}</b>
-		         			</c:when>
-		         			<c:otherwise>
-		       					<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
-		       						<f:param name="t" value="#{topic.topic.id}"/>
-		       						<f:param name="page" value="#{page-1}"/>
-		       						<h:outputText value="${page}"/>
-		       					</h:outputLink>
-		       				</c:otherwise>		       						       				
-		       			</c:choose>
-		       			<c:if test="${idx.index-1 ne topic.pageNavigator.totalPages-1}">
-		       				<f:verbatim>,</f:verbatim>
-		       			</c:if>
-	       			</c:forEach>
-	       			<!-- Next link -->  
-	       			<c:if test="#{topic.pageNavigator.pageNumber lt topic.pageNavigator.totalPages}">     			
-		         		&#160;&#160;
-		         		<h:outputLink 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}"/>
-		         		</h:outputLink>         		
-		         		&#160;&#160;
-	         		</c:if>
-	         	</span>
-	         </td>
-	      </c:if>
-      </tr>
-      <!-- the current page number information -->
-      <c:if test="#{topic.pageNavigator.totalPages gt 1}">        
-	      <tr>
-	      	<td>&#160;</td>
-	      </tr>       
-	      <tr>
-	         <td align="left" colspan="3">
-	         	<span class="nav">
-                            <b>
-                              <h:outputFormat value="#{resource.PageNumber}">
-                                     <f:param value="${topic.pageNavigator.pageNumber}"/>
-                                     <f:param value="${topic.pageNavigator.totalPages}"/>
-                              </h:outputFormat>
-                            </b>
-	         	</span>
-	         </td>
-	      </tr> 
-	      <tr>
-	      	<td>&#160;</td>
-	      </tr>         
-      </c:if>
-   </table>
-      
-   <table width="100%" cellspacing="2" border="0" align="center">
-      <tr>         
-         <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">                                            
-         <td>
-            <!-- instant reply widget -->                	
-        	<script language='JavaScript' type='text/javascript'>
-        	function checkForm() 
-        	{        
-			formErrors = false;    		
-			if (document.getElementById('post:message').value.length &#60; 1) 
-			{
-				formErrors = "${resource.Empty_message}";
-			}		
-			if (formErrors) 
-			{
-				alert(formErrors);
-				return false;
-			} 
-			else 
-			{				
-				return true;
-			}
-                }
-        	</script>
-            <h:form id="post">
-               <input type="hidden" name="f" value="#{topic.topic.forum.id}"/>
-               <input type="hidden" name="t" value="#{topic.topic.id}"/>
-               <!-- add this reply and navigate to the page that will have this reply -->
-               <input type="hidden" name="page" value="#{topic.pageNavigator.pageAfterAdd}"/>               
-               <span class="genmed">
-                  <b>${resource.Instant_reply}</b>
-                  <br/>
-                  <br/>
-                  	<h:inputTextarea id="message" value="#{replyTopic.message}" rows="10" cols="50" styleClass="post"></h:inputTextarea>
-                  <br/>
-                  <br/>                  
-                  	<h:commandButton action="#{replyTopic.startInstantReplyPreview}" value="${resource.Preview}" 
-	      		  	styleClass="liteoption" onclick="return checkForm();"/>
-                  	&#160;                  
-                  	<h:commandButton action="#{replyTopic.executeInstantReply}" value="${resource.Submit}" 	      
-	      		  	styleClass="mainoption" onclick="return checkForm();"/>	      	
-               </span>
-             </h:form>
-            </td>
+                             src="#{forums:themeURL('resourceReplyNewURL')}"
+                             alt="${resource.Reply_to_topic}" />
+                    </f:verbatim>
+                </h:commandLink>
             </forums:isAllowed>
             
-            <!-- integrate jumpbox here -->
-            <td align="right" valign="top" nowrap="nowrap">
-                <ui:include src="/views/jumpbox.xhtml"/>                
-            </td> 
-        </tr>
+        </c:otherwise>
         
-        <forums:isAllowed fragment="acl://moderateForum" contextData="#{forum.forum}">
-        <c:if test="#{moderator.initialized &amp;&amp; moderator.forum!=null &amp;&amp; moderator.forum.id!=-1}">
-        <tr>
-            <td>
-                <h:form>
-                &#160;<br/>
-                <forums:isAllowed fragment="acl://deleteTopics" contextData="#{forum.forum}">
-                <h:commandLink action="#{moderator.deleteConfirm}" style="text-decoration: none;">
+    </c:choose>
+    </h:form>
+    </div>
+
+    <forums:isAllowed fragment="acl://reply" contextData="#{topic.topic}">
+    <div class="foruminstantreply">
+    
+        <!-- instant reply widget -->
+        <script language='JavaScript' type='text/javascript'>
+            function checkForm()
+            {
+                formErrors = false;
+                if (document.getElementById('post:message').value.length &#60; 1)
+                {
+                    formErrors = "${resource.Empty_message}";
+                }
+                if (formErrors)
+                {
+                    alert(formErrors);
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        </script>
+        
+        <h:form id="post">
+        
+            <input type="hidden" name="f" value="#{topic.topic.forum.id}"/>
+            <input type="hidden" name="t" value="#{topic.topic.id}"/>
+            <!-- add this reply and navigate to the page that will have this reply -->
+            <input type="hidden" name="page" value="#{topic.pageNavigator.pageAfterAdd}"/>
+            
+            <label class="forumformlabelbold">${resource.Instant_reply}</label>
+            <br />
+            <h:inputTextarea id="message" value="#{replyTopic.message}" rows="8" styleClass="forumformtextfield550px"></h:inputTextarea>
+            <div class="forumformbuttonrow">
+                <ul>
+                    <li>
+                        <h:commandButton action="#{replyTopic.startInstantReplyPreview}"
+                                         value="${resource.Preview}"
+                                         styleClass="buttonMed"
+                                         onclick="return checkForm();"/>
+                    </li>
+                    <li>
+                        <h:commandButton action="#{replyTopic.executeInstantReply}"
+                                         value="${resource.Submit}"
+                                         styleClass="buttonMed"
+                                         onclick="return checkForm();"/>
+                    </li>
+                </ul>
+            </div>
+        </h:form>
+    </div>
+    </forums:isAllowed>
+
+    <hr class="forumdashedHR" />
+
+    <div class="forumlegendjumpboxfloat">
+        <ui:include src="/views/jumpbox.xhtml"/>
+    </div>
+
+    <forums:isAllowed fragment="acl://moderateForum" contextData="#{forum.forum}">
+    <c:if test="#{moderator.initialized &amp;&amp; moderator.forum!=null &amp;&amp; moderator.forum.id!=-1}">
+    <div class="admintools">
+    <h:form>
+        <ul>
+        
+            <li>
+                ${resource.Thread_moderation}:
+            </li>
+            
+            <forums:isAllowed fragment="acl://deleteTopics" contextData="#{forum.forum}">
+            <li>
+                <h:commandLink action="#{moderator.deleteConfirm}">
                     <f:param name="t" value="#{topic.topic.id}"/>
                     <f:verbatim>
-                	<img border="0" src="/portal-forums/subSilver/images/topic_delete.gif" alt="Delete this topic" title="Delete this topic"/>
+                        <img width="17" height="17" border="0"
+                             src="#{forums:themeURL('resourceTopicModeDeleteURL')}"
+                             alt="${resource.Delete_topic}" />
                     </f:verbatim>
                 </h:commandLink>
-                </forums:isAllowed>
-                &#160;
-                <forums:isAllowed fragment="acl://moveTopics" contextData="#{forum.forum}">
-                <h:commandLink action="#{moderator.moveConfirm}" style="text-decoration: none;">
+            </li>
+            </forums:isAllowed>
+
+            <forums:isAllowed fragment="acl://moveTopics" contextData="#{forum.forum}">
+            <li>
+                <h:commandLink action="#{moderator.moveConfirm}">
                     <f:param name="t" value="#{topic.topic.id}"/>
                     <f:verbatim>
-                	<img border="0" src="/portal-forums/subSilver/images/topic_move.gif" alt="Move this topic" title="Move this topic"/>
+                        <img width="17" height="17" border="0"
+                             src="#{forums:themeURL('resourceTopicModMoveURL')}"
+                             alt="${resource.Move_topic}" />
                     </f:verbatim>
                 </h:commandLink>
-                </forums:isAllowed>                
-                &#160;
-                <forums:isAllowed fragment="acl://lockTopics" contextData="#{forum.forum}">
-                <c:choose>
-                	<c:when test="#{topic.topic.status!=forums:constantInt('TOPIC_LOCKED')}">
-		                <h:commandLink action="#{moderator.lockTopic}" style="text-decoration: none;">
-                                    <f:param name="t" value="#{topic.topic.id}"/>
-                                    <f:verbatim>
-		                	<img border="0" src="/portal-forums/subSilver/images/topic_lock.gif" alt="Lock this topic" title="Lock this topic"/>
-                                    </f:verbatim>
-                                </h:commandLink>
-                                &#160;
-	                </c:when>
-	                <c:otherwise>
-		                <h:commandLink action="#{moderator.unlockTopic}" style="text-decoration: none;">
-                                    <f:param name="t" value="#{topic.topic.id}"/>
-                                    <f:verbatim>
-		                	<img border="0" src="/portal-forums/subSilver/images/topic_unlock.gif" alt="Unlock this topic" title="Unlock this topic"/>
-                                    </f:verbatim>
-                                </h:commandLink>
-                                &#160;
-	                </c:otherwise>
-                </c:choose>
-                </forums:isAllowed>
-                <forums:isAllowed fragment="acl://splitTopic" contextData="#{forum.forum},#{topic.topic}">
-                <h:outputLink value="#{forums:outputLink(shared.links['topicSplit'],true)}" style="text-decoration: none;">
+            </li>
+            </forums:isAllowed>
+            
+            <forums:isAllowed fragment="acl://lockTopics" contextData="#{forum.forum}">
+            <c:choose>
+            <li>
+            
+                <c:when test="#{topic.topic.status!=forums:constantInt('TOPIC_LOCKED')}">
+                    <h:commandLink action="#{moderator.lockTopic}">
+                        <f:param name="t" value="#{topic.topic.id}"/>
+                        <f:verbatim>
+                            <img width="17" height="17" border="0"
+                                 src="#{forums:themeURL('resourceTopicModLockURL')}"
+                                 alt="${resource.Lock_topic}"/>
+                        </f:verbatim>
+                    </h:commandLink>
+                </c:when>
+                
+                <c:otherwise>
+                    <h:commandLink action="#{moderator.unlockTopic}">
+                        <f:param name="t" value="#{topic.topic.id}"/>
+                        <f:verbatim>
+                            <img width="17" height="17" border="0"
+                                 src="#{forums:themeURL('resourceTopicModUnlockURL')}"
+                                 alt="${resource.Unlock_topic}"/>
+                        </f:verbatim>
+                    </h:commandLink>
+                </c:otherwise>
+                
+            </li>
+            </c:choose>
+            </forums:isAllowed>
+
+            <forums:isAllowed fragment="acl://splitTopic" contextData="#{forum.forum},#{topic.topic}">
+            <li>
+                <h:outputLink value="#{forums:outputLink(shared.links['topicSplit'],true)}">
                     <f:param name="t" value="#{topic.topic.id}"/>
                     <f:verbatim>
-                	<img border="0" src="/portal-forums/subSilver/images/topic_split.gif" alt="Split this topic" title="Split this topic"/>
+                        <img width="17" height="17" border="0"
+                             src="#{forums:themeURL('resourceTopicModSplitURL')}"
+                             alt="${resource.Split_topic}"/>
                     </f:verbatim>
-                </h:outputLink>&#160;
-                </forums:isAllowed>
-                </h:form>
-            </td>
-        </tr>
-        </c:if>
-        </forums:isAllowed>
-      </table>
-      </forums:isAllowed>
-      </forums:isAllowed>
-     </c:when>
-     <c:otherwise>
-     	<table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
-		   <tr>
-		      <td>
-		         <table width="100%" cellspacing="0" cellpadding="1" border="0">
-		            <tr>
-		               <td>&#160;</td>
-		            </tr>
-		            <tr>
-		               <td align="center">
-		               		<span class="gen">${resource.No_posts_topic}</span>
-		               </td>
-		            </tr>
-		            <tr>
-		               <td>&#160;</td>
-		            </tr>
-		         </table>
-		      </td>
-		   </tr>
-	     </table>
-     </c:otherwise>
-     </c:choose>
-   </ui:define>
-   </ui:composition>
-   
+                </h:outputLink>
+            </li>
+            </forums:isAllowed>
+            
+        </ul>
+    </h:form>
+    </div>
+    </c:if>
+    </forums:isAllowed>
+
+    </forums:isAllowed>
+    </forums:isAllowed>
+    </c:when>
+
+    <c:otherwise>
+        <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+            <tr>
+                <td>
+                    <table width="100%" cellspacing="0" cellpadding="1" border="0">
+                        <tr>
+                            <td>&#160;</td>
+                        </tr>
+                        <tr>
+                            <td align="center">
+                                ${resource.No_posts_topic}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>&#160;</td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </c:otherwise>
+</c:choose>
+
+</ui:define>
+</ui:composition>
 </div>




More information about the jboss-svn-commits mailing list