Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv22784
Modified Files:
index.jsp learnobject.jsp mode.include.jsp newfromtree.jsp
showlearnobject.jsp
Log Message:
tidied up a bit using di:leaf
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/index.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- index.jsp 1 Feb 2008 14:06:25 -0000 1.29
+++ index.jsp 29 Feb 2008 09:24:12 -0000 1.30
@@ -5,6 +5,7 @@
<di:html
type="text/html"
styleClass="editwizards"
+ component="education.wizards"
title_key="education.editwizards"
rank="editor" expires="0">
Index: learnobject.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/learnobject.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- learnobject.jsp 1 Nov 2006 10:10:37 -0000 1.23
+++ learnobject.jsp 29 Feb 2008 09:24:12 -0000 1.24
@@ -1,143 +1,58 @@
-<%@ page import = "java.util.HashSet" %>
-<%@ page import = "org.mmbase.bridge.*" %>
-
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" %>
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di" %>
-
-
-<mm:content postprocessor="reducespace">
-<mm:import externid="wizardjsp" required="true" jspvar="wizardjsp" />
-<mm:cloud method="delegate" jspvar="cloud">
-<[EMAIL PROTECTED] file="/shared/setImports.jsp"%>
-
-<%
- Node nodeUser = nl.didactor.security.Authentication.getCurrentUserNode(cloud);
- String imageName = "";
- String sAltText = "";
- String startnode = request.getParameterValues("startnode")[0];
- String zeroPath="";
-
-
-
- int [] offset = new int[10];
- for(int d=0; d<offset.length; d++) offset[d]= 0;
-
- String [] lastLearnObject = new String[10];
- for(int d=0; d<lastLearnObject.length; d++) lastLearnObject[d]= "";
- lastLearnObject[0] = startnode;
-
- int depth = 1;
- boolean subLearnobjectFound = false;
- boolean[] branches = {true, true, true, true, true, true, true, true, true,
true};
-
- %>
- <mm:import reset="true" id="the_last_element">true</mm:import>
- <mm:node id="sn" number="<%= startnode %>">
- <mm:relatednodes type="learnobjects" searchdir="destination" max="1">
- <mm:import reset="true" id="the_last_element">false</mm:import>
- </mm:relatednodes>
- <mm:import reset="true" id="the_last_parent"><%=
request.getParameter("the_last_parent")%></mm:import>
- <mm:field name="name" jspvar="startnodename" vartype="String"
write="false">
- <%
- zeroPath=startnodename;
- %>
- </mm:field>
- <% session.setAttribute("path",zeroPath); %>
- <[EMAIL PROTECTED] file="newfromtree.jsp" %>
- </mm:node>
-<%
-String currentPath="";
-branches = new boolean[10];
-String[] currentPathN = new String[10];
-
- while( (depth > 0 || subLearnobjectFound) && depth < 10)
- {
- subLearnobjectFound = false;
- %>
-
- <mm:list nodes="<%= lastLearnObject[depth-1] %>"
path="learnobjects1,posrel,learnobjects2" searchdir="destination"
orderby="posrel.pos" directions="UP" max="1" offset="<%= ""+ offset[depth] %>">
- <mm:import id="ow1" reset="true" jspvar="ow1">
- <mm:field name="learnobjects1.name" jspvar="learnobjects1_name"
vartype="String"/>
- </mm:import>
-
- <mm:import id="ow2" reset="true" jspvar="ow2">
- <mm:field name="learnobjects2.otype" jspvar="learnobjects2_otype"
vartype="String"/>
- </mm:import>
- <mm:import id="ow3" reset="true" jspvar="ow3"></mm:import>
- <mm:import id="owtrim" reset="true"><%=ow2.trim()%></mm:import>
- <mm:compare referid="owtrim" value="202" >
- <mm:import id="ow3" reset="true" jspvar="ow3">
- <mm:field name="learnobjects2.name" jspvar="learnobjects2_name"
vartype="String"/>
- </mm:import>
- <%
- currentPathN[depth]=" > "+ow3.trim();
- %>
- </mm:compare>
-
- <%
- currentPath="";
- for(int j=1;j<depth;j++){
- currentPath=currentPath+currentPathN[j];
- }
- session.setAttribute("path",zeroPath+currentPath);
- %>
-
- <mm:field name="learnobjects2.number"
jspvar="learnobjects2_number" vartype="String" write="false">
- <%
- if(offset[depth]==0)
- {
- %>
- <mm:node number="component.pdf" notfound="skip">
- <mm:relatednodes type="providers"
constraints="providers.number=$provider">
- <mm:import id="pdfurl"
reset="true"><mm:treefile write="true" page="/pdf/pdfchooser.jsp"
objectlist="$includePath" referids="$referids" /></mm:import>
- </mm:relatednodes>
- </mm:node>
- <%
- }
- subLearnobjectFound= true;
- offset[depth]++;
- %>
- <mm:import reset="true" id="the_last_leaf_in_this_level"
>true</mm:import>
- <%
- branches[depth - 1] = false;
- %>
- <mm:list nodes="<%= lastLearnObject[depth-1] %>"
path="learnobjects1,posrel,learnobjects2" searchdir="destination"
orderby="posrel.pos" directions="UP" max="1" offset="<%= ""+ offset[depth] %>">
- <mm:import reset="true"
id="the_last_leaf_in_this_level">false</mm:import>
- <%
- branches[depth - 1] = true;
- %>
-
- </mm:list>
- <[EMAIL PROTECTED] file="showlearnobject.jsp" %>
- <%
- lastLearnObject[depth] = learnobjects2_number;
- depth ++;
- %>
- </mm:field>
- </mm:list>
- <%
- if(!subLearnobjectFound)
- { // go one layer back
- %>
- <mm:node number="<%= lastLearnObject[depth-1] %>">
- <mm:import id="objecttype" reset="true"><mm:nodeinfo type="type"
/></mm:import>
- <mm:compare referid="objecttype" valueset="learnblocks">
- <%
- if(depth > 1)
- {// We haven't to close the last level. There is </div> in
code.jsp
- %>
+<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:di="http://www.didactor.nl/ditaglib_1.0";>
+ <jsp:output omit-xml-declaration="yes" />
+ <mm:import externid="startnode" required="true" />
+ <mm:import externid="branchPath" required="true" />
+
+ <mm:content postprocessor="none">
+ <mm:cloud method="delegate">
+ <mm:node id="sn" number="${startnode}">
+ <div id="tree_for_${_node}" >
+
+ <mm:include page="newfromtree.jsp">
+ <mm:param name="branchPath">${branchPath}</mm:param>
+ </mm:include>
+
+
+ <mm:treecontainer
+ type="learnobjects"
+ role="posrel"
+ searchdirs="destination"
+ >
+ <mm:sortorder field="posrel.pos" direction="up" />
+ <mm:typeconstraint name="questions" inverse="true" />
+ <mm:write request="branch" value="" />
+ <mm:tree
+ varBranchStatus="status"
+ maxdepth="6">
+ <mm:first inverse="true">
+ <mm:nodeinfo type="type">
+ <mm:haspage page="/education/wizards/show/${_}.jspx">
+ <mm:include page="/education/wizards/show/${_}.jspx"
+ attributes="[EMAIL PROTECTED]"
+ referids="branchPath"
+ >
+ </mm:include>
+ </mm:haspage>
+ <mm:haspage page="/education/wizards/show/${_}.jspx"
inverse="true">
+ <mm:include page="/education/wizards/showlearnobject.jsp"
+ attributes="[EMAIL PROTECTED]"
+ debug="html"
+ referids="branchPath"
+ >
+ </mm:include>
+ </mm:haspage>
+ </mm:nodeinfo>
+ </mm:first>
+ <mm:shrink />
+ </mm:tree>
+ </mm:treecontainer>
</div>
- <%
- }
- %>
- </mm:compare>
</mm:node>
- <%
- offset[depth]=0;
- depth--;
- }
- }
-%>
-</mm:cloud>
-</mm:content>
-<% session.removeAttribute("path");%>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
Index: mode.include.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/mode.include.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- mode.include.jsp 28 Jan 2008 17:24:56 -0000 1.9
+++ mode.include.jsp 29 Feb 2008 09:24:12 -0000 1.10
@@ -1,19 +1,24 @@
<mm:import id="templates">/editwizards/data/</mm:import>
+<mm:import id="referrer">/education/wizards/ok.jsp?reload=true</mm:import>
<mm:import externid="showcode">false</mm:import>
<mm:treefile id="wizardjsp" write="false" escapeamps="false"
- page="/mmbase/edit/wizard/jsp/wizard.jsp"
objectlist="$includePath" referids="templates">
+ page="/mmbase/edit/wizard/jsp/wizard.jsp"
objectlist="$includePath" referids="templates,referrer">
<mm:param name="language">${locale.language}</mm:param>
- <mm:param name="referrer">/education/wizards/ok.jsp?reload=true</mm:param>
<mm:param name="loginmethod">delegate</mm:param>
</mm:treefile>
-<mm:treefile id="listjsp" page="/mmbase/edit/wizard/jsp/list.jsp"
objectlist="$includePath" referids="templates" write="false" escapeamps="false">
+<mm:treefile id="listjsp" page="/mmbase/edit/wizard/jsp/list.jsp"
objectlist="$includePath" referids="templates,referrer" write="false"
escapeamps="false">
<mm:param name="language">${locale.language}</mm:param>
<mm:param name="loginmethod">delegate</mm:param>
</mm:treefile>
+<mm:write request="templates" referid="templates" />
+<mm:write request="referrer" referid="referrer" />
+<mm:write request="wizardjsp" referid="wizardjsp" />
+<mm:write request="listjsp" referid="listjsp" />
+
<mm:hasnode number="component.pdf">
<mm:node number="component.pdf">
<mm:relatednodes type="providers" constraints="providers.number=$provider">
Index: newfromtree.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/newfromtree.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- newfromtree.jsp 13 Dec 2007 15:27:02 -0000 1.18
+++ newfromtree.jsp 29 Feb 2008 09:24:12 -0000 1.19
@@ -1,170 +1,24 @@
-<%@ page import = "java.util.HashSet" %>
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" %>
-<mm:import id="lastIt" jspvar="lastIt" reset="true"><mm:field
name="name"/></mm:import>
-<%
-String lastItem = "";
-if(depth!=1){
- lastItem=" > "+lastIt;
-}
-%>
-<mm:remove referid="type_of_node"/>
-<mm:nodeinfo id="type_of_node" type="type" jspvar="sNodeType" vartype="String">
+<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:di="http://www.didactor.nl/ditaglib_1.0";>
+ <jsp:output omit-xml-declaration="yes" />
+
+ <mm:import externid="wizardjsp" from="request" />
+ <mm:import externid="branchPath" />
+
+ <di:getsetting setting="new_learnobjects" component="core" vartype="list"
id="new_learnobjects" write="false" />
+ <mm:stringlist referid="new_learnobjects">
+
+ <mm:haspage page="/education/wizards/new/${_}.jspx">
+ <mm:treeinclude page="/education/wizards/new/${_}.jspx"
+ objectlist="$includePath"
+ referids="$referids,depth?">
+ </mm:treeinclude>
+ </mm:haspage>
+ </mm:stringlist>
- <mm:compare referid="type_of_node" value="learnblocks">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true" inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px" height="16px"
border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px" height="16px"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="learnblocks" type="guitype"/></mm:import>
- <td><img src="gfx/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- <td><img src="gfx/new_education.gif" width="16" border="0"
align="middle" /></td>
- <td><nobr>
- <mm:context>
- <mm:listrelations role="posrel" type="learnblocks" max="1"
orderby="pos">
- <mm:field name="pos" id="maxpos" write="false" />
- </mm:listrelations>
- <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
- <mm:param
name="wizard">config/learnblocks/learnblocks-origin</mm:param>
- <mm:param name="objectnumber">new</mm:param>
- <mm:param name="newpos">${maxpos + 1}</mm:param>
- <mm:param name="path"><%=session.getAttribute("eduname")%> > <%=
session.getAttribute("path") %> <%=lastItem %></mm:param>
- <a href="${_}" title="${di:translate('education.new')}
${dummyname} ${di:translate('education.aanmaken')}"
- target="text">
- <di:translate key="education.new" /> ${dummyname}
<di:translate key="education.aanmaken" />
- </a>
- </mm:link>
- </mm:context>
- </nobr></td>
- </tr>
- </table><!-- the sillyness doesn't stop! -->
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true" inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px" height="16px"
border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px" height="16px"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="pages" type="guitype"/></mm:import>
- <td><img src="gfx/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- <td><img src="gfx/new_education.gif" width="16" border="0"
align="middle" /></td>
- <td><nobr>
- <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
- <mm:param name="wizard">config/pages/pages-origin</mm:param>
- <mm:param name="objectnumber">new</mm:param>
- <mm:param name="path"><%=session.getAttribute("eduname")%> > <%=
session.getAttribute("path") %> <%=lastItem %></mm:param>
- <a href="${_}"
- title="${di:translate('education.new')} ${dummyname}
${di:translate('education.aanmaken')}"
- target="text"><di:translate key="education.new" /> ${dummyname}
<di:translate key="education.aanmaken" />
- </a>
- </mm:link>
- </nobr></td>
- </tr>
- </table>
- <!-- WTF, yet more tables, and noise -->
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true" inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px" height="16px"
border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px" height="16px"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:import id="dummyname" jspvar="dummyName" vartype="String"
reset="true"><mm:nodeinfo nodetype="tests" type="guitype"/></mm:import>
- <td><img src="gfx/tree_vertline-leaf.gif" border="0"
align="center" valign="middle"/></td>
- <td><img src="gfx/new_education.gif" width="16" border="0"
align="middle" /></td>
- <td><nobr>
- <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
- <mm:param name="wizard">config/tests/tests-origin</mm:param>
- <mm:param name="objectnumber">new</mm:param>
- <mm:param name="path"><%=session.getAttribute("eduname")%> >
<%= session.getAttribute("path") %> <%=lastItem %></mm:param>
- <a href="${_}"
- title="${di:translate('education.new')} ${dummyname}"
- target="text"><di:translate key="education.new" />
${dummyname}</a>
- </mm:link>
- </nobr></td>
- </tr>
- </table>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true" inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px" height="16px"
border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px" height="16px"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="flashpages" type="guitype"/></mm:import>
- <td><img src="gfx/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- <td><img src="gfx/new_education.gif" width="16" border="0"
align="middle" /></td>
- <td><nobr>
- <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
- <mm:param
name="wizard">config/flashpages/flashpages-origin</mm:param>
- <mm:param name="objectnumber">new</mm:param>
- <mm:param name="path"><%=session.getAttribute("eduname")%> > <%=
session.getAttribute("path") %> <%=lastItem %></mm:param>
- <a href="${_}"
- title="${di:translate('education.new')} {dummyname}"
- target="text"><di:translate key="education.new" />
${dummyname}</a>
- </mm:link>
- </nobr></td>
- </tr>
- </table>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true" inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px" height="16px"
border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px" height="16px"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="htmlpages" type="guitype"/></mm:import>
- <mm:compare referid="the_last_element" value="true" inverse="true">
- <td><img src="gfx/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_element" value="true">
- <td><img src="gfx/tree_leaflast.gif" border="0" align="center"
valign="middle"/></td>
- </mm:compare>
- <td><img src="gfx/new_education.gif" width="16" border="0"
align="middle" /></td>
- <td><nobr>
- <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
- <mm:param
name="wizard">config/htmlpages/htmlpages-origin</mm:param>
- <mm:param name="objectnumber">new</mm:param>
- <mm:param name="path"><%=session.getAttribute("eduname")%> > <%=
session.getAttribute("path") %> <%=lastItem %></mm:param>
- <a href="${_}"
- title="${di:translate('education.new')} ${dummyname}"
- target="text"><di:translate key="education.new" />
${dummyname}</a>
- </mm:link>
- </nobr></td>
- </tr>
- </table>
- </mm:compare>
-
-</mm:nodeinfo>
+</jsp:root>
Index: showlearnobject.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/showlearnobject.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- showlearnobject.jsp 4 Jun 2007 11:03:08 -0000 1.19
+++ showlearnobject.jsp 29 Feb 2008 09:24:12 -0000 1.20
@@ -1,43 +1,30 @@
-<mm:node number="<%= learnobjects2_number %>">
- <[EMAIL PROTECTED] file="whichimage.jsp"%>
- <mm:import id="objecttype" reset="true" jspvar="dummyName"
vartype="String"><mm:nodeinfo type="type" /></mm:import>
-
- <mm:compare referid="objecttype"
valueset="couplingquestions,dropquestions,hotspotquestions,mcquestions,openquestions,rankingquestions,valuequestions,fillquestions,fillselectquestions,opennumeralquestions,essayquestions,openvaluequestions"
inverse="true">
-
- <mm:compare referid="objecttype" valueset="learnblocks"
inverse="true">
- <table border="0" bordercolor="red" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true"
inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px"
height="16px" border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px"
height="16px" border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:compare referid="the_last_element" value="true"
inverse="true">
- <mm:compare referid="the_last_leaf_in_this_level"
value="true">
- <td><img src="gfx/tree_leaflast.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_leaf_in_this_level"
value="true" inverse="true">
- <td><img src="gfx/tree_vertline-leaf.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- </mm:compare>
- <mm:compare referid="the_last_element" value="true">
- <td><img src="gfx/tree_leaflast.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- <td><img src="gfx/edit_learnobject.gif" width="16" border="0"
align="middle" /></td>
- <td>
- <nobr>
+<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="http://www.didactor.nl/ditaglib_1.0";>
+ <jsp:output omit-xml-declaration="yes" />
+
+ <mm:import externid="b" from="request" />
+ <mm:import externid="branchPath" required="true" />
+
+ <mm:nodeinfo id="objecttype" type="type" write="false" />
+
+ <di:leaf styleClass="self"
+ branch="${b}"
+ branchOffset="1"
+ branchPath="${branchPath}">
+ SL
<mm:link referid="wizardjsp" referids="[EMAIL
PROTECTED],[EMAIL PROTECTED]">
<mm:param name="wizard">config/<mm:write
referid="objecttype" />/<mm:write referid="objecttype" /></mm:param>
- <mm:param
name="path"><%=session.getAttribute("eduname")%> > <%=
session.getAttribute("path")%></mm:param>
- <a href='${_}' title='<di:translate key="education.edit"
/> <%= dummyName.toLowerCase() %>' target="text">
- <mm:field name="name"><mm:isempty><mm:field
name="title"/></mm:isempty><mm:isnotempty><mm:write/></mm:isnotempty></mm:field>
+ <mm:param
name="path">${sessionScope.eduname}${sessionScope.path}</mm:param>
+ <a href='${_}' title="${di:translate('education.edit')} ${objecttype}"
target="text">
+ <mm:hasfield name="name"><mm:field name="name" /></mm:hasfield>
+ <mm:hasfield name="title"><mm:field name="title" /></mm:hasfield>
</a>
</mm:link>
+
+ <!--
<mm:present referid="pdfurl">
<mm:compare referid="objecttype" value="pages">
<mm:link referid="pdfurl" referids="[EMAIL PROTECTED]">
@@ -50,10 +37,12 @@
</mm:link>
</mm:compare>
</mm:present>
+ -->
+
<mm:field write="false" name="number" id="node_number" />
<mm:node number="component.metadata" notfound="skip"> <!--
WTF -->
<mm:link page="metaedit.jsp" referids="[EMAIL PROTECTED]">
- <a href='${_}' target='text'><img id='img_<mm:field
name="number"/>' src='<%= imageName %>' border='0' title='<%= sAltText %>'
alt='<%= sAltText %>' /></a>
+ <a href='${_}' target='text'><img id='img_${_}' src='' border='0'
title='' alt='' /></a>
</mm:link>
</mm:node>
<mm:node number="component.versioning" notfound="skip">
<!-- WTF -->
@@ -61,103 +50,6 @@
<a href="${_}" target="text"><img
src="gfx/versions.gif" border="0" /></a>
</mm:link>
</mm:node>
- <mm:remove referid="node_number" />
- </nobr>
- </td>
- </tr>
- </table>
- </mm:compare>
-
-<!-- fascicle here -->
- <mm:compare referid="objecttype" valueset="learnblocks">
-
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <mm:compare referid="the_last_parent" value="true"
inverse="true">
- <td><img src="gfx/tree_spacer.gif" width="32px"
height="16px" border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="48px"
height="16px" border="0" align="center" valign="middle"/></td>
- </mm:compare>
-
-
- <[EMAIL PROTECTED] file="tree_shift_child.jsp" %>
-
- <mm:compare referid="the_last_element" value="true"
inverse="true">
-
- <mm:compare referid="the_last_leaf_in_this_level"
value="true">
- <td><a href='javascript:clickNode("<%=
learnobjects2_number %>")'><img src="gfx/tree_pluslast.gif" border="0"
align="center" valign="middle" id="img_<%= learnobjects2_number %>"/></a></td>
- </mm:compare>
- <mm:compare referid="the_last_leaf_in_this_level"
value="true" inverse="true">
- <td><a href='javascript:clickNode("<%=
learnobjects2_number %>")'><img src="gfx/tree_plus.gif" border="0"
align="center" valign="middle" id="img_<%= learnobjects2_number %>"/></a></td>
- </mm:compare>
- </mm:compare>
- <mm:compare referid="the_last_element" value="true">
- <td><img src="gfx/tree_leaflast.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- <td><img src="gfx/folder_closed.gif" border="0" align="middle"
id="img2_<%= learnobjects2_number %>"/></td>
- <td> <nobr>
- <mm:link referid="wizardjsp" referids="[EMAIL
PROTECTED],[EMAIL PROTECTED]">
- <mm:param name="wizard">config/<mm:write
referid="objecttype" />/<mm:write referid="objecttype" /></mm:param>
- <mm:param name="path"><%=session.getAttribute("eduname")%>
> <%= session.getAttribute("path") %></mm:param>
- <a href='${_}' title='<di:translate key="education.edit" />
<%= dummyName.toLowerCase() %>' target="text"><mm:field
name="name"><mm:isempty><mm:field
name="title"/></mm:isempty><mm:isnotempty><mm:write/></mm:isnotempty></mm:field></a>
- </mm:link>
- <mm:present referid="pdfurl">
- <mm:compare referid="objecttype" value="pages">
- <a href='<mm:write
referid="pdfurl"/>&number=<mm:field name="number"/>' target='text'><img
src='gfx/icpdf.gif' border='0' title='(PDF)' alt='(PDF)'/></a>
- </mm:compare>
- <mm:compare referid="objecttype" value="learnblocks">
- <a href='<mm:write
referid="pdfurl"/>&number=<mm:field name="number"/>' target='text'><img
src='gfx/icpdf.gif' border='0' title='(PDF)' alt='(PDF)'/></a>
- </mm:compare>
- </mm:present>
- <mm:field write="false" name="number" id="node_number" />
- <mm:node number="component.metadata" notfound="skip">
- <a href='metaedit.jsp?number=<mm:write
referid="node_number" />' target='text'><img id='img_<mm:field name="number"/>'
src='<%= imageName %>' border='0' title='<%= sAltText %>' alt='<%= sAltText %>'
/></a>
- </mm:node>
- <mm:node number="component.versioning" notfound="skip">
- <a href="versioning.jsp?nodeid=<mm:write
referid="node_number" />" target="text"><img id="img_<mm:field name="number"/>"
src="gfx/versions.gif" border="0" /></a>
- </mm:node>
- <mm:remove referid="node_number" />
- </nobr></td>
- </tr>
- </table>
- <div id="<%= learnobjects2_number %>" style="display:none">
- <%
- //Teporaly increase the depth for next level of learnblock
- depth++;
- %>
- <%// Is this learnobject empty? If so, we have to close the branch %>
- <mm:import reset="true" id="the_last_element">true</mm:import>
- <mm:relatednodes type="learnobjects" searchdir="destination" max="1">
- <mm:import reset="true" id="the_last_element">false</mm:import>
- </mm:relatednodes>
- <mm:relatednodes type="tests" searchdir="destination" max="1">
- <mm:import reset="true" id="the_last_element">false</mm:import>
- </mm:relatednodes>
- <mm:relatednodes type="pages" searchdir="destination" max="1">
- <mm:import reset="true" id="the_last_element">false</mm:import>
- </mm:relatednodes>
- <mm:relatednodes type="flashpages" searchdir="destination" max="1">
- <mm:import reset="true" id="the_last_element">false</mm:import>
- </mm:relatednodes>
- <mm:relatednodes type="htmlpages" searchdir="destination" max="1">
- <mm:import reset="true" id="the_last_element">false</mm:import>
- </mm:relatednodes>
-
- <[EMAIL PROTECTED] file="newfromtree.jsp" %>
- <%--
- <mm:compare referid="the_last_element" value="true">
- end1
- </div>
- </mm:compare>
---%>
- <mm:import reset="true" id="the_last_element">false</mm:import>
- <%
- //Back to current level
- depth--;
- %>
- </mm:compare>
- </mm:compare>
+ </di:leaf>
-</mm:node>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
