[jboss-svn-commits] JBL Code SVN: r11867 - in labs/jbossforums/branches/forums101P22/forums/src: resources/portal-forums-war/views/pref and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 15 16:42:10 EDT 2007
Author: unibrew
Date: 2007-05-15 16:42:10 -0400 (Tue, 15 May 2007)
New Revision: 11867
Modified:
labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/pref/index.xhtml
Log:
[JBFORUMS-218] UserPreferencesView rewritten
Modified: labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-05-15 20:40:59 UTC (rev 11866)
+++ labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-05-15 20:42:10 UTC (rev 11867)
@@ -54,7 +54,7 @@
float:left;
}
-/* -------------------------- titles and headers ------------------------------- */
+/* -------------------------- titles, headers & text ------------------------------- */
.forumtitletext {
}
@@ -86,6 +86,12 @@
font-size:12px;
font-weight: bold;
}
+
+.note {
+ color:#233345;
+ font-size:9px;
+ line-height: 9px;
+}
/* --------------------------- Buttons ---------------------------------- */
.buttonMed {
@@ -196,8 +202,16 @@
.forumtablestyle .forumheaderfirst {
border-bottom:1px solid #233345;
+ height:2em;
+
}
+.forumtablestyle .tableheader {
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
.forumtablestyle .forumheadercentered {
text-align:center;
border-left:1px solid #94aebd;
@@ -279,6 +293,14 @@
padding-left:20px;
}
+.forumtablestyle .rowlinefirst {
+ border-bottom:1px solid #e6e7e8;
+}
+
+.forumtablestyle .rowline {
+ border-left:1px solid #e6e7e8;
+ border-bottom:1px solid #e6e7e8;
+}
.forumtablestyle .editRow{
background-color:#fff6e4;
}
@@ -288,6 +310,14 @@
font-weight:bold;
}
+.forumsubtablestyle {
+ clear:both;
+}
+
+.forumsubtablestyle td {
+ border-bottom:0px;
+ padding: 0px 0px;
+}
.forumthreaduserinfo {
border-left:1px solid #e6e7e8;
}
@@ -365,6 +395,60 @@
vertical-align: text-bottom;
}
+/* -------------------- Forum Topic Attachment styles ------------------------ */
+
+.forumAttachmentTable {
+ clear:both;
+ width: 100%;
+ border: 1px solid #e6e7e8;
+ border-bottom: 0px;
+ margin: 4px;
+}
+
+.forumAttachmentTable .header {
+ background-color:#233345;
+ font-size:10px;
+ font-weight:bold;
+ color:#94aebd;
+ height: 20px;
+ text-align:left;
+}
+
+.forumAttachmentTable .forumHeaderFirst {
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
+.forumAttachmentTable .tableHeader {
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
+.forumAttachmentTable .forumHeaderLast {
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ width:250px;
+}
+
+.forumAttachmentTable .labelCell {
+ background-color: #f4f3f3;
+ width: 0%;
+ white-space: nowrap;
+ font-size:10px;
+ font-weight:bold;
+}
+
+.forumAttachmentTable .valueCell {
+ width: 100%;
+}
+
+.forumAttachmentTable .downloadCell {
+ border-left:1px solid #e6e7e8;
+ padding: 4px;
+ text-align: center;
+ vertical-align: middle;
+}
/* ------------------- Forms ------------------------------- */
.forumtablestyle .categorylabel {
@@ -373,12 +457,11 @@
margin:0px;
}
.forumtablestyle label{
- width: 100px;
float: left;
- margin-bottom: 10px;
+ vertical-align: middle;
}
-.forumtablestyle input, textarea {
+.forumtablestyle textarea {
width: 180px;
margin-bottom: 5px;
vertical-align:middle;
@@ -579,6 +662,7 @@
}
.forumformbuttonrow {
padding-top: 6px;
+ text-align: right;
}
.forumformbuttonrow ul {
Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/pref/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/pref/index.xhtml 2007-05-15 20:40:59 UTC (rev 11866)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/pref/index.xhtml 2007-05-15 20:42:10 UTC (rev 11867)
@@ -27,249 +27,232 @@
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">
-
- <ui:composition template="/views/common/common_noMenu.xhtml">
-
- <ui:define name="mainContent">
-
- <c:if test="#{prefController.initialized && prefController.anonymous==false}">
- <h:form>
- <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
- <!-- title -->
- <tr>
- <th class="thSides" colspan="2" height="25" valign="middle">${resource.L_PREFERENCES}</th>
- </tr>
-
- <!-- notify on reply -->
- <tr>
- <td class="row1"><span class="gen">${resource.L_NOTIFY_ON_REPLY}:</span><br/>
- <span class="gensmall">${resource.L_NOTIFY_ON_REPLY_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:selectOneRadio value="#{prefController.notifyOnReply}" styleClass="gen">
- <f:selectItem itemValue="true" itemLabel="${resource.L_YES}">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="false" itemLabel="${resource.L_NO}"/>
- </h:selectOneRadio>
- </td>
- </tr>
-
- <!-- Always allow html -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_ALWAYS_ALLOW_HTML}:</span>
- </td>
- <td class="row2">
- <h:selectOneRadio value="#{prefController.alwaysAllowHtml}" styleClass="gen">
- <f:selectItem itemValue="true" itemLabel="${resource.L_YES}">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="false" itemLabel="${resource.L_NO}"/>
- </h:selectOneRadio>
- </td>
- </tr>
-
- <!-- Post Order -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_POST_ORDER}:</span>
- </td>
- <td class="row2">
- <h:selectOneRadio value="#{prefController.postOrder}" styleClass="gen">
- <f:selectItem itemValue="ascending" itemLabel="${resource.L_ASCENDING}">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="descending" itemLabel="${resource.L_DESCENDING}"/>
- </h:selectOneRadio>
- </td>
- </tr>
-
- <!-- Topics Per Page -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_TOPICS_PER_FORUM}:</span><br/>
- <span class="gensmall">${resource.L_TOPICS_PER_FORUM_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:selectOneRadio value="#{prefController.topicsPerForum}" styleClass="gen">
- <f:selectItem itemValue="5" itemLabel="5">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="10" itemLabel="10">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="15" itemLabel="15">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="20" itemLabel="20">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="25" itemLabel="25">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="30" itemLabel="30"/>
- </h:selectOneRadio>
- </td>
- </tr>
-
- <!-- Posts Per Page -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_POSTS_PER_TOPIC}:</span><br/>
- <span class="gensmall">${resource.L_POSTS_PER_TOPIC_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:selectOneRadio value="#{prefController.postsPerTopic}" styleClass="gen">
- <f:selectItem itemValue="5" itemLabel="5">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="10" itemLabel="10">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="15" itemLabel="15">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="20" itemLabel="20">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="25" itemLabel="25">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="30" itemLabel="30"/>
- </h:selectOneRadio>
- </td>
- </tr>
-
- <!-- Date Format -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_DATE_FORMAT}:</span>
- </td>
- <td class="row2">
- <h:inputText maxlength="14" styleClass="post" value="#{prefController.dateFormat}"/>
- </td>
- </tr>
-
- <tr>
- <th class="thSides" colspan="2" height="25" valign="middle">${resource.L_USER_INFO}</th>
- </tr>
-
- <!-- Always add Signature -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_ALWAYS_ADD_SIGNATURE}:</span>
- </td>
- <td class="row2">
- <h:selectOneRadio value="#{prefController.alwaysAddSignature}" styleClass="gen">
- <f:selectItem itemValue="true" itemLabel="${resource.L_YES}">
- <f:verbatim>  </f:verbatim>
- </f:selectItem>
- <f:selectItem itemValue="false" itemLabel="${resource.L_NO}"/>
- </h:selectOneRadio>
- </td>
- </tr>
-
- <!-- Signature -->
- <tr>
- <td class="row1">
- <span class="gen">${resource.L_SIGNATURE}:</span><br/>
- <span class="gensmall">${resource.L_SIGNATURE_EXPLAIN}
- <br/><br/><br/><br/>
- </span>
- </td>
- <td class="row2">
- <h:inputTextarea style="width: 300px" rows="6" cols="30" styleClass="post" value="#{prefController.signature}"/>
- </td>
- </tr>
-
- <!-- Topic Summary -->
- <tr>
- <th class="thSides" colspan="2" height="25" valign="middle">${resource.L_TOPIC_SUMMARY}</th>
- </tr>
-
- <!-- Summary Mode -->
- <tr>
- <td class="row1"><span class="gen">${resource.L_MODE_CHOOSE}:</span><br/>
- <span class="gensmall">${resource.L_MODE_CHOOSE_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:selectOneMenu value="#{prefController.summaryMode}">
- <f:selectItem itemValue="1" itemLabel="Hot topics (above some number of replies)" styleClass="gen"/>
- <f:selectItem itemValue="0" itemLabel="Latest posted topics" styleClass="gen"/>
- <f:selectItem itemValue="2" itemLabel="Hottest topics (most replied)" styleClass="gen"/>
- <f:selectItem itemValue="3" itemLabel="Most viewed topics" styleClass="gen"/>
- </h:selectOneMenu>
- </td>
- </tr>
-
- <!-- Topics Limit -->
- <tr>
- <td class="row1"><span class="gen">${resource.L_TOPIC_SUMMARY_LIMIT}:</span><br/>
- <span class="gensmall">${resource.L_TOPIC_SUMMARY_LIMIT_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:inputText maxlength="7" styleClass="post" value="#{prefController.summaryTopicLimit}"/>
- </td>
- </tr>
-
- <!-- Days Old Posts -->
- <tr>
- <td class="row1"><span class="gen">${resource.L_TOPIC_SUMMARY_DAYS}:</span><br/>
- <span class="gensmall">${resource.L_TOPIC_SUMMARY_DAYS_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:inputText maxlength="7" styleClass="post" value="#{prefController.summaryTopicDays}"/>
- </td>
- </tr>
-
- <!-- Replies in Topic -->
- <tr>
- <td class="row1"><span class="gen">${resource.L_TOPIC_SUMMARY_REPLIES}:</span><br/>
- <span class="gensmall">${resource.L_TOPIC_SUMMARY_REPLIES_EXPLAIN}</span>
- </td>
- <td class="row2">
- <h:inputText maxlength="7" styleClass="post" value="#{prefController.summaryTopicReplies}"/>
- </td>
- </tr>
+ xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
+ class="forumscontainer">
-
- <!-- buttons -->
- <tr>
- <td class="catBottom" colspan="2" align="center" height="28">
- <h:commandButton value="${resource.L_SUBMIT}" styleClass="mainoption" action="#{prefController.execute}"/>
-   
- <h:commandButton type="reset" value="${resource.L_RESET}" styleClass="liteoption"/>
- </td>
- </tr>
- </table>
- </h:form>
- </c:if>
-
- <!-- in case of anonymous access -->
- <c:if test="#{prefController.anonymous==true}">
- <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">
- <h:outputText value="${resource.L_LOGIN_REQUIRED}" styleClass="gen"/>
- </td>
- </tr>
- <tr>
- <td> </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </c:if>
+<ui:composition template="/views/common/common_noMenu.xhtml">
+
+<ui:define name="mainContent">
- </ui:define>
- </ui:composition>
+<c:if test="#{prefController.initialized && prefController.anonymous==false}">
+<h:form>
+<table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+
+ <!-- title -->
+ <tr class="header">
+ <td class="forumheaderfirst" colspan="2">${resource.L_PREFERENCES}</td>
+ </tr>
+
+ <!-- notify on reply -->
+ <tr class="oddRow">
+ <td class="rowlinefirst">
+ ${resource.L_NOTIFY_ON_REPLY}:
+ <br/>
+ <span class="note">${resource.L_NOTIFY_ON_REPLY_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:selectOneRadio value="#{prefController.notifyOnReply}" styleClass="forumsubtablestyle" >
+ <f:selectItem itemValue="true" itemLabel=" ${resource.L_YES}" />
+ <f:selectItem itemValue="false" itemLabel=" ${resource.L_NO}" />
+ </h:selectOneRadio>
+ </td>
+ </tr>
+
+ <!-- Always allow html -->
+ <tr class="evenRow">
+ <td class="rowlinefirst">
+ ${resource.L_ALWAYS_ALLOW_HTML}:
+ </td>
+ <td class="rowline">
+ <h:selectOneRadio value="#{prefController.alwaysAllowHtml}" styleClass="forumsubtablestyle">
+ <f:selectItem itemValue="true" itemLabel="${resource.L_YES}" />
+ <f:selectItem itemValue="false" itemLabel="${resource.L_NO}" />
+ </h:selectOneRadio>
+ </td>
+ </tr>
+
+ <!-- Post Order -->
+ <tr class="oddRow" >
+ <td class="rowlinefirst">
+ ${resource.L_POST_ORDER}:
+ </td>
+ <td class="rowline">
+ <h:selectOneRadio value="#{prefController.postOrder}" styleClass="forumsubtablestyle">
+ <f:selectItem itemValue="ascending" itemLabel="${resource.L_ASCENDING}" />
+ <f:selectItem itemValue="descending" itemLabel="${resource.L_DESCENDING}" />
+ </h:selectOneRadio>
+ </td>
+ </tr>
+
+ <!-- Topics Per Page -->
+ <tr class="evenRow">
+ <td class="rowlinefirst">
+ ${resource.L_TOPICS_PER_FORUM}:
+ <br />
+ <span class="note">${resource.L_TOPICS_PER_FORUM_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:selectOneRadio value="#{prefController.topicsPerForum}" styleClass="forumsubtablestyle">
+ <f:selectItem itemValue="5" itemLabel="5" />
+ <f:selectItem itemValue="10" itemLabel="10" />
+ <f:selectItem itemValue="15" itemLabel="15" />
+ <f:selectItem itemValue="20" itemLabel="20" />
+ <f:selectItem itemValue="25" itemLabel="25" />
+ <f:selectItem itemValue="30" itemLabel="30" />
+ </h:selectOneRadio>
+ </td>
+ </tr>
+
+ <!-- Posts Per Page -->
+ <tr class="oddRow">
+ <td class="rowlinefirst">
+ ${resource.L_POSTS_PER_TOPIC}:
+ <br />
+ <span class="note">${resource.L_POSTS_PER_TOPIC_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:selectOneRadio value="#{prefController.postsPerTopic}" styleClass="forumsubtablestyle">
+ <f:selectItem itemValue="5" itemLabel="5" />
+ <f:selectItem itemValue="10" itemLabel="10" />
+ <f:selectItem itemValue="15" itemLabel="15" />
+ <f:selectItem itemValue="20" itemLabel="20" />
+ <f:selectItem itemValue="25" itemLabel="25" />
+ <f:selectItem itemValue="30" itemLabel="30" />
+ </h:selectOneRadio>
+ </td>
+ </tr>
+
+ <!-- Date Format -->
+ <tr class="evenRow">
+ <td class="rowlinefirst">
+ ${resource.L_DATE_FORMAT}:
+ </td>
+ <td class="rowline">
+ <h:inputText maxlength="14" styleClass="post" value="#{prefController.dateFormat}"/>
+ </td>
+ </tr>
+
+ <tr class="header">
+ <td class="forumheaderfirst" colspan="2">${resource.L_USER_INFO}</td>
+ </tr>
+
+ <!-- Always add Signature -->
+ <tr class="oddRow">
+ <td class="rowlinefirst">
+ ${resource.L_ALWAYS_ADD_SIGNATURE}:
+ </td>
+ <td class="rowline">
+ <h:selectOneRadio value="#{prefController.alwaysAddSignature}" styleClass="forumsubtablestyle">
+ <f:selectItem itemValue="true" itemLabel="${resource.L_YES}" />
+ <f:selectItem itemValue="false" itemLabel="${resource.L_NO}" />
+ </h:selectOneRadio>
+ </td>
+ </tr>
+
+ <!-- Signature -->
+ <tr class="evenRow">
+ <td class="rowlinefirst">
+ ${resource.L_SIGNATURE}:
+ <br />
+ <span class="note">${resource.L_SIGNATURE_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:inputTextarea style="width: 300px" rows="6" cols="30" styleClass="post" value="#{prefController.signature}"/>
+ </td>
+ </tr>
+
+ <!-- Topic Summary -->
+ <tr class="header">
+ <td class="forumheaderfirst" colspan="2">${resource.L_TOPIC_SUMMARY}</td>
+ </tr>
+
+ <!-- Summary Mode -->
+ <tr class="oddRow">
+ <td class="rowlinefirst">
+ ${resource.L_MODE_CHOOSE}:
+ <br />
+ <span class="note">${resource.L_MODE_CHOOSE_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:selectOneMenu value="#{prefController.summaryMode}">
+ <f:selectItem itemValue="1" itemLabel="Hot topics (above some number of replies)"/>
+ <f:selectItem itemValue="0" itemLabel="Latest posted topics"/>
+ <f:selectItem itemValue="2" itemLabel="Hottest topics (most replied)"/>
+ <f:selectItem itemValue="3" itemLabel="Most viewed topics"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+
+ <!-- Topics Limit -->
+ <tr class="evenRow">
+ <td class="rowlinefirst">
+ ${resource.L_TOPIC_SUMMARY_LIMIT}:
+ <br />
+ <span class="note">${resource.L_TOPIC_SUMMARY_LIMIT_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:inputText maxlength="7" value="#{prefController.summaryTopicLimit}"/>
+ </td>
+ </tr>
+
+ <!-- Days Old Posts -->
+ <tr class="oddRow">
+ <td class="rowlinefirst">
+ ${resource.L_TOPIC_SUMMARY_DAYS}:
+ <br />
+ <span class="note">${resource.L_TOPIC_SUMMARY_DAYS_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:inputText maxlength="7" value="#{prefController.summaryTopicDays}"/>
+ </td>
+ </tr>
+
+ <!-- Replies in Topic -->
+ <tr>
+ <td class="rowlinefirst">
+ ${resource.L_TOPIC_SUMMARY_REPLIES}:
+ <br />
+ <span class="note">${resource.L_TOPIC_SUMMARY_REPLIES_EXPLAIN}</span>
+ </td>
+ <td class="rowline">
+ <h:inputText maxlength="7" styleClass="post" value="#{prefController.summaryTopicReplies}"/>
+ </td>
+ </tr>
+
+ <!-- buttons -->
+ <tr>
+ <td class="forumformbuttonrow" colspan="2" style="border:0px;">
+ <h:commandButton value="${resource.L_SUBMIT}" styleClass="buttonMed" action="#{prefController.execute}"/>
+ <h:commandButton type="reset" value="${resource.L_RESET}" styleClass="buttonMed"/>
+ </td>
+ </tr>
+</table>
+</h:form>
+</c:if>
+
+<!-- in case of anonymous access -->
+<c:if test="#{prefController.anonymous==true}">
+<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">
+ <h:outputText value="${resource.L_LOGIN_REQUIRED}"/>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</c:if>
+
+</ui:define>
+</ui:composition>
</div>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list