Author: michiel
Date: 2010-05-12 12:02:09 +0200 (Wed, 12 May 2010)
New Revision: 42136
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/delete.tagx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/toggle.tagx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/unlink.tagx
Log:
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/delete.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/delete.tagx
2010-05-12 09:18:08 UTC (rev 42135)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/delete.tagx
2010-05-12 10:02:09 UTC (rev 42136)
@@ -22,7 +22,7 @@
/>
<jsp:directive.attribute name="parameters" type="java.util.Map" />
- <c:if test="${empty parameters}">
+ <c:if test="${empty pageScope.parameters}">
<c:set var="parameters"
value="${requestScope['org.mmbase.sr.relatednodes.parameters']}" />
</c:if>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-05-12 09:18:08 UTC (rev 42135)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-05-12 10:02:09 UTC (rev 42136)
@@ -3,7 +3,6 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:fn="http://java.sun.com/jsp/jstl/functions";
- xmlns:mm-srt="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
version="2.0"
>
<!--
@@ -13,16 +12,12 @@
@version $Id$
-->
<jsp:directive.tag
- description="Combines mm-sr:search's to a an 'accordion' search" />
+ description="Combines mm-sr:searchs to an accordion search" />
<jsp:directive.attribute name="path" type="java.lang.String"
required="true"
description="Node types to search. This is
equivalent to the path attribute of an mm:listnodescontainer" />
<jsp:directive.attribute name="searchdirs" type="java.lang.String"
- description="This is equivalent to the searchdirs
attribute of an mm:listnodescontainer" />
-
- <jsp:directive.attribute name="searchdirs" type="java.lang.String"
description="This is equivalent to the searchdirs
attribute of an mm:listnodescontainer" />
-
<jsp:directive.attribute name="element" type="java.lang.String"
description="This is equivalent to the element
attribute of an mm:listnodescontainer, but it defaults to the _last_ element."
/>
@@ -37,6 +32,10 @@
<jsp:directive.attribute name="forms" type="java.lang.Boolean"
/>
+ <jsp:directive.attribute name="intro" fragment="true"
+ description="A fragment that will be used to
introduce the first step. The following steps will be introduced with the
selected previous step."
+ />
+
<mm:import externid="org.mmbase.in_form" id="in_form"
vartype="boolean">false</mm:import>
<mm:import id="_forms" vartype="boolean">${empty forms ? ! in_form :
forms}</mm:import>
@@ -73,12 +72,17 @@
id="${pid}">
<tr>
<c:forEach begin="0" end="${laststep + 1}" var="i" step="2"
varStatus="status">
- <th class="${status.first ? 'first' : ''} ${status.last ? 'last' :
''}"><mm:nodeinfo nodetype="${query.steps[i].tableName}"
type="plural_guinodemanager" /></th>
+ <th class="${status.first ? 'first' : ''} ${status.last ? 'last' :
''}">
+ <mm:nodeinfo nodetype="${query.steps[i].tableName}"
type="plural_guinodemanager" />
+ </th>
</c:forEach>
</tr>
<tr>
<td class="first">
<mm:include page="/mmbase/searchrelate/path/searcher.jspx"
referids="pid,pagesize?">
+ <mm:param name="intro">
+ <jsp:invoke fragment="intro" />
+ </mm:param>
<mm:param name="step">0</mm:param>
</mm:include>
</td>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/toggle.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/toggle.tagx
2010-05-12 09:18:08 UTC (rev 42135)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/toggle.tagx
2010-05-12 10:02:09 UTC (rev 42136)
@@ -2,6 +2,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:mm-srt="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
version="2.0"
>
@@ -12,8 +13,14 @@
<jsp:directive.tag
description="This is meant to be isued in an item jsp of
mm-sr:relatednodes. A part of the item can be hidden with that, with a toggle
button the user can click to show it. A subtag can be mm-sr:lazy" />
- <a class="toggle toggle_open"><mm-sr:button type="toggle_open" alt="+" /></a>
- <a class="toggle toggle_close" style="display: none;"><mm-sr:button
type="toggle_close" alt="-" /></a>
+
+ <a class="toggle toggle_open">
+ <mm-sr:button type="toggle_open"
+ alt="+" />
+ </a>
+ <a class="toggle toggle_close" style="display: none;">
+ <mm-sr:button type="toggle_close" alt="-" />
+ </a>
<div class="toggle_body" style="display: none;">
<jsp:doBody />
</div>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/unlink.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/unlink.tagx
2010-05-12 09:18:08 UTC (rev 42135)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/unlink.tagx
2010-05-12 10:02:09 UTC (rev 42136)
@@ -18,7 +18,8 @@
<jsp:directive.attribute name="parameters" type="java.util.Map" />
- <c:if test="${empty parameters}">
+
+ <c:if test="${empty pageScope.parameters}">
<c:set var="parameters"
value="${requestScope['org.mmbase.sr.relatednodes.parameters']}" />
</c:if>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
