[jboss-svn-commits] JBL Code SVN: r16547 - in labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views: myforums and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 12 16:17:29 EST 2007
Author: dejp
Date: 2007-11-12 16:17:29 -0500 (Mon, 12 Nov 2007)
New Revision: 16547
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/myforums/myforums_editforums.xhtml
Log:
duplicated id
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-11-12 21:10:33 UTC (rev 16546)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2007-11-12 21:17:29 UTC (rev 16547)
@@ -68,6 +68,9 @@
<!-- display a list of categories -->
<c:forEach items="#{adminPanel.categories}" var="category" varStatus="categoryIdx" >
<forums:isAllowed fragment="acl://viewCategory" contextData="#{category}">
+
+ <f:subview>
+
<c:choose>
<c:when test="${ ( (adminController.editCategoryMode or forums:message('form:Category') ne null)
@@ -200,10 +203,14 @@
</c:choose>
+ </f:subview>
<!-- display the forums in this category -->
<c:forEach items="#{category.forums}" var="forum" varStatus="forumIdx" >
<forums:isAllowed fragment="acl://viewForum" contextData="#{forum}">
+
+ <f:subview>
+
<c:choose>
<c:when test="${( (adminController.editForumMode or forums:message('forumForm:Forum') ne null)
@@ -346,6 +353,9 @@
</c:otherwise>
</c:choose>
+
+ </f:subview>
+
</forums:isAllowed>
</c:forEach>
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml 2007-11-12 21:10:33 UTC (rev 16546)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml 2007-11-12 21:17:29 UTC (rev 16547)
@@ -52,11 +52,15 @@
<c:if test="${forums:collectionSize(myForumsEdit.watchedForums) gt 0}">
<c:forEach items="#{myForumsEdit.watchedForums}" var="forumrow" varStatus="status" >
- <ui:fragment>
+
+ <f:subview>
+
<c:choose>
<c:when test="${forumWatch.selectedForum ne forumrow.id || forumWatch.editMode eq false}">
- <ui:fragment>
+
+ <f:subview>
+
<tr>
<td class="forumlisticon">
<img src="#{myForumsEdit.forumImages[forumrow.id]}" width="11" height="14"
@@ -163,11 +167,14 @@
</h:form>
</td>
</tr>
- </ui:fragment>
+
+ </f:subview>
+
</c:when>
<c:otherwise>
- <ui:fragment>
+
+ <f:subview>
<tr class="editRow">
<td class="forumlisticon">
<img src="#{myForumsEdit.forumImages[forumrow.id]}" width="11" height="14"
@@ -235,11 +242,14 @@
</div>
</td>
</tr>
- </ui:fragment>
+ </f:subview>
+
</c:otherwise>
</c:choose>
- </ui:fragment>
+
+ </f:subview>
+
</c:forEach>
</c:if>
More information about the jboss-svn-commits
mailing list