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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Aug 19 12:44:10 EDT 2009


Author: sviluppatorefico
Date: 2009-08-19 12:44:09 -0400 (Wed, 19 Aug 2009)
New Revision: 28991

Modified:
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_reply_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
   labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
Log:
added internationalization support for portletbridge and worked for migration from outputLink to commandLink

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -24,6 +24,11 @@
          <portlet-mode>VIEW</portlet-mode>
          <portlet-mode>EDIT</portlet-mode>
       </supports>
+      <supported-locale>en</supported-locale>
+      <supported-locale>it</supported-locale>
+      <supported-locale>fr</supported-locale>
+      <supported-locale>pl</supported-locale>
+      <supported-locale>de</supported-locale>	
       <portlet-info>
          <title>JBoss Forums</title>
       </portlet-info>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -204,7 +204,8 @@
         </ul>
     </div>
     </c:if>
-
+</h:form>
+<h:form>
     <forums:isAllowed fragment="acl://newTopic" contextData="#{forum.forum}">
     <div class="actionbuttons">
         <ul>
@@ -670,7 +671,8 @@
         </ul>
     </div>
     </c:if>
-    
+ </h:form>
+ <h:form>   
     <!-- NEWTOPIC -->
     <forums:isAllowed fragment="acl://newTopic" contextData="#{forum.forum}">
     <div class="actionbuttons">

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -1,25 +1,25 @@
 <!--
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
  ******************************************************************************/
 -->
 
@@ -30,46 +30,46 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
->
+>
 
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
-
-<div class="forumbread">
-    <ul>
-        <li class="first">
-            <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
-        </li>
-    </ul>
-</div>
-
-<table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
-
-    <!-- topic type -->
-    <tr class="header">
-        <td class="forumheaderfirst">
-            ${resource[summary.blockTopicsType]}
-        </td>
-    </tr>
-    
-    <!-- a list of topics for the summary-->
-    <c:forEach items="#{summary.topics}" var="topicrow" varStatus="status" >
-    <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
-        <td class='${status.last?"bottomline":""}' >
+<h:form>
+<div class="forumbread">
+    <ul>
+        <li class="first">
+            <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
+        </li>
+    </ul>
+</div>
+
+<table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+
+    <!-- topic type -->
+    <tr class="header">
+        <td class="forumheaderfirst">
+            ${resource[summary.blockTopicsType]}
+        </td>
+    </tr>
+    
+    <!-- a list of topics for the summary-->
+    <c:forEach items="#{summary.topics}" var="topicrow" varStatus="status" >
+    <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
+        <td class='${status.last?"bottomline":""}' >
             <h:commandLink action="viewTopic" value="#{topicrow.subject}" id="_${status.index}">
                 <f:param name="t" value="#{topicrow.id}"/>					
-            </h:commandLink>
-        </td>
-    </tr>
-    </c:forEach>
-    
-</table>
-        
-<!-- number of topics found in the summary -->
-<br/> 
-<span class="note">${summary.numberOfTopicsFound}&#160;${resource.L_TOPICS_FOUND}</span>
-<hr />
-
-</ui:define>
-</ui:composition>
-</div>
+            </h:commandLink>
+        </td>
+    </tr>
+    </c:forEach>
+    
+</table>
+</h:form>        
+<!-- number of topics found in the summary -->
+<br/> 
+<span class="note">${summary.numberOfTopicsFound}&#160;${resource.L_TOPICS_FOUND}</span>
+<hr />
+
+</ui:define>
+</ui:composition>
+</div>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
 >
 <c:forEach items="#{attachments}" var="attachment">  

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -1,25 +1,25 @@
 <!--
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
  ******************************************************************************/
 -->
 
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >
@@ -279,520 +278,520 @@
 
 //--&gt;
 </script>
-
-<c:if test="#{editPost.preview}">
-    <ui:include src="/views/topics/posting_edit_preview.xhtml"/>
-    <br clear="all"/>
-</c:if>
-
-<div class="forumtitletext">
-    <h4>${resource.Edit_Post}</h4>
-    <h:messages errorClass="failuretext" layout="table" />
-</div>
-
-<div class="PostviewStyle">
-<h:form id="post" enctype="multipart/form-data">
-<table border="0" cellpadding="5" cellspacing="0" width="100%" name="table" id="table" >
-
-    <!-- keeps the topic where this post is being edited in context, this is a control parameter -->
-    <input type="hidden" name="t" value="#{editPost.topicId}"/>
-    <input type="hidden" name="p" value="#{editPost.postId}"/>
-    
-    <tr>
-        <td colspan="2" class="PostViewMainHeader">${resource.Compose_Message}</td>
-    </tr>
-    <tr class="PostViewMainDescription">
-        <td colspan="2">${resource.Posting_Description}</td>
-    </tr>
-    
-    <!-- add Subject -->
-    <tr class="PostViewUnderlineBoth">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Subject}
-            </label>
-        </td>
-        <td>
-            <h:inputText value="#{editPost.subject}" maxlength="200" id="SubjectInputText"
-                         size="45" style="width: 450px;" tabindex="2" />
-        </td>
-    </tr>
-    
-    <!-- Add Message -->
-    <tr>
-        <td valign="top">
-            <table border="0" cellpadding="1" cellspacing="0" width="100%">
-                <tbody>
-                    <tr>
-                        <td>
-                            <label class="forumformlabelbold">
-                                ${resource.Message_body}
-                            </label>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td align="center" valign="middle">
-                            <br />
-                            <table border="0" cellpadding="5" cellspacing="0" width="100">
-                                <tbody>
-                                    <tr align="center">
-                                        <td>
-                                            <b></b>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </td>
-		<td valign="top">
-            <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumline">
-            <tbody>
-                <tr>
-                    <td class="row2" valign="top">
-                        <span class="genmed"></span>
-                        <table border="0" cellpadding="2" cellspacing="0" width="450">
-                        <tbody>
-                            <tr align="center" valign="middle">
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="b"
-                                               name="addbbcode0" value=" B " style="font-weight:bold; width: 30px"
-                                               onClick="bbstyle(0)" onMouseOver="helpline('b')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="i"
-                                               name="addbbcode2" value=" i " style="font-style:italic; width: 30px"
-                                               onClick="bbstyle(2)" onMouseOver="helpline('i')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="u"
-                                               name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px"
-                                               onClick="bbstyle(4)" onMouseOver="helpline('u')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="q"
-                                               name="addbbcode6" value="Quote" style="width: 50px"
-                                               onClick="bbstyle(6)" onMouseOver="helpline('q')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="c"
-                                               name="addbbcode8" value="Code" style="width: 40px"
-                                               onClick="bbstyle(8)" onMouseOver="helpline('c')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="l"
-                                               name="addbbcode10" value="List" style="width: 40px"
-                                               onClick="bbstyle(10)" onMouseOver="helpline('l')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="o"
-                                               name="addbbcode12" value="List=" style="width: 40px"
-                                               onClick="bbstyle(12)" onMouseOver="helpline('o')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="p"
-                                               name="addbbcode14" value="Img" style="width: 40px"
-                                               onClick="bbstyle(14)" onMouseOver="helpline('p')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="w"
-                                               name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px"
-                                               onClick="bbstyle(16)" onMouseOver="helpline('w')"/>
-                                    </span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="9">
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                    <tbody>
-                                        <tr>
-                                            <td>
-                                                <span class="genmed">
-                                                    &#160;${resource.Font_color}:
-                                                    <select name="addbbcode18"
-                                                            onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;"
-                                                            onMouseOver="helpline('s')">
-                                                        <option style="color:black; background-color: "
-                                                                value="" class="genmed">
-                                                            ${resource.color_default}
-                                                        </option>
-                                                        <option style="color:darkred; background-color: "
-                                                                value="darkred" class="genmed">
-                                                            ${resource.color_dark_red}
-                                                        </option>
-                                                        <option style="color:red; background-color: "
-                                                                value="red" class="genmed">
-                                                            ${resource.color_red}
-                                                        </option>
-                                                        <option style="color:orange; background-color: "
-                                                                value="orange" class="genmed">
-                                                            ${resource.color_orange}
-                                                        </option>
-                                                        <option style="color:brown; background-color: "
-                                                                value="brown" class="genmed">
-                                                            ${resource.color_brown}
-                                                        </option>
-                                                        <option style="color:yellow; background-color: "
-                                                                value="yellow" class="genmed">
-                                                            ${resource.color_yellow}
-                                                        </option>
-                                                        <option style="color:green; background-color: "
-                                                                value="green" class="genmed">
-                                                            ${resource.color_green}
-                                                        </option>
-                                                        <option style="color:olive; background-color: "
-                                                                value="olive" class="genmed">
-                                                            ${resource.color_olive}
-                                                        </option>
-                                                        <option style="color:cyan; background-color: "
-                                                                value="cyan" class="genmed">
-                                                            ${resource.color_cyan}
-                                                        </option>
-                                                        <option style="color:blue; background-color: "
-                                                                value="blue" class="genmed">
-                                                            ${resource.color_blue}
-                                                        </option>
-                                                        <option style="color:darkblue; background-color: "
-                                                                value="darkblue" class="genmed">
-                                                            ${resource.color_dark_blue}
-                                                        </option>
-                                                        <option style="color:indigo; background-color: "
-                                                                value="indigo" class="genmed">
-                                                            ${resource.color_indigo}
-                                                        </option>
-                                                        <option style="color:violet; background-color: "
-                                                                value="violet" class="genmed">
-                                                            ${resource.color_violet}
-                                                        </option>
-                                                        <option style="color:white; background-color: "
-                                                                value="white" class="genmed">
-                                                            ${resource.color_white}
-                                                        </option>
-                                                        <option style="color:black; background-color: "
-                                                                value="black" class="genmed">
-                                                            ${resource.color_black}
-                                                        </option>
-                                                    </select>
-                                                    &#160;${resource.Font_size}:
-                                                    <select name="addbbcode20"
-                                                            onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')"
-                                                            onMouseOver="helpline('f')">
-                                                        <option value="7" class="genmed">
-                                                            ${resource.font_tiny}
-                                                        </option>
-                                                        <option value="9" class="genmed">
-                                                            ${resource.font_small}
-                                                        </option>
-                                                        <option value="12" class="genmed" selected="true">
-                                                            ${resource.font_normal}
-                                                        </option>
-                                                        <option value="18" class="genmed">
-                                                            ${resource.font_large}
-                                                        </option>
-                                                        <option value="24" class="genmed">
-                                                            ${resource.font_huge}
-                                                        </option>
-                                                    </select>
-                                                </span>
-                                            </td>
-                                            <td nowrap="nowrap" align="right">
-                                                <span class="gensmall">
-                                                    <a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">
-                                                        ${resource.Close_Tags}
-                                                    </a>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="9">
-                                    <span class="gensmall">
-                                        <input type="text" name="helpbox" size="45" maxlength="100"
-                                               style="width:450px; font-size:10px"
-                                               class="helpline" value="${resource.Styles_tip}"/>
-                                    </span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="9">
-                                    <h:inputTextarea id="message" value="#{editPost.message}"
-                                                     rows="15" cols="35"
-                                                     tabindex="3"
-                                                     styleClass="Posttextarea"
-                                                     onselect="storeCaret(this);"
-                                                     onkeyup="storeCaret(this);"
-                                                     onclick="storeCaret(this)" />
-                                </td>
-                            </tr>
-                        </tbody>
-                        </table>
-                    </td>
-                </tr>
-            </tbody>
-            </table>
-        </td>
-    </tr>
-    
-    <!-- subject and message invisible input for validator execution workaround -->
-    <h:inputHidden id="validator" value="validator">
-        <f:validator validatorId="subjectLengthValidator" />
-        <f:validator validatorId="messageLengthValidator" />
-    </h:inputHidden>
-
-    <!-- Add Options -->
-    <c:if test="#{editPost.firstPost}">
-    <forums:isAllowed fragment="acl://topicType" contextData="#{editPost.forumId}">
-    <tr class="PostViewUnderlineBoth">
-        <td valign="top">
-            <label class="forumformlabelbold">
-                ${resource.Options}
-            </label>
-        </td>
-        <td>
-            ${resource.Post_topic_as}:
-            <h:selectOneRadio value="#{editPost.topicType}" styleClass="gen">
-                <f:selectItem itemValue="0" itemLabel="${resource.Post_Normal}">
-                    <f:verbatim>&#160;&#160;&#160;</f:verbatim>
-                </f:selectItem>
-                <f:selectItem itemValue="1" itemLabel="${resource.Post_Sticky}">
-                    <f:verbatim>&#160;&#160;&#160;</f:verbatim>
-                </f:selectItem>
-                <f:selectItem itemValue="2" itemLabel="${resource.Post_Announcement}">
-                    <f:verbatim>&#160;&#160;&#160;</f:verbatim>
-                </f:selectItem>
-            </h:selectOneRadio>
-        </td>
-    </tr>
-    </forums:isAllowed>
-    </c:if>
-    
-    <!-- poll ui -->
-    <forums:isAllowed fragment="acl://managePoll">
-    <c:if test="#{editPost.firstPost}">
-    
-	<tr class="PostViewMainHeader">
-        <td colspan="2">
-            ${resource.Add_poll}
-        </td>
-    </tr>
-    <tr class="PostViewMainDescription">
-        <td colspan="2">
-            ${resource.Add_poll_explain}
-        </td>
-    </tr>
-    
-    <!-- setup poll question -->
-    <tr>
-        <td class="PostViewUnderline">
-            <label class="forumformlabelbold">
-                ${resource.Poll_question}
-            </label>
-        </td>
-        <td>
-            <h:inputText value="#{editPost.question}" id="question" maxlength="255" style="width: 450px;"/>
-        </td>
-    </tr>
-    
-    <!-- update poll options already added -->
-    <input type="hidden" name="o"/>
-    <c:forEach items="${editPost.options}" var="optionRow" varStatus="idx">
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Poll_option}
-            </label>
-        </td>
-        <td>
-            <h:inputText id="option_${idx.index+1}" name="option_${idx.index+1}"
-                   value="${optionRow}" style="width: 300px;" maxlength="255"/>
-            &#160;
-            <h:commandButton id="UpdateOption_${idx.index+1}" action="#{editPost.updateOption}" value="${resource.Update}"
-                             styleClass="buttonMed" onclick="selectOption(${idx.index+1});"/>
-            <h:commandButton id="DeleteOption_${idx.index+1}" action="#{editPost.deleteOption}" value="${resource.Delete}"
-                             styleClass="buttonMed" onclick="selectOption(${idx.index+1});"/>
-        </td>
-    </tr>
-    </c:forEach>
-    
-    <!-- add poll options -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Poll_option}
-            </label>
-        </td>
-        <td>  		
-            <h:inputText value="#{editPost.option}" id="newOption" maxlength="255" style="width: 300px;"/>
-            &#160;   	
-            <h:commandButton action="#{editPost.addOption}"
-                             value="${resource.Add_option}"
-                             styleClass="buttonMed"/>
-        </td>
-    </tr>
-		
-		
-    <!-- setup poll duration -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Poll_for}
-            </label>
-        </td>
-        <td>
-            <h:inputText value="#{editPost.activeDuration}" id="pollDuration" size="3" maxlength="3">
-                <f:converter  converterId="pollDurationConverter" />
-            </h:inputText>
-            &#160;
-            <strong>
-                ${resource.Days}
-            </strong>
-            &#160;
-            ${resource.Poll_for_explain}
-        </td>
-    </tr>
-    
-    <!-- poll invisible input for validator execution workaround -->
-    <h:inputHidden id="execute" value="execute">
-        <f:validator validatorId="pollValidator" />
-    </h:inputHidden>
-    
-    </c:if>
-    </forums:isAllowed>
-    
-    <!-- attachment ui -->
-    <forums:isAllowed fragment="acl://managePostAttachments">
-    <tr>
-        <td colspan="2" class="PostViewMainHeader">
-            ${resource.Add_attachment_title}
-        </td>
-    </tr>
-    <tr class="PostViewMainDescription">
-        <td colspan="2">
-            ${resource.Add_attachment_explain}
-        </td>
-    </tr>
-    
-    <!-- upload button -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_name}
-            </label>
-        </td>
-        <td>
-            <t:inputFileUpload value="#{editPost.attachment}" size="40" styleClass="post"/>
-        </td>
-    </tr>
-    
-    <!-- comment -->
-    <tr valign="top" class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_comment}
-            </label>
-        </td>
-        <td>
-            <h:inputTextarea value="#{editPost.attachmentComment}" rows="3" styleClass="Posttextarea"/>
-        </td>
-    </tr>
-    <tr class="PostViewUnderline">
-        <td></td>
-        <td>
-            <h:commandButton action="#{editPost.addAttachment}" value="${resource.Add_attachment}" styleClass="buttonMed"/>
-        </td>
-    </tr>
-    
-    <c:if test="#{editPost.numberOfAttachments>0}">
-    <tr>
-        <th class="thHead" colspan="2">${resource.Posted_attachments}</th>
-    </tr>
-	
-	<!-- uploaded list of attachments -->
-    <input type="hidden" name="ATTACHMENT"/>
-    <c:forEach items="#{editPost.attachments}" var="attachRow" varStatus="idx">
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_name}
-            </label>
-        </td>
-        <td>
-            ${attachRow.fileName}
-        </td>
-    </tr>
-    <tr valign="top" class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_comment}
-            </label>
-        </td>
-        <td>
-            <h:inputTextarea id="attachment_${idx.index}" value="#{attachRow.comment}" rows="3" cols="35" styleClass="Posttextarea"/>
-        </td>
-    </tr>
-    <tr class="PostViewUnderline">
-        <td></td>
-        <td>
-            <h:commandButton id="UpdateAttachment_${idx.index}" action="#{editPost.updateAttachment}" value="${resource.Update_comment}"
-                         styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
-            &#160;
-            <h:commandButton id="DeleteAttachment_${idx.index}" action="#{editPost.deleteAttachment}" value="${resource.Delete_attachment}"
-                             styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
-        </td>
-    </tr>
-    </c:forEach>
-    </c:if>
-    </forums:isAllowed>
-</table>
-    
-<!-- hookup the buttons -->
-<div class="forumformbuttonrow">
-    <ul>
-        <li>
-            <h:commandButton action="#{editPost.preview}" value="${resource.Preview}"
-                             id="Preview"
-                             styleClass="buttonMed"
-                             tabindex="5"/>
-        </li>
-        <li>
-            <!--TODO: Missing execution of javascript checking form - onclick="return checkForm(this.parentNode)" -->
-            <h:commandButton action="#{editPost.execute}" value="${resource.Submit}"
-                             id="Submit"
-                             styleClass="buttonMed"
-                             accesskey="s" tabindex="6"/>
-        </li>
-        <li>
-            <h:commandButton action="#{editPost.cancel}" value="${resource.Cancel}"
-                             id="Cancel" accesskey="c" tabindex="7" styleClass="buttonMed"/>
-        </li>
-    </ul>
-</div>
-</h:form>
-</div>
-
-</ui:define>
-</ui:composition>
-
+
+<c:if test="#{editPost.preview}">
+    <ui:include src="/views/topics/posting_edit_preview.xhtml"/>
+    <br clear="all"/>
+</c:if>
+
+<div class="forumtitletext">
+    <h4>${resource.Edit_Post}</h4>
+    <h:messages errorClass="failuretext" layout="table" />
+</div>
+
+<div class="PostviewStyle">
+<h:form id="post" enctype="multipart/form-data">
+<table border="0" cellpadding="5" cellspacing="0" width="100%" name="table" id="table" >
+
+    <!-- keeps the topic where this post is being edited in context, this is a control parameter -->
+    <input type="hidden" name="t" value="#{editPost.topicId}"/>
+    <input type="hidden" name="p" value="#{editPost.postId}"/>
+    
+    <tr>
+        <td colspan="2" class="PostViewMainHeader">${resource.Compose_Message}</td>
+    </tr>
+    <tr class="PostViewMainDescription">
+        <td colspan="2">${resource.Posting_Description}</td>
+    </tr>
+    
+    <!-- add Subject -->
+    <tr class="PostViewUnderlineBoth">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Subject}
+            </label>
+        </td>
+        <td>
+            <h:inputText value="#{editPost.subject}" maxlength="200" id="SubjectInputText"
+                         size="45" style="width: 450px;" tabindex="2" />
+        </td>
+    </tr>
+    
+    <!-- Add Message -->
+    <tr>
+        <td valign="top">
+            <table border="0" cellpadding="1" cellspacing="0" width="100%">
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="forumformlabelbold">
+                                ${resource.Message_body}
+                            </label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center" valign="middle">
+                            <br />
+                            <table border="0" cellpadding="5" cellspacing="0" width="100">
+                                <tbody>
+                                    <tr align="center">
+                                        <td>
+                                            <b></b>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </td>
+		<td valign="top">
+            <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumline">
+            <tbody>
+                <tr>
+                    <td class="row2" valign="top">
+                        <span class="genmed"></span>
+                        <table border="0" cellpadding="2" cellspacing="0" width="450">
+                        <tbody>
+                            <tr align="center" valign="middle">
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="b"
+                                               name="addbbcode0" value=" B " style="font-weight:bold; width: 30px"
+                                               onClick="bbstyle(0)" onMouseOver="helpline('b')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="i"
+                                               name="addbbcode2" value=" i " style="font-style:italic; width: 30px"
+                                               onClick="bbstyle(2)" onMouseOver="helpline('i')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="u"
+                                               name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px"
+                                               onClick="bbstyle(4)" onMouseOver="helpline('u')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="q"
+                                               name="addbbcode6" value="Quote" style="width: 50px"
+                                               onClick="bbstyle(6)" onMouseOver="helpline('q')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="c"
+                                               name="addbbcode8" value="Code" style="width: 40px"
+                                               onClick="bbstyle(8)" onMouseOver="helpline('c')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="l"
+                                               name="addbbcode10" value="List" style="width: 40px"
+                                               onClick="bbstyle(10)" onMouseOver="helpline('l')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="o"
+                                               name="addbbcode12" value="List=" style="width: 40px"
+                                               onClick="bbstyle(12)" onMouseOver="helpline('o')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="p"
+                                               name="addbbcode14" value="Img" style="width: 40px"
+                                               onClick="bbstyle(14)" onMouseOver="helpline('p')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="w"
+                                               name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px"
+                                               onClick="bbstyle(16)" onMouseOver="helpline('w')"/>
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                    <tbody>
+                                        <tr>
+                                            <td>
+                                                <span class="genmed">
+                                                    &#160;${resource.Font_color}:
+                                                    <select name="addbbcode18"
+                                                            onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;"
+                                                            onMouseOver="helpline('s')">
+                                                        <option style="color:black; background-color: "
+                                                                value="" class="genmed">
+                                                            ${resource.color_default}
+                                                        </option>
+                                                        <option style="color:darkred; background-color: "
+                                                                value="darkred" class="genmed">
+                                                            ${resource.color_dark_red}
+                                                        </option>
+                                                        <option style="color:red; background-color: "
+                                                                value="red" class="genmed">
+                                                            ${resource.color_red}
+                                                        </option>
+                                                        <option style="color:orange; background-color: "
+                                                                value="orange" class="genmed">
+                                                            ${resource.color_orange}
+                                                        </option>
+                                                        <option style="color:brown; background-color: "
+                                                                value="brown" class="genmed">
+                                                            ${resource.color_brown}
+                                                        </option>
+                                                        <option style="color:yellow; background-color: "
+                                                                value="yellow" class="genmed">
+                                                            ${resource.color_yellow}
+                                                        </option>
+                                                        <option style="color:green; background-color: "
+                                                                value="green" class="genmed">
+                                                            ${resource.color_green}
+                                                        </option>
+                                                        <option style="color:olive; background-color: "
+                                                                value="olive" class="genmed">
+                                                            ${resource.color_olive}
+                                                        </option>
+                                                        <option style="color:cyan; background-color: "
+                                                                value="cyan" class="genmed">
+                                                            ${resource.color_cyan}
+                                                        </option>
+                                                        <option style="color:blue; background-color: "
+                                                                value="blue" class="genmed">
+                                                            ${resource.color_blue}
+                                                        </option>
+                                                        <option style="color:darkblue; background-color: "
+                                                                value="darkblue" class="genmed">
+                                                            ${resource.color_dark_blue}
+                                                        </option>
+                                                        <option style="color:indigo; background-color: "
+                                                                value="indigo" class="genmed">
+                                                            ${resource.color_indigo}
+                                                        </option>
+                                                        <option style="color:violet; background-color: "
+                                                                value="violet" class="genmed">
+                                                            ${resource.color_violet}
+                                                        </option>
+                                                        <option style="color:white; background-color: "
+                                                                value="white" class="genmed">
+                                                            ${resource.color_white}
+                                                        </option>
+                                                        <option style="color:black; background-color: "
+                                                                value="black" class="genmed">
+                                                            ${resource.color_black}
+                                                        </option>
+                                                    </select>
+                                                    &#160;${resource.Font_size}:
+                                                    <select name="addbbcode20"
+                                                            onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')"
+                                                            onMouseOver="helpline('f')">
+                                                        <option value="7" class="genmed">
+                                                            ${resource.font_tiny}
+                                                        </option>
+                                                        <option value="9" class="genmed">
+                                                            ${resource.font_small}
+                                                        </option>
+                                                        <option value="12" class="genmed" selected="true">
+                                                            ${resource.font_normal}
+                                                        </option>
+                                                        <option value="18" class="genmed">
+                                                            ${resource.font_large}
+                                                        </option>
+                                                        <option value="24" class="genmed">
+                                                            ${resource.font_huge}
+                                                        </option>
+                                                    </select>
+                                                </span>
+                                            </td>
+                                            <td nowrap="nowrap" align="right">
+                                                <span class="gensmall">
+                                                    <a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">
+                                                        ${resource.Close_Tags}
+                                                    </a>
+                                                </span>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <span class="gensmall">
+                                        <input type="text" name="helpbox" size="45" maxlength="100"
+                                               style="width:450px; font-size:10px"
+                                               class="helpline" value="${resource.Styles_tip}"/>
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <h:inputTextarea id="message" value="#{editPost.message}"
+                                                     rows="15" cols="35"
+                                                     tabindex="3"
+                                                     styleClass="Posttextarea"
+                                                     onselect="storeCaret(this);"
+                                                     onkeyup="storeCaret(this);"
+                                                     onclick="storeCaret(this)" />
+                                </td>
+                            </tr>
+                        </tbody>
+                        </table>
+                    </td>
+                </tr>
+            </tbody>
+            </table>
+        </td>
+    </tr>
+    
+    <!-- subject and message invisible input for validator execution workaround -->
+    <h:inputHidden id="validator" value="validator">
+        <f:validator validatorId="subjectLengthValidator" />
+        <f:validator validatorId="messageLengthValidator" />
+    </h:inputHidden>
+
+    <!-- Add Options -->
+    <c:if test="#{editPost.firstPost}">
+    <forums:isAllowed fragment="acl://topicType" contextData="#{editPost.forumId}">
+    <tr class="PostViewUnderlineBoth">
+        <td valign="top">
+            <label class="forumformlabelbold">
+                ${resource.Options}
+            </label>
+        </td>
+        <td>
+            ${resource.Post_topic_as}:
+            <h:selectOneRadio value="#{editPost.topicType}" styleClass="gen">
+                <f:selectItem itemValue="0" itemLabel="${resource.Post_Normal}">
+                    <f:verbatim>&#160;&#160;&#160;</f:verbatim>
+                </f:selectItem>
+                <f:selectItem itemValue="1" itemLabel="${resource.Post_Sticky}">
+                    <f:verbatim>&#160;&#160;&#160;</f:verbatim>
+                </f:selectItem>
+                <f:selectItem itemValue="2" itemLabel="${resource.Post_Announcement}">
+                    <f:verbatim>&#160;&#160;&#160;</f:verbatim>
+                </f:selectItem>
+            </h:selectOneRadio>
+        </td>
+    </tr>
+    </forums:isAllowed>
+    </c:if>
+    
+    <!-- poll ui -->
+    <forums:isAllowed fragment="acl://managePoll">
+    <c:if test="#{editPost.firstPost}">
+    
+	<tr class="PostViewMainHeader">
+        <td colspan="2">
+            ${resource.Add_poll}
+        </td>
+    </tr>
+    <tr class="PostViewMainDescription">
+        <td colspan="2">
+            ${resource.Add_poll_explain}
+        </td>
+    </tr>
+    
+    <!-- setup poll question -->
+    <tr>
+        <td class="PostViewUnderline">
+            <label class="forumformlabelbold">
+                ${resource.Poll_question}
+            </label>
+        </td>
+        <td>
+            <h:inputText value="#{editPost.question}" id="question" maxlength="255" style="width: 450px;"/>
+        </td>
+    </tr>
+    
+    <!-- update poll options already added -->
+    <input type="hidden" name="o"/>
+    <c:forEach items="${editPost.options}" var="optionRow" varStatus="idx">
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Poll_option}
+            </label>
+        </td>
+        <td>
+            <h:inputText id="option_${idx.index+1}" name="option_${idx.index+1}"
+                   value="${optionRow}" style="width: 300px;" maxlength="255"/>
+            &#160;
+            <h:commandButton id="UpdateOption_${idx.index+1}" action="#{editPost.updateOption}" value="${resource.Update}"
+                             styleClass="buttonMed" onclick="selectOption(${idx.index+1});"/>
+            <h:commandButton id="DeleteOption_${idx.index+1}" action="#{editPost.deleteOption}" value="${resource.Delete}"
+                             styleClass="buttonMed" onclick="selectOption(${idx.index+1});"/>
+        </td>
+    </tr>
+    </c:forEach>
+    
+    <!-- add poll options -->
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Poll_option}
+            </label>
+        </td>
+        <td>  		
+            <h:inputText value="#{editPost.option}" id="newOption" maxlength="255" style="width: 300px;"/>
+            &#160;   	
+            <h:commandButton action="#{editPost.addOption}"
+                             value="${resource.Add_option}"
+                             styleClass="buttonMed"/>
+        </td>
+    </tr>
+		
+		
+    <!-- setup poll duration -->
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Poll_for}
+            </label>
+        </td>
+        <td>
+            <h:inputText value="#{editPost.activeDuration}" id="pollDuration" size="3" maxlength="3">
+                <f:converter  converterId="pollDurationConverter" />
+            </h:inputText>
+            &#160;
+            <strong>
+                ${resource.Days}
+            </strong>
+            &#160;
+            ${resource.Poll_for_explain}
+        </td>
+    </tr>
+    
+    <!-- poll invisible input for validator execution workaround -->
+    <h:inputHidden id="execute" value="execute">
+        <f:validator validatorId="pollValidator" />
+    </h:inputHidden>
+    
+    </c:if>
+    </forums:isAllowed>
+    
+    <!-- attachment ui -->
+    <forums:isAllowed fragment="acl://managePostAttachments">
+    <tr>
+        <td colspan="2" class="PostViewMainHeader">
+            ${resource.Add_attachment_title}
+        </td>
+    </tr>
+    <tr class="PostViewMainDescription">
+        <td colspan="2">
+            ${resource.Add_attachment_explain}
+        </td>
+    </tr>
+    
+    <!-- upload button -->
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_name}
+            </label>
+        </td>
+        <td>
+            <input type="file" size="40" class="post" /> 
+        </td>
+    </tr>
+    
+    <!-- comment -->
+    <tr valign="top" class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_comment}
+            </label>
+        </td>
+        <td>
+            <h:inputTextarea value="#{editPost.attachmentComment}" rows="3" styleClass="Posttextarea"/>
+        </td>
+    </tr>
+    <tr class="PostViewUnderline">
+        <td></td>
+        <td>
+            <h:commandButton action="#{editPost.addAttachment}" value="${resource.Add_attachment}" styleClass="buttonMed"/>
+        </td>
+    </tr>
+    
+    <c:if test="#{editPost.numberOfAttachments>0}">
+    <tr>
+        <th class="thHead" colspan="2">${resource.Posted_attachments}</th>
+    </tr>
+	
+	<!-- uploaded list of attachments -->
+    <input type="hidden" name="ATTACHMENT"/>
+    <c:forEach items="#{editPost.attachments}" var="attachRow" varStatus="idx">
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_name}
+            </label>
+        </td>
+        <td>
+            ${attachRow.fileName}
+        </td>
+    </tr>
+    <tr valign="top" class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_comment}
+            </label>
+        </td>
+        <td>
+            <h:inputTextarea id="attachment_${idx.index}" value="#{attachRow.comment}" rows="3" cols="35" styleClass="Posttextarea"/>
+        </td>
+    </tr>
+    <tr class="PostViewUnderline">
+        <td></td>
+        <td>
+            <h:commandButton id="UpdateAttachment_${idx.index}" action="#{editPost.updateAttachment}" value="${resource.Update_comment}"
+                         styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
+            &#160;
+            <h:commandButton id="DeleteAttachment_${idx.index}" action="#{editPost.deleteAttachment}" value="${resource.Delete_attachment}"
+                             styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
+        </td>
+    </tr>
+    </c:forEach>
+    </c:if>
+    </forums:isAllowed>
+</table>
+    
+<!-- hookup the buttons -->
+<div class="forumformbuttonrow">
+    <ul>
+        <li>
+            <h:commandButton action="#{editPost.preview}" value="${resource.Preview}"
+                             id="Preview"
+                             styleClass="buttonMed"
+                             tabindex="5"/>
+        </li>
+        <li>
+            <!--TODO: Missing execution of javascript checking form - onclick="return checkForm(this.parentNode)" -->
+            <h:commandButton action="#{editPost.execute}" value="${resource.Submit}"
+                             id="Submit"
+                             styleClass="buttonMed"
+                             accesskey="s" tabindex="6"/>
+        </li>
+        <li>
+            <h:commandButton action="#{editPost.cancel}" value="${resource.Cancel}"
+                             id="Cancel" accesskey="c" tabindex="7" styleClass="buttonMed"/>
+        </li>
+    </ul>
+</div>
+</h:form>
+</div>
+
+</ui:define>
+</ui:composition>
+
 </div>
\ No newline at end of file

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -1,25 +1,25 @@
 <!--
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
  ******************************************************************************/
 -->
 
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >
@@ -285,290 +284,290 @@
     <br clear="all"/>
 </c:if>
 
-<div class="forumtitletext">
-    <h4>${resource.Post_a_new_topic}</h4>
-    <h:messages errorClass="failuretext" layout="table" />
-</div>
-
-<div class="PostviewStyle">
-<h:form id="post" enctype="multipart/form-data">
+<div class="forumtitletext">
+    <h4>${resource.Post_a_new_topic}</h4>
+    <h:messages errorClass="failuretext" layout="table" />
+</div>
+
+<div class="PostviewStyle">
+<h:form id="post" enctype="multipart/form-data">
 <table border="0" cellpadding="5" cellspacing="0" width="100%" name="table" id="table" >
-
+
     <!-- keeps the forum where this topic is being created in context, this is a control parameter -->
-    <input type="hidden" name="f" value="#{newTopic.forumId}"/>
-    
-    <tr>
-        <td colspan="2" class="PostViewMainHeader">${resource.Compose_Message}</td>
-    </tr>
-    <tr class="PostViewMainDescription">
-        <td colspan="2">${resource.Posting_Description}</td>
-    </tr>
+    <input type="hidden" name="f" value="#{newTopic.forumId}"/>
     
+    <tr>
+        <td colspan="2" class="PostViewMainHeader">${resource.Compose_Message}</td>
+    </tr>
+    <tr class="PostViewMainDescription">
+        <td colspan="2">${resource.Posting_Description}</td>
+    </tr>
+    
     <!-- add Subject -->
-    <tr class="PostViewUnderlineBoth">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Subject}
+    <tr class="PostViewUnderlineBoth">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Subject}
             </label>
         </td>
         <td>
-            <h:inputText value="#{newTopic.subject}" maxlength="200" id="SubjectInputText" 
+            <h:inputText value="#{newTopic.subject}" maxlength="200" id="SubjectInputText" 
                          size="45" style="width: 450px;" tabindex="2" />
         </td>
-    </tr>
+    </tr>
     
     <!-- Add Message -->
-    <tr>
-        <td valign="top">
-            <table border="0" cellpadding="1" cellspacing="0" width="100%">
-                <tbody>
-                    <tr>
-                        <td>
-                            <label class="forumformlabelbold">
-                                ${resource.Message_body}
-                            </label>
+    <tr>
+        <td valign="top">
+            <table border="0" cellpadding="1" cellspacing="0" width="100%">
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="forumformlabelbold">
+                                ${resource.Message_body}
+                            </label>
                         </td>
-                    </tr>
-                    <tr>
-                        <td align="center" valign="middle">
-                            <br />
-                            <table border="0" cellpadding="5" cellspacing="0" width="100">
-                                <tbody>
-                                    <tr align="center">
-                                        <td>
-                                            <b></b>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
+                    </tr>
+                    <tr>
+                        <td align="center" valign="middle">
+                            <br />
+                            <table border="0" cellpadding="5" cellspacing="0" width="100">
+                                <tbody>
+                                    <tr align="center">
+                                        <td>
+                                            <b></b>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </td>
 		<td valign="top">
-            <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumline">
+            <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumline">
             <tbody>
-                <tr>
-                    <td class="row2" valign="top">
-                        <span class="genmed"></span>
-                        <table border="0" cellpadding="2" cellspacing="0" width="450">
-                        <tbody>
-                            <tr align="center" valign="middle">
-                                <td>
+                <tr>
+                    <td class="row2" valign="top">
+                        <span class="genmed"></span>
+                        <table border="0" cellpadding="2" cellspacing="0" width="450">
+                        <tbody>
+                            <tr align="center" valign="middle">
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="b"
-                                               name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;"
+                                        <input type="button" class="button buttonMed" accesskey="b"
+                                               name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;"
                                                onClick="bbstyle(0)" onMouseOver="helpline('b')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="i"
-                                               name="addbbcode2" value=" i " style="font-style:italic; width: 30px;"
+                                        <input type="button" class="button buttonMed" accesskey="i"
+                                               name="addbbcode2" value=" i " style="font-style:italic; width: 30px;"
                                                onClick="bbstyle(2)" onMouseOver="helpline('i')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="u"
-                                               name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;"
+                                        <input type="button" class="button buttonMed" accesskey="u"
+                                               name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;"
                                                onClick="bbstyle(4)" onMouseOver="helpline('u')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="q"
+                                        <input type="button" class="button buttonMed" accesskey="q"
                                                name="addbbcode6" value="Quote" style="width: 50px;"
                                                onClick="bbstyle(6)" onMouseOver="helpline('q')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="c"
+                                        <input type="button" class="button buttonMed" accesskey="c"
                                                name="addbbcode8" value="Code" style="width: 40px;"
                                                onClick="bbstyle(8)" onMouseOver="helpline('c')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="l"
+                                        <input type="button" class="button buttonMed" accesskey="l"
                                                name="addbbcode10" value="List" style="width: 40px;"
                                                onClick="bbstyle(10)" onMouseOver="helpline('l')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="o"
+                                        <input type="button" class="button buttonMed" accesskey="o"
                                                name="addbbcode12" value="List=" style="width: 40px;"
                                                onClick="bbstyle(12)" onMouseOver="helpline('o')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="p"
+                                        <input type="button" class="button buttonMed" accesskey="p"
                                                name="addbbcode14" value="Img" style="width: 40px;"
                                                onClick="bbstyle(14)" onMouseOver="helpline('p')"/>
-                                    </span>
+                                    </span>
                                 </td>
-                                <td>
+                                <td>
                                     <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="w"
-                                               name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px;"
+                                        <input type="button" class="button buttonMed" accesskey="w"
+                                               name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px;"
                                                onClick="bbstyle(16)" onMouseOver="helpline('w')"/>
-                                    </span>
+                                    </span>
                                 </td>
                             </tr>
                             <tr>
                                 <td colspan="9">
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
                                     <tbody>
                                         <tr>
-                                            <td>
-                                                <span class="genmed">
+                                            <td>
+                                                <span class="genmed">
                                                     &#160;${resource.Font_color}:
-                                                    <select name="addbbcode18"
+                                                    <select name="addbbcode18"
                                                             onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;"
-                                                            onMouseOver="helpline('s')">
-                                                        <option style="color:black; background-color: "
-                                                                value="" class="genmed">
-                                                            ${resource.color_default}
-                                                        </option>
-                                                        <option style="color:darkred; background-color: "
-                                                                value="darkred" class="genmed">
-                                                            ${resource.color_dark_red}
-                                                        </option>
-                                                        <option style="color:red; background-color: "
-                                                                value="red" class="genmed">
-                                                            ${resource.color_red}
-                                                        </option>
-                                                        <option style="color:orange; background-color: "
-                                                                value="orange" class="genmed">
-                                                            ${resource.color_orange}
-                                                        </option>
-                                                        <option style="color:brown; background-color: "
-                                                                value="brown" class="genmed">
-                                                            ${resource.color_brown}
-                                                        </option>
-                                                        <option style="color:yellow; background-color: "
-                                                                value="yellow" class="genmed">
-                                                            ${resource.color_yellow}
-                                                        </option>
-                                                        <option style="color:green; background-color: "
-                                                                value="green" class="genmed">
-                                                            ${resource.color_green}
-                                                        </option>
-                                                        <option style="color:olive; background-color: "
-                                                                value="olive" class="genmed">
-                                                            ${resource.color_olive}
-                                                        </option>
-                                                        <option style="color:cyan; background-color: "
-                                                                value="cyan" class="genmed">
-                                                            ${resource.color_cyan}
-                                                        </option>
-                                                        <option style="color:blue; background-color: "
-                                                                value="blue" class="genmed">
-                                                            ${resource.color_blue}
-                                                        </option>
-                                                        <option style="color:darkblue; background-color: "
-                                                                value="darkblue" class="genmed">
-                                                            ${resource.color_dark_blue}
-                                                        </option>
-                                                        <option style="color:indigo; background-color: "
-                                                                value="indigo" class="genmed">
-                                                            ${resource.color_indigo}
-                                                        </option>
-                                                        <option style="color:violet; background-color: "
-                                                                value="violet" class="genmed">
-                                                            ${resource.color_violet}
-                                                        </option>
-                                                        <option style="color:white; background-color: "
-                                                                value="white" class="genmed">
-                                                            ${resource.color_white}
-                                                        </option>
-                                                        <option style="color:black; background-color: "
-                                                                value="black" class="genmed">
-                                                            ${resource.color_black}
-                                                        </option>
-                                                    </select>
-                                                    &#160;${resource.Font_size}:
-                                                    <select name="addbbcode20"
-                                                            onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')"
-                                                            onMouseOver="helpline('f')">
-                                                        <option value="7" class="genmed">
-                                                            ${resource.font_tiny}
-                                                        </option>
-                                                        <option value="9" class="genmed">
-                                                            ${resource.font_small}
-                                                        </option>
-                                                        <option value="12" class="genmed" selected="true">
-                                                            ${resource.font_normal}
-                                                        </option>
-                                                        <option value="18" class="genmed">
-                                                            ${resource.font_large}
-                                                        </option>
-                                                        <option value="24" class="genmed">
-                                                            ${resource.font_huge}
-                                                        </option>
+                                                            onMouseOver="helpline('s')">
+                                                        <option style="color:black; background-color: "
+                                                                value="" class="genmed">
+                                                            ${resource.color_default}
+                                                        </option>
+                                                        <option style="color:darkred; background-color: "
+                                                                value="darkred" class="genmed">
+                                                            ${resource.color_dark_red}
+                                                        </option>
+                                                        <option style="color:red; background-color: "
+                                                                value="red" class="genmed">
+                                                            ${resource.color_red}
+                                                        </option>
+                                                        <option style="color:orange; background-color: "
+                                                                value="orange" class="genmed">
+                                                            ${resource.color_orange}
+                                                        </option>
+                                                        <option style="color:brown; background-color: "
+                                                                value="brown" class="genmed">
+                                                            ${resource.color_brown}
+                                                        </option>
+                                                        <option style="color:yellow; background-color: "
+                                                                value="yellow" class="genmed">
+                                                            ${resource.color_yellow}
+                                                        </option>
+                                                        <option style="color:green; background-color: "
+                                                                value="green" class="genmed">
+                                                            ${resource.color_green}
+                                                        </option>
+                                                        <option style="color:olive; background-color: "
+                                                                value="olive" class="genmed">
+                                                            ${resource.color_olive}
+                                                        </option>
+                                                        <option style="color:cyan; background-color: "
+                                                                value="cyan" class="genmed">
+                                                            ${resource.color_cyan}
+                                                        </option>
+                                                        <option style="color:blue; background-color: "
+                                                                value="blue" class="genmed">
+                                                            ${resource.color_blue}
+                                                        </option>
+                                                        <option style="color:darkblue; background-color: "
+                                                                value="darkblue" class="genmed">
+                                                            ${resource.color_dark_blue}
+                                                        </option>
+                                                        <option style="color:indigo; background-color: "
+                                                                value="indigo" class="genmed">
+                                                            ${resource.color_indigo}
+                                                        </option>
+                                                        <option style="color:violet; background-color: "
+                                                                value="violet" class="genmed">
+                                                            ${resource.color_violet}
+                                                        </option>
+                                                        <option style="color:white; background-color: "
+                                                                value="white" class="genmed">
+                                                            ${resource.color_white}
+                                                        </option>
+                                                        <option style="color:black; background-color: "
+                                                                value="black" class="genmed">
+                                                            ${resource.color_black}
+                                                        </option>
                                                     </select>
-                                                </span>
+                                                    &#160;${resource.Font_size}:
+                                                    <select name="addbbcode20"
+                                                            onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')"
+                                                            onMouseOver="helpline('f')">
+                                                        <option value="7" class="genmed">
+                                                            ${resource.font_tiny}
+                                                        </option>
+                                                        <option value="9" class="genmed">
+                                                            ${resource.font_small}
+                                                        </option>
+                                                        <option value="12" class="genmed" selected="true">
+                                                            ${resource.font_normal}
+                                                        </option>
+                                                        <option value="18" class="genmed">
+                                                            ${resource.font_large}
+                                                        </option>
+                                                        <option value="24" class="genmed">
+                                                            ${resource.font_huge}
+                                                        </option>
+                                                    </select>
+                                                </span>
                                             </td>
-                                            <td nowrap="nowrap" align="right">
-                                                <span class="gensmall">
-                                                    <a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">
-                                                        ${resource.Close_Tags}
-                                                    </a>
+                                            <td nowrap="nowrap" align="right">
+                                                <span class="gensmall">
+                                                    <a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">
+                                                        ${resource.Close_Tags}
+                                                    </a>
                                                 </span>
                                             </td>
-                                        </tr>
+                                        </tr>
                                     </tbody>
                                     </table>
                                 </td>
                             </tr>
                             <tr>
-                                <td colspan="9">
+                                <td colspan="9">
                                     <span class="gensmall">
-                                        <input type="text" name="helpbox" size="45" maxlength="100"
+                                        <input type="text" name="helpbox" size="45" maxlength="100"
                                                style="width:450px; font-size:10px"
                                                class="helpline" value="${resource.Styles_tip}"/>
-                                    </span>
+                                    </span>
                                 </td>
                             </tr>
                             <tr>
                                 <td colspan="9">
-                                    <h:inputTextarea id="message" value="#{newTopic.message}"
+                                    <h:inputTextarea id="message" value="#{newTopic.message}"
                                                      rows="15" cols="35"
-                                                     tabindex="3"
+                                                     tabindex="3"
                                                      styleClass="Posttextarea"
-                                                     onselect="storeCaret(this);"
-                                                     onkeyup="storeCaret(this);"
+                                                     onselect="storeCaret(this);"
+                                                     onkeyup="storeCaret(this);"
                                                      onclick="storeCaret(this)" />
                                 </td>
-                            </tr>
+                            </tr>
                         </tbody>
                         </table>
                     </td>
-                </tr>
-            </tbody>
-            </table>
-        </td>
-    </tr>
-    
-    <!-- subject and message invisible input for validator execution workaround -->
-    <h:inputHidden id="validator" value="validator">
-        <f:validator validatorId="subjectLengthValidator" />
-        <f:validator validatorId="messageLengthValidator" />
-    </h:inputHidden>
-    
-    <!-- Add Options -->
+                </tr>
+            </tbody>
+            </table>
+        </td>
+    </tr>
+    
+    <!-- subject and message invisible input for validator execution workaround -->
+    <h:inputHidden id="validator" value="validator">
+        <f:validator validatorId="subjectLengthValidator" />
+        <f:validator validatorId="messageLengthValidator" />
+    </h:inputHidden>
+    
+    <!-- Add Options -->
     <forums:isAllowed fragment="acl://topicType" contextData="#{newTopic.forumId}">
     <tr class="PostViewUnderlineBoth">
         <td valign="top">
-            <label class="forumformlabelbold">
-                ${resource.Options}
+            <label class="forumformlabelbold">
+                ${resource.Options}
             </label>
         </td>
-        <td>
+        <td>
             ${resource.Post_topic_as}:
             <h:selectOneRadio value="#{newTopic.topicType}" styleClass="gen">
                 <f:selectItem itemValue="0" itemLabel="${resource.Post_Normal}">
@@ -582,143 +581,143 @@
                 </f:selectItem>
             </h:selectOneRadio>
         </td>
-    </tr>
-    </forums:isAllowed>
+    </tr>
+    </forums:isAllowed>
     
     <!-- poll ui -->
-    <forums:isAllowed fragment="acl://managePoll">
+    <forums:isAllowed fragment="acl://managePoll">
     
 	<tr class="PostViewMainHeader">
-        <td colspan="2">
-            ${resource.Add_poll}
+        <td colspan="2">
+            ${resource.Add_poll}
         </td>
     </tr>
     <tr class="PostViewMainDescription">
-        <td colspan="2">
-            ${resource.Add_poll_explain}
+        <td colspan="2">
+            ${resource.Add_poll_explain}
         </td>
-    </tr>
+    </tr>
     
     <!-- setup poll question -->
     <tr>
-        <td class="PostViewUnderline">
-            <label class="forumformlabelbold">
-                ${resource.Poll_question}
-            </label>
+        <td class="PostViewUnderline">
+            <label class="forumformlabelbold">
+                ${resource.Poll_question}
+            </label>
         </td>
         <td>
             <h:inputText value="#{newTopic.question}" id="question" maxlength="255" style="width: 450px;"/>
         </td>
-    </tr>
-    
+    </tr>
+    
     <!-- update poll options already added -->
     <input type="hidden" name="o"/>
     <c:forEach items="${newTopic.options}" var="optionRow" varStatus="idx">
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Poll_option}
-            </label>
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Poll_option}
+            </label>
         </td>
         <td>
-            <h:inputText id="option_${idx.index+1}" name="option_${idx.index+1}"
-                   value="${optionRow}" style="width: 300px;" maxlength="255"/>
+            <h:inputText id="option_${idx.index+1}" name="option_${idx.index+1}"
+                   value="${optionRow}" style="width: 300px;" maxlength="255"/>
             &#160;
-            <h:commandButton id="UpdateOption_${idx.index+1}" action="#{newTopic.updateOption}" value="${resource.Update}"
+            <h:commandButton id="UpdateOption_${idx.index+1}" action="#{newTopic.updateOption}" value="${resource.Update}"
                              styleClass="buttonMed" onclick="selectOption(${idx.index+1});"/>
-            <h:commandButton id="DeleteOption_${idx.index+1}" action="#{newTopic.deleteOption}" value="${resource.Delete}"
+            <h:commandButton id="DeleteOption_${idx.index+1}" action="#{newTopic.deleteOption}" value="${resource.Delete}"
                              styleClass="buttonMed" onclick="selectOption(${idx.index+1});"/>
         </td>
     </tr>
-    </c:forEach>
+    </c:forEach>
     
     <!-- add poll options -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Poll_option}
-            </label>
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Poll_option}
+            </label>
         </td>
         <td>  		
-            <h:inputText value="#{newTopic.option}" id="newOption" maxlength="255" style="width: 300px;"/>
+            <h:inputText value="#{newTopic.option}" id="newOption" maxlength="255" style="width: 300px;"/>
             &#160;   	
-            <h:commandButton action="#{newTopic.addOption}"
-                             value="${resource.Add_option}"
+            <h:commandButton action="#{newTopic.addOption}"
+                             value="${resource.Add_option}"
                              styleClass="buttonMed"/>
         </td>
     </tr>
 		
 		
     <!-- setup poll duration -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Poll_for}
-            </label>
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Poll_for}
+            </label>
         </td>
         <td>
-            <h:inputText value="#{newTopic.activeDuration}" id="pollDuration" size="3" maxlength="3">
-                <f:converter  converterId="pollDurationConverter" />
+            <h:inputText value="#{newTopic.activeDuration}" id="pollDuration" size="3" maxlength="3">
+                <f:converter  converterId="pollDurationConverter" />
             </h:inputText>
             &#160;
-            <strong>
-                ${resource.Days}
-            </strong>
-            &#160;
+            <strong>
+                ${resource.Days}
+            </strong>
+            &#160;
             ${resource.Poll_for_explain}
         </td>
-    </tr>
-    
-    <!-- poll invisible input for validator execution workaround -->
-    <h:inputHidden id="execute" value="execute">
-        <f:validator validatorId="pollValidator" />
+    </tr>
+    
+    <!-- poll invisible input for validator execution workaround -->
+    <h:inputHidden id="execute" value="execute">
+        <f:validator validatorId="pollValidator" />
     </h:inputHidden>
