Update of /var/cvs/html/mmbase/components/core/components In directory james.mmbase.org:/tmp/cvs-serv25958/components
Modified Files: blockType.jspx list.jspx tree.jspx Log Message: MMB-1650 See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core/components See also: http://www.mmbase.org/jira/browse/MMB-1650 Index: blockType.jspx =================================================================== RCS file: /var/cvs/html/mmbase/components/core/components/blockType.jspx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- blockType.jspx 24 Feb 2008 10:51:17 -0000 1.4 +++ blockType.jspx 27 Jun 2008 12:39:45 -0000 1.5 @@ -1,24 +1,25 @@ <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" version="1.2" > <mm:import externid="blockType" from="request" /> - <h2>${blockType.name} (${blockType.weight})</h2> <ul> - <mm:stringlist referid="blockType.subTypes"> - <mm:write request="blockType" /> + <c:forEach items="${blockType.subTypes}" var="bt"> + <mm:write request="blockType" referid="bt" /> <li> - ${requestScope.blockType.name} (${requestScope.blockType.weight}) + <jsp:text>${bt.name}: ${mm:string(bt.title)} (${bt.weight})</jsp:text> <mm:include page="blockType.jspx" /> </li> - </mm:stringlist> + </c:forEach> </ul> <ul> <mm:stringlist referid="blockType.blocks" id="block"> <li> <mm:link page="components"> <mm:param name="component">${block.component.name}</mm:param> - <a href="${_}">${block.component.name}</a> : ${block.name} + <a href="${_}">${block.component.name}</a> + <jsp:text>: ${block.name}: ${mm:string(block.title)}</jsp:text> </mm:link> </li> </mm:stringlist> Index: list.jspx =================================================================== RCS file: /var/cvs/html/mmbase/components/core/components/list.jspx,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- list.jspx 13 Jun 2008 12:18:52 -0000 1.14 +++ list.jspx 27 Jun 2008 12:39:45 -0000 1.15 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <div xmlns="http://www.w3.org/1999/xhtml" - class="mm_c mm_c_core mm_c_b_components ${requestScope.componentClassName}" + class="mm_c c_core c_b_components ${requestScope.componentClassName}" id="${requestScope.componentId}" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" @@ -18,9 +18,7 @@ <mm:notpresent referid="component"> <h3>${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.title)}</h3> <table summary="components" border="0" cellspacing="0" cellpadding="3"> - <caption> - ${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.description)} - </caption> + <caption>${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.description)}</caption> <tr> <th>Component</th> <th>Description</th> @@ -48,9 +46,7 @@ </table> <table summary="framework" border="0" cellspacing="0" cellpadding="3"> - <caption> - Current Framework - </caption> + <caption>Current Framework</caption> <mm:function set="utils" name="framework"> <tr><th>Framework</th><td>${_}</td></tr> </mm:function> @@ -62,9 +58,7 @@ <h2>Component '${component}'</h2> <mm:function set="components" name="get" referids="[EMAIL PROTECTED]" id="c"> <table summary="component" border="0" cellspacing="0" cellpadding="3"> - <caption> - ${c.description} - </caption> + <caption>${c.description}</caption> <tr><th>Version</th><td>${c.version}</td></tr> <tr><th>Defined in</th><td>${c.uri}</td></tr> <tr><th>Translations</th><td>${c.bundle}</td></tr> @@ -93,12 +87,11 @@ <mm:stringlist referid="c.blocks" id="b" jspvar="b" vartype="org.mmbase.framework.Block"> <h4>${b.name}</h4> <table summary="block" border="0" cellspacing="0" cellpadding="3"> - <caption> - ${mm:string(b.description)} - </caption> + <caption>${mm:string(b.description)}</caption> <tr><th>HEAD</th><td><mm:escape><jsp:expression>b.getRenderer(Renderer.Type.HEAD)</jsp:expression></mm:escape></td></tr> <tr><th>BODY</th><td><mm:escape><jsp:expression>b.getRenderer(Renderer.Type.BODY)</jsp:expression></mm:escape></td></tr> <tr><th>Processor</th><td><jsp:expression>b.getProcessor()</jsp:expression></td></tr> + <tr><th>Classification</th><td><jsp:expression>Arrays.asList(b.getClassification())</jsp:expression></td></tr> </table> </mm:stringlist> </mm:function> Index: tree.jspx =================================================================== RCS file: /var/cvs/html/mmbase/components/core/components/tree.jspx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- tree.jspx 18 Jun 2007 20:29:44 -0000 1.1 +++ tree.jspx 27 Jun 2008 12:39:45 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <div - class="mm_c mm_c_core mm_c_b_component-block-tree ${requestScope.componentClassName}" + class="mm_c c_core c_b_component-block-tree ${requestScope.componentClassName}" id="${requestScope.componentId}" xmlns="http://www.w3.org/1999/xhtml" xmlns:jsp="http://java.sun.com/JSP/Page" _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs