Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv12296
Modified Files:
learnobject.jsp newfromtree.jsp tree_top_menu.jsp
Log Message:
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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- learnobject.jsp 29 Feb 2008 09:24:12 -0000 1.24
+++ learnobject.jsp 6 Mar 2008 16:30:45 -0000 1.25
@@ -13,6 +13,7 @@
<mm:node id="sn" number="${startnode}">
<div id="tree_for_${_node}" >
+ <mm:write request="b" value="" />
<mm:include page="newfromtree.jsp">
<mm:param name="branchPath">${branchPath}</mm:param>
</mm:include>
@@ -25,7 +26,6 @@
>
<mm:sortorder field="posrel.pos" direction="up" />
<mm:typeconstraint name="questions" inverse="true" />
- <mm:write request="branch" value="" />
<mm:tree
varBranchStatus="status"
maxdepth="6">
Index: newfromtree.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/newfromtree.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- newfromtree.jsp 29 Feb 2008 15:06:05 -0000 1.20
+++ newfromtree.jsp 6 Mar 2008 16:30:45 -0000 1.21
@@ -6,15 +6,16 @@
<jsp:output omit-xml-declaration="yes" />
<mm:import externid="wizardjsp" from="request" />
- <mm:import externid="branchPath" />
+ <mm:import externid="branchPath" required="true" />
<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?">
+ referids="$referids,branchPath">
</mm:treeinclude>
</mm:haspage>
<mm:haspage page="/education/wizards/new/${_}.jspx" inverse="true">
Index: tree_top_menu.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/tree_top_menu.jsp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- tree_top_menu.jsp 3 Mar 2008 14:52:57 -0000 1.46
+++ tree_top_menu.jsp 6 Mar 2008 16:30:45 -0000 1.47
@@ -49,7 +49,8 @@
href="${_}"><di:translate key="education.educationmenupersons"
/></a> </mm:link>
</di:has>
- <jsp:text> </jsp:text>
+
+
<mm:hasnode number="component.pop">
<!--
A user will see a Competence submenu only if POP component is
switched ON
@@ -67,6 +68,7 @@
</mm:relatednodes>
</mm:node>
</mm:hasnode>
+
<mm:hasnode number="component.metadata" >
<di:has editcontext="metadata">
<mm:link page="." referids="e?">
@@ -128,7 +130,9 @@
<span class="education_top_menu ${mode eq 'educations' ? 'selected' :
''}">
<mm:link page="." referids="e?">
<mm:param name="mode">educations</mm:param>
- <a href="${_}"><di:translate
key="education.educationmenueducations" /></a>
+ <a href="${_}">
+ <di:translate key="education.educationmenueducations" />
+ </a>
</mm:link>
<c:if test="${fn:length(educations) ge 2}">
<script>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