-    
-    </forums:isAllowed>
-    
+    
+    </forums:isAllowed>
+    
     <!-- attachment ui -->
     <forums:isAllowed fragment="acl://managePostAttachments">
     <tr>
-        <td colspan="2" class="PostViewMainHeader">
-            ${resource.Add_attachment_title}
+        <td colspan="2" class="PostViewMainHeader">
+            ${resource.Add_attachment_title}
         </td>
     </tr>
     <tr class="PostViewMainDescription">
         <td colspan="2">
             ${resource.Add_attachment_explain}
         </td>
-    </tr>
-    
+    </tr>
+    
     <!-- upload button -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_name}
-            </label>
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_name}
+            </label>
         </td>
         <td>
-            <t:inputFileUpload value="#{newTopic.attachment}" size="40" styleClass="post"/>
+            <input type="file" size="40" class="post" /> 
         </td>
-    </tr>
+    </tr>
     
     <!-- comment -->
-    <tr valign="top" class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_comment}
-            </label>
+    <tr valign="top" class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_comment}
+            </label>
         </td>
         <td>
             <h:inputTextarea value="#{newTopic.attachmentComment}" rows="3" styleClass="Posttextarea"/>
-        </td>
-    </tr>
-    <tr class="PostViewUnderline">
-        <td></td>
+        </td>
+    </tr>
+    <tr class="PostViewUnderline">
+        <td></td>
         <td>
             <h:commandButton action="#{newTopic.addAttachment}" value="${resource.Add_attachment}" styleClass="buttonMed"/>
         </td>
-    </tr>
-    
+    </tr>
+    
     <c:if test="#{newTopic.numberOfAttachments>0}">
     <tr>
         <th class="thHead" colspan="2">${resource.Posted_attachments}</th>
@@ -727,63 +726,63 @@
 	<!-- uploaded list of attachments -->
     <input type="hidden" name="ATTACHMENT"/>
     <c:forEach items="#{newTopic.attachments}" var="attachRow" varStatus="idx">
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_name}
-            </label>
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_name}
+            </label>
         </td>
-        <td>
-            ${attachRow.fileName}
+        <td>
+            ${attachRow.fileName}
         </td>
     </tr>
-    <tr valign="top" class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_comment}
-            </label>
+    <tr valign="top" class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_comment}
+            </label>
         </td>
         <td>
             <h:inputTextarea id="attachment_${idx.index}" value="#{attachRow.comment}" rows="3" cols="35" styleClass="Posttextarea"/>
         </td>
     </tr>
-    <tr class="PostViewUnderline">
-        <td></td>
+    <tr class="PostViewUnderline">
+        <td></td>
         <td>
-            <h:commandButton id="UpdateAttachment_${idx.index}" action="#{newTopic.updateAttachment}" value="${resource.Update_comment}"
+            <h:commandButton id="UpdateAttachment_${idx.index}" action="#{newTopic.updateAttachment}" value="${resource.Update_comment}"
                          styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
             &#160;
-            <h:commandButton id="DeleteAttachment_${idx.index}" action="#{newTopic.deleteAttachment}" value="${resource.Delete_attachment}"
+            <h:commandButton id="DeleteAttachment_${idx.index}" action="#{newTopic.deleteAttachment}" value="${resource.Delete_attachment}"
                              styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
         </td>
     </tr>
     </c:forEach>
     </c:if>
-    </forums:isAllowed>
-</table>
+    </forums:isAllowed>
+</table>
     
 <!-- hookup the buttons -->
-<div class="forumformbuttonrow">
-    <ul>
-        <li>
-            <h:commandButton action="#{newTopic.preview}" value="${resource.Preview}"
+<div class="forumformbuttonrow">
+    <ul>
+        <li>
+            <h:commandButton action="#{newTopic.preview}" value="${resource.Preview}"
                              id="Preview"
                              styleClass="buttonMed"
                              tabindex="5"/>
-        </li>
+        </li>
         <li>
             <!--TODO: Missing execution of javascript checking form - onclick="return checkForm(this.parentNode)" -->
             <h:commandButton action="#{newTopic.execute}" value="${resource.Submit}"
-                             id="Submit"
+                             id="Submit"
                              styleClass="buttonMed"
-                             accesskey="s" tabindex="6">
-              <f:actionListener type="org.jboss.portlet.forums.ui.event.FloodControlListener" />
+                             accesskey="s" tabindex="6">
+              <f:actionListener type="org.jboss.portlet.forums.ui.event.FloodControlListener" />
             </h:commandButton>
-        </li>
+        </li>
         <li>
-            <h:commandButton action="#{newTopic.cancel}" value="${resource.Cancel}"
-                             id="Cancel" accesskey="c" tabindex="7" styleClass="buttonMed"/>
-        </li>
+            <h:commandButton action="#{newTopic.cancel}" value="${resource.Cancel}"
+                             id="Cancel" accesskey="c" tabindex="7" styleClass="buttonMed"/>
+        </li>
     </ul>
 </div>
 </h:form>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_reply_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_reply_body.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/posting_reply_body.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -1,25 +1,25 @@
 <!--
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
  ******************************************************************************/
 -->
 
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       class="forumscontainer"
 >
@@ -279,408 +278,408 @@
 
 //--&gt;
 </script>
-
-<!-- Checking whether bean was initialized. If not, the initialization should execute. -->
-<c:if test="#{replyTopic.initialized}"></c:if>
-
-<c:if test="#{replyTopic.preview}">
-    <ui:include src="/views/topics/posting_reply_preview.xhtml"/>
-    <br clear="all"/>
-</c:if>
-
-<div class="forumtitletext">
-    <h4>${resource.Post_a_reply}</h4>
-    <h:messages errorClass="failuretext" layout="table" />
+
+<!-- Checking whether bean was initialized. If not, the initialization should execute. -->
+<c:if test="#{replyTopic.initialized}"></c:if>
+
+<c:if test="#{replyTopic.preview}">
+    <ui:include src="/views/topics/posting_reply_preview.xhtml"/>
+    <br clear="all"/>
+</c:if>
+
+<div class="forumtitletext">
+    <h4>${resource.Post_a_reply}</h4>
+    <h:messages errorClass="failuretext" layout="table" />
 </div>
 
-<div class="PostviewStyle">
-<h:form id="post" enctype="multipart/form-data">
-<table border="0" cellpadding="5" cellspacing="0" width="100%" name="table" id="table" >
+<div class="PostviewStyle">
+<h:form id="post" enctype="multipart/form-data">
+<table border="0" cellpadding="5" cellspacing="0" width="100%" name="table" id="table" >
 
     <!-- keeps the forum where this topic is being created in context, this is a control parameter -->
     <input type="hidden" name="f" value="#{replyTopic.forumId}"/>
     <input type="hidden" name="t" value="#{replyTopic.topicId}"/>
     <c:if test="#{param['page'] ne null}">
         <input type="hidden" name="page" value="#{param['page']}"/>
-    </c:if>
-    
-    <tr>
-        <td colspan="2" class="PostViewMainHeader">${resource.Compose_Message}</td>
-    </tr>
-    <tr class="PostViewMainDescription">
-        <td colspan="2">${resource.Posting_Description}</td>
-    </tr>
+    </c:if>
     
-    <!-- add Subject -->
-    <tr class="PostViewUnderlineBoth">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.Subject}
-            </label>
-        </td>
-        <td>
-            <h:inputText value="#{replyTopic.subject}" maxlength="200" id="SubjectInputText"
-                         size="45" style="width: 450px;" tabindex="2"/>
-        </td>
-    </tr>
+    <tr>
+        <td colspan="2" class="PostViewMainHeader">${resource.Compose_Message}</td>
+    </tr>
+    <tr class="PostViewMainDescription">
+        <td colspan="2">${resource.Posting_Description}</td>
+    </tr>
     
