[jboss-svn-commits] JBL Code SVN: r10582 - in labs/jbossforums/branches/forums101P26: 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 28 13:47:02 EDT 2007
Author: dejp
Date: 2007-03-28 13:47:02 -0400 (Wed, 28 Mar 2007)
New Revision: 10582
Modified:
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
labs/jbossforums/branches/forums101P26/thirdparty/facelets/lib/jsf-facelets.jar
Log:
JBFORUMS-191
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/application.xml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/application.xml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -4,7 +4,7 @@
<module>
<java>portal-forums-ui.jar</java>
</module>
- <module>
+ <!--module>
<java>jsf-facelets.jar</java>
</module>
<module>
@@ -12,11 +12,11 @@
</module>
<module>
<java>el-ri.jar</java>
- </module>
- <!--<module>
+ </module-->
+ <module>
<java>tomahawk.jar</java>
</module>
- <module>
+ <!--module>
<java>myfaces-impl.jar</java>
</module>
<module>
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -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/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-03-28 17:47:02 UTC (rev 10582)
@@ -186,6 +186,9 @@
L_TOPICS_PER_FORUM_EXPLAIN=How many topics per page do you want to display
L_USER_INFO=Information
+ICQ_IMG=
+ICQ_STATUS_IMG=
+
L_N5=5
L_N10=10
L_N15=15
@@ -359,8 +362,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>
@@ -701,6 +704,8 @@
# %s is username
About_user_0=All about
About_user_1=
+L_ABOUT_USER=
+AVATAR_IMG=
Preferences=Preferences
Items_required=Items marked with a * are required unless stated otherwise.
@@ -722,7 +727,10 @@
Interests=Interests
Occupation=Occupation
Poster_rank=Poster rank
+POSTER_RANK=
+POST_PERCENT_STATS=
+POST_DAY_STATS=
Total_posts=Total posts
L_TOTAL_POSTS=Total posts
# 1.25% of total
@@ -734,6 +742,7 @@
# Find all posts by username
Search_user_posts_0=Find all posts by
Search_user_posts_1=
+U_SEARCH_USER=
No_user_id_specified=Sorry, but that user does not exist.
Wrong_Profile=You cannot modify a profile that is not your own.
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -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/forums101P26/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -56,13 +56,13 @@
<th class="thHead" colspan="2" height="25" nowrap="nowrap">${resource.L_VIEWING_PROFILE}</th>
</tr>
<!-- <tr> TODO: MISSING AVATAR FEATURE - NEW FEATURE FOR FORUMS
- <td class="catLeft" width="40%" height="28" align="center"><b><span class="gen">${n:i18n("L_AVATAR")}</span></b>
+ <td class="catLeft" width="40%" height="28" align="center"><b><span class="gen">${resource.L_AVATAR}</span></b>
</td>
- <td class="catRight" width="60%"><b><span class="gen">${n:i18n("L_ABOUT_USER")}</span></b></td>
+ <td class="catRight" width="60%"><b><span class="gen">${resource.L_ABOUT_USER}</span></b></td>
</tr>-->
<tr>
- <!--<td class="row1" height="6" valign="top" align="center">${n:out("AVATAR_IMG")}<br/><span
- class="postdetails">${n:out("POSTER_RANK")}</span></td>-->
+ <!--<td class="row1" height="6" valign="top" align="center">${resource.AVATAR_IMG}<br/><span
+ class="postdetails">${resource.POSTER_RANK}</span></td>-->
<td class="row1" rowspan="3" valign="top">
<table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr>
@@ -81,8 +81,8 @@
<b><span class="gen">${profile.poster.postCount}</span></b>
<!-- TODO: MISSING STATS - NEW FEATURE FOR FORUMS
<br/><span
- class="genmed">[${n:out("POST_PERCENT_STATS")} / ${n:out("POST_DAY_STATS")}]</span> <br/><span
- class="genmed"><a href="${n:out("U_SEARCH_USER")}" class="genmed">${n:i18n("L_SEARCH_USER_POSTS")}</a></span>-->
+ class="genmed">[${resource.POST_PERCENT_STATS} / ${resource.POST_DAY_STATS}]</span> <br/><span
+ class="genmed"><a href="${resource.U_SEARCH_USER}" class="genmed">${resource.Search_user_posts}</a></span>-->
</td>
</tr>
<tr>
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -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/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -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/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2007-03-28 17:01:05 UTC (rev 10581)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2007-03-28 17:47:02 UTC (rev 10582)
@@ -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/forums101P26/thirdparty/facelets/lib/jsf-facelets.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list