[MMBASE CVS] applications/richtext/META-INF/tags/mm/rich versions.tagx

[Michiel Meeuwissen]

Update of /var/cvs/applications/richtext/META-INF/tags/mm/rich
In directory james.mmbase.org:/tmp/cvs-serv1996/META-INF/tags/mm/rich

Modified Files:
        versions.tagx 
Log Message:
fields attribute


See also: 
http://cvs.mmbase.org/viewcvs/applications/richtext/META-INF/tags/mm/rich


Index: versions.tagx
===================================================================
RCS file: /var/cvs/applications/richtext/META-INF/tags/mm/rich/versions.tagx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- versions.tagx       30 Jun 2008 16:46:25 -0000      1.5
+++ versions.tagx       30 Jun 2008 16:52:29 -0000      1.6
@@ -9,6 +9,7 @@
   <jsp:directive.tag import="org.mmbase.versioning.*,java.util.*" />
 
   <jsp:directive.attribute name="format" />
+  <jsp:directive.attribute name="fields" />
 
   <mm:include page="/mmbase/jquery/jquery.jspx" />
   <script type="text/javascript">
@@ -85,8 +86,14 @@
           </fmt:message>
           <c:if test="${version2 - 1 eq version1 and ! empty 
version2node.comments}"> (${version2node.comments})</c:if>
         </h2>
-        <mm:import jspvar="body1"><mm:node referid="version1node"><mm:field 
name="body"  /></mm:node></mm:import>
-        <mm:import jspvar="body2"><mm:node referid="version2node"><mm:field 
name="body"  /></mm:node></mm:import>
+        <mm:import id="f" vartype="list">${empty fields ? 'body' : 
fields}</mm:import>
+        <c:if test="${empty format or format == 'html'}">
+          &lt;table class="versions"&gt;
+          <tr><th 
class="difference"/><th>v${version1}</th><th>v${version2}</th></tr>
+        </c:if>
+        <c:forEach items="${f}" var="field">
+          <mm:import jspvar="body1"><mm:node referid="version1node"><mm:field 
name="${field}" /></mm:node></mm:import>
+          <mm:import jspvar="body2"><mm:node referid="version2node"><mm:field 
name="${field}" /></mm:node></mm:import>
         <jsp:scriptlet>
           String[] lines1 = body1.split("\n+");
           String[] lines2 = body2.split("\n+");
@@ -95,10 +102,7 @@
         </jsp:scriptlet>
         <c:choose>
           <c:when test="${empty format or format == 'html'}">
-            <table class="versions">
-              <tr><th 
class="difference"/><th>v${version1}</th><th>v${version2}</th></tr>
               <jsp:expression>diff.toHtml()</jsp:expression>
-            </table>
           </c:when>
           <c:otherwise>
             <pre>
@@ -106,6 +110,10 @@
             </pre>
         </c:otherwise>
         </c:choose>
+        </c:forEach>
+      </c:if>
+      <c:if test="${empty format or format == 'html'}">
+        &lt;/table&gt;
       </c:if>
     </c:if>
   </mm:nodeinfo>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs