Author: andre
Date: 2010-03-26 11:31:23 +0100 (Fri, 26 Mar 2010)
New Revision: 41625
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:
reordered fields in streams table
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-03-25 21:55:16 UTC (rev 41624)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/admin.jspx
2010-03-26 10:31:23 UTC (rev 41625)
@@ -41,6 +41,14 @@
<table summary="mediafragments">
<caption>Recent mediafragments</caption>
+ <tr>
+ <th>#</th>
+ <th>title or url</th>
+ <th>mimetype</th>
+ <th>size</th>
+ <th>sourcenode, builder</th>
+ <th>action</th>
+ </tr>
<mm:listnodescontainer type="${type}">
<mm:sortorder field="number" direction="down" />
<mm:offset value="${page * pagesize}" />
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-03-25 21:55:16 UTC (rev 41624)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx
2010-03-26 10:31:23 UTC (rev 41625)
@@ -7,29 +7,26 @@
<mm:listnodes id="fragment">
<tr>
- <th>
- <mm:nodeinfo type="nodemanager"/>
- </th><th>
- <mm:field name="number" />
- </th><th colspan="4">
- <mm:nodeinfo type="gui" />
- </th><th colspan="99" />
+ <th><mm:field name="number" /></th>
+ <th colspan="3"><mm:nodeinfo type="gui" /></th>
+ <th><mm:nodeinfo type="nodemanager" /></th>
+ <th colspan="3" />
</tr>
<mm:listfunction name="filteredurls">
<c:if test="${_.main}">
<c:set var="source" value="${_.source.number}" />
<tr>
- <th>${_.source.builder.tableName}</th>
<td>${_.source.number}</td>
<td>
- <jsp:text>${_.state}</jsp:text>
- ${_.mimeType}
- ${_.dimension}
+ <strong><a href="${mm:escape('text/xml',
_.URL)}"><mm:escape>${_.URL}</mm:escape></a></strong>
</td>
- <td>
- <a href="${mm:escape('text/xml',
_.URL)}"><mm:escape>${_.URL}</mm:escape></a>
- </td>
- <td colspan="2">
+ <td> ${_.mimeType} </td>
+ <td> ${_.dimension} </td>
+ <td> ${_.source.builder.tableName} </td>
+ <td>${_.state}</td>
+ </tr><tr>
+ <td />
+ <td colspan="4">
<mm:function set="streams" name="getJob" referids="_n...@node">
JOB: ${_.class}<br />
</mm:function>
@@ -71,26 +68,30 @@
<mm:listfunction name="filteredurls">
<c:if test="${!_.main}">
<tr>
- <th>${_.source.builder.tableName}</th>
- <td>${_.source.number}</td>
- <td>
- <jsp:text>${_.state}</jsp:text>
- ${_.mimeType}
+ <td> ${_.source.number} </td>
+ <td>
+ <strong><a href="${mm:escape('text/xml',
_.URL)}"><mm:escape>${_.URL}</mm:escape></a></strong>
+ </td>
+ <td> ${_.mimeType} </td>
+ <td>
${_.dimension}
+ <mm:node number="${_.source.number}" notfound="skip">
+ <mm:hasfield name="label">
+ <mm:field
name="label"><mm:isnotempty>${_}</mm:isnotempty></mm:field>
+ </mm:hasfield>
+ </mm:node>
</td>
- <td>
- <a href="${mm:escape('text/xml',
_.URL)}"><mm:escape>${_.URL}</mm:escape></a>
- </td>
+ <td>
+ <mm:node number="${_.source.number}" notfound="skip">
+ <mm:hasfield name="id"><mm:field name="id" />, </mm:hasfield>
+ </mm:node>
+ ${_.source.builder.tableName}
+ </td>
+ <td>${_.state}</td>
+ </tr><tr>
+ <td />
<mm:node number="${_.source.number}" notfound="skip" id="cache">
- <td>
- <mm:hasfield name="label">
- <mm:field name="label" /><br />
- </mm:hasfield>
- <mm:hasfield name="id">
- <mm:field name="id" />
- </mm:hasfield>
- </td>
- <td>
+ <td colspan="4">
<mm:hasfield name="key">
<mm:field name="key" />
</mm:hasfield>
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-03-25 21:55:16 UTC (rev 41624)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/webapp/mmbase/components/streams/myfragments.jspx
2010-03-26 10:31:23 UTC (rev 41625)
@@ -10,7 +10,15 @@
<table summary="my fragments">
<caption><mm:cloudinfo type="user" id="currentuser" /></caption>
- <mm:listnodescontainer type="mediafragments">
+ <tr>
+ <th>#</th>
+ <th>title or url</th>
+ <th>mimetype</th>
+ <th>size</th>
+ <th>sourcenode, builder</th>
+ <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" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
