[jboss-svn-commits] JBL Code SVN: r6160 - in labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views: category forums topics

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-09-11 18:13:28 -0400 (Mon, 11 Sep 2006)
New Revision: 6160

Modified:
   labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
   labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
   labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
Log:
[JBFORUMS-105] Changes in XHTML view files needed for migration but still compatible with old 22 version.

Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml	2006-09-11 22:08:55 UTC (rev 6159)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml	2006-09-11 22:13:28 UTC (rev 6160)
@@ -33,7 +33,7 @@
 
 <ui:composition template="/views/common/common.xhtml">
     <ui:define name="mainContent">
-    
+        <h:form>
 		<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
 		
 			<tr>
@@ -127,7 +127,7 @@
 	
 		<!--table width="100%" cellspacing="0" border="0" align="center" cellpadding="2">
 		<tr>
-		<td align="left"><span class="gensmall"><a href="" class="gensmall">${n:i18n("Mark_all_forums")}</a></span></td>
+		<td align="left"><span class="gensmall"><a href="" class="gensmall">${resource.Mark_all_forums}</a></span></td>
 		<td align="right"><span class="gensmall"></span></td>
 		</tr>
 		</table>
@@ -135,11 +135,11 @@
 		<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
 		<tr>
 		<td class="catHead" colspan="2" height="28"><span class="cattitle"><a href=""
-		class="cattitle">${n:i18n("Who_is_Online")}</a></span></td>
+		class="cattitle">${resource.Who_is_Online}</a></span></td>
 		</tr>
 		<tr>
 		<td class="row1" align="center" valign="middle" rowspan="2"><img
-		src="modules/bb/templates/subSilver/images/whosonline.gif" alt="${n:i18n("Who_is_Online")}" /></td>
+		src="modules/bb/templates/subSilver/images/whosonline.gif" alt="${respource.Who_is_Online}" /></td>
 		<td class="row1" align="left" width="100%"><span class="gensmall"><br /><br /></span>
 		</td>
 		</tr>
@@ -150,7 +150,7 @@
 		
 		<table width="100%" cellpadding="1" cellspacing="1" border="0">
 		<tr>
-		<td align="left" valign="top"><span class="gensmall">${n:i18n("Online_explain")}</span></td>
+		<td align="left" valign="top"><span class="gensmall">${resource.Online_explain}</span></td>
 		</tr>
 		</table-->
 	
@@ -168,6 +168,7 @@
 		      <td><span class="gensmall">${resource.Forum_is_locked}</span></td>      
 		   </tr>
 		</table>
-	</ui:define>
+        </h:form>
+    </ui:define>
 </ui:composition>
 </div>
\ No newline at end of file

Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2006-09-11 22:08:55 UTC (rev 6159)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2006-09-11 22:13:28 UTC (rev 6160)
@@ -35,6 +35,7 @@
 
 
 <c:if test="#{forum.initialized &amp;&amp; forum.forum!=null &amp;&amp; forum.forum.id!=-1}">
+    <h:form>
     <!-- make sure the user is allowed to access both the specified forum and the category that this forum belongs to -->
 	<forums:isAllowed fragment="acl://readCategory" contextData="#{forum.forum.category}">
 	<forums:isAllowed fragment="acl://readForum" contextData="#{forum.forum}">
@@ -693,7 +694,8 @@
 	   </tr>
   </table>
   </forums:isAllowed>
-  </forums:isAllowed>  
+  </forums:isAllowed>
+  </h:form>
   </c:if>
   
   <c:if test="#{forum.forum==null}">

Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2006-09-11 22:08:55 UTC (rev 6159)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2006-09-11 22:13:28 UTC (rev 6160)
@@ -625,10 +625,7 @@
 	      styleClass="mainoption"
 	      tabindex="5"/>
 	      &#160;
-	      <!--h:commandButton action="#{newTopic.execute}" value="${resource.Submit}" 
-	      onclick="return checkForm(this.parentNode)" 
-	      styleClass="mainoption"
-	      accesskey="s" tabindex="6"/-->
+	      <!--TODO: Missing execution of javascript checking form - onclick="return checkForm(this.parentNode)" -->
 	      <h:commandButton action="#{newTopic.execute}" value="${resource.Submit}" 	      
 	      styleClass="mainoption"
 	      accesskey="s" tabindex="6"/>