[jboss-svn-commits] JBL Code SVN: r10592 - in labs/jbossforums/branches/forums101P26/forums/src: resources/portal-forums-war/WEB-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 28 16:00:45 EDT 2007
Author: unibrew
Date: 2007-03-28 16:00:45 -0400 (Wed, 28 Mar 2007)
New Revision: 10592
Modified:
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
Log:
[JBFORUMS-172] Admin main view updates. Additional small updates of other views and files
Modified: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-03-28 19:57:30 UTC (rev 10591)
+++ labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-03-28 20:00:45 UTC (rev 10592)
@@ -31,6 +31,7 @@
.forumdashedHR {
clear:both;
border-top:1px dashed #a1a1a1;
+ background-color: #FFFFFF;
border-bottom:0px;
border-left:0px;
border-right:0px;
@@ -79,10 +80,17 @@
margin: 2px auto 12px auto;
}
+.inlinefailure {
+ margin: 5px auto;
+ color:#CC0000;
+ font-size:12px;
+} font-weight:bold;
+
/* --------------------------- Buttons ---------------------------------- */
+
.buttonMed {
- font-size: 10px;
+ font-size: 10px;
font-weight: bold;
color: #FFFFFF;
background-color: #4a5d75;
@@ -356,8 +364,8 @@
.forumtablestyle .categorylabel {
width: 100px;
- float: left;
- margin-bottom: 10px;
+ padding:0px;
+ margin:0px;
}
.forumtablestyle label{
width: 100px;
@@ -365,9 +373,10 @@
margin-bottom: 10px;
}
-.forumtablestyle input, textarea, {
+.forumtablestyle input, textarea {
width: 180px;
margin-bottom: 5px;
+ vertical-align:middle;
}
textarea{
@@ -428,7 +437,7 @@
.forumthreadlegend ul {
margin-top:0px;
padding-left: 0px;
- marging-left: 0px;
+ margin-left: 0px;
display: block;
text-indent:none;
}
@@ -598,7 +607,7 @@
.forumsubscriptionconfirm h4 {
font-weight:normal;
font-size: 12px;
- color:##343434;
+ color:#343434;
margin: 0px auto 8px auto;
}
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2007-03-28 19:57:30 UTC (rev 10591)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2007-03-28 20:00:45 UTC (rev 10592)
@@ -100,6 +100,10 @@
<key>pref</key>
<value>/views/pref/index.jsf</value>
</map-entry>
+ <map-entry>
+ <key>myForums</key>
+ <value>/views/myforums/myforums_main.jsf</value>
+ </map-entry>
</map-entries>
</managed-property>
</managed-bean>
@@ -393,6 +397,20 @@
<to-view-id>/views/admin/index.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/views/admin/deleteCategory.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>cancel</from-outcome>
+ <to-view-id>/views/admin/index.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/views/admin/deleteForum.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>cancel</from-outcome>
+ <to-view-id>/views/admin/index.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
<navigation-rule>
<from-view-id>/views/moderator/modcp_move.xhtml</from-view-id>
@@ -496,4 +514,11 @@
<to-view-id>/views/watches/forumWatch.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+
+ <!-- myforums controller -->
+ <managed-bean>
+ <managed-bean-name>myForums</managed-bean-name>
+ <managed-bean-class>org.jboss.portlet.forums.ui.view.ViewMyForums</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
</faces-config>
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2007-03-28 19:57:30 UTC (rev 10591)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2007-03-28 20:00:45 UTC (rev 10592)
@@ -70,19 +70,20 @@
<forums:isAllowed fragment="acl://viewCategory" contextData="#{category}">
<c:choose>
- <c:when test="${(adminController.editCategoryMode or forums:message('form:Category') ne null)
- and adminController.selectedCategory eq category.id}" >
+ <c:when test="${ ( (adminController.editCategoryMode or forums:message('form:Category') ne null)
+ and (adminController.selectedCategory eq category.id) )
+ or
+ ( (forums:nullIfEmptyString(category.title) eq null) )}" >
<tr class="editRow">
<td>
- <h:form id="form">
- <input type="hidden" name="c" value="#{param['c']}"/>
+ <h:form id="form_${category.id}">
+ <input type="hidden" name="c" value="#{category.id}"/>
<label for="categoryname" class="categorylabel">${resource.Category_name}:</label>
<h:inputText id="Category" required="true"
value="#{adminController.categoryName}" />
+ <h:message for="Category" styleClass="inlinefailure"/>
<h:commandButton id="editinline" value="${resource.Update}" styleClass="buttonMed"
action="#{adminController.editCategory}"/>
- <br />
- <h:message for="Category" styleClass="forumtitletext failuretext"/>
</h:form>
</td>
<td class="forumlistlast">
@@ -99,7 +100,7 @@
<forums:isAllowed fragment="acl://addForum">
<h:form>
<input type="hidden" name="c" value="#{category.id}"/>
- <div class="forumfloatright">
+ <div class="forumfloatright actionbuttons">
<h:commandLink action="#{adminController.addForum}">
<img src="${forums:themeURL('resourceAdminNewForumURL')}"
alt="${resource.Create_forum}" border="0" />
@@ -205,16 +206,17 @@
<forums:isAllowed fragment="acl://viewForum" contextData="#{forum}">
<c:choose>
- <c:when test="${(adminController.editForumMode or forums:message('forumForm:Forum') ne null)
- and adminController.selectedForum eq forum.id}" >
+ <c:when test="${( (adminController.editForumMode or forums:message('forumForm:Forum') ne null)
+ and adminController.selectedForum eq forum.id )
+ or ( forums:nullIfEmptyString(forum.name) eq null )}" >
<tr class="editRow">
<td class="Indent">
- <h:form id="forumForm">
- <input type="hidden" name="f" value="#{param['f']}"/>
+ <h:form id="forumForm_${forum.id}">
+ <input type="hidden" name="f" value="#{forum.id}"/>
<label for="forumname">${resource.Forum_name}:</label>
<h:inputText id="Forum" required="true"
value="#{adminController.forumName}" />
- <h:message for="Forum" styleClass="forumtitletext failuretext"/>
+ <h:message for="Forum" styleClass="inlinefailure"/>
<br />
<label for="forumdescription">${resource.Forum_desc}:</label>
<h:inputTextarea rows="5" styleClass="forumdescription"
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2007-03-28 19:57:30 UTC (rev 10591)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2007-03-28 20:00:45 UTC (rev 10592)
@@ -333,7 +333,7 @@
${resource.By}
<c:choose>
- <c:when test="#{category.anonymous}">
+ <c:when test="#{myForum.anonymous}">
${forum.topicLastPosts[topicrow.id].poster.user.userName}
</c:when>
@@ -530,7 +530,7 @@
${resource.By} 
<c:choose>
- <c:when test="#{category.anonymous}">
+ <c:when test="#{forum.anonymous}">
${topicrow.poster.user.userName}
</c:when>
More information about the jboss-svn-commits
mailing list