Author: michiel
Date: 2009-05-15 16:10:49 +0200 (Fri, 15 May 2009)
New Revision: 35199
Modified:
speeltuin/mihxil/streams/blocks/admin.jspx
speeltuin/mihxil/streams/blocks/myjobs.jspx
Log:
blocks
Modified: speeltuin/mihxil/streams/blocks/admin.jspx
===================================================================
--- speeltuin/mihxil/streams/blocks/admin.jspx 2009-05-15 13:46:12 UTC (rev
35198)
+++ speeltuin/mihxil/streams/blocks/admin.jspx 2009-05-15 14:10:49 UTC (rev
35199)
@@ -23,17 +23,19 @@
</h4>
- URL: <mm:function name="url" />
- <mm:present referid="trigger">
- <mm:voidfunction name="trigger" />
- Triggered conversion
- </mm:present>
- <mm:present referid="trigger" inverse="true">
- <mm:link>
- <mm:param name="trigger" />
- <a href="${_}">Trigger</a>
- </mm:link>
- </mm:present>
+ URL:
+ <mm:function name="url" />
+ <c:choose>
+ <c:when test="${trigger eq _node.number}">
+ <mm:voidfunction name="trigger" />
+ <jsp:text>Triggered conversion</jsp:text>
+ </c:when>
+ <c:otherwise>
+ <mm:link referids="_n...@trigger">
+ <a href="${_}">Trigger</a>
+ </mm:link>
+ </c:otherwise>
+ </c:choose>
</div>
</mm:listnodes>
</mm:listnodescontainer>
Modified: speeltuin/mihxil/streams/blocks/myjobs.jspx
===================================================================
--- speeltuin/mihxil/streams/blocks/myjobs.jspx 2009-05-15 13:46:12 UTC (rev
35198)
+++ speeltuin/mihxil/streams/blocks/myjobs.jspx 2009-05-15 14:10:49 UTC (rev
35199)
@@ -1,14 +1,14 @@
<div
- class="mm_c c_streams b_myfragments ${requestScope.componentClassName}"
+ class="mm_c c_streams b_myjobs ${requestScope.componentClassName}"
id="${requestScope.componentId}"
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm-res="urn:jsptagdir:/WEB-INF/tags/mm/resources"
xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
+
<jsp:output omit-xml-declaration="true" />
-
<ul>
<mm:listfunction set="streams" name="myJobs">
<li>
@@ -19,9 +19,8 @@
<span class="out">${_.transcoder.out}</span>
</p>
<div class="log">
- ${_.logger}
<pre>
- ${_.logger.debugList}
+ <jsp:text>${_.logger.debugList}</jsp:text>
</pre>
</div>
</li>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
