Author: andre Date: 2010-05-31 10:40:59 +0200 (Mon, 31 May 2010) New Revision: 42312
Modified: mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/admin.jspx mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/myfragments.jspx Log: renamed recache param to cache, a bit layout Modified: mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/admin.jspx =================================================================== --- mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/admin.jspx 2010-05-31 08:29:16 UTC (rev 42311) +++ mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/admin.jspx 2010-05-31 08:40:59 UTC (rev 42312) @@ -14,11 +14,13 @@ <mm:import from="request" externid="trigger" /> <mm:import from="request" externid="interrupt" vartype="integer" /> - <mm:import from="request" externid="recache" /> + <mm:import from="request" externid="all" vartype="boolean">false</mm:import> + <mm:import from="request" externid="cache" /> <mm:import from="request" externid="page">0</mm:import> <mm:import id="pagesize" vartype="integer">50</mm:import> <mm:import externid="type">mediafragments</mm:import> + <mm:fieldlist nodetype="streamsources" fields="url" varStatus="status"> <table summary="configuration"> <caption>Configuration of creation of streamscaches</caption> Modified: mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx =================================================================== --- mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx 2010-05-31 08:29:16 UTC (rev 42311) +++ mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx 2010-05-31 08:40:59 UTC (rev 42312) @@ -15,7 +15,7 @@ <mm:listfunction name="filteredurls"> <c:if test="${_.main}"> <c:set var="source" value="${_.source.number}" /> - <tr> + <tr class="odd"> <td>${_.source.number}</td> <td> <strong><a href="${mm:escape('text/xml', _.URL)}"><mm:escape>${_.URL}</mm:escape></a></strong> @@ -40,11 +40,15 @@ <c:choose> <c:when test="${trigger eq triggervalue}"> <mm:log> CALLING TRIGGER FOR ${trigger}</mm:log> - <mm:voidfunction name="triggerCaches" /> + <mm:voidfunction name="triggerCaches" referids="all,cache" /> <div class="msg">Triggered transcoding</div> </c:when> <c:otherwise> <mm:link referids="triggerva...@trigger"> + <a href="${_}">Trigger</a>, + </mm:link> + <mm:link referids="triggerva...@trigger"> + <mm:param name="all">true</mm:param> <a href="${_}">Trigger all</a> </mm:link> </c:otherwise> @@ -67,7 +71,7 @@ </mm:listfunction> <mm:listfunction name="filteredurls"> <c:if test="${!_.main}"> - <tr> + <tr class="odd"> <td> ${_.source.number} </td> <td> <strong><a href="${mm:escape('text/xml', _.URL)}"><mm:escape>${_.URL}</mm:escape></a></strong> @@ -90,7 +94,7 @@ <td>${_.state}</td> </tr><tr> <td /> - <mm:node number="${_.source.number}" notfound="skip" id="cache"> + <mm:node number="${_.source.number}" notfound="skip" id="recache"> <td colspan="4"> <mm:hasfield name="key"> <mm:field name="key" /> @@ -98,21 +102,28 @@ </td> <td> <mm:hasfield name="id"> - <c:set var="recachevalue" value="${fragment}:${cache}" /> + <c:set var="recachevalue" value="${fragment}:${recache}" /> <c:choose> - <c:when test="${recache eq recachevalue}"> + <c:when test="${cache eq recachevalue}"> <mm:field name="id"> <mm:node number="${source}"> - <mm:booleanfunction name="triggerRecache" referids="ca...@recache"> + <mm:booleanfunction name="triggerCaches" referids="reca...@cache"> <div class="msg">Triggered transcoding</div> </mm:booleanfunction> </mm:node> </mm:field> </c:when> <c:otherwise> - <mm:link referids="recacheva...@recache"> - <a href="${_}">Retrigger cache</a> - </mm:link> + <c:choose> + <c:when test="${_.state != 'BUSY'}"> + <mm:link referids="recacheva...@cache"> + <a href="${_}">Retrigger cache</a> + </mm:link> + </c:when> + <c:otherwise> + <div class="msg">Transcoding</div> + </c:otherwise> + </c:choose> </c:otherwise> </c:choose> </mm:hasfield> @@ -122,6 +133,9 @@ </c:if> </mm:listfunction> + <tr class="odd"> + <td colspan="9"><jsp:text> </jsp:text></td> + </tr> </mm:listnodes> <tr cols="100"> Modified: mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/myfragments.jspx =================================================================== --- mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/myfragments.jspx 2010-05-31 08:29:16 UTC (rev 42311) +++ mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/myfragments.jspx 2010-05-31 08:40:59 UTC (rev 42312) @@ -7,9 +7,22 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"> <jsp:output omit-xml-declaration="true" /> + <mm:cloud rank="basic user" jspvar="cloud"> - <table summary="my fragments"> - <caption><mm:cloudinfo type="user" id="currentuser" /></caption> + <h3>${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.title)}</h3> + <p>${mm:string(requestScope['org.mmbase.framework.state'].renderer.block.description)}</p> + + <mm:import from="request" externid="trigger" /> + <mm:import from="request" externid="interrupt" vartype="integer" /> + <mm:import from="request" externid="all" vartype="boolean">false</mm:import> + <mm:import from="request" externid="cache" /> + <mm:import from="request" externid="page">0</mm:import> + + <mm:import id="pagesize" vartype="integer">50</mm:import> + <mm:import externid="type">mediafragments</mm:import> + + <table summary="my fragments"> + <caption>Recent mediafragments of <mm:cloudinfo type="user" id="currentuser" /></caption> <tr> <th>#</th> <th>title or url</th> @@ -19,11 +32,11 @@ <th>action</th> </tr> <mm:listnodescontainer type="mediafragments"> - <mm:constraint field="owner" value="${requestScope['org.mmbase.cloud'].user.ownerField}" /> - <mm:maxnumber value="100" /> - <jsp:directive.include file="fragment.trs.jspx" /> - </mm:listnodescontainer> - </table> - - + <mm:constraint field="owner" value="${requestScope['org.mmbase.cloud'].user.ownerField}" /> + <mm:maxnumber value="100" /> + <jsp:directive.include file="fragment.trs.jspx" /> + </mm:listnodescontainer> + </table> + + </mm:cloud> </div> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs