[jboss-svn-commits] JBL Code SVN: r9729 - in labs/jbossforums/branches/forums101P24/forums/src: main/org/jboss/portlet/forums and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 23 17:56:42 EST 2007
Author: unibrew
Date: 2007-02-23 17:56:42 -0500 (Fri, 23 Feb 2007)
New Revision: 9729
Added:
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
Removed:
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
Modified:
labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java
labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumUtil.java
labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums.taglib.xml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/common/common.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/index.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/portal_index.xhtml
Log:
[JBFORUMS-168] I rewrote CategoriesView and CategoryView to new L&F.Branch 1.0.1 P2.4.
Modified: labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-02-23 22:56:42 UTC (rev 9729)
@@ -181,21 +181,25 @@
.forumtablestyle .forumlisticon {
width:10px;
+ height:40px;
}
.forumtablestyle .forumlistcentered {
width:50px;
text-align: center;
border-left:1px solid #e6e7e8;
+ height:40px;
}
.forumtablestyle .forumlistlast {
width:250px;
border-left:1px solid #e6e7e8;
+ height:40px;
}
.forumtablestyle .forumlistopen {
border-left:1px solid #e6e7e8;
+ height:40px;
}
.forumtablestyle .forumcategory {
Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java 2007-02-23 22:56:42 UTC (rev 9729)
@@ -176,7 +176,7 @@
/**
* DOCUMENT_ME
*/
- String THEMENAME = "subSilver";
+ String THEMENAME = "default_graphics";
/**
* DOCUMENT_ME
Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumUtil.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumUtil.java 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumUtil.java 2007-02-23 22:56:42 UTC (rev 9729)
@@ -103,10 +103,38 @@
return dateStr;
}
- public static Post getLastPost(ForumsModule fm, Forum forum) {
- try {
+ public static String subString( String string , int length )
+ {
+ if (string==null || length<0)
+ {
+ return "";
+ }
+
+ if (string.length()<=length)
+ {
+ return string;
+ }
+
+ return string.substring(0,length-1);
+ }
+
+ public static boolean isLongerThan( String string , int length )
+ {
+ if (string == null || length<0 )
+ {
+ return false;
+ }
+
+ return string.length()>length;
+ }
+
+ public static Post getLastPost(ForumsModule fm, Forum forum)
+ {
+ try
+ {
return fm.findLastPost(forum);
- } catch (ModuleException e) {
+ } catch (ModuleException e)
+ {
return null;
}
}
Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2007-02-23 22:56:42 UTC (rev 9729)
@@ -56,6 +56,7 @@
private Map forumImages = null;
private Map forumImageDescriptions = null;
private Map forumLastPosts = null;
+ private boolean categorySelected = false;
//----------------bean configuration supplied by the forums-config.xml---------------------------------------------------------------------------------------------
@@ -127,6 +128,13 @@
return this.forumLastPosts;
}
+ /**
+ * @return Returns true if category has been selected.
+ */
+ public boolean isCategorySelected() {
+ return this.categorySelected;
+ }
+
//------------user preferences-------------------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------------------------------------------
@@ -159,6 +167,9 @@
if(c!=null && c.trim().length()>0)
{
categoryId = Integer.parseInt(c);
+
+ // Setting flag that category has been selected.
+ this.categorySelected=true;
}
this.forumLastPosts = this.getForumsModule().findLastPostsOfForums();
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-02-23 22:56:42 UTC (rev 9729)
@@ -267,6 +267,7 @@
BBCode_guide=BBCode Guide
Usergroups=Usergroups
Last_Post=Last Post
+By=by
Moderator=Moderator
Moderators=Moderators
Copied: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics (from rev 9725, labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics)
Deleted: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties 2007-02-23 21:03:48 UTC (rev 9725)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties 2007-02-23 22:56:42 UTC (rev 9729)
@@ -1,127 +0,0 @@
-#NEW
-
-forum=images/forum_ico_nonew_open.gif
-forum_new=images/forum_ico_new_open.gif
-forum_locked=images/forum_ico_nonew_locked.gif
-
-#OLD
-
-icon_quote=images/lang_english/icon_quote.gif
-icon_edit=images/lang_english/icon_edit.gif
-icon_repost=images/lang_english/icon_repost.gif
-icon_search=images/lang_english/icon_search.gif
-icon_profile=images/lang_english/icon_profile.gif
-icon_pm=images/lang_english/icon_pm.gif
-icon_email=images/lang_english/icon_email.gif
-icon_delpost=images/icon_delete.gif
-icon_ip=images/lang_english/icon_ip.gif
-icon_www=images/lang_english/icon_www.gif
-icon_icq=images/lang_english/icon_icq_add.gif
-icon_aim=images/lang_english/icon_aim.gif
-icon_skype=images/lang_english/icon_skype.gif
-icon_yim=images/lang_english/icon_yim.gif
-icon_msnm=images/lang_english/icon_msnm.gif
-icon_minipost=images/icon_minipost.gif
-icon_gotopost=images/icon_minipost.gif
-icon_minipost_new=images/icon_minipost_new.gif
-icon_latest_reply=images/icon_latest_reply.gif
-icon_newest_reply=images/icon_newest_reply.gif
-
-#forum=images/folder_big.gif
-#forum_new=images/folder_new.gif
-forum_new_big=images/folder_new_big.gif
-#forum_locked=images/folder_locked_big.gif
-
-folder=images/folder.gif
-folder_new=images/folder_new.gif
-folder_hot=images/folder_hot.gif
-folder_hot_new=images/folder_new_hot.gif
-folder_locked=images/folder_lock.gif
-folder_locked_new=images/folder_lock_new.gif
-folder_sticky=images/folder_sticky.gif
-folder_sticky_new=images/folder_sticky_new.gif
-folder_announce=images/folder_announce.gif
-folder_announce_new=images/folder_announce_new.gif
-
-post_new=images/lang_english/post.gif
-post_locked=images/lang_english/reply-locked.gif
-reply_new=images/lang_english/reply.gif
-reply_locked=images/lang_english/reply-locked.gif
-
-pm_inbox=images/msg_inbox.gif
-pm_outbox=images/msg_outbox.gif
-pm_savebox=images/msg_savebox.gif
-pm_sentbox=images/msg_sentbox.gif
-pm_readmsg=images/folder.gif
-pm_unreadmsg=images/folder_new.gif
-pm_replymsg=images/reply.gif
-pm_postmsg=images/lang_english/msg_newpost.gif
-pm_quotemsg=images/icon_quote.gif
-pm_editmsg=images/icon_edit.gif
-pm_new_msg=
-pm_no_new_msg=
-
-topic_watch=
-topic_un_watch=
-topic_mod_lock=images/topic_lock.gif
-topic_mod_unlock=images/topic_unlock.gif
-topic_mod_split=images/topic_split.gif
-topic_mod_move=images/topic_move.gif
-topic_mod_delete=images/topic_delete.gif
-
-voting_graphic_0=images/voting_bar.gif
-voting_graphic_1=images/voting_bar.gif
-voting_graphic_2=images/voting_bar.gif
-voting_graphic_3=images/voting_bar.gif
-voting_graphic_4=images/voting_bar.gif
-
-vote_lcap=images/vote_lcap.gif
-vote_rcap=images/vote_rcap.gif
-
-
-
-vote_graphic_length=205
-privmsg_graphic_length=175
-
-template_name=subSilver
-style_name=subSilver
-head_stylesheet=subSilver.css
-body_background=
-body_bgcolor=E5E5E5
-body_text=000000
-body_link=006699
-body_vlink=5493B4
-body_alink=
-body_hlink=DD6900
-tr_color1=EFEFEF
-tr_color2=DEE3E7
-tr_color3=D1D7DC
-tr_class1=
-tr_class2=
-tr_class3=
-th_color1=98AAB1
-th_color2=006699
-th_color3=FFFFFF
-th_class1=images/cellpic1.gif
-th_class2=images/cellpic3.gif
-th_class3=images/cellpic2.jpg
-td_color1=FAFAFA
-td_color2=FFFFFF
-td_color3=
-td_class1=row1
-td_class2=row2
-td_class3=
-fontface1=Verdana, Arial, Helvetica, sans-serif
-fontface2=Trebuchet MS
-fontface3=Courier, \'Courier New\', sans-serif
-fontsize1=10
-fontsize2=11
-fontsize3=12
-fontcolor1=444444
-fontcolor2=006600
-fontcolor3=FFA34F
-span_class1=
-span_class2=
-span_class3=
-img_size_poll=0
-img_size_privmsg=0
Copied: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties (from rev 9725, labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties)
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties (rev 0)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties 2007-02-23 22:56:42 UTC (rev 9729)
@@ -0,0 +1,127 @@
+#NEW
+
+forum=images/forum_ico_nonew_open.gif
+forum_new=images/forum_ico_new_open.gif
+forum_locked=images/forum_ico_nonew_locked.gif
+
+#OLD
+
+icon_quote=images/lang_english/icon_quote.gif
+icon_edit=images/lang_english/icon_edit.gif
+icon_repost=images/lang_english/icon_repost.gif
+icon_search=images/lang_english/icon_search.gif
+icon_profile=images/lang_english/icon_profile.gif
+icon_pm=images/lang_english/icon_pm.gif
+icon_email=images/lang_english/icon_email.gif
+icon_delpost=images/icon_delete.gif
+icon_ip=images/lang_english/icon_ip.gif
+icon_www=images/lang_english/icon_www.gif
+icon_icq=images/lang_english/icon_icq_add.gif
+icon_aim=images/lang_english/icon_aim.gif
+icon_skype=images/lang_english/icon_skype.gif
+icon_yim=images/lang_english/icon_yim.gif
+icon_msnm=images/lang_english/icon_msnm.gif
+icon_minipost=images/icon_minipost.gif
+icon_gotopost=images/icon_minipost.gif
+icon_minipost_new=images/icon_minipost_new.gif
+icon_latest_reply=images/icon_latest_reply.gif
+icon_newest_reply=images/icon_newest_reply.gif
+
+#forum=images/folder_big.gif
+#forum_new=images/folder_new.gif
+forum_new_big=images/folder_new_big.gif
+#forum_locked=images/folder_locked_big.gif
+
+folder=images/folder.gif
+folder_new=images/folder_new.gif
+folder_hot=images/folder_hot.gif
+folder_hot_new=images/folder_new_hot.gif
+folder_locked=images/folder_lock.gif
+folder_locked_new=images/folder_lock_new.gif
+folder_sticky=images/folder_sticky.gif
+folder_sticky_new=images/folder_sticky_new.gif
+folder_announce=images/folder_announce.gif
+folder_announce_new=images/folder_announce_new.gif
+
+post_new=images/lang_english/post.gif
+post_locked=images/lang_english/reply-locked.gif
+reply_new=images/lang_english/reply.gif
+reply_locked=images/lang_english/reply-locked.gif
+
+pm_inbox=images/msg_inbox.gif
+pm_outbox=images/msg_outbox.gif
+pm_savebox=images/msg_savebox.gif
+pm_sentbox=images/msg_sentbox.gif
+pm_readmsg=images/folder.gif
+pm_unreadmsg=images/folder_new.gif
+pm_replymsg=images/reply.gif
+pm_postmsg=images/lang_english/msg_newpost.gif
+pm_quotemsg=images/icon_quote.gif
+pm_editmsg=images/icon_edit.gif
+pm_new_msg=
+pm_no_new_msg=
+
+topic_watch=
+topic_un_watch=
+topic_mod_lock=images/topic_lock.gif
+topic_mod_unlock=images/topic_unlock.gif
+topic_mod_split=images/topic_split.gif
+topic_mod_move=images/topic_move.gif
+topic_mod_delete=images/topic_delete.gif
+
+voting_graphic_0=images/voting_bar.gif
+voting_graphic_1=images/voting_bar.gif
+voting_graphic_2=images/voting_bar.gif
+voting_graphic_3=images/voting_bar.gif
+voting_graphic_4=images/voting_bar.gif
+
+vote_lcap=images/vote_lcap.gif
+vote_rcap=images/vote_rcap.gif
+
+
+
+vote_graphic_length=205
+privmsg_graphic_length=175
+
+template_name=subSilver
+style_name=subSilver
+head_stylesheet=subSilver.css
+body_background=
+body_bgcolor=E5E5E5
+body_text=000000
+body_link=006699
+body_vlink=5493B4
+body_alink=
+body_hlink=DD6900
+tr_color1=EFEFEF
+tr_color2=DEE3E7
+tr_color3=D1D7DC
+tr_class1=
+tr_class2=
+tr_class3=
+th_color1=98AAB1
+th_color2=006699
+th_color3=FFFFFF
+th_class1=images/cellpic1.gif
+th_class2=images/cellpic3.gif
+th_class3=images/cellpic2.jpg
+td_color1=FAFAFA
+td_color2=FFFFFF
+td_color3=
+td_class1=row1
+td_class2=row2
+td_class3=
+fontface1=Verdana, Arial, Helvetica, sans-serif
+fontface2=Trebuchet MS
+fontface3=Courier, \'Courier New\', sans-serif
+fontsize1=10
+fontsize2=11
+fontsize3=12
+fontcolor1=444444
+fontcolor2=006600
+fontcolor3=FFA34F
+span_class1=
+span_class2=
+span_class3=
+img_size_poll=0
+img_size_privmsg=0
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2007-02-23 22:56:42 UTC (rev 9729)
@@ -45,7 +45,7 @@
<!-- bean level configuration -->
<managed-property>
<property-name>mainPageName</property-name>
- <value>Forums</value>
+ <value>JBoss Forums</value>
</managed-property>
<!-- bookmarkable links in forums -->
<managed-property>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums.taglib.xml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums.taglib.xml 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/forums.taglib.xml 2007-02-23 22:56:42 UTC (rev 9729)
@@ -107,7 +107,25 @@
<function-class>org.jboss.portlet.forums.ui.PortalUtil</function-class>
<function-signature>java.lang.String formatMessage(java.lang.String,boolean)</function-signature>
</function>
-
+
+ <!--
+ Simple method returing subString of given String.
+ -->
+ <function>
+ <function-name>subString</function-name>
+ <function-class>org.jboss.portlet.forums.ui.ForumUtil</function-class>
+ <function-signature>java.lang.String subString(java.lang.String,int)</function-signature>
+ </function>
+
+ <!--
+ Simple method returing true if string is longer than given integer parameter.
+ -->
+ <function>
+ <function-name>isLongerThan</function-name>
+ <function-class>org.jboss.portlet.forums.ui.ForumUtil</function-class>
+ <function-signature>boolean isLongerThan( java.lang.String , int )</function-signature>
+ </function>
+
<!--
function to get theme URL location
-->
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2007-02-23 22:56:42 UTC (rev 9729)
@@ -25,105 +25,142 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
+ class="forumscontainer"
>
<ui:composition template="/views/common/common.xhtml">
- <ui:define name="mainContent">
+ <ui:define name="mainContent">
+ <div class="forumbread">
+ <ul>
+ <li class="first">
+
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <h:outputText value="#{shared.mainPageName}"/>
+ </h:outputLink>
+
+ <c:if test="#{category.categories ne null and category.categorySelected eq true}" >
+ <ul>
+ <li>>
+ <c:forEach items="#{category.categories}" var="catrow">
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <f:param name="c" value="#{catrow.id}"/>
+ <h:outputText value="#{catrow.title}"/>
+ </h:outputLink>
+ </c:forEach>
+ </li>
+ </ul>
+ </c:if>
+
+ </li>
+ </ul>
+ </div>
+
<h:form>
- <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
-
- <tr>
- <th colspan="2" class="thCornerL" height="25" nowrap="nowrap">
-  #{resource.Forum} 
- </th>
- <th width="50" class="thTop" nowrap="nowrap">
-  #{resource.Topics} 
- </th>
- <th width="50" class="thTop" nowrap="nowrap">
-  #{resource.Posts} 
- </th>
- <th class="thCornerR" nowrap="nowrap">
-  #{resource.Last_Post} 
- </th>
- </tr>
-
- <!-- display each category and its corresponding forums -->
- <c:forEach items="#{category.categories}" var="catrow">
- <forums:isAllowed fragment="acl://readCategory" contextData="#{catrow}">
- <tr>
- <td class="catLeft" colspan="2" height="28">
- <span class="cattitle">
- <h:outputLink
- value="#{forums:outputLink(shared.links['category'],true)}"
- styleClass="cattitle">
- <f:param name="c" value="#{catrow.id}"/>
- <h:outputText value="#{catrow.title}"/>
- </h:outputLink>
- </span>
- </td>
- <td class="rowpic" colspan="3" align="right"> </td>
- </tr>
- <c:forEach items="#{category.forums[catrow.id]}" var="forumrow">
- <forums:isAllowed fragment="acl://readForum" contextData="#{forumrow}">
- <tr>
- <td class="row1" align="center" valign="middle" height="50">
- <img src="#{category.forumImages[forumrow.id]}" width="46" height="25"
- alt="#{resource[category.forumImageDescriptions[forumrow.id]]}"
- title="#{resource[category.forumImageDescriptions[forumrow.id]]}"/>
- </td>
- <td class="row1" width="100%" height="50">
- <span class="forumlink">
- <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}" styleClass="forumlink">
- <f:param name="f" value="#{forumrow.id}"/>
- <h:outputText value="#{forumrow.name}"/>
- </h:outputLink><br/>
- </span>
- <span class="genmed">${forumrow.description}<br/></span>
- <span class="gensmall">  </span>
- </td>
- <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">${forumrow.topicCount}</span></td>
- <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">${forumrow.postCount}</span></td>
- <!-- display last post information for this forum -->
- <td class="row2" align="center" valign="middle" height="50" nowrap="nowrap">
- <span class="gensmall">
- <c:choose>
- <c:when test="#{category.forumLastPosts[forumrow.id]!=null}">
- #{category.forumLastPosts[forumrow.id].createDate}
- <br/>
- <c:choose>
- <c:when test="#{category.anonymous}">
- ${category.forumLastPosts[forumrow.id].poster.user.userName}
- </c:when>
- <c:otherwise>
- <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
- <f:param name="uid" value="#{category.forumLastPosts[forumrow.id].poster.user.id}"/>
- <h:outputText value="${category.forumLastPosts[forumrow.id].poster.user.userName}"/>
- </h:outputLink>
- </c:otherwise>
- </c:choose>
- <h:outputLink value="#{forums:postPermlink(category.forumLastPosts[forumrow.id].id)}" style="text-decoration: none;">
- <f:verbatim>
- <img src="#{forums:themeURL('resourceIconLatestReplyURL')}"
- alt='${resource.Posts}'
- title='${resource.Posts}' border="0"/>
- </f:verbatim>
- </h:outputLink>
- </c:when>
- <c:otherwise>
- #{resource.No_Posts}
- </c:otherwise>
- </c:choose>
- </span>
- </td>
- </tr>
- </forums:isAllowed>
- </c:forEach>
- </forums:isAllowed>
- </c:forEach>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+
+ <tr class="header">
+ <td class="forumheaderfirst" colspan="2">#{resource.Forum}</td>
+ <td class="forumheadercentered">#{resource.Topics}</td>
+ <td class="forumheadercentered">#{resource.Posts}</td>
+ <td class="forumheaderlast">#{resource.Last_Post}</td>
+ </tr>
+
+ <!-- display each category and its corresponding forums -->
+ <c:forEach items="#{category.categories}" var="catrow">
+ <forums:isAllowed fragment="acl://readCategory" contextData="#{catrow}">
+
+ <tr>
+ <td class="forumcategory" colspan="5">
+ <h3>
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <f:param name="c" value="#{catrow.id}"/>
+ <h:outputText value="#{catrow.title}"/>
+ </h:outputLink>
+ </h3>
+ </td>
+ </tr>
+
+ <c:forEach items="#{category.forums[catrow.id]}" var="forumrow">
+ <forums:isAllowed fragment="acl://readForum" contextData="#{forumrow}">
+ <tr>
+ <td class="forumlisticon">
+ <img src="#{category.forumImages[forumrow.id]}" width="11" height="14"
+ alt="#{resource[category.forumImageDescriptions[forumrow.id]]}"
+ title="#{resource[category.forumImageDescriptions[forumrow.id]]}" />
+ </td>
+ <td>
+ <h3>
+ <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
+ <f:param name="f" value="#{forumrow.id}"/>
+ <h:outputText value="#{forumrow.name}"/>
+ </h:outputLink>
+ </h3>
+ <br></br>
+ ${forumrow.description}
+ </td>
+ <td class="forumlistcentered">
+ ${forumrow.topicCount}
+ </td>
+ <td class="forumlistcentered">
+ ${forumrow.postCount}
+ </td>
+ <td class="forumlistlast">
+
+ <c:choose>
+ <c:when test="#{category.forumLastPosts[forumrow.id]!=null}">
+
+ <a href="#{forums:postPermlink(category.forumLastPosts[forumrow.id].id)}">
+ <c:choose>
+ <c:when test="#{forums:isLongerThan(category.forumLastPosts[forumrow.id].message.subject,25)}">
+ #{forums:subString(category.forumLastPosts[forumrow.id].message.subject,25)}…
+ </c:when>
+ <c:otherwise>
+ #{category.forumLastPosts[forumrow.id].message.subject}
+ </c:otherwise>
+ </c:choose>
+ </a>
+
+ <br></br>
+ ${resource.By} 
+
+ <c:choose>
+
+ <c:when test="#{category.anonymous}">
+ ${forums:subString(category.forumLastPosts[forumrow.id].poster.user.userName,25)}
+ </c:when>
+
+ <c:otherwise>
+ <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
+ <f:param name="uid" value="#{category.forumLastPosts[forumrow.id].poster.user.id}"/>
+ <h:outputText value="${category.forumLastPosts[forumrow.id].poster.user.userName}"/>
+ </h:outputLink>
+ </c:otherwise>
+
+ </c:choose>
+
+ <br></br>
+ #{category.forumLastPosts[forumrow.id].createDate}
+
+ </c:when>
+
+ <c:otherwise>
+ #{resource.No_Posts}
+ </c:otherwise>
+
+ </c:choose>
+ </td>
+
+ </tr>
+
+ </forums:isAllowed>
+ </c:forEach>
+
+ </forums:isAllowed>
+ </c:forEach>
+
</table>
<!--table width="100%" cellspacing="0" border="0" align="center" cellpadding="2">
@@ -140,7 +177,7 @@
</tr>
<tr>
<td class="row1" align="center" valign="middle" rowspan="2"><img
- src="modules/bb/templates/subSilver/images/whosonline.gif" alt="${respource.Who_is_Online}" /></td>
+ src="images/whosonline.gif" alt="${respource.Who_is_Online}" /></td>
<td class="row1" align="left" width="100%"><span class="gensmall"><br /><br /></span>
</td>
</tr>
@@ -153,22 +190,26 @@
<tr>
<td align="left" valign="top"><span class="gensmall">${resource.Online_explain}</span></td>
</tr>
- </table-->
-
- <br clear="all"/>
-
- <table cellspacing="3" border="0" align="center" cellpadding="0">
- <tr>
- <td width="20" align="center"><img src="#{forums:contextPath()}/subSilver/images/folder_new.gif" alt="${resource.New_posts}"/></td>
- <td><span class="gensmall">${resource.New_posts}</span></td>
- <td>  </td>
- <td width="20" align="center"><img src="#{forums:contextPath()}/subSilver/images/folder.gif" alt="${resource.No_new_posts}"/></td>
- <td><span class="gensmall">${resource.No_new_posts}</span></td>
- <td>  </td>
- <td width="20" align="center"><img src="#{forums:contextPath()}/subSilver/images/folder_lock.gif" alt="${resource.Forum_is_locked}"/></td>
- <td><span class="gensmall">${resource.Forum_is_locked}</span></td>
- </tr>
- </table>
+ </table-->
+
+ <div class="forumlegend">
+ <hr class="forumdashedHR"></hr>
+ <ul>
+ <li>
+ <img src="${forums:themeURL('resourceForumNewURL')}" alt="${resource.New_posts}" width="11" height="14" />
+ ${resource.New_posts}
+ </li>
+ <li>
+ <img src="${forums:themeURL('resourceForumURL')}" alt="${resource.No_new_posts}" width="11" height="14" />
+ ${resource.No_new_posts}
+ </li>
+ <li>
+ <img src="${forums:themeURL('resourceForumLockedURL')}" alt="${resource.Forum_is_locked}" width="11" height="14" />
+ ${resource.Forum_is_locked}
+ </li>
+ </ul>
+ </div>
+
</h:form>
</ui:define>
</ui:composition>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/common/common.xhtml 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/common/common.xhtml 2007-02-23 22:56:42 UTC (rev 9729)
@@ -25,7 +25,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
class="forumscontainer"
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/index.xhtml 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/index.xhtml 2007-02-23 22:56:42 UTC (rev 9729)
@@ -27,7 +27,7 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- class="bb"
+ class="forumscontainer"
>
<c:if test="#{summary.initialized}">
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/portal_index.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/portal_index.xhtml 2007-02-23 22:55:47 UTC (rev 9728)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/portal_index.xhtml 2007-02-23 22:56:42 UTC (rev 9729)
@@ -28,12 +28,12 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
+ class="forumscontainer"
>
-<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
+<table width="100%" cellpadding="2" cellspacing="1" border="0">
<tr>
- <th colspan="2" class="thCornerL" height="25" nowrap="nowrap">
+ <th colspan="2" height="25" nowrap="nowrap">
 
<form name="redirect" action="#{forums:outputLink(shared.links['index'],true)}" method="post">
<!--input type="submit" name="Start Forums"/-->
More information about the jboss-svn-commits
mailing list