Update of /var/cvs/html/mmbase/components/core/cache
In directory james.mmbase.org:/tmp/cvs-serv11788/components/core/cache
Modified Files:
index.jspx show.jspx
Log Message:
cache show page, deleting entries from cache does not work
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core/cache
Index: index.jspx
===================================================================
RCS file: /var/cvs/html/mmbase/components/core/cache/index.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- index.jspx 21 Mar 2008 15:34:52 -0000 1.5
+++ index.jspx 21 Mar 2008 16:16:32 -0000 1.6
@@ -3,22 +3,17 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
- class="component ${requestScope.componentClassName}"
+ class="component mm_c ${requestScope.componentClassName}"
id="${requestScope.componentId}">
<jsp:directive.page import="org.mmbase.cache.*" />
<jsp:output omit-xml-declaration="true" />
<mm:cloud rank="administrator">
-
<mm:import externid="active" from="request" />
<mm:import externid="clear" from="request" />
<mm:import externid="rs_active" from="request" />
<mm:import externid="rs_show" from="request" />
-<div
- class="component mm_c ${requestScope.componentClassName}"
- id="${requestScope.componentId}">
-
<h3>Cache Monitor</h3>
<!-- activate or deactivate cache -->
@@ -257,7 +252,5 @@
</mm:functioncontainer>
</table>
-
-</div>
-</mm:cloud>
+ </mm:cloud>
</div>
Index: show.jspx
===================================================================
RCS file: /var/cvs/html/mmbase/components/core/cache/show.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- show.jspx 5 Dec 2007 21:13:21 -0000 1.5
+++ show.jspx 21 Mar 2008 16:16:32 -0000 1.6
@@ -2,8 +2,10 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:jsp="http://java.sun.com/JSP/Page";
- class="component ${requestScope.componentClassName}"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
+ class="component mm_c ${requestScope.componentClassName}"
id="${requestScope.componentId}">
+
<jsp:output omit-xml-declaration="true" />
<mm:cloud rank="administrator">
<mm:import externid="cache" from="request" id="name" required="true"
/>
@@ -11,24 +13,26 @@
<mm:import externid="deletekey" from="request" />
<mm:url id="form" page="showcache" />
+
+ <h3>Cache Monitor</h3>
+
<form method="post">
<input type="hidden" name="cache" value="${name}" />
- <table summary="show cache ${name}">
+ <table summary="show cache ${name}" cellspacing="0" cellpadding="3"
border="0">
<mm:voidfunction set="caches" name="get" referids="name" id="cache" />
- <tr>
- <th colspan="5">Cache Monitor</th>
- </tr>
- <tr>
- <td class="multidata" colspan="5">${cache.description} Cache -
${cache.size gt 500 ? 'first 500 of' : ''} ${cache.size} entries</td>
- </tr>
+
+ <caption>
+ ${cache.description} Cache - ${cache.size gt 500 ? 'first 500 of' :
''} ${cache.size} entries
+ </caption>
+
<mm:import externid="key" from="request">.*</mm:import>
<mm:import externid="value" from="request">.*</mm:import>
<tr>
<th>Position</th>
<th>Count</th>
- <th>Key<input type="text" name="key" value="${key}" /></th>
- <th>Value<input type="text" name="value" value="${value}" /></th>
+ <th>Key <input type="text" name="key" value="${key}" /></th>
+ <th>Value <input type="text" name="value" value="${value}" /></th>
<th><input type="submit" value="search" /></th>
</tr>
@@ -48,14 +52,16 @@
<mm:write value="${entry.value}">
<mm:compare regexp="${value}">
<tr>
- <td><mm:index /></td>
+ <td class="right"><mm:index /></td>
<td>${cache.counts[entry.key]}</td>
- <td>${k}</td>
- <td>${entry.value}</td>
+ <td>${k} </td>
+ <td>${entry.value} </td>
<mm:link referids="[EMAIL PROTECTED]">
<mm:param name="deletekey" value="${entry.key}" />
<mm:param name="deleteentry" value="${status.index}" />
- <td><a href="${_}">remove</a></td>
+ <td class="center">
+ <a title="remove this entry" href="${_}"><img
src="${mm:link('/mmbase/style/images/delete.png')}" alt="remove" /></a>
+ </td>
</mm:link>
</tr>
</mm:compare>
@@ -64,15 +70,15 @@
</mm:write>
</mm:context>
</c:forEach>
- <tr class="footer">
- <td>
- <a href="${mm:url('cache', pageContext)}">
- <img src="${mm:url('/mmbase/style/images/back.png', pageContext)}"
alt="back" border="0" />
- </a>
- </td>
- <td class="navigate" colspan="3">Return to Cache Monitor</td>
- </tr>
+
</table>
</form>
+
+ <p>
+ <mm:link page="cache">
+ <a href="${_}"><img src="${mm:link('/mmbase/style/images/back.png')}"
alt="back" /></a>
+ </mm:link>
+ Return to Cache Monitor
+ </p>
</mm:cloud>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
