[kupu-checkins] r53037 - kupu/trunk/kupu/mmbase/drawers

[mihxil at codespeak.net]

Author: mihxil
Date: Fri Mar 28 10:32:04 2008
New Revision: 53037

Modified:
   kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx
   kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
   kupu/trunk/kupu/mmbase/drawers/search.library.jspx
Log:
made it a bit more robust, removed some trailing whitespace

Modified: kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx	Fri Mar 28 10:32:04 2008
@@ -3,11 +3,11 @@
     Needs: a request context 'drawer', containing a listcontainer 'query'.
 -->
 <mm:context
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
     id="drawer" scope="request">
   <jsp:output omit-xml-declaration="yes" />
-  <mm:import externid="surpressupload" />
+  <mm:import externid="surpressupload" reset="true" />
   <mm:content type="text/xml">
     <mm:listnodescontainer referid="query">
       <items>
@@ -16,7 +16,7 @@
             <uploadbutton>yes</uploadbutton>
           </mm:notpresent>
           <mm:listnodes id="attachment">
-            <resource id="${attachment.number}">          
+            <resource id="${attachment.number}">
               <uri>mmbase://attachments/${attachment.number}</uri>
               <title>[<mm:field name="mimetype" />: <mm:field name="title" />]</title>
               <size><mm:field name="size" />b</size>

Modified: kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	Fri Mar 28 10:32:04 2008
@@ -1,4 +1,4 @@
-<!-- 
+<!--
      This xml can be jsp:directive.include-d inside a node-container.
      It need two variables to exist:
      search:    string to search on
@@ -6,12 +6,11 @@
      $Id: search.constraints.jspx,v 1.2 2005/06/28 12:33:20 michiel Exp $
 -->
 <jsp:root
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:jsp="http://java.sun.com/JSP/Page"
     version="1.2"
     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
     >
   <mm:isnotempty  xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" referid="search">
-    <mm:log>bla</mm:log>
     <mm:composite operator="OR">
       <mm:fieldlist type="search" nodetype="$nodetype">
         <mm:fieldinfo type="typedescription">
@@ -28,4 +27,4 @@
   <mm:hasfield nodetype="${nodetype}" name="version">
     <mm:constraint field="version" value="10000" />
   </mm:hasfield>
-</jsp:root>
\ No newline at end of file
+</jsp:root>

Modified: kupu/trunk/kupu/mmbase/drawers/search.library.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/search.library.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/search.library.jspx	Fri Mar 28 10:32:04 2008
@@ -17,7 +17,6 @@
     <mm:import vartype="list" externid="link_nodetypes">images</mm:import>
     <mm:import externid="source" />
 
-    <mm:log>${nodetypes}</mm:log>
     <library id="${nodetypes}_${search}">
       <uri><mm:url referids="search,librarysize at max,link_nodetypes at nodetypes" page="drawers/collection.jspx" /></uri>
       <title>"<mm:write referid="search" />"</title>
@@ -36,7 +35,7 @@
                 <mm:constraint field="number" inverse="true" value="${source}" />
               </mm:present>
               <mm:sortorder field="number" direction="down" />
-              <mm:size id="size" write="false" />
+              <mm:import id="size" reset="true"><mm:size  /></mm:import>
               <mm:maxnumber value="$librarysize" />
               <mm:offset    value="${librarysize * page}" />
               <mm:haspage page="${nodetype}.items.jspx">
@@ -54,4 +53,4 @@
 
     </library>
   </mm:cloud>
-</mm:content>
\ No newline at end of file
+</mm:content>