Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv3589
Modified Files:
student.jspx
Log Message:
redid my previous changes
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- student.jspx 9 Jan 2009 12:51:13 -0000 1.35
+++ student.jspx 9 Jan 2009 13:28:43 -0000 1.36
@@ -11,15 +11,8 @@
<mm:node number="${education}">
- <mm:relatednodescontainer
- element="learnblocks"
- searchdirs="destination"
- path="posrel,learnblocks${di:setting('assessment',
'relate_learnblocks') ? ',related,components' : ''}">
- <mm:sortorder field="posrel.pos" />
- <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
- <mm:addnode element="components" number="component.assessment" />
- </c:if>
- <mm:relatednodes id="learnBlock">
+
+ <mm:nodelistfunction id="learnBlock" name="lessons">
<mm:listrelationscontainer type="learnblocks" role="posrel">
<mm:listrelations>
<mm:relation from="${learnBlock}" to="${user}" role="classrel">
@@ -29,7 +22,7 @@
</mm:listrelations>
</mm:listrelationscontainer>
<mm:relation to="${user}" notfound="null">
- <c:if test="${! empty _node or empty currentlesson}">
+ <c:if test="${empty currentlesson}">
<c:if test="${empty _node}">
<mm:node node="learnBlock" id="currentlesson">
<mm:function id="reached" name="sequence" write="false" />
@@ -37,9 +30,19 @@
</c:if>
</c:if>
</mm:relation>
- </mm:relatednodes>
- </mm:relatednodescontainer>
+
+ <mm:last>
+ <c:if test="${empty currentlesson}">
+ <mm:node node="learnBlock">
+ <mm:function id="reached" name="sequence" write="false" />
</mm:node>
+ </c:if>
+ </mm:last>
+
+ </mm:nodelistfunction>
+ </mm:node>
+
+
<ul class="tabs">
<c:forEach
items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s">
@@ -66,12 +69,9 @@
<mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
- <mm:write session="currentlesson_${user}_${education}"
referid="currentlesson" />
+ <mm:write session="currentlesson_${user}_${education}"
value="${currentlesson}" />
+
- <mm:link page="/education/">
- <mm:param name="learnobject">${currentlesson}</mm:param>
- <a href="${_}">&lt; terug naar de les</a>
- </mm:link>
<di:include page="/assessment/${stage}.jspx" />
@@ -82,8 +82,6 @@
<p>
<h4 class="problemFeedback"><di:translate
key="assessment.feedback_coach" />:
<mm:link page="/c/shoutbox/index/">
- <mm:param name="_reference">${currentlesson}</mm:param>
- <mm:param name="self">not</mm:param>
<a href="${_}" name="">bekijk <di:translate
key="assessment.messages"/> voor deze les</a>
</mm:link>
</h4>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
