[kupu-checkins] r38004 - in kupu/trunk/kupu/mmbase: . drawers
mihxil at codespeak.net
mihxil at codespeak.net
Tue Feb 6 14:06:56 CET 2007
Author: mihxil
Date: Tue Feb 6 14:06:53 2007
New Revision: 38004
Modified:
kupu/trunk/kupu/mmbase/drawers.kupu
kupu/trunk/kupu/mmbase/drawers/collection.jspx
kupu/trunk/kupu/mmbase/drawers/images.items.jspx
kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css
kupu/trunk/kupu/mmbase/drawers/libraries.jspx
kupu/trunk/kupu/mmbase/drawers/library.jspx
kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
kupu/trunk/kupu/mmbase/drawers/search.library.jspx
kupu/trunk/kupu/mmbase/drawers/segments.items.jspx
kupu/trunk/kupu/mmbase/mmbase.css
kupu/trunk/kupu/mmbase/node.body.jspx
Log:
made drawers a bit bigger, made 'librarysize' configurable, some start on 'version' filtering in drawers (a bit rudimentary still)
Modified: kupu/trunk/kupu/mmbase/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers.kupu (original)
+++ kupu/trunk/kupu/mmbase/drawers.kupu Tue Feb 6 14:06:53 2007
@@ -34,14 +34,15 @@
<kupu:part name="xmlconfig">
<mm:import externid="link_nodetypes">urls,segments,attachments</mm:import>
+ <mm:import externid="librarysize">50</mm:import>
<image_xsl_uri>drawers/drawer.xsl.jspx</image_xsl_uri>
<link_xsl_uri>drawers/drawer.xsl.jspx</link_xsl_uri>
- <image_libraries_uri>drawers/libraries.jspx?nodetypes=images&amp;source=${objectnumber}</image_libraries_uri>
- <link_libraries_uri>drawers/libraries.jspx?nodetypes=${link_nodetypes}&amp;source=${objectnumber}</link_libraries_uri>
+ <image_libraries_uri>drawers/libraries.jspx?nodetypes=images&amp;source=${objectnumber}&amp;librarysize=${librarysize}</image_libraries_uri>
+ <link_libraries_uri>drawers/libraries.jspx?nodetypes=${link_nodetypes}&amp;source=${objectnumber}&amp;librarysize=${librarysize}</link_libraries_uri>
- <search_images_uri>drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=images&amp;source=${objectnumber}</search_images_uri>
- <search_links_uri> drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=${link_nodetypes}&amp;source=${objectnumber}</search_links_uri>
+ <search_images_uri>drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=images&amp;source=${objectnumber}&amp;librarysize=${librarysize}</search_images_uri>
+ <search_links_uri> drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=${link_nodetypes}&amp;source=${objectnumber}&amp;librarysize=${librarysize}</search_links_uri>
</kupu:part>
Modified: kupu/trunk/kupu/mmbase/drawers/collection.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/collection.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/collection.jspx Tue Feb 6 14:06:53 2007
@@ -7,10 +7,10 @@
<jsp:directive.page session="true" errorPage="../error.jspx" />
<mm:import externid="search" />
<mm:import externid="page" vartype="integer" >0</mm:import>
- <mm:import id="max" vartype="integer">50</mm:import>
+ <mm:import externid="max" vartype="integer">50</mm:import>
<mm:import externid="kupubasedir" />
<collection>
- <uri>drawers/collection.jspx?search=${search}</uri>
+ <uri>drawers/collection.jspx?search=${search}&max=${max}</uri>
<icon>${kupubasedir}/mmbase/icons/map.gif</icon>
<title>MMBase</title>
<mm:cloud method="asis">
@@ -19,18 +19,18 @@
<mm:context scope="request" id="drawer">
<mm:listnodescontainer id="query" type="$nodetype">
- <jsp:directive.include file="search.constraints.jspx" />
<mm:present referid="source">
<mm:constraint field="number" inverse="true" value="${source}" />
</mm:present>
+ <jsp:directive.include file="search.constraints.jspx" />
<mm:sortorder field="number" direction="down" />
<mm:maxnumber value="$max" />
<mm:offset value="${page * max}" />
<mm:haspage page="${nodetype}.items.jspx">
- <mm:include referids="kupubasedir" page="${nodetype}.items.jspx" />
+ <mm:include referids="kupubasedir,max" page="${nodetype}.items.jspx" />
</mm:haspage>
<mm:haspage page="${nodetype}.items.jspx" inverse="true">
- <mm:include referids="kupubasedir" page="texts.items.jspx" />
+ <mm:include referids="kupubasedir,max" page="texts.items.jspx" />
</mm:haspage>
</mm:listnodescontainer>
</mm:context>
Modified: kupu/trunk/kupu/mmbase/drawers/images.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/images.items.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/images.items.jspx Tue Feb 6 14:06:53 2007
@@ -14,8 +14,9 @@
<mm:listnodescontainer id="query" type="images" />
</mm:cloud>
</mm:notpresent>
+ <mm:import externid="max">100</mm:import>
<mm:listnodescontainer referid="query">
- <mm:maxnumber value="100" />
+ <mm:maxnumber value="${100}" />
<mm:sortorder field="number" direction="down" />
<items>
<mm:context>
Modified: kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css (original)
+++ kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css Tue Feb 6 14:06:53 2007
@@ -83,7 +83,7 @@
}
td.panel {
- height: 260px;
+ height: 400px;
}
td#kupu-librariespanel {
Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx Tue Feb 6 14:06:53 2007
@@ -14,12 +14,13 @@
<param name="showupload">yes</param>
<param name="drawertype">image</param>
<mm:import id="kupubasedir"><mm:url absolute="server" page="../.." /></mm:import>
+ <mm:import externid="librarysize">50</mm:import>
<mm:stringlist referid="nodetypes" id="nodetype">
<mm:hasnodemanager name="$_">
<mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel">
<mm:context scope="request" id="drawer">
<mm:import from="parent" externid="nodetype" reset="true" />
- <mm:include referids="kupubasedir" page="library.jspx" />
+ <mm:include referids="kupubasedir,librarysize" page="library.jspx" />
</mm:context>
</mm:hasrelationmanager>
<mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel" inverse="true">
Modified: kupu/trunk/kupu/mmbase/drawers/library.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/library.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/library.jspx Tue Feb 6 14:06:53 2007
@@ -12,6 +12,7 @@
<mm:import externid="nodetype">images</mm:import>
<mm:import externid="source" />
<mm:import externid="kupubasedir" />
+ <mm:import externid="librarysize">50</mm:import>
<mm:context scope="request" id="drawer">
<library id="${nodetype}">
<title>
@@ -20,11 +21,15 @@
<icon height="12" width="16">${kupubasedir}mmbase/icons/map.gif</icon>
<mm:remove referid="query" />
<mm:listnodescontainer id="query" type="$nodetype">
+ <!-- a bit of a hack, we probably need a bit more sophisticated filter on version -->
+ <mm:hasfield nodetype="$nodetype" name="version">
+ <mm:constraint field="version" value="10000" />
+ </mm:hasfield>
<mm:present referid="source">
<mm:constraint field="number" inverse="true" value="${source}" />
</mm:present>
<mm:sortorder field="number" direction="down" />
- <src><mm:url referids="nodetype,kupubasedir,source?" page="drawers/collection.jspx" /></src>
+ <src><mm:url referids="nodetype,kupubasedir,source?,librarysize at max" page="drawers/collection.jspx" /></src>
</mm:listnodescontainer>
<mm:compare referid="nodetype" valueset="images,attachments">
<uploadbutton type="${nodetype}">
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 Tue Feb 6 14:06:53 2007
@@ -5,17 +5,26 @@
nodetype: fields of which node-type must be considered
$Id: search.constraints.jspx,v 1.2 2005/06/28 12:33:20 michiel Exp $
-->
-<mm:isnotempty xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
- referid="search">
- <mm:composite operator="OR">
- <mm:fieldlist type="search" nodetype="$nodetype">
- <mm:fieldinfo type="typedescription">
- <mm:compare valueset="STRING,XML">
- <mm:fieldinfo type="name">
- <mm:constraint field="$_" operator="LIKE" value="%$search%" />
- </mm:fieldinfo>
- </mm:compare>
+<jsp:root
+ 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:composite operator="OR">
+ <mm:fieldlist type="search" nodetype="$nodetype">
+ <mm:fieldinfo type="typedescription">
+ <mm:compare valueset="STRING,XML">
+ <mm:fieldinfo type="name">
+ <mm:constraint field="$_" operator="LIKE" value="%$search%" />
+ </mm:fieldinfo>
+ </mm:compare>
</mm:fieldinfo>
- </mm:fieldlist>
- </mm:composite>
-</mm:isnotempty>
+ </mm:fieldlist>
+ </mm:composite>
+ </mm:isnotempty>
+ <!-- see remark in library.jspx -->
+ <mm:hasfield nodetype="$nodetype" name="version">
+ <mm:constraint field="version" value="10000" />
+ </mm:hasfield>
+</jsp:root>
\ No newline at end of file
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 Tue Feb 6 14:06:53 2007
@@ -36,6 +36,7 @@
<mm:constraint field="number" inverse="true" value="${source}" />
</mm:present>
<mm:sortorder field="number" direction="down" />
+ <mm:size id="size" write="false" />
<mm:maxnumber value="$librarysize" />
<mm:offset value="${librarysize * page}" />
<mm:haspage page="${nodetype}.items.jspx">
Modified: kupu/trunk/kupu/mmbase/drawers/segments.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/segments.items.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/segments.items.jspx Tue Feb 6 14:06:53 2007
@@ -18,12 +18,11 @@
<title>
<mm:hasfunction name="index">
<mm:function name="index">
- <mm:isempty>
- <mm:field name="title" />
- </mm:isempty>
<mm:write />
</mm:function>
</mm:hasfunction>
+ <jsp:text> </jsp:text>
+ <mm:field name="title" />
</title>
<description><h2><mm:field name="title" /></h2><mm:field name="subtitle" /><mm:field name="intro" ><mm:isnotempty> / <mm:write /></mm:isnotempty></mm:field></description>
<icon>${kupubasedir}/common/kupuimages/document.png</icon>
Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css (original)
+++ kupu/trunk/kupu/mmbase/mmbase.css Tue Feb 6 14:06:53 2007
@@ -103,6 +103,12 @@
display: none;
background-color: white;
}
+#kupu div.kupu-drawer {
+ width: 800px;
+}
+#kupu div.kupu-resourceitems {
+ width: 400px;
+}
#kupu div.kupu-drawer textarea, #kupu div.kupu-drawer input {
border: 1px solid;
background-color: #eee;
@@ -110,6 +116,10 @@
#kupu div.kupu-drawer textarea {
width: 95%;
}
+div.kupu-panels td.panel {
+ height: 300px;
+}
+
#kupu div#image_alt_div {
display: none;
}
Modified: kupu/trunk/kupu/mmbase/node.body.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/node.body.jspx (original)
+++ kupu/trunk/kupu/mmbase/node.body.jspx Tue Feb 6 14:06:53 2007
@@ -8,7 +8,7 @@
<jsp:directive.page session="false" errorPage="error.jspx" />
<jsp:output omit-xml-declaration="true" />
<mm:import id="kupu_node" from="session" externid="node" />
- <mm:import id="node" externid="kupu_node" from="this,session" />
+ <mm:import id="node" externid="kupu_node" from="parameters,this,session" />
<mm:cloud method="asis">
<mm:notpresent referid="node">
<mm:remove referid="node" />
More information about the kupu-checkins
mailing list