[jboss-svn-commits] JBL Code SVN: r10207 - in labs/jbossforums/branches/forums26: forums/src/resources/portal-forums-war/WEB-INF/classes and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 14 20:11:46 EDT 2007
Author: dejp
Date: 2007-03-14 20:11:46 -0400 (Wed, 14 Mar 2007)
New Revision: 10207
Modified:
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
labs/jbossforums/branches/forums26/thirdparty/facelets/lib/jsf-facelets.jar
Log:
JBFORUMS-191
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/application.xml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/application.xml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -4,7 +4,7 @@
<module>
<java>portal-forums-ui.jar</java>
</module>
- <module>
+ <!--module>
<java>jsf-facelets.jar</java>
</module>
<module>
@@ -12,7 +12,7 @@
</module>
<module>
<java>el-ri.jar</java>
- </module>
+ </module-->
<module>
<java>tomahawk.jar</java>
</module>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-app>
- <loader-repository>
+ <!--loader-repository>
forums.jboss.com:loader=jboss-forums-sar
<loader-repository-config>
java2ParentDelegation=false
</loader-repository-config>
- </loader-repository>
+ </loader-repository-->
<module>
<java>portal-forums-ui.jar</java>
</module>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-03-15 00:11:46 UTC (rev 10207)
@@ -349,8 +349,8 @@
Sticky_Threads=Sticky Threads
Normal_Threads=Normal Threads
-Topic_Announcement=<b>Announcement:</b>
-Topic_Sticky=<b>Sticky:</b>
+Topic_Announcement=Announcement:
+Topic_Sticky=Sticky:
Topic_Moved=<b>Moved:</b>
Topic_Poll=<b>[ Poll ]</b>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -470,7 +470,7 @@
<tr>
<td class="row1" colspan="6" height="30" align="center" valign="middle">
<span class="gen">
- ${resource.No_topics_post_one}
+ <h:outputText value="#{resource['No_topics_post_one']}" escape="false" />
</span>
</td>
</tr>
@@ -652,44 +652,44 @@
<!-- post new topics link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://newTopic">
- ${resource.Rules_post_can}<br/>
+ <h:outputText value="#{resource['Rules_post_can']}" escape="false" /><br/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_post_cannot}<br/>
+ <h:outputText value="#{resource['Rules_post_cannot']}" escape="false" /><br/>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
<!-- manage poll link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://managePoll">
- ${resource.Rules_poll_can}<br/>
+ <h:outputText value="#{resource['Rules_poll_can']}" escape="false" /><br/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_poll_cannot}<br/>
+ <h:outputText value="#{resource['Rules_poll_cannot']}" escape="false" /><br/>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
<!-- votePoll link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://votePoll">
- ${resource.Rules_vote_can}<br/>
+ <h:outputText value="#{resource['Rules_vote_can']}" escape="false" /><br/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_vote_cannot}<br/>
+ <h:outputText value="#{resource['Rules_vote_cannot']}" escape="false" /><br/>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
<!-- moderate forum link -->
<forums:isAllowedChoose>
- <forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{forum.forum}">
- ${resource.Rules_moderate_0}
+ <forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{forum.forum}">
+ <h:outputText value="#{resource['Rules_moderate_0']}" escape="false" />
<h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{forum.forum.id}"/>
- ${resource.Rules_moderate_2}
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <h:outputText value="#{resource['Rules_moderate_2']}" escape="false" />
</h:outputLink>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_moderate_1}${resource.Rules_moderate_2}
+ <h:outputText value="#{resource['Rules_moderate_1']}" escape="false" /><h:outputText value="#{resource['Rules_moderate_2']}" escape="false" />
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
</span>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -161,7 +161,7 @@
<td valign="top">
<hr size="1"/>
<span class="postbody">
- #{forums:formatMessage(postrow.message.text,false)}
+ <h:outputText value="#{forums:formatMessage(postrow.message.text,false)}" escape="false" />
<br /><br />
${postrow.poster.user.signature}
</span>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -48,7 +48,7 @@
<tr>
<td>
<span class="postbody">
- #{forums:formatMessage(editPost.message,false)}
+ <h:outputText value="#{forums:formatMessage(editPost.message,false)}" escape="false" />
</span>
</td>
</tr>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -48,7 +48,7 @@
<tr>
<td>
<span class="postbody">
- #{forums:formatMessage(newTopic.message,false)}
+ <h:outputText value="#{forums:formatMessage(newTopic.message,false)}" escape="false" />
</span>
</td>
</tr>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -48,7 +48,7 @@
<tr>
<td>
<span class="postbody">
- #{forums:formatMessage(replyTopic.message,false)}
+ <h:outputText value="#{forums:formatMessage(replyTopic.message,false)}" escape="false" />
</span>
</td>
</tr>
Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2007-03-14 23:39:28 UTC (rev 10206)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2007-03-15 00:11:46 UTC (rev 10207)
@@ -345,7 +345,7 @@
<tr>
<td colspan="2">
<span class="postbody">
- #{forums:formatMessage(postrow.message.text,false)}
+ <h:outputText value="#{forums:formatMessage(postrow.message.text,false)}" escape="false" />
<br /><br />
${forums:userProperty(postrow.poster.user,'INFO_USER_SIGNATURE')}
</span>
Modified: labs/jbossforums/branches/forums26/thirdparty/facelets/lib/jsf-facelets.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list