Author: michiel
Date: 2009-08-13 21:31:21 +0200 (Thu, 13 Aug 2009)
New Revision: 37795
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/item.jspx
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes.jspx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.body.jspx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/item.jspx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/li.jspx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
Log:
all kind of details
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/item.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/item.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/item.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -18,4 +18,5 @@
<mm:fieldinfo type="errors" />
</mm:field>
<mm-sr:unlink />
+ <mm-sr:delete />
</span>
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -10,17 +10,19 @@
<mm:content
type="application/xhtml+xml"
expires="0"
- language="en">
+ language="nl">
<!--
xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
-
-->
<mm:cloud rank="administrator">
<head>
<jsp:directive.include file="/mmbase/validation/javascript.jspxf" />
+ <mm:link page="/mmbase/searchrelate/page.css.jsp">
+ <link rel="stylesheet" href="${_}" type="text/css" />
+ </mm:link>
</head>
<body>
<h1>Search and Relate examples/tests</h1>
@@ -42,7 +44,9 @@
<h3><mm:field name="title" /></h3>
<mm-sr:relatednodes type="news" role="posrel"
- item="/item.jspx" />
+ sortable="true"
+ search="true"
+ />
</mm:node>
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -10,7 +10,7 @@
<mm:content
type="application/xhtml+xml"
expires="0"
- language="en">
+ language="nl">
<!--
xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -27,7 +27,11 @@
<c:forEach items="${parameters.query.steps}" var="step">
<mm:listnodes referid="tn" commitonclose="false">
<c:if test="${_node._exists eq 'nolonger' or _node._exists eq 'no'
or empty _node._number}"> <!-- DELETED! -->
- <mm:constraint field="${step.alias}.number" inverse="true"
value="${_node.number}" />
+ <mm:hasnode number="${_node.number}">
+ <c:catch>
+ <mm:constraint field="${step.alias}.number" inverse="true"
value="${_node.number}" />
+ </c:catch>
+ </mm:hasnode>
</c:if>
</mm:listnodes>
</c:forEach>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -6,11 +6,9 @@
version="2.0"
>
<!--
+ xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
- xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
-
-
@author Michiel Meeuwissen
@version $Id: relatednodes.tagx,v 1.29 2009-04-09 11:06:58 michiel Exp $
-->
@@ -43,8 +41,15 @@
description="Direction of orderby of
mm:relatednodes, but default to <UP>.pos"
/>
- <jsp:directive.attribute name="fields" type="java.lang.String" />
+ <jsp:directive.attribute name="fields" type="java.lang.String"
+ description="List of fields to show. Defaults to
'use only fieldlistType'."
+ />
+ <jsp:directive.attribute name="fieldlistType" type="java.lang.String"
+ description="Like 'type' of mm:fieldlist. Default
to 'list'."
+
+ />
+
<jsp:directive.attribute name="icondir" type="java.lang.String"
description="Directory from which to take
create/delete icons, can be empty for default icons."
/>
@@ -99,6 +104,14 @@
-->
+ <!--
+ <c:if test="${! empty item and ! empty delete}">
+ <div class="WARNING">WARNING: It makes no sense to use both 'item' and
'delete' attributes. If you use item="", you should use mm-sr:delete in that
jsp (or not)</div>
+ </c:if>
+ <c:if test="${! empty item and ! empty unlink}">
+ <div class="WARNING">WARNING: It makes no sense to use both 'item' and
'unlink' attributes. If you use item="", you should use mm-sr:unlink in that
jsp (or not)</div>
+ </c:if>
+ -->
<mm:import id="_item">${empty item ? '/mmbase/searchrelate/list/item.jspx' :
item}</mm:import>
<mm:import id="_role">${empty role and empty path ? 'posrel' :
role}</mm:import><!-- role defaults to 'posrel' -->
<mm:import id="_direction">${empty direction? 'UP' :
direction}</mm:import><!-- defaults to UP -->
@@ -122,7 +135,7 @@
- <mm:import id="requestid">R<mm:escape
escape="crc32,radix(36)">${pageContext.request.requestURI}?${pageContext.request.queryString}</mm:escape></mm:import>
+ <mm:import id="requestid">R<mm:escape
escape="crc32,radix(36)">${pageContext.request.requestURI}</mm:escape></mm:import>
<mm:import from="session" id="seq" externid="${requestid}_sequence"
vartype="integer">0</mm:import>
<mm:write session="${requestid}_sequence" value="${seq + 1}" />
@@ -149,6 +162,7 @@
<mm:import from="parent" id="confirm" externid="_confirm" />
<mm:import from="parent" id="create" externid="_create" />
<mm:import from="parent" id="unlink" externid="_unlink" />
+ <mm:import from="parent" externid="fieldlistType" />
<mm:import from="parent" externid="type" />
<mm:import from="parent" externid="path" />
@@ -158,6 +172,7 @@
<mm:import from="parent" id="search" externid="_search" />
<mm:import from="parent" externid="query" />
+ <mm:import
id="language">${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}</mm:import>
<mm:import id="referrer"><mm:url absolute="context" /></mm:import>
</mm:context>
@@ -185,15 +200,20 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
basename="org.mmbase.searchrelate.resources.searchrelate">
+ <h2>${id}</h2>
+ <div id="${id}" class="list ${q.nodeManager.name}">
-
-
- <div class="list ${q.nodeManager.name}">
-
<div id="${type}_${id}" class="listinfo">
<!-- This div contains all necessary settings, the javascript can
easily access this data, in case it want to know it too. -->
<c:forEach items="${parameters}" var="entry">
- <input type="hidden" name="${entry.key}"
value="${entry.value}" />
+ <c:choose>
+ <c:when test="${entry.key eq 'query'}">
+ <input type="hidden" name="${entry.key}"
value="${entry.value.sql}" />
+ </c:when>
+ <c:otherwise>
+ <input type="hidden" name="${entry.key}"
value="${entry.value}" />
+ </c:otherwise>
+ </c:choose>
</c:forEach>
</div>
@@ -212,8 +232,10 @@
<mm-sr:search type="${query.nodeManager.name}" />
</c:if>
</c:if>
- <ol>
- <mm:node id="source" />
+
+ <!--
================================================================================
-->
+ <ol class="${query.nodeManager.name}">
+
<mm:relatednodescontainer clone="query">
<mm-sr:deletedConstraint parameters="${parameters}" />
@@ -226,12 +248,15 @@
page="/mmbase/searchrelate/list/li.jspx"
referids="id" />
</mm:relatednodes>
+
<c:if test="${_create and _createposition eq 'bottom'}">
<mm-sr:newNodes />
</c:if>
</mm:relatednodescontainer>
</ol>
+ <!--
================================================================================
-->
+
<c:if test="${_create and _createposition eq 'bottom'}">
<mm:link page="/mmbase/searchrelate/list/create.jspx"
referids="id">
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.body.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.body.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.body.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -6,7 +6,7 @@
>
<mm:hasnode number="$n">
<mm:node referid="n" id="n" />
- <mm:node id="source" referid="source">
+ <mm:node id="source" referid="parameters.source">
<mm:relatednodescontainer type="object">
<mm:constraint field="number" value="${n}" />
<mm:maxnumber value="1" />
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/item.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/item.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/item.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -17,19 +17,31 @@
<mm:fieldlist
id="${requestScope['org.mmbase.cloud'].name}_node_${mm:escape('identifier',
_node)}"
- type="${empty fields ? 'list' : ''}" fields="${fields}"
varStatus="status">
+ type="${empty parameter.fieldlistType ? (empty parameters.fields ?
'list' : '') : parameters.fieldlistType}"
+ fields="${parameters.fields}"
+ varStatus="status">
+
<c:if test="${status.current.state ne 3}"> <!-- don't show system fields
on default -->
- <mm:fieldinfo type="input" />
- <c:if test="${status.first}">
+ <div class="mm_field ${status.current.name}
mm_state_${status.current.state}">
+
+ <mm:fieldinfo type="forid">
+ <label forid="${_}"><mm:fieldinfo type="guiname" /></label>
+ </mm:fieldinfo>
<jsp:text> </jsp:text>
- <c:if test="${parameters.delete}">
- <mm-sr:delete />
+
+ <mm:fieldinfo type="input" />
+ <c:if test="${status.first}">
+ <jsp:text> </jsp:text>
+ <c:if test="${parameters.delete}">
+ <mm-sr:delete />
+ </c:if>
+ <c:if test="${parameters.unlink}">
+ <mm-sr:unlink />
+ </c:if>
</c:if>
- <c:if test="${parameters.unlink}">
- <mm-sr:unlink />
- </c:if>
- </c:if>
- <mm:fieldinfo type="errors" />
+ <mm:fieldinfo type="errors" />
+ </div>
</c:if>
+
</mm:fieldlist>
</jsp:root>
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/li.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/li.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/li.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -8,15 +8,34 @@
<jsp:output omit-xml-declaration="true" />
<jsp:directive.include file="parameters.jspf" />
- <li
- class="node_${_node}"
- xmlns="http://www.w3.org/1999/xhtml";>
- <mm:form id="${parameters.formtag}"
- name="${parameters.formtag}"
- page="${parameters.referrer}">
- <mm:include debug="html" page="${parameters.item}">
- <mm:param name="source" value="${parameters.source}" />
- </mm:include>
- </mm:form>
- </li>
+ <mm:locale language="${parameters.language}">
+ <li
+ class="node_${_node}"
+ xmlns="http://www.w3.org/1999/xhtml";>
+ <c:choose>
+ <c:when test="${! empty parameters.formtag}">
+ <mm:include debug="html"
+ page="${parameters.item}"
+ referids="id">
+ <mm:param name="source" value="${parameters.source}" />
+ <mm:param name="fields" value="${parameters.fields}" />
+ <mm:param name="fieldlistType" value="${parameters.fieldlistType}"
/>
+ </mm:include>
+ </c:when>
+ <c:otherwise>
+ <mm:import id="formtagid">node${_node}</mm:import>
+ <mm:form id="${formtagid}"
+ name="${formtagid}">
+ <mm:include debug="html"
+ page="${parameters.item}"
+ referids="id">
+ <mm:param name="source" value="${parameters.source}" />
+ <mm:param name="fields" value="${parameters.fields}" />
+ <mm:param name="fieldlistType"
value="${parameters.fieldlistType}" />
+ </mm:include>
+ </mm:form>
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </mm:locale>
</jsp:root>
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -14,34 +14,40 @@
-->
<div class="saveresult">
- <mm:escape escape="swallow">
- <mm:listnodescontainer clone="parameters.query">
- <mm-sr:deletedConstraint parameters="${parameters}" />
- <mm:listnodes>
- <mm:import id="formtagid" externid="formtag">node${_node}</mm:import>
- <mm:form id="${formtagid}"
+ <mm:listnodescontainer clone="parameters.query">
+ <mm-sr:deletedConstraint parameters="${parameters}" />
+ <mm:listnodes>
+ <mm:import id="formtagid">
+ <c:choose>
+ <c:when test="${empty parameters.formtag}">node${_node}</c:when>
+ <c:otherwise>${parameters.formtag}</c:otherwise>
+ </c:choose>
+ </mm:import>
+ <span>${formtagid}</span>
+ <mm:form id="${formtagid}"
name="${formtagid}"
>
+ <mm:escape escape="swallow">
<mm:include page="${parameters.item}" referids="id" />
- <c:if test="${empty formtag}">
- <mm:valid>
- <mm:import externid="submit" />
- <mm:present referid="submit">
- <mm:log level="debug">Submitting form</mm:log>
- <mm:commit />
- </mm:present>
+ </mm:escape>
+ <c:if test="${empty parameters.formtag}">
+ <mm:valid>
+ <mm:import externid="submit" />
+ <mm:present referid="submit">
+ <mm:log level="debug">Submitting form</mm:log>
+ <mm:commit />
+ </mm:present>
+ </mm:valid>
+ <span class="status">
+ <mm:valid inverse="true">
+ <mm:log level="debug">Form not valid</mm:log>
+ <jsp:text>Form not valid</jsp:text>
</mm:valid>
- <span class="status">
- <mm:valid inverse="true">
- <mm:log level="debug">Form not valid</mm:log>
- <jsp:text>Form not valid</jsp:text>
- </mm:valid>
- </span>
- </c:if>
- </mm:form>
- </mm:listnodes>
- </mm:listnodescontainer>
- </mm:escape>
+ </span>
+ </c:if>
+ </mm:form>
+ </mm:listnodes>
+ </mm:listnodescontainer>
<c:if test="${! empty parameters.formtag}">
<mm:form id="${parameters.formtag}"
name="${parameters.formtag}"
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
2009-08-13 19:12:18 UTC (rev 37794)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
2009-08-13 19:31:21 UTC (rev 37795)
@@ -23,7 +23,7 @@
</mm:fieldlist>
</c:when>
<c:otherwise>
- <td class="node"><mm:nodeinfo type="gui" /></td>
+ <td class="node gui"><mm:nodeinfo type="gui" /></td>
<mm:fieldlist type="list" varStatus="field">
<td class="fields ${field.current.name}"><mm:fieldinfo
type="guivalue" /></td>
</mm:fieldlist>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
