Update of /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core
In directory james.mmbase.org:/tmp/cvs-serv4599
Modified Files:
html.tagx include.tagx rich.tagx title.tagx
Log Message:
various details
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/metainf/tags/di/core
Index: html.tagx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/html.tagx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- html.tagx 29 Feb 2008 09:26:25 -0000 1.12
+++ html.tagx 13 Mar 2008 14:20:58 -0000 1.13
@@ -9,6 +9,7 @@
/>
<jsp:directive.attribute name="title_key" />
<jsp:directive.attribute name="title" />
+ <jsp:directive.attribute name="title_nodeparams" />
<jsp:directive.attribute name="rank" />
<jsp:directive.attribute name="expires" />
<jsp:directive.attribute name="reset" />
@@ -33,6 +34,14 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<di:head>
<title>
+ <c:forTokens items="${title_nodeparams}" delims=","
var="title_nodeparam">
+ <c:if test="${! empty title_nodeparam and ! empty
param[title_nodeparam]}">
+ <mm:node number="${param[title_nodeparam]}">
+ <mm:nodeinfo type="gui" />
+ <jsp:text> - </jsp:text>
+ </mm:node>
+ </c:if>
+ </c:forTokens>
<jsp:text>${title}</jsp:text>
<c:if test="${! empty title_key}">
<di:translate key="${title_key}" />
Index: include.tagx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/include.tagx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include.tagx 1 Feb 2008 15:30:09 -0000 1.3
+++ include.tagx 13 Mar 2008 14:20:58 -0000 1.4
@@ -10,6 +10,7 @@
<jsp:directive.attribute name="debug" type="java.lang.String" />
<mm:treeinclude debug="${debug}"
page="${page}"
+ notfound="message"
objectlist="$includePath" referids="$referids">
<mm:param name="extraheader">
<jsp:doBody />
Index: rich.tagx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/rich.tagx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- rich.tagx 7 Mar 2008 17:08:38 -0000 1.1
+++ rich.tagx 13 Mar 2008 14:20:58 -0000 1.2
@@ -1,4 +1,5 @@
<jsp:root
+ xmlns:rich="http://www.mmbase.org/tags/mm/rich";
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
@@ -7,19 +8,6 @@
<jsp:directive.tag description="" />
<jsp:directive.attribute name="field" />
- <mm:formatter format="xhtml">
- <mm:field name="${empty field ? 'body' : field}" />
- <mm:listrelations type="object" role="idrel" searchdir="destination">
- <mm:relatednode>
- <mm:nodeinfo type="nodemanager">
- <mm:compare value="blocks">
- <mm:listrelations type="object" role="idrel"
searchdir="destination" >
- <mm:relatednode />
- </mm:listrelations>
- </mm:compare>
- </mm:nodeinfo>
- </mm:relatednode>
- </mm:listrelations>
- </mm:formatter>
+ <rich:field name="${field}" />
</jsp:root>
Index: title.tagx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/title.tagx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- title.tagx 7 Mar 2008 17:08:38 -0000 1.1
+++ title.tagx 13 Mar 2008 14:20:58 -0000 1.2
@@ -8,6 +8,7 @@
<jsp:directive.attribute name="field" />
+ <mm:hasfield name="showtitle">
<mm:field name="showtitle">
<mm:compare value="1">
<mm:field name="${empty field ? 'title' : field}">
@@ -17,5 +18,13 @@
</mm:field>
</mm:compare>
</mm:field>
+ </mm:hasfield>
+ <mm:hasfield name="showtitle" inverse="true">
+ <mm:field name="${empty field ? 'title' : field}">
+ <mm:isnotempty>
+ <h1><mm:write /></h1>
+ </mm:isnotempty>
+ </mm:field>
+ </mm:hasfield>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