-    <!-- Add Message -->
-    <tr>
-        <td valign="top">
-            <table border="0" cellpadding="1" cellspacing="0" width="100%">
-                <tbody>
-                    <tr>
-                        <td>
-                            <label class="forumformlabelbold">
-                                ${resource.Message_body}
-                            </label>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td align="center" valign="middle">
-                            <br />
-                            <table border="0" cellpadding="5" cellspacing="0" width="100">
-                                <tbody>
-                                    <tr align="center">
-                                        <td>
-                                            <b></b>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </td>
-        <td valign="top">
-            <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumline">
-            <tbody>
-                <tr>
-                    <td class="row2" valign="top">
-                        <span class="genmed"></span>
-                        <table border="0" cellpadding="2" cellspacing="0" width="450">
-                        <tbody>
-                            <tr align="center" valign="middle">
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="b"
-                                               name="addbbcode0" value=" B " style="font-weight:bold; width: 30px"
-                                               onClick="bbstyle(0)" onMouseOver="helpline('b')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="i"
-                                               name="addbbcode2" value=" i " style="font-style:italic; width: 30px"
-                                               onClick="bbstyle(2)" onMouseOver="helpline('i')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="u"
-                                               name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px"
-                                               onClick="bbstyle(4)" onMouseOver="helpline('u')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="q"
-                                               name="addbbcode6" value="Quote" style="width: 50px"
-                                               onClick="bbstyle(6)" onMouseOver="helpline('q')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="c"
-                                               name="addbbcode8" value="Code" style="width: 40px"
-                                               onClick="bbstyle(8)" onMouseOver="helpline('c')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="l"
-                                               name="addbbcode10" value="List" style="width: 40px"
-                                               onClick="bbstyle(10)" onMouseOver="helpline('l')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="o"
-                                               name="addbbcode12" value="List=" style="width: 40px"
-                                               onClick="bbstyle(12)" onMouseOver="helpline('o')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="p"
-                                               name="addbbcode14" value="Img" style="width: 40px"
-                                               onClick="bbstyle(14)" onMouseOver="helpline('p')"/>
-                                    </span>
-                                </td>
-                                <td>
-                                    <span class="genmed">
-                                        <input type="button" class="button buttonMed" accesskey="w"
-                                               name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px"
-                                               onClick="bbstyle(16)" onMouseOver="helpline('w')"/>
-                                    </span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="9">
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                    <tbody>
-                                        <tr>
-                                            <td>
-                                                <span class="genmed">
-                                                    &#160;${resource.Font_color}:
-                                                    <select name="addbbcode18"
-                                                            onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;"
-                                                            onMouseOver="helpline('s')">
-                                                        <option style="color:black; background-color: "
-                                                                value="" class="genmed">
-                                                            ${resource.color_default}
-                                                        </option>
-                                                        <option style="color:darkred; background-color: "
-                                                                value="darkred" class="genmed">
-                                                            ${resource.color_dark_red}
-                                                        </option>
-                                                        <option style="color:red; background-color: "
-                                                                value="red" class="genmed">
-                                                            ${resource.color_red}
-                                                        </option>
-                                                        <option style="color:orange; background-color: "
-                                                                value="orange" class="genmed">
-                                                            ${resource.color_orange}
-                                                        </option>
-                                                        <option style="color:brown; background-color: "
-                                                                value="brown" class="genmed">
-                                                            ${resource.color_brown}
-                                                        </option>
-                                                        <option style="color:yellow; background-color: "
-                                                                value="yellow" class="genmed">
-                                                            ${resource.color_yellow}
-                                                        </option>
-                                                        <option style="color:green; background-color: "
-                                                                value="green" class="genmed">
-                                                            ${resource.color_green}
-                                                        </option>
-                                                        <option style="color:olive; background-color: "
-                                                                value="olive" class="genmed">
-                                                            ${resource.color_olive}
-                                                        </option>
-                                                        <option style="color:cyan; background-color: "
-                                                                value="cyan" class="genmed">
-                                                            ${resource.color_cyan}
-                                                        </option>
-                                                        <option style="color:blue; background-color: "
-                                                                value="blue" class="genmed">
-                                                            ${resource.color_blue}
-                                                        </option>
-                                                        <option style="color:darkblue; background-color: "
-                                                                value="darkblue" class="genmed">
-                                                            ${resource.color_dark_blue}
-                                                        </option>
-                                                        <option style="color:indigo; background-color: "
-                                                                value="indigo" class="genmed">
-                                                            ${resource.color_indigo}
-                                                        </option>
-                                                        <option style="color:violet; background-color: "
-                                                                value="violet" class="genmed">
-                                                            ${resource.color_violet}
-                                                        </option>
-                                                        <option style="color:white; background-color: "
-                                                                value="white" class="genmed">
-                                                            ${resource.color_white}
-                                                        </option>
-                                                        <option style="color:black; background-color: "
-                                                                value="black" class="genmed">
-                                                            ${resource.color_black}
-                                                        </option>
-                                                    </select>
-                                                    &#160;${resource.Font_size}:
-                                                    <select name="addbbcode20"
-                                                            onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')"
-                                                            onMouseOver="helpline('f')">
-                                                        <option value="7" class="genmed">
-                                                            ${resource.font_tiny}
-                                                        </option>
-                                                        <option value="9" class="genmed">
-                                                            ${resource.font_small}
-                                                        </option>
-                                                        <option value="12" class="genmed" selected="true">
-                                                            ${resource.font_normal}
-                                                        </option>
-                                                        <option value="18" class="genmed">
-                                                            ${resource.font_large}
-                                                        </option>
-                                                        <option value="24" class="genmed">
-                                                            ${resource.font_huge}
-                                                        </option>
-                                                    </select>
-                                                </span>
-                                            </td>
-                                            <td nowrap="nowrap" align="right">
-                                                <span class="gensmall">
-                                                    <a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">
-                                                        ${resource.Close_Tags}
-                                                    </a>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="9">
-                                    <span class="gensmall">
-                                        <input type="text" name="helpbox" size="45" maxlength="100"
-                                               style="width:450px; font-size:10px"
-                                               class="helpline" value="${resource.Styles_tip}"/>
-                                    </span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="9">
-                                    <h:inputTextarea id="message" value="#{replyTopic.message}"
-                                                     rows="15" cols="35"
-                                                     tabindex="3"
-                                                     styleClass="Posttextarea"
-                                                     onselect="storeCaret(this);"
-                                                     onkeyup="storeCaret(this);"
-                                                     onclick="storeCaret(this)" />
-                                </td>
-                            </tr>
-                        </tbody>
-                        </table>
-                    </td>
-                </tr>
-            </tbody>
-            </table>
-        </td>
-    </tr>
-    
-    <!-- subject and message invisible input for validator execution workaround -->
-    <h:inputHidden id="validator" value="validator">
-        <f:validator validatorId="subjectLengthValidator" />
-        <f:validator validatorId="messageLengthValidator" />
-    </h:inputHidden>
-    
-    <!-- attachment ui -->
-    <forums:isAllowed fragment="acl://managePostAttachments">
-    <tr>
-        <td colspan="2" class="PostViewMainHeader">
-            ${resource.Add_attachment_title}
-        </td>
-    </tr>
-    <tr class="PostViewMainDescription">
-        <td colspan="2">
-            ${resource.Add_attachment_explain}
-        </td>
-    </tr>
-    
-    <!-- upload button -->
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_name}
-            </label>
-        </td>
-        <td>
-            <t:inputFileUpload value="#{replyTopic.attachment}" size="40" styleClass="post"/>
-        </td>
-    </tr>
-    
-    <!-- comment -->
-    <tr valign="top" class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_comment}
-            </label>
-        </td>
-        <td>
-            <h:inputTextarea value="#{replyTopic.attachmentComment}" rows="3" styleClass="Posttextarea"/>
-        </td>
-    </tr>
-    <tr class="PostViewUnderline">
-        <td></td>
-        <td>
-            <h:commandButton action="#{replyTopic.addAttachment}" value="${resource.Add_attachment}" styleClass="buttonMed"/>
-        </td>
-    </tr>
-    
-    <c:if test="#{replyTopic.numberOfAttachments>0}">
-    <tr>
-        <th class="thHead" colspan="2">${resource.Posted_attachments}</th>
-    </tr>
-    
-    <!-- uploaded list of attachments -->
-    <input type="hidden" name="ATTACHMENT"/>
-    <c:forEach items="#{replyTopic.attachments}" var="attachRow" varStatus="idx">
-    <tr class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_name}
-            </label>
-        </td>
-        <td>
-            ${attachRow.fileName}
-        </td>
-    </tr>
-    <tr valign="top" class="PostViewUnderline">
-        <td>
-            <label class="forumformlabelbold">
-                ${resource.File_comment}
-            </label>
-        </td>
-        <td>
-            <h:inputTextarea id="attachment_${idx.index}" value="#{attachRow.comment}" rows="3" cols="35" styleClass="Posttextarea"/>
-        </td>
-    </tr>
-    <tr class="PostViewUnderline">
-        <td></td>
-        <td>
-            <h:commandButton id="UpdateAttachment_${idx.index}" action="#{replyTopic.updateAttachment}" value="${resource.Update_comment}"
-                         styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
-            &#160;
-            <h:commandButton id="DeleteAttachment_${idx.index}" action="#{replyTopic.deleteAttachment}" value="${resource.Delete_attachment}"
-                             styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
-        </td>
-    </tr>
-    </c:forEach>
-    </c:if>
-    </forums:isAllowed>
-</table>
-
-<!-- hookup the buttons -->
-<div class="forumformbuttonrow">
-    <ul>
-        <li>
-            <h:commandButton action="#{replyTopic.preview}" value="${resource.Preview}"
-                             id="Preview"
-                             styleClass="buttonMed"
-                             tabindex="5"/>
-        </li>
-        <li>
-            <!--TODO: Missing execution of javascript checking form - onclick="return checkForm(this.parentNode)" -->
-            <h:commandButton action="#{replyTopic.execute}" value="${resource.Submit}"
-                             id="Submit"
-                             styleClass="buttonMed"
-                             accesskey="s" tabindex="6">
-              <f:actionListener type="org.jboss.portlet.forums.ui.event.FloodControlListener" />
-            </h:commandButton>
-        </li>
-        <li>
-            <h:commandButton action="#{replyTopic.cancel}" value="${resource.Cancel}"
-                             id="Cancel" accesskey="c" tabindex="7" styleClass="buttonMed"/>
-        </li>
-    </ul>
-</div>
-</h:form>
-</div>
-
-</ui:define>
-</ui:composition>
-
-</div>
+    <!-- add Subject -->
+    <tr class="PostViewUnderlineBoth">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.Subject}
+            </label>
+        </td>
+        <td>
+            <h:inputText value="#{replyTopic.subject}" maxlength="200" id="SubjectInputText"
+                         size="45" style="width: 450px;" tabindex="2"/>
+        </td>
+    </tr>
+    
+    <!-- Add Message -->
+    <tr>
+        <td valign="top">
+            <table border="0" cellpadding="1" cellspacing="0" width="100%">
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="forumformlabelbold">
+                                ${resource.Message_body}
+                            </label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="center" valign="middle">
+                            <br />
+                            <table border="0" cellpadding="5" cellspacing="0" width="100">
+                                <tbody>
+                                    <tr align="center">
+                                        <td>
+                                            <b></b>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </td>
+        <td valign="top">
+            <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumline">
+            <tbody>
+                <tr>
+                    <td class="row2" valign="top">
+                        <span class="genmed"></span>
+                        <table border="0" cellpadding="2" cellspacing="0" width="450">
+                        <tbody>
+                            <tr align="center" valign="middle">
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="b"
+                                               name="addbbcode0" value=" B " style="font-weight:bold; width: 30px"
+                                               onClick="bbstyle(0)" onMouseOver="helpline('b')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="i"
+                                               name="addbbcode2" value=" i " style="font-style:italic; width: 30px"
+                                               onClick="bbstyle(2)" onMouseOver="helpline('i')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="u"
+                                               name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px"
+                                               onClick="bbstyle(4)" onMouseOver="helpline('u')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="q"
+                                               name="addbbcode6" value="Quote" style="width: 50px"
+                                               onClick="bbstyle(6)" onMouseOver="helpline('q')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="c"
+                                               name="addbbcode8" value="Code" style="width: 40px"
+                                               onClick="bbstyle(8)" onMouseOver="helpline('c')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="l"
+                                               name="addbbcode10" value="List" style="width: 40px"
+                                               onClick="bbstyle(10)" onMouseOver="helpline('l')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="o"
+                                               name="addbbcode12" value="List=" style="width: 40px"
+                                               onClick="bbstyle(12)" onMouseOver="helpline('o')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="p"
+                                               name="addbbcode14" value="Img" style="width: 40px"
+                                               onClick="bbstyle(14)" onMouseOver="helpline('p')"/>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="genmed">
+                                        <input type="button" class="button buttonMed" accesskey="w"
+                                               name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px"
+                                               onClick="bbstyle(16)" onMouseOver="helpline('w')"/>
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                    <tbody>
+                                        <tr>
+                                            <td>
+                                                <span class="genmed">
+                                                    &#160;${resource.Font_color}:
+                                                    <select name="addbbcode18"
+                                                            onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;"
+                                                            onMouseOver="helpline('s')">
+                                                        <option style="color:black; background-color: "
+                                                                value="" class="genmed">
+                                                            ${resource.color_default}
+                                                        </option>
+                                                        <option style="color:darkred; background-color: "
+                                                                value="darkred" class="genmed">
+                                                            ${resource.color_dark_red}
+                                                        </option>
+                                                        <option style="color:red; background-color: "
+                                                                value="red" class="genmed">
+                                                            ${resource.color_red}
+                                                        </option>
+                                                        <option style="color:orange; background-color: "
+                                                                value="orange" class="genmed">
+                                                            ${resource.color_orange}
+                                                        </option>
+                                                        <option style="color:brown; background-color: "
+                                                                value="brown" class="genmed">
+                                                            ${resource.color_brown}
+                                                        </option>
+                                                        <option style="color:yellow; background-color: "
+                                                                value="yellow" class="genmed">
+                                                            ${resource.color_yellow}
+                                                        </option>
+                                                        <option style="color:green; background-color: "
+                                                                value="green" class="genmed">
+                                                            ${resource.color_green}
+                                                        </option>
+                                                        <option style="color:olive; background-color: "
+                                                                value="olive" class="genmed">
+                                                            ${resource.color_olive}
+                                                        </option>
+                                                        <option style="color:cyan; background-color: "
+                                                                value="cyan" class="genmed">
+                                                            ${resource.color_cyan}
+                                                        </option>
+                                                        <option style="color:blue; background-color: "
+                                                                value="blue" class="genmed">
+                                                            ${resource.color_blue}
+                                                        </option>
+                                                        <option style="color:darkblue; background-color: "
+                                                                value="darkblue" class="genmed">
+                                                            ${resource.color_dark_blue}
+                                                        </option>
+                                                        <option style="color:indigo; background-color: "
+                                                                value="indigo" class="genmed">
+                                                            ${resource.color_indigo}
+                                                        </option>
+                                                        <option style="color:violet; background-color: "
+                                                                value="violet" class="genmed">
+                                                            ${resource.color_violet}
+                                                        </option>
+                                                        <option style="color:white; background-color: "
+                                                                value="white" class="genmed">
+                                                            ${resource.color_white}
+                                                        </option>
+                                                        <option style="color:black; background-color: "
+                                                                value="black" class="genmed">
+                                                            ${resource.color_black}
+                                                        </option>
+                                                    </select>
+                                                    &#160;${resource.Font_size}:
+                                                    <select name="addbbcode20"
+                                                            onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')"
+                                                            onMouseOver="helpline('f')">
+                                                        <option value="7" class="genmed">
+                                                            ${resource.font_tiny}
+                                                        </option>
+                                                        <option value="9" class="genmed">
+                                                            ${resource.font_small}
+                                                        </option>
+                                                        <option value="12" class="genmed" selected="true">
+                                                            ${resource.font_normal}
+                                                        </option>
+                                                        <option value="18" class="genmed">
+                                                            ${resource.font_large}
+                                                        </option>
+                                                        <option value="24" class="genmed">
+                                                            ${resource.font_huge}
+                                                        </option>
+                                                    </select>
+                                                </span>
+                                            </td>
+                                            <td nowrap="nowrap" align="right">
+                                                <span class="gensmall">
+                                                    <a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">
+                                                        ${resource.Close_Tags}
+                                                    </a>
+                                                </span>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <span class="gensmall">
+                                        <input type="text" name="helpbox" size="45" maxlength="100"
+                                               style="width:450px; font-size:10px"
+                                               class="helpline" value="${resource.Styles_tip}"/>
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <h:inputTextarea id="message" value="#{replyTopic.message}"
+                                                     rows="15" cols="35"
+                                                     tabindex="3"
+                                                     styleClass="Posttextarea"
+                                                     onselect="storeCaret(this);"
+                                                     onkeyup="storeCaret(this);"
+                                                     onclick="storeCaret(this)" />
+                                </td>
+                            </tr>
+                        </tbody>
+                        </table>
+                    </td>
+                </tr>
+            </tbody>
+            </table>
+        </td>
+    </tr>
+    
+    <!-- subject and message invisible input for validator execution workaround -->
+    <h:inputHidden id="validator" value="validator">
+        <f:validator validatorId="subjectLengthValidator" />
+        <f:validator validatorId="messageLengthValidator" />
+    </h:inputHidden>
+    
+    <!-- attachment ui -->
+    <forums:isAllowed fragment="acl://managePostAttachments">
+    <tr>
+        <td colspan="2" class="PostViewMainHeader">
+            ${resource.Add_attachment_title}
+        </td>
+    </tr>
+    <tr class="PostViewMainDescription">
+        <td colspan="2">
+            ${resource.Add_attachment_explain}
+        </td>
+    </tr>
+    
+    <!-- upload button -->
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_name}
+            </label>
+        </td>
+        <td>
+            <input type="file" size="40" class="post" /> 
+        </td>
+    </tr>
+    
+    <!-- comment -->
+    <tr valign="top" class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_comment}
+            </label>
+        </td>
+        <td>
+            <h:inputTextarea value="#{replyTopic.attachmentComment}" rows="3" styleClass="Posttextarea"/>
+        </td>
+    </tr>
+    <tr class="PostViewUnderline">
+        <td></td>
+        <td>
+            <h:commandButton action="#{replyTopic.addAttachment}" value="${resource.Add_attachment}" styleClass="buttonMed"/>
+        </td>
+    </tr>
+    
+    <c:if test="#{replyTopic.numberOfAttachments>0}">
+    <tr>
+        <th class="thHead" colspan="2">${resource.Posted_attachments}</th>
+    </tr>
+    
+    <!-- uploaded list of attachments -->
+    <input type="hidden" name="ATTACHMENT"/>
+    <c:forEach items="#{replyTopic.attachments}" var="attachRow" varStatus="idx">
+    <tr class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_name}
+            </label>
+        </td>
+        <td>
+            ${attachRow.fileName}
+        </td>
+    </tr>
+    <tr valign="top" class="PostViewUnderline">
+        <td>
+            <label class="forumformlabelbold">
+                ${resource.File_comment}
+            </label>
+        </td>
+        <td>
+            <h:inputTextarea id="attachment_${idx.index}" value="#{attachRow.comment}" rows="3" cols="35" styleClass="Posttextarea"/>
+        </td>
+    </tr>
+    <tr class="PostViewUnderline">
+        <td></td>
+        <td>
+            <h:commandButton id="UpdateAttachment_${idx.index}" action="#{replyTopic.updateAttachment}" value="${resource.Update_comment}"
+                         styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
+            &#160;
+            <h:commandButton id="DeleteAttachment_${idx.index}" action="#{replyTopic.deleteAttachment}" value="${resource.Delete_attachment}"
+                             styleClass="buttonMed" onclick="selectAttachment('${idx.index}');"/>
+        </td>
+    </tr>
+    </c:forEach>
+    </c:if>
+    </forums:isAllowed>
+</table>
+
+<!-- hookup the buttons -->
+<div class="forumformbuttonrow">
+    <ul>
+        <li>
+            <h:commandButton action="#{replyTopic.preview}" value="${resource.Preview}"
+                             id="Preview"
+                             styleClass="buttonMed"
+                             tabindex="5"/>
+        </li>
+        <li>
+            <!--TODO: Missing execution of javascript checking form - onclick="return checkForm(this.parentNode)" -->
+            <h:commandButton action="#{replyTopic.execute}" value="${resource.Submit}"
+                             id="Submit"
+                             styleClass="buttonMed"
+                             accesskey="s" tabindex="6">
+              <f:actionListener type="org.jboss.portlet.forums.ui.event.FloodControlListener" />
+            </h:commandButton>
+        </li>
+        <li>
+            <h:commandButton action="#{replyTopic.cancel}" value="${resource.Cancel}"
+                             id="Cancel" accesskey="c" tabindex="7" styleClass="buttonMed"/>
+        </li>
+    </ul>
+</div>
+</h:form>
+</div>
+
+</ui:define>
+</ui:composition>
+
+</div>

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -45,6 +45,7 @@
     <a name="top" />
     
     <div id="miviewtopicbody1" class="forumbread">
