[jboss-svn-commits] JBL Code SVN: r18791 - labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/moderator.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 10 07:26:22 EDT 2008
Author: unibrew
Date: 2008-03-10 07:26:22 -0400 (Mon, 10 Mar 2008)
New Revision: 18791
Modified:
labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
Log:
[JBFORUMS-214] Main Moderator view rewritten. Still some small corrections needed.
Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2008-03-10 11:25:49 UTC (rev 18790)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2008-03-10 11:26:22 UTC (rev 18791)
@@ -27,7 +27,8 @@
xmlns:c="http://java.sun.com/jstl/core"
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">
+ xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
+ class="forumscontainer">
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
@@ -35,257 +36,354 @@
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{moderator.forum}">
- <h:messages layout="table" infoStyle="color:green" warnStyle="color:red"/>
- <h:form>
- <input type="hidden" name="f" value="#{moderator.forum.id}"/>
- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
- <tr>
- <td align="left">
- <span class="nav">
- -> 
- <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
- styleClass="nav">
- <f:param name="f"
- value="#{moderator.forum.id}"/>
- <h:outputText value="#{moderator.forum.name}"/>
- </h:outputLink>
- </span>
- </td>
- <!-- page navigation -->
- <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
- <td align="right" valign="middle" nowrap="nowrap">
- <br/>
- <span class="nav">
- ${resource.Goto_page}
- <!-- previous link -->
- <c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
-   
- <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <f:param name="page" value="#{moderator.pageNavigator.currentPage-1}"/>
- <h:outputText value="${resource.Previous}"/>
- </h:outputLink>
-   
- </c:if>
- <!-- actual pages -->
- <c:forEach items="#{moderator.pageNavigator.pages}"
- var="page" varStatus="idx">
- <c:choose>
- <c:when test="#{moderator.pageNavigator.pageNumber==page}">
- <b>${page}</b>
- </c:when>
- <c:otherwise>
- <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <f:param name="page" value="#{page-1}"/>
- <h:outputText value="${page}"/>
- </h:outputLink>
- </c:otherwise>
- </c:choose>
- <c:if test="${idx.index-1 ne moderator.pageNavigator.totalPages-1}">
- <f:verbatim>,</f:verbatim>
- </c:if>
- </c:forEach>
- <!-- Next link -->
- <c:if test="#{moderator.pageNavigator.pageNumber lt moderator.pageNavigator.totalPages}">
-   
- <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <f:param name="page" value="#{moderator.pageNavigator.currentPage+1}"/>
- <h:outputText value="${resource.Next}"/>
- </h:outputLink>
-   
- </c:if>
- </span>
- </td>
- </c:if>
+
+ <h:form>
+ <input type="hidden" name="f" value="#{moderator.forum.id}"/>
+ <div class="forumbread">
+ <ul>
+ <li class="first">
+
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <h:outputText value="#{shared.mainPageName}"/>
+ </h:outputLink>
+
+ <ul>
+ <li>>
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <f:param name="c" value="#{moderator.forum.category.id}"/>
+ <h:outputText value="#{moderator.forum.category.title}"/>
+ </h:outputLink>
+
+ <ul>
+ <li>>
+ <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <h:outputText value="#{moderator.forum.name}"/>
+ </h:outputLink>
+
+ <ul>
+ <li>>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <h:outputText value="${resource.Mod_CP}"/>
+ </h:outputLink>
+ </li>
+ </ul>
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+ </div>
+
+ <!-- Forum moderator tool title and usability explanation and feedback messages -->
+ <div class="forumtitletext">
+ <h4>${resource.Mod_CP}</h4>
+ <p>${resource.Mod_CP_explain}</p>
+ <p class="successtext">
+ <h:messages layout="table" infoStyle="color:green" warnStyle="color:red"/>
+ </p>
+ </div>
+
+ <!-- PAGINATION -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <div class="forumpagination">
+ <ul>
+ <li class="disablepage">
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${moderator.pageNavigator.pageNumber}"/>
+ <f:param value="${moderator.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </li>
+
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.currentPage eq 0}">
+ <li class="disablepage">
+ ${resource.First}
+ </li>
+ <li class="disablepage">
+ < ${resource.Previous}
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{modaerator.forum.id}"/>
+ <f:param name="page" value="0"/>
+ <h:outputText value="${resource.First}"/>
+ </h:outputLink>
+ </li>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
+ <h:outputText value="< ${resource.Previous}"/>
+ </h:outputLink>
+ </li>
+ </c:otherwise>
+ </c:choose>
+
+ <c:forEach items="#{moderator.pageNavigator.currentPaginationLeft}" var="pageNumber">
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ <h:outputText value="${pageNumber}"/>
+ </h:outputLink>
+ </li>
+ </c:forEach>
+
+ <li class="currentpage">
+ ${moderator.pageNavigator.currentPage+1}
+ </li>
+
+ <c:forEach items="#{moderator.pageNavigator.currentPaginationRight}" var="pageNumber">
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ <h:outputText value="${pageNumber}"/>
+ </h:outputLink>
+ </li>
+ </c:forEach>
+
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.currentPage eq (moderator.pageNavigator.totalPages-1) }">
+ <li class="disablepage">
+ ${resource.Next} >
+ </li>
+ <li class="disablepage">
+ ${resource.Last}
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
+ <h:outputText value="${resource.Next} >"/>
+ </h:outputLink>
+ </li>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
+ <h:outputText value="${resource.Last}"/>
+ </h:outputLink>
+ </li>
+ </c:otherwise>
+ </c:choose>
+ </ul>
+ </div>
+ </c:if>
+
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+
+ <tr class="header">
+ <td class="forumheaderfirst"> </td>
+ <td class="tableheader"> ${resource.Topics} </td>
+ <td class="tableheader"> ${resource.Replies} </td>
+ <td class="tableheader"> ${resource.Last_Post} </td>
+ <td class="forumheaderlast"> ${resource.Select} </td>
</tr>
- </table>
- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
- <tr>
- <td class="catHead" colspan="5" align="center" height="28">
- <span class="cattitle">${resource.Mod_CP}</span>
- </td>
+
+ <c:forEach items="#{moderator.page}" var="topicrow" varStatus="status">
+ <tr class='${(status.index%2==0)?"evenRow":"oddRow"}'>
+
+ <td class='rowlinefirst ${(status.last)?"bottomline":""}' width="20px" align="center">
+ <img src="#{forums:folderTypeURL(topicrow,moderator.anonymous)}"
+ alt="${resource.Topic_Moved}"
+ title="${resource.Topic_Moved}"/>
+ </td>
+
+ <td class='rowline ${(status.last)?"bottomline":""}'>
+ ${forums:folderType(topicrow)}
+ <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
+ <f:param name="t" value="${topicrow.id}"/>
+ <h:outputText value="${topicrow.subject}"/>
+ </h:outputLink>
+ </td>
+ <td class='rowline ${(status.last)?"bottomline":""}' width="30px">
+ ${topicrow.replies}
+ </td>
+ <td class='rowline ${(status.last)?"bottomline":""}' width="150px">
+ ${topicrow.lastPostDate}
+ </td>
+ <td class='rowline ${(status.last)?"bottomline":""}' width="30px">
+ <h:selectBooleanCheckbox value="#{moderator.checkboxes[topicrow.id]}"/>
+ </td>
</tr>
- <tr>
- <td class="spaceRow" colspan="5" align="center">
- <span class="gensmall">${resource.Mod_CP_explain}</span>
- </td>
- </tr>
- <tr>
- <th width="4%" class="thLeft" nowrap="nowrap"> </th>
- <th nowrap="nowrap"> ${resource.Topics} </th>
- <th width="8%" nowrap="nowrap"> ${resource.Replies} </th>
- <th width="17%" nowrap="nowrap"> ${resource.Last_Post} </th>
- <th width="5%" class="thRight" nowrap="nowrap"> ${resource.Select} </th>
- </tr>
- <c:forEach items="#{moderator.page}" var="topicrow">
- <tr>
- <td class="row1" align="center" valign="middle">
- <img src="#{forums:folderTypeURL(topicrow,moderator.anonymous)}"
- width="19" height="18"
- alt="${resource.Topic_Moved}"
- title="${resource.Topic_Moved}"/>
- </td>
- <td class="row1">
-  
- <span class="topictitle">
- ${forums:folderType(topicrow)}
- <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
- styleClass="topictitle">
- <f:param name="t" value="${topicrow.id}"/>
- <h:outputText value="${topicrow.subject}"/>
- </h:outputLink>
- </span>
- </td>
- <td class="row2" align="center" valign="middle">
- <span class="postdetails">${topicrow.replies}</span>
- </td>
- <td class="row1" align="center" valign="middle">
- <span class="postdetails">${topicrow.lastPostDate}</span>
- </td>
- <td class="row2" align="center" valign="middle">
- <h:selectBooleanCheckbox value="#{moderator.checkboxes[topicrow.id]}"/>
- </td>
- </tr>
</c:forEach>
+
<tr align="right">
- <td class="catBottom" colspan="5" height="29">
- <forums:isAllowed fragment="acl://deleteTopics" contextData="#{moderator.forum}">
- <h:commandButton action="#{moderator.deleteConfirm}"
- class="liteoption"
- value="${resource.Delete}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- </h:commandButton>
- </forums:isAllowed>
-  
- <forums:isAllowed fragment="acl://moveTopics" contextData="#{moderator.forum}">
- <h:commandButton action="#{moderator.moveConfirm}"
- class="liteoption"
- value="${resource.Move}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- </h:commandButton>
- </forums:isAllowed>
-  
- <forums:isAllowed fragment="acl://lockTopics" contextData="#{moderator.forum}">
- <h:commandButton action="#{moderator.lockTopic}"
- class="liteoption"
- value="${resource.Lock}">
- <f:param name="f"
- value="#{moderator.forum.id}"/>
- </h:commandButton>
-  
- <h:commandButton action="#{moderator.unlockTopic}"
- class="liteoption"
- value="${resource.Unlock}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- </h:commandButton>
- </forums:isAllowed>
- </td>
+ <td class="buttonrow" colspan="5" height="29">
+ <forums:isAllowed fragment="acl://deleteTopics" contextData="#{moderator.forum}">
+ <h:commandButton action="#{moderator.deleteConfirm}"
+ class="buttonMed"
+ value="${resource.Delete}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ </h:commandButton>
+ </forums:isAllowed>
+ <forums:isAllowed fragment="acl://moveTopics" contextData="#{moderator.forum}">
+ <h:commandButton action="#{moderator.moveConfirm}"
+ class="buttonMed"
+ value="${resource.Move}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ </h:commandButton>
+ </forums:isAllowed>
+ <forums:isAllowed fragment="acl://lockTopics" contextData="#{moderator.forum}">
+ <h:commandButton action="#{moderator.lockTopic}"
+ class="buttonMed"
+ value="${resource.Lock}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ </h:commandButton>
+ <h:commandButton action="#{moderator.unlockTopic}"
+ class="buttonMed"
+ value="${resource.Unlock}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ </h:commandButton>
+ </forums:isAllowed>
+ </td>
</tr>
- </table>
- <table width="100%" cellspacing="2" border="0"
- align="center" cellpadding="2">
+ </table>
+ <br/>
+
+ <!-- PAGINATION -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <div class="forumpagination">
+ <ul>
+ <li class="disablepage">
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${moderator.pageNavigator.pageNumber}"/>
+ <f:param value="${moderator.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </li>
+
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.currentPage eq 0}">
+ <li class="disablepage">
+ ${resource.First}
+ </li>
+ <li class="disablepage">
+ < ${resource.Previous}
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{modaerator.forum.id}"/>
+ <f:param name="page" value="0"/>
+ <h:outputText value="${resource.First}"/>
+ </h:outputLink>
+ </li>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
+ <h:outputText value="< ${resource.Previous}"/>
+ </h:outputLink>
+ </li>
+ </c:otherwise>
+ </c:choose>
+
+ <c:forEach items="#{moderator.pageNavigator.currentPaginationLeft}" var="pageNumber">
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ <h:outputText value="${pageNumber}"/>
+ </h:outputLink>
+ </li>
+ </c:forEach>
+
+ <li class="currentpage">
+ ${moderator.pageNavigator.currentPage+1}
+ </li>
+
+ <c:forEach items="#{moderator.pageNavigator.currentPaginationRight}" var="pageNumber">
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ <h:outputText value="${pageNumber}"/>
+ </h:outputLink>
+ </li>
+ </c:forEach>
+
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.currentPage eq (moderator.pageNavigator.totalPages-1) }">
+ <li class="disablepage">
+ ${resource.Next} >
+ </li>
+ <li class="disablepage">
+ ${resource.Last}
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
+ <h:outputText value="${resource.Next} >"/>
+ </h:outputLink>
+ </li>
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
+ <h:outputText value="${resource.Last}"/>
+ </h:outputLink>
+ </li>
+ </c:otherwise>
+ </c:choose>
+ </ul>
+ </div>
+ </c:if>
+
+ <hr />
+
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
-
- <!-- the current page number information -->
- <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
- <td align="left" colspan="3">
- <span class="nav">
- <b>
-
- <h:outputFormat value="#{resource.PageNumber}">
- <f:param value="${moderator.pageNavigator.pageNumber}"/>
- <f:param value="${moderator.pageNavigator.totalPages}"/>
- </h:outputFormat>
- </b>
- </span>
- </td>
- </c:if>
-
- <!-- page navigation -->
- <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
- <td align="right" valign="middle" nowrap="nowrap">
- <br/>
- <span class="nav">
- ${resource.Goto_page}
- <!-- previous link -->
- <c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
-   
- <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <f:param name="page" value="#{moderator.pageNavigator.currentPage-1}"/>
- <h:outputText value="${resource.Previous}"/>
- </h:outputLink>
-   
- </c:if>
- <!-- actual pages -->
- <c:forEach items="#{moderator.pageNavigator.pages}"
- var="page" varStatus="idx">
- <c:choose>
- <c:when test="#{moderator.pageNavigator.pageNumber==page}">
- <b>${page}</b>
- </c:when>
- <c:otherwise>
- <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <f:param name="page" value="#{page-1}"/>
- <h:outputText value="${page}"/>
- </h:outputLink>
- </c:otherwise>
- </c:choose>
- <c:if test="${idx.index-1 ne moderator.pageNavigator.totalPages-1}">
- <f:verbatim>,</f:verbatim>
- </c:if>
- </c:forEach>
- <!-- Next link -->
- <c:if test="#{moderator.pageNavigator.pageNumber lt moderator.pageNavigator.totalPages}">
-   
- <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <f:param name="page" value="#{moderator.pageNavigator.currentPage+1}"/>
- <h:outputText value="${resource.Next}"/>
- </h:outputLink>
-   
- </c:if>
- </span>
- </td>
- </c:if>
+ <td align="right">
+ <ui:include src="/views/jumpbox.xhtml"/>
+ </td>
</tr>
- </table>
- </h:form>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td align="right">
- <ui:include src="/views/jumpbox.xhtml"/>
- </td>
- </tr>
- </table>
+ </table>
+
+ </h:form>
+
</forums:isAllowedWhen>
+
<forums:isAllowedOtherwise>
- <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
- <tr>
- <td>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td> </td>
- </tr>
- <tr>
- <td align="center">
- <span class="gen">${resource.Not_Moderator}</span>
- </td>
- </tr>
- <tr>
- <td> </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+ <tr>
+ <td>
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center">
+ ${resource.Not_Moderator}
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
</c:if>
</ui:define>
</ui:composition>
-</div>
\ No newline at end of file
+</div>
More information about the jboss-svn-commits
mailing list