Update of /var/cvs/html/mmbase/admin
In directory james.mmbase.org:/tmp/cvs-serv21527
Modified Files:
index.jsp
Log Message:
showing title rather then name of 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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- index.jsp 16 Nov 2007 15:10:01 -0000 1.25
+++ index.jsp 22 Feb 2008 09:37:14 -0000 1.26
@@ -29,19 +29,22 @@
<link rel="icon" href="${_}" type="image/x-icon" />
<link rel="shortcut icon" href="${_}" type="image/x-icon" />
</mm:link>
- <mm:present referid="block"><mm:component name="$component"
block="$block" render="head" /></mm:present>
+ <mm:present referid="block">
+ <mm:component name="$component" block="$block" render="head" />
+ </mm:present>
<mm:notpresent referid="block">
<mm:functioncontainer>
<mm:param name="id">mmbase.${category}</mm:param>
<mm:function set="components" name="blockClassification">
<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"
/>
+ <mm:component name="$component" block="${block}"
render="head" />
</mm:function>
</mm:functioncontainer>
</mm:notpresent>
</head>
</mm:formatter>
+ <mm:function id="blockObject" set="components" name="block"
referids="component,block" write="false" />
<body>
<div id="header">
<div id="logo"><a href="."><mm:link
page="/mmbase/style/logo_trans.png"><img src="${_}" alt="MMBase" width="40"
height="50" /></mm:link></a></div>
@@ -64,14 +67,14 @@
<li><a class="${category eq cat.name ? 'selected' : ''}"
href="${link}">${cat.name}</a>
<mm:compare referid="category" value="${cat.name}">
<ul>
- <c:forEach var="subcat" items="${cat.blocks}">
+ <c:forEach var="b" items="${cat.blocks}">
<mm:link>
<mm:frameworkparam
name="category">${category}</mm:frameworkparam>
- <mm:frameworkparam
name="component">${subcat.component.name}</mm:frameworkparam>
- <mm:frameworkparam
name="block">${subcat.name}</mm:frameworkparam>
- <li class="${subcat.name eq block and
subcat.component.name eq component ? 'current' : ''}">
- <a title="${subcat.description}"
href="${_}">${subcat.name}
- <span
class="component">(${subcat.component.name})</span>
+ <mm:frameworkparam
name="component">${b.component.name}</mm:frameworkparam>
+ <mm:frameworkparam
name="block">${b.name}</mm:frameworkparam>
+ <li class="${b.name eq block and
subcat.component.name eq component ? 'current' : ''}">
+ <a title="${b.description}"
href="${_}">${b.title}
+ <span
class="component">(${b.component.name})</span>
</a>
</li>
</mm:link>
@@ -86,8 +89,8 @@
</div>
<div id="content">
<c:catch var="exception">
- <h2 class="top"><mm:write referid="block"
/></h2>
- <mm:component debug="xml" name="$component"
block="$block">
+ <h2 class="top">${blockObject.title}</h2>
+ <mm:component debug="xml" name="$component" block="${block}">
<mm:frameworkparam
name="category">${category}</mm:frameworkparam>
</mm:component>
</c:catch>
@@ -103,7 +106,6 @@
${mm:escape('text/xml', exception.cause)}
</pre>
</c:if>
-
</div>
<div id="footer">
<ul>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
