[jboss-svn-commits] JBL Code SVN: r18853 - in labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war: views/moderator and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 11 18:39:06 EDT 2008
Author: unibrew
Date: 2008-03-11 18:39:05 -0400 (Tue, 11 Mar 2008)
New Revision: 18853
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/views/moderator/modcp_split.xhtml
Log:
[JBFORUMS-234] Split topic view is rewritten.
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 2008-03-11 22:35:46 UTC (rev 18852)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2008-03-11 22:39:05 UTC (rev 18853)
@@ -327,6 +327,7 @@
Move_to_forum=Move to forum
Leave_shadow_topic=Leave shadow topic in old forum.
+L_SPLIT_DESTINATION=Destination
L_SPLIT_TOPIC=Split Topic Control Panel
L_SPLIT_TOPIC_EXPLAIN=Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post
L_SPLIT_SUBJECT=New topic title
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2008-03-11 22:35:46 UTC (rev 18852)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2008-03-11 22:39:05 UTC (rev 18853)
@@ -27,8 +27,9 @@
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">
@@ -39,171 +40,195 @@
<forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{splitTopic.topic.forum}">
-<h:messages layout="table" infoStyle="color:green" warnStyle="color:red"/>
-
<h:form>
- <input type="hidden" name="t" value="#{splitTopic.topic.id}"/>
- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
- <tr>
- <td align="left" class="nav">
- <span class="nav">
- -> 
- <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
- styleClass="nav">
- <f:param name="f" value="#{splitTopic.topic.forum.id}"/>
- <h:outputText value="#{splitTopic.topic.forum.name}"/>
+ <input type="hidden" name="t" value="#{splitTopic.topic.id}"/>
+ <div class="forumbread">
+ <ul>
+ <li class="first">
+
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
- </span>
- </td>
- </tr>
- </table>
- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
- <tr>
- <th height="25" class="thHead" colspan="3" nowrap="nowrap">
- ${resource.L_SPLIT_TOPIC}
- </th>
- </tr>
- <tr>
- <td class="row2" colspan="3" align="center">
- <span class="gensmall">${resource.L_SPLIT_TOPIC_EXPLAIN}</span>
- </td>
- </tr>
- <tr>
- <td class="row1" nowrap="nowrap">
- <span class="gen">${resource.L_SPLIT_SUBJECT}</span>
- </td>
- <td class="row2" colspan="2">
- <h:inputText class="post" size="35" style="width: 350px" maxlength="60"
- value="#{splitTopic.newTopicTitle}"/>
- </td>
- </tr>
- <tr>
- <td class="row1" nowrap="nowrap">
- <span class="gen">${resource.L_SPLIT_FORUM}</span>
- </td>
- <td class="row2" colspan="2">
- <select name="forum_to_id">
- <option value="-1">${resource.Select_forum}</option>
- <c:forEach items="${jumpbox.categories}"
- var="category">
- <forums:isAllowed fragment="acl://readCategory"
- contextData="#{category}">
- <option value="-1"></option>
- <option value="-1">${category.title}</option>
- <option value="-1">----------------</option>
- <c:forEach items="${category.forums}"
- var="forum">
- <forums:isAllowed fragment="acl://newTopic"
- contextData="#{forum}">
- <option value="${forum.id}">
- ${forum.name}
- </option>
- </forums:isAllowed>
- </c:forEach>
- </forums:isAllowed>
- </c:forEach>
- </select>
- </td>
- </tr>
- <tr>
- <td class="catHead" colspan="3" height="28">
- <table width="60%" cellspacing="0" cellpadding="0"
- border="0" align="center">
- <tr>
- <td width="50%" align="center">
- <h:commandButton action="${splitTopic.splitPosts}"
- type="submit"
- class="liteoption"
- value="${resource.L_SPLIT_POSTS}">
- <f:param name="t" value="#{splitTopic.topic.id}"/>
- </h:commandButton>
- </td>
- <td width="50%" align="center">
- <h:commandButton action="${splitTopic.splitAfter}"
- type="submit"
- class="liteoption"
- value="${resource.L_SPLIT_AFTER}">
- <f:param name="t" value="#{splitTopic.topic.id}"/>
- </h:commandButton>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <th class="thLeft" nowrap="nowrap">${resource.L_AUTHOR}</th>
- <th nowrap="nowrap">${resoure.L_MESSAGE}</th>
- <th class="thRight" nowrap="nowrap">${resource.L_SELECT}</th>
- </tr>
- <c:forEach items="#{splitTopic.topic.posts}" var="postrow" varStatus="status" >
- <tr>
- <td align="left" valign="top" class='${(status.index%2==0)?"row1":"row2"}'>
- <span class="name">
- <a name="${postrow.id}"></a>
- ${postrow.poster.user.userName}
- </span>
+
+ <ul>
+ <li>>
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <f:param name="c" value="#{splitTopic.topic.forum.category.id}"/>
+ <h:outputText value="#{splitTopic.topic.forum.category.title}"/>
+ </h:outputLink>
+
+ <ul>
+ <li>>
+ <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
+ <f:param name="f" value="#{splitTopic.topic.forum.id}"/>
+ <h:outputText value="#{splitTopic.topic.forum.name}"/>
+ </h:outputLink>
+
+ <ul>
+ <li>>
+ <h:outputLink value="#{forums:outputLink(shared.links['topicSplit'],true)}">
+ <f:param name="t" value="#{splitTopic.topic.id}"/>
+ <h:outputText value="${resource.L_SPLIT_TOPIC}"/>
+ </h:outputLink>
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+ </div>
+
+ <!-- Topic split title and usability explanation and feedback messages -->
+ <div class="forumtitletext">
+ <h4>${resource.L_SPLIT_TOPIC}</h4>
+ <p class="successtext">
+ <h:messages layout="table" infoStyle="color:green" warnStyle="color:red"/>
+ </p>
+ </div>
+
+ <table width="100%" cellpadding="0" cellspacing="0" class="forumtablestyle">
+ <tr class="oddRow">
+ <td colspan="2">${resource.L_SPLIT_TOPIC_EXPLAIN}</td>
+ </tr>
+ <tr class="header">
+ <td class="forumheaderfirst" colspan="2">${resource.L_SPLIT_DESTINATION}</td>
+ </tr>
+ <tr>
+ <td>
+ <label class="forumformlabelbold" for="topic_name">${resource.L_SPLIT_SUBJECT}</label>
</td>
- <td width="100%" valign="top" class='${(status.index%2==0)?"row1":"row2"}'>
- <table width="100%" cellspacing="0" cellpadding="3" border="0">
- <tr>
- <td valign="middle">
- <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="${resource.L_POST}" />
- <span class="postdetails">
- ${resource.L_POSTED}:
- #{forums:dateStr(postrow.createDate)}
-     
- ${resource.L_POST_SUBJECT}:
- ${postrow.message.subject}
- </span>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <hr size="1"/>
- <span class="postbody">
- #{forums:formatMessage(postrow.message.text,false)}
- <br /><br />
- ${postrow.poster.user.signature}
- </span>
- </td>
- </tr>
- </table>
+ <td>
+ <h:inputText size="35" style="width: 350px" maxlength="60" id="topic_name"
+ value="#{splitTopic.newTopicTitle}"/>
</td>
- <td width="5%" align="center" class='${(status.index%2==0)?"row1":"row2"}'>
- <h:selectBooleanCheckbox value="${splitTopic.checkboxes[postrow.id]}"/>
+ </tr>
+ <tr>
+ <td>
+ <label class="forumformlabelbold" for="forum_to_id">${resource.L_SPLIT_FORUM}</label>
</td>
- </tr>
- <tr>
- <td colspan="3" height="1" class="row3">
- <img src="#{forums:themeURL('resourceIconSpacerURL')}" width="1" height="1" alt="." />
+ <td>
+ <select name="forum_to_id">
+ <option value="-1">${resource.Select_forum}</option>
+ <c:forEach items="${jumpbox.categories}"
+ var="category">
+ <forums:isAllowed fragment="acl://readCategory"
+ contextData="#{category}">
+ <option value="-1"></option>
+ <option value="-1">${category.title}</option>
+ <option value="-1">----------------</option>
+ <c:forEach items="${category.forums}"
+ var="forum">
+ <forums:isAllowed fragment="acl://newTopic"
+ contextData="#{forum}">
+ <option value="${forum.id}">
+ ${forum.name}
+ </option>
+ </forums:isAllowed>
+ </c:forEach>
+ </forums:isAllowed>
+ </c:forEach>
+ </select>
</td>
- </tr>
- </c:forEach>
- <tr>
- <td class="catBottom" colspan="3" height="28">
- <table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
- <tr>
- <td width="50%" align="center">
- <h:commandButton action="${splitTopic.splitPosts}"
- type="submit"
- class="liteoption"
- value="${resource.L_SPLIT_POSTS}">
- <f:param name="t" value="#{splitTopic.topic.id}"/>
- </h:commandButton>
- </td>
- <td width="50%" align="center">
- <h:commandButton action="${splitTopic.splitAfter}"
- type="submit"
- class="liteoption"
- value="${resource.L_SPLIT_AFTER}">
- <f:param name="t" value="#{splitTopic.topic.id}"/>
- </h:commandButton>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+ </tr>
+ </table>
+ <br />
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+ <tr>
+ <td colspan="3" class="buttonrow">
+ <h:commandButton action="${splitTopic.splitPosts}"
+ type="submit"
+ class="buttonMed"
+ value="${resource.L_SPLIT_POSTS}">
+ <f:param name="t" value="#{splitTopic.topic.id}"/>
+ </h:commandButton>
+ <h:commandButton action="${splitTopic.splitAfter}"
+ type="submit"
+ class="buttonMed"
+ value="${resource.L_SPLIT_AFTER}">
+ <f:param name="t" value="#{splitTopic.topic.id}"/>
+ </h:commandButton>
+ </td>
+ </tr>
+ <tr class="header">
+ <td class="forumheaderfirst">${resource.L_AUTHOR}</td>
+ <td class="tableheader">${resoure.L_MESSAGE}</td>
+ <td class="forumheaderopen">${resource.L_SELECT}</td>
+ </tr>
+
+ <c:forEach items="#{splitTopic.topic.posts}" var="postrow" varStatus="status" >
+ <tr class="oddRow">
+ <td class="forumpostleftcolumn">
+ <c:choose>
+
+ <c:when test="#{splitTopic.anonymous}">
+ ${postrow.poster.user.userName}
+ </c:when>
+
+ <c:otherwise>
+ <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
+ <f:param name="uid" value="${postrow.poster.user.id}"/>
+ <h:outputText value="${postrow.poster.user.userName}"/>
+ </h:outputLink>
+ </c:otherwise>
+
+ </c:choose>
+ </td>
+ <td class="forumpostspacer">
+ <div class="forumpostinfo">
+ <ul>
+ <li>
+ <a name="${postrow.id}" />
+ <h:outputLink value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
+ <f:verbatim>
+ <h:outputText value="${resource.Permalink}"/>
+ </f:verbatim>
+ </h:outputLink>
+ </li>
+ <li>${resource.L_POSTED}:#{forums:dateStr(postrow.createDate)}</li>
+ <li>${resource.L_POST_SUBJECT}:${postrow.message.subject}</li>
+ </ul>
+ </div>
+ </td>
+ <td class="forumpostspacer"></td>
+ </tr>
+ <tr>
+ <td class="forumpostleftcolumn"> </td>
+ <td class="forumpostcontent">
+ <p>
+ <h:outputText value="#{forums:formatMessage(postrow.message.text,false)}" escape="false" />
+ <br /><br />
+ ${forums:userProperty(postrow.poster.user,'INFO_USER_SIGNATURE')}
+ </p>
+ </td>
+ <td width="5%" align="center" class="forumpostcontent">
+ <h:selectBooleanCheckbox value="${splitTopic.checkboxes[postrow.id]}"/>
+ </td>
+ </tr>
+ </c:forEach>
+
+ <tr>
+ <td colspan="3" class="buttonrow">
+ <h:commandButton action="${splitTopic.splitPosts}"
+ type="submit"
+ class="buttonMed"
+ value="${resource.L_SPLIT_POSTS}">
+ <f:param name="t" value="#{splitTopic.topic.id}"/>
+ </h:commandButton>
+ <h:commandButton action="${splitTopic.splitAfter}"
+ type="submit"
+ class="buttonMed"
+ value="${resource.L_SPLIT_AFTER}">
+ <f:param name="t" value="#{splitTopic.topic.id}"/>
+ </h:commandButton>
+ </td>
+ </tr>
+ </table>
</h:form>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
@@ -213,55 +238,56 @@
</td>
</tr>
</table>
+<hr />
</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:when>
<c:otherwise>
- <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
- <tr>
- <td>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <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>
+ <td> </td>
</tr>
<tr>
- <td align="center">
- <span class="gen">${resource.No_posts_topic}</span>
- </td>
+ <td align="center">
+ ${resource.Not_Moderator}
+ </td>
</tr>
<tr>
- <td> </td>
+ <td> </td>
</tr>
- </table>
- </td>
- </tr>
- </table>
+ </table>
+ </td>
+ </tr>
+ </table>
</c:otherwise>
</c:choose>
</ui:define>
</ui:composition>
-</div>
\ No newline at end of file
+</div>
More information about the jboss-svn-commits
mailing list