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

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

Author: unibrew
Date: 2006-09-13 15:45:12 -0400 (Wed, 13 Sep 2006)
New Revision: 6211

Modified:
   labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/index.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/viewtopic_body.xhtml
Log:
[JBFORUMS-105] Repairing vanishing request parameters in newTopic. Rewriting one missed &nbsp into &#160. Clearing all uses of n:out and n:i18n in TopicView. Those changes are compatible with both branches.

Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2006-09-13 19:44:40 UTC (rev 6210)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2006-09-13 19:45:12 UTC (rev 6211)
@@ -30,8 +30,7 @@
      xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
      
    <ui:composition template="/views/common/common.xhtml">
-   <ui:define name="mainContent">   
-   
+   <ui:define name="mainContent">
     <!-- Forum admin tool title/messages -->
 	<h1>${resource.Forum_admin}</h1>
 	
@@ -95,7 +94,7 @@
             	</span>
             </td>
             <td class="catRight" align="center" valign="middle">
-            	<span class="gen">&amp;nbsp</span>
+            	<span class="gen">&#160;</span>
             </td>
          </tr>
          <!-- display the forums in this category -->
@@ -200,7 +199,6 @@
         </td>
       </tr>
     </table>
-      
    </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-13 19:44:40 UTC (rev 6210)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2006-09-13 19:45:12 UTC (rev 6211)
@@ -44,7 +44,8 @@
     <!-- title, newtopic, forum, and page navigation -->
 	<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
       <tr>
-         <td align="left" valign="bottom" colspan="2">         	
+         <td align="left" valign="bottom" colspan="2">
+            <input type="hidden" name="f" value="#{forum.forum.id}" />
             <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}" styleClass="maintitle">          			
           			<f:param name="f" value="#{forum.forum.id}"/>
          			<h:outputText value="#{forum.forum.name}"/>  					

Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-09-13 19:44:40 UTC (rev 6210)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-09-13 19:45:12 UTC (rev 6211)
@@ -198,7 +198,7 @@
       <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
          <!-- TODO: hook in the previous/next topic function -->
          <!--tr align="right">
-    		<td class="catHead" colspan="2" height="28"><span class="nav"><a href="${n:out("U_VIEW_OLDER_TOPIC")}" class="nav">${n:i18n("View_previous_topic")}</a> :: <a href="${n:out("U_VIEW_NEWER_TOPIC")}" class="nav">${n:i18n("View_next_topic")}</a> &nbsp;</span></td>
+    		<td class="catHead" colspan="2" height="28"><span class="nav"><a href="${U_VIEW_OLDER_TOPIC}" class="nav">${resource.View_previous_topic}</a> :: <a href="${U_VIEW_NEWER_TOPIC}" class="nav">${resource.View_next_topic}</a> &nbsp;</span></td>
 	      </tr-->                 
          <!-- POLL DISPLAY -->
          <c:if test="#{topic.pollPresent &amp;&amp; topic.ballotView}">
@@ -229,15 +229,15 @@
                      <br/>
                      <!-- TODO: NEED TO BE REIMPLEMENTED
                      <span class="postdetails">                        
-                        ${n:out(&quot;postrow.poster.user.POSTER_RANK&quot;)}
+                        ${postrow.poster.user.POSTER_RANK}
                         <br/>
-                        ${n:out(&quot;postrow.RANK_IMAGE&quot;)}${n:out(&quot;postrow.POSTER_AVATAR&quot;)}
+                        ${postrow.RANK_IMAGE}${postrow.POSTER_AVATAR}
                         <br/>
-                        ${n:out(&quot;postrow.POSTER_JOINED&quot;)}
+                        ${postrow.POSTER_JOINED}
                         <br/>
-                        ${n:out(&quot;postrow.POSTER_POSTS&quot;)}
+                        ${postrow.POSTER_POSTS}
                         <br/>
-                        ${n:out(&quot;postrow.POSTER_FROM&quot;)}
+                        ${postrow.POSTER_FROM}
                      </span>
                      -->
                      <br/>