Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new
In directory james.mmbase.org:/tmp/cvs-serv22784/new
Modified Files:
flashpages.jspx htmlpages.jspx learnblocks.jspx pages.jspx
tests.jspx xmlcontent.jspx
Added Files:
README
Log Message:
tidied up a bit using di:leaf
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/new
README is new
Index: flashpages.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/flashpages.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- flashpages.jspx 14 Feb 2008 11:26:48 -0000 1.1
+++ flashpages.jspx 29 Feb 2008 09:24:12 -0000 1.2
@@ -2,22 +2,27 @@
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="depth">0</mm:import>
<mm:import externid="wizardjsp" from="request" />
- <di-t:leaf styleClass="newflashpages" depth="${depth}">
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="flashpages" type="guitype"/></mm:import>
+ <mm:import externid="depth"><mm:depth /></mm:import>
+
+ <di:leaf styleClass="newflashpages"
+ depth="${depth + 1}">
+
+
+ <mm:nodeinfo id="guitype" nodetype="flashpages" type="guitype"
write="false" />>
+
<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">${sessionScope.eduname}${sessionScope.path}</mm:param>
<a href="${_}"
- title="${di:translate('education.new')} {dummyname}"
- target="text"><di:translate key="education.new" /> ${dummyname}</a>
+ title="${di:translate('education.new')} ${guitype}"
+ target="text"><di:translate key="education.new" /> ${guitype}</a>
</mm:link>
- </di-t:leaf>
+
+ </di:leaf>
</jsp:root>
Index: htmlpages.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/htmlpages.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- htmlpages.jspx 14 Feb 2008 11:26:48 -0000 1.1
+++ htmlpages.jspx 29 Feb 2008 09:24:12 -0000 1.2
@@ -2,22 +2,22 @@
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="depth">0</mm:import>
+ <mm:import externid="depth"><mm:depth /></mm:import>
+
<mm:import externid="wizardjsp" from="request" />
- <di-t:leaf styleClass="newhtmlpages" depth="${depth}">
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="htmlpages" type="guitype"/></mm:import>
+ <di:leaf styleClass="newhtmlpages" depth="${depth + 1}">
+
<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">${sessionScope.eduname}${sessionScope.path}</mm:param>
<a href="${_}"
title="${di:translate('education.new')} ${dummyname}"
- target="text"><di:translate key="education.new" /> ${dummyname}</a>
+ target="text"><di:translate key="education.new" /> <mm:nodeinfo
nodetype="htmlpages" type="guitype" /></a>
</mm:link>
- </di-t:leaf>
+ </di:leaf>
</jsp:root>
Index: learnblocks.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/learnblocks.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- learnblocks.jspx 14 Feb 2008 11:26:48 -0000 1.1
+++ learnblocks.jspx 29 Feb 2008 09:24:12 -0000 1.2
@@ -1,15 +1,18 @@
<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="depth">0</mm:import>
<mm:import externid="wizardjsp" from="request" />
+ <mm:import externid="branchPath" />
+ <mm:import externid="b" from="request" required="true" />
- <di-t:leaf styleClass="neweducation" depth="${depth}">
- <mm:context>
+ <di:leaf styleClass="neweducation"
+ branch="${b}"
+ branchOffset="1"
+ branchPath="${branchPath} ">
<mm:listrelations role="posrel" type="learnblocks" max="1" orderby="pos"
directions="down">
<mm:field name="pos" id="maxpos" write="false" />
</mm:listrelations>
@@ -31,7 +34,6 @@
<di:translate key="education.aanmaken" />
</a>
</mm:link>
- </mm:context>
- </di-t:leaf>
+ </di:leaf>
</jsp:root>
Index: pages.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/pages.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pages.jspx 14 Feb 2008 11:26:48 -0000 1.1
+++ pages.jspx 29 Feb 2008 09:24:12 -0000 1.2
@@ -1,28 +1,29 @@
<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="depth">0</mm:import>
<mm:import externid="wizardjsp" from="request" />
+ <mm:import externid="branchPath" />
+ <mm:import externid="b" from="request" required="true" />
+
+ <di:leaf styleClass="neweducation"
+ branch="${b}"
+ branchOffset="1"
+ branchPath="${branchPath} ">
+ <mm:nodeinfo id="guitype" nodetype="pages" type="guitype" write="false" />
- <di-t:leaf styleClass="newpages" depth="${depth}">
- <mm:context>
- <mm:import id="dummyname" escape="lowercase" reset="true"><mm:nodeinfo
nodetype="pages" type="guitype"/></mm:import>
<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">${sessionScope.eduname}${sessionScope.path}</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" />
+ title="${di:translate('education.new')} ${guitype}
${di:translate('education.aanmaken')}"
+ target="text"><di:translate key="education.new" /> ${guitype}
<di:translate key="education.aanmaken" />
</a>
</mm:link>
- </mm:context>
- </di-t:leaf>
+ </di:leaf>
</jsp:root>
Index: tests.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/tests.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests.jspx 14 Feb 2008 11:26:48 -0000 1.1
+++ tests.jspx 29 Feb 2008 09:24:12 -0000 1.2
@@ -1,22 +1,26 @@
<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="depth">0</mm:import>
<mm:import externid="wizardjsp" from="request" />
+ <mm:import externid="branchPath" />
+ <mm:import externid="b" from="request" />
- <di-t:leaf styleClass="newtests" depth="${depth}">
- <mm:import id="dummyname" jspvar="dummyName" vartype="String"
reset="true"><mm:nodeinfo nodetype="tests" type="guitype"/></mm:import>
+ <di-t:leaf styleClass="newtests"
+ branchPath="${branchPath} "
+ branch="${b}"
+ branchOffset="1"
+ >
+ <mm:nodeinfo id="guitype" nodetype="tests" type="guitype" write="false" />
<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">${sessionScope.eduname}${sessionScope.path}</mm:param>
<a href="${_}"
- title="${di:translate('education.new')} ${dummyname}"
- target="text"><di:translate key="education.new" /> ${dummyname}</a>
+ title="${di:translate('education.new')} ${guitype}"
+ target="text"><di:translate key="education.new" /> ${guitype}</a>
</mm:link>
</di-t:leaf>
Index: xmlcontent.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/xmlcontent.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- xmlcontent.jspx 14 Feb 2008 11:26:48 -0000 1.1
+++ xmlcontent.jspx 29 Feb 2008 09:24:12 -0000 1.2
@@ -1,21 +1,27 @@
<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="depth">0</mm:import>
+ <mm:import externid="branchPath" />
+ <mm:import externid="b" from="request" />
+ <mm:import from="request" externid="referrer" />
+ <mm:import id="kupu_back"><mm:url page="${referrer}" /></mm:import>
- <di-t:leaf styleClass="newkupu" depth="${depth}">
- <mm:link page="/mmbase/kupu/mmbase" referids="[EMAIL
PROTECTED],referrer,templates">
+
+ <di:leaf styleClass="newkupu"
+ branch="${b}"
+ branchOffset="1"
+ branchPath="${branchPath} ">
+ <mm:nodeinfo id="guitype" nodetype="xmlcontent" type="guitype"
write="false" />
+
+ <mm:link page="/mmbase/kupu/mmbase" referids="[EMAIL
PROTECTED],referrer,kupu_back">
<mm:param name="wizard">config/xmlcontent/xmlcontent</mm:param>
<mm:param name="objectnumber">new</mm:param>
-
<a href="${_}"
- title="${di:translate('education.new')} ${dummyname}"
- target="text"><di:translate key="education.new" /> richtext</a>
+ title="${di:translate('education.new')} ${guitype}"
+ target="text"><di:translate key="education.new" /> ${guitype}</a>
</mm:link>
- </di-t:leaf>
+ </di:leaf>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
