Update of /var/cvs/html/mmbase/admin/tools/email
In directory james.mmbase.org:/tmp/cvs-serv24685/admin/tools/email
Modified Files:
emailqueue.jsp
Log Message:
halfway revision of email to blocks in its own app
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/admin/tools/email
Index: emailqueue.jsp
===================================================================
RCS file: /var/cvs/html/mmbase/admin/tools/email/emailqueue.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- emailqueue.jsp 27 Mar 2006 13:29:07 -0000 1.10
+++ emailqueue.jsp 12 Apr 2008 14:12:10 -0000 1.11
@@ -1,75 +1,63 @@
-<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm"
-%><[EMAIL PROTECTED] import="org.mmbase.bridge.*"
-%><[EMAIL PROTECTED] import="java.util.Hashtable"
-%><[EMAIL PROTECTED] file="../../settings.jsp"
-%><mm:content expires="0">
-<mm:cloud method="$method" authenticate="$authenticate" rank="administrator"
jspvar="cloud">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml/DTD/transitional.dtd";>
-<html xmlns="http://www.w3.org/TR/xhtml";>
-<head>
-<title>Timed email Queue Monitor</title>
-<link rel="stylesheet" type="text/css" href="<mm:url
page="/mmbase/style/css/mmbase.css" />" />
-</head>
-<body class="basic" >
-
-<table summary="applications">
-
-<%
+<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
+%><[EMAIL PROTECTED]
import="org.mmbase.bridge.*,java.util.Hashtable,org.mmbase.applications.email.*"
+%><%@ taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" %>
+<mm:cloud rank="administrator" loginpage="login.jsp" jspvar="cloud">
+<div
+ class="mm_c mm_c_core mm_c_b_email ${requestScope.componentClassName}"
+ id="${requestScope.componentId}">
+
+
<h3>${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.title)}</h3>
+ <table summary="queued email" border="0" cellspacing="0" cellpadding="3">
+ <caption>
+
${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.description)}
+ </caption>
+ <tr>
+ <th>second to mail</th>
+ <th>to</th>
+ <th>from</th>
+ <th>subject</th>
+ </tr>
+ <%
NodeManager email=null;
try {
- email=cloud.getNodeManager("email");
- } catch (NotFoundException e) {}
-%>
-
-<tr>
- <th class="header" colspan="4">Dynamic & Timed Email System - Queue
Monitor - v1.0</th>
-</tr>
-<% if (email==null) { %>
-<tr>
- <td class="multidata" colspan="4"><p>Email builder not available</p></td>
-</tr>
-<% } else { %>
-
-<tr>
- <td class="multidata" colspan="4">Email queue - first 1000 entries</td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
- <th class="header" colspan="4">First (1000 max) messages into the memory
queue</th>
-</tr>
-<tr>
- <th class="header">second to mail</th>
- <th class="header">to</th>
- <th class="header">from</th>
- <th class="header">subject</th>
-</tr>
-
-<%
- Hashtable params= new Hashtable();
- params.put("MAX","1000");
- params.put("ITEMS","5");
- NodeList msgs=email.getList("MEMTASKS",params);
- for (int i=0; i<msgs.size(); i++) {
- Node msg=msgs.getNode(i);
-%>
-<tr>
- <td class="data"><%=msg.getValue("item2")%></td>
- <td class="data"><%=msg.getValue("item3")%></td>
- <td class="data"><%=msg.getValue("item4")%></td>
- <td class="data"><a href="<mm:url
page="<%="fullmail.jsp?msg="+msg.getValue("item1")%>"
/>"><%=msg.getValue("item5")%></a></td>
-</tr>
-<% } %>
-<% } %>
-
-<tr><td> </td></tr>
+ email = cloud.getNodeManager("email");
+ } catch (NotFoundException e) {
+ %>
+ <tr>
+ <th>NodeManager Email NotFoundException</th><td><%= e %> </td>
+ </tr>
+ <% } %>
+ <%--
+ Hashtable params = new Hashtable();
+ params.put("MAX", "1000");
+ params.put("ITEMS", "5");
+ NodeList msgs = email.getList("MEMTASKS", params);
+ for (int i = 0; i < msgs.size(); i++) {
+ Node msg = msgs.getNode(i);
+ %>
+ <tr>
+ <td><%=msg.getValue("item2")%></td>
+ <td><%=msg.getValue("item3")%></td>
+ <td><%=msg.getValue("item4")%></td>
+ <td>
+ <mm:link page="<%="fullmail.jsp?msg="+msg.getValue("item1")%>"><a
href="${_}"><%= msg.getValue("item5") %></a></mm:link>
+ </td>
+ </tr>
+ <% } --%>
+ </table>
+
+ <ul>
+ <li>
+
+ </li>
+ </ul>
+
+ <p>
+ <mm:link page="email">
+ <a href="${_}"><mm:link page="/mmbase/style/images/back.png"><img
src="${_}" alt="back" /></mm:link></a>
+ <a href="${_}">Return to Email Monitor</a>
+ </mm:link>
+ </p>
-<tr class="footer">
-<td class="navigate"><a href="<mm:url page="../email.jsp"/>"><img src="<mm:url
page="/mmbase/style/images/back.gif" />" alt="back" border="0" /></td>
-<td class="data" colspan="3">Return to Email Monitor</td>
-</tr>
-</table>
-</body></html>
+</div>
</mm:cloud>
-</mm:content>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