+      <h:form>
         <ul>
             <li class="first">
             
@@ -60,7 +61,6 @@
                             <li>&gt; 
                                 <h:commandLink action="viewForum" id="outputLink3" value="#{topic.topic.forum.name}">
                                     <f:param name="f" value="#{topic.topic.forum.id}"/>
-                                    <h:outputText value="#{topic.topic.forum.name}"/>
                                 </h:commandLink>
                                 
                                 <ul>
@@ -80,6 +80,7 @@
                 
             </li>
         </ul>
+       </h:form>
     </div>
     
     <div id="miviewtopicbody2" class="forumfloatright">
@@ -142,6 +143,7 @@
     <!-- PAGINATION -->
     <c:if test="#{topic.pageNavigator.totalPages gt 1}">
     <div id="miviewtopicbody4" class="forumpagination">
+      <h:form>
         <ul>
             <li class="disablepage">
                 <h:outputFormat value="#{resource.PageNumber}">
@@ -222,6 +224,7 @@
                 </c:otherwise>
             </c:choose>
         </ul>
+      </h:form>
     </div>
     </c:if>
 
@@ -333,9 +336,11 @@
                     </c:when>
                     
                     <c:otherwise>
+                     <h:form>
                         <h:commandLink action="viewProfile" id="_#{postrow.id}outputLink12" value="${postrow.poster.user.userName}">
                             <f:param name="uid" value="${postrow.poster.user.id}"/>
                         </h:commandLink>
+                     </h:form>
                     </c:otherwise>
                     
                 </c:choose>
@@ -410,7 +415,9 @@
                     <ul>
                         <li>
                             <a name="${postrow.id}" />
-                            <h:commandLink action="#{forums:postPermlink(postrow.id)}" id="_${postrow.id}outputLink15" value="${resource.Permalink}" style="text-decoration: none;"/>
+                            <h:outputLink id="_${postrow.id}outputLink15" value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
+                                <h:outputText value="${resource.Permalink}"/>
+                            </h:outputLink>
                         </li>
                         <li>${resource.Posted}:&#160;#{forums:dateStr(postrow.createDate)}</li>
                         <li>${resource.Post_subject}:&#160;${postrow.message.subject}</li>
@@ -467,6 +474,7 @@
                 <a href="#top">${resource.Back_to_top}</a>
             </td>
             <td class="forumthreaduserinfo">
+              <h:form>
                 <ul>
                     <li>
                         <h:commandLink action="viewProfile" id="_${postrow.id}outputLink16">
@@ -574,6 +582,7 @@
                     </script>
                     <noscript>${ICQ_IMG}</noscript> -->
                 </ul>
+             </h:form>
             </td>
         </tr> 
         <tr>
@@ -619,6 +628,7 @@
     <!-- PAGINATION -->
     <c:if test="#{topic.pageNavigator.totalPages gt 1}">
     <div id="miviewtopicbody11" class="forumpagination">
+      <h:form>
         <ul>
             <li class="disablepage">
                 <h:outputFormat value="#{resource.PageNumber}">
@@ -699,6 +709,7 @@
                 </c:otherwise>
             </c:choose>
         </ul>
+      </h:form>
     </div>
     </c:if>
 

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       colspan="2">
 

Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml	2009-08-19 16:15:57 UTC (rev 28990)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml	2009-08-19 16:44:09 UTC (rev 28991)
@@ -28,7 +28,6 @@
       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:t="http://myfaces.apache.org/tomahawk"
       xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
       colspan="2">
 



More information about the jboss-svn-commits mailing list