Update of /var/cvs/html/mmbase/admin
In directory james.mmbase.org:/tmp/cvs-serv27375
Modified Files:
index.jsp
Log Message:
no point in showing categories without blocks
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/admin
Index: index.jsp
===================================================================
RCS file: /var/cvs/html/mmbase/admin/index.jsp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- index.jsp 22 Oct 2008 12:30:00 -0000 1.37
+++ index.jsp 24 Dec 2008 17:04:02 -0000 1.38
@@ -1,6 +1,8 @@
-<jsp:root version="2.0"
+<jsp:root
+ version="2.0"
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
<!-- actually just to help some browsers: -->
@@ -41,9 +43,11 @@
<mm:functioncontainer>
<mm:param name="id">mmbase.${category}</mm:param>
<mm:function set="components" name="blockClassification">
+ <c:if test="${fn:length(_[0].blocks) gt 0}">
<c:set var="component"
value="${_[0].blocks[0].component.name}" />
<c:set var="block" value="${_[0].blocks[0].name}" />
<mm:component name="$component" block="${block}"
render="head" />
+ </c:if>
</mm:function>
</mm:functioncontainer>
</mm:notpresent>
@@ -82,8 +86,12 @@
<mm:param name="id">mmbase</mm:param>
<mm:listfunction set="components" name="blockClassification">
<mm:stringlist referid="_.subTypes" id="cat">
- <mm:link id="link"><mm:frameworkparam
name="category">${cat.name}</mm:frameworkparam></mm:link>
- <li class="weight_${cat.weight}"><a class="${category eq
cat.name ? 'selected' : ''}" href="${link}">${mm:string(cat.title)}</a>
+ <c:if test="${fn:length(cat.blocks) gt 0}">
+ <mm:link id="link">
+ <mm:frameworkparam
name="category">${cat.name}</mm:frameworkparam>
+ </mm:link>
+ <li class="weight_${cat.weight}">
+ <a class="${category eq cat.name ? 'selected' : ''}"
href="${link}">${mm:string(cat.title)}</a>
<mm:compare referid="category" value="${cat.name}">
<ul>
<c:forEach var="b" items="${cat.blocks}">
@@ -102,6 +110,7 @@
</ul>
</mm:compare>
</li>
+ </c:if>
</mm:stringlist>
</mm:listfunction>
</mm:functioncontainer>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
