Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv32274
Modified Files:
learnobject.jsp showlearnobject.jsp
Log Message:
cleaning, removed usage of mm:tree, and simply using recursive mm:include,
which is easier to understand.
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
Index: learnobject.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/learnobject.jsp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- learnobject.jsp 15 Jan 2009 12:09:28 -0000 1.31
+++ learnobject.jsp 15 Jan 2009 13:04:09 -0000 1.32
@@ -1,8 +1,9 @@
-<jsp:root version="2.0"
+<jsp:root
+ version="2.0"
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
- xmlns:di-t="urn:jsptagdir:/WEB-INF/tags/di/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
<jsp:output omit-xml-declaration="yes" />
<mm:import externid="startnode" required="true" />
@@ -14,42 +15,35 @@
<mm:include page="newfromtree.jsp" />
- <mm:treecontainer
+ <mm:relatednodescontainer
type="learnobjects"
role="posrel"
searchdirs="destination"
>
<mm:sortorder field="posrel.pos" direction="up" />
<mm:typeconstraint name="questions" inverse="true" />
- <mm:tree
- varBranchStatus="status"
- maxdepth="6">
- <mm:first inverse="true">
+ <mm:relatednodes>
+ <li>
<mm:nodeinfo type="type">
<mm:treehaspage page="/education/wizards/show/${_}.jspx"
objectlist="$includePath">
- <li>
<mm:treeinclude page="/education/wizards/show/${_}.jspx"
objectlist="$includePath"
- attributes="sta...@b"
debug="html"
/>
- </li>
</mm:treehaspage>
<mm:treehaspage page="/education/wizards/show/${_}.jspx"
objectlist="$includePath"
inverse="true">
<mm:treeinclude page="/education/wizards/showlearnobject.jsp"
objectlist="$includePath"
- attributes="sta...@b"
debug="html"
>
</mm:treeinclude>
</mm:treehaspage>
</mm:nodeinfo>
- </mm:first>
- <mm:shrink />
- </mm:tree>
- </mm:treecontainer>
+ </li>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
</mm:node>
</mm:cloud>
</mm:content>
Index: showlearnobject.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/showlearnobject.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- showlearnobject.jsp 9 Jan 2009 17:27:56 -0000 1.23
+++ showlearnobject.jsp 15 Jan 2009 13:04:09 -0000 1.24
@@ -10,7 +10,6 @@
<mm:nodeinfo id="objecttype" type="type" write="false" />
- <li>
<mm:link referid="wizardjsp" referids="_n...@objectnumber,_n...@origin">
<mm:param name="wizard">config/<mm:write referid="objecttype"
/>/<mm:write referid="objecttype" /></mm:param>
<mm:param
name="path">${sessionScope.eduname}${sessionScope.path}</mm:param>
@@ -46,6 +45,5 @@
<a href="${_}" target="text"><img src="gfx/versions.gif" border="0"
/></a>
</mm:link>
</mm:node>
- </li>
</jsp:root>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
