Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv30135
Modified Files:
closelesson.link.jspx problem.item.jspx stage3-problems.jspx
stage4-problems.jspx student.jspx
Removed Files:
matrix.div.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: closelesson.link.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/closelesson.link.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- closelesson.link.jspx 8 Jan 2009 10:51:53 -0000 1.4
+++ closelesson.link.jspx 8 Jan 2009 12:01:31 -0000 1.5
@@ -8,17 +8,17 @@
class="closelesson">
<jsp:output omit-xml-declaration="true" />
- <mm:import id="firstopenlesson" from="session"
externid="firstopenlesson_${user}_${education}" />
+ <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
- <c:if test="${! empty firstopenlesson}">
+ <c:if test="${! empty currentlesson}">
<mm:node number="$user">
- <mm:node referid="firstopenlesson">
+ <mm:node referid="currentlesson">
<mm:nodeinfo type="gui" />
</mm:node>
<mm:function name="canCloseLesson"
- referids="firstopenles...@lesson">
+ referids="currentles...@lesson">
<c:choose>
<c:when test="${_}">
@@ -29,8 +29,8 @@
<form name="closelessonform" action="${_}" method="post">
<input type="hidden" name="coachmode" value="false" />
- <input type="hidden" name="lesson" value="${firstopenlesson}"
/>
- <di:translate key="assessment.close_and_send_to_coach"
arg0="${firstopenlesson.name}">
+ <input type="hidden" name="lesson" value="${currentlesson}" />
+ <di:translate key="assessment.close_and_send_to_coach"
arg0="${currentlesson.name}">
<input type="submit" class="formbutton" value="${_}" />
</di:translate>
</form>
Index: problem.item.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/problem.item.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- problem.item.jspx 8 Jan 2009 11:08:50 -0000 1.5
+++ problem.item.jspx 8 Jan 2009 12:01:31 -0000 1.6
@@ -18,7 +18,7 @@
<mm:fieldinfo type="errors" />
</mm:fieldlist>
- <mm:import id="currentlesson" from="session"
externid="firstopenlesson_${user}_${education}" />
+ <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
<mm:present referid="currentlesson">
Index: stage3-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage3-problems.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- stage3-problems.jspx 8 Jan 2009 11:08:50 -0000 1.5
+++ stage3-problems.jspx 8 Jan 2009 12:01:31 -0000 1.6
@@ -9,11 +9,11 @@
<h2><di:translate key="assessment.problems" /></h2>
- <mm:import id="firstopenlesson" from="session"
externid="firstopenlesson_${user}_${education}" />
+ <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
<div>
- <mm:node referid="firstopenlesson">
+ <mm:node referid="currentlesson">
Hoeveel last in <mm:nodeinfo type="gui" />
</mm:node>
</div>
Index: stage4-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage4-problems.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- stage4-problems.jspx 8 Jan 2009 09:33:28 -0000 1.1
+++ stage4-problems.jspx 8 Jan 2009 12:01:31 -0000 1.2
@@ -25,9 +25,6 @@
-->
<mm:relation to="${user}" role="classrel" searchdir="source"
notfound="null">
- <c:if test="${empty _node and empty firstopenlesson}">
- <mm:node node="learnBlock" id="firstopenlesson" />
- </c:if>
<span class="head ${empty _node ? '' : 'closed'}" style="width: ${60
/ status.count}%">
<mm:field name="name" node="learnBlock" />
</span>
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- student.jspx 8 Jan 2009 10:51:53 -0000 1.30
+++ student.jspx 8 Jan 2009 12:01:31 -0000 1.31
@@ -10,32 +10,6 @@
<mm:import externid="stage">stage1-goals</mm:import>
- <ul class="tabs">
- <mm:import from="cookie"
externid="didactor_${education}_${user}_maxsequence" id="reached">0</mm:import>
-
- <c:forEach
items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s">
- <mm:context>
- <c:set var="settingname" value="opens_${s}" />
-
- <c:if test="${! empty di:setting('assessment', settingname)}">
- <mm:node number="${di:setting('assessment', settingname)}">
- <mm:function id="stage_required" name="sequence" write="false" />
- </mm:node>
- </c:if>
-
- <c:if test="${empty di:setting('assessment', settingname) or reached
ge stage_required}">
- <li class="${stage eq s ? 'current' : ''}">
- <mm:link referids="s...@stage">
- <mm:param name="sub">assessment</mm:param>
- <a href="${_}"><di:translate key="assessment.${s}" /></a>
- </mm:link>
- </li>
- </c:if>
- </mm:context>
- </c:forEach>
- </ul>
-
-
<mm:node number="${education}">
<mm:relatednodescontainer
element="learnblocks"
@@ -55,19 +29,44 @@
</mm:listrelations>
</mm:listrelationscontainer>
<mm:relation to="${user}" notfound="null">
- <c:if test="${! empty _node or empty firstopenlesson}">
+ <c:if test="${! empty _node or empty currentlesson}">
<c:if test="${empty _node}">
- <mm:node node="learnBlock" id="firstopenlesson" />
+ <mm:node node="learnBlock" id="currentlesson">
+ <mm:function id="reached" name="sequence" write="false" />
+ </mm:node>
</c:if>
</c:if>
</mm:relation>
</mm:relatednodes>
</mm:relatednodescontainer>
+ </mm:node>
+
+ <ul class="tabs">
+ <c:forEach
items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s">
+ <mm:context>
+ <c:set var="settingname" value="opens_${s}" />
+ <c:if test="${! empty di:setting('assessment', settingname)}">
+ <mm:node number="${di:setting('assessment', settingname)}">
+ <mm:function id="stage_required" name="sequence" write="false" />
</mm:node>
+ </c:if>
+
+ <c:if test="${empty di:setting('assessment', settingname) or reached
ge stage_required}">
+ <li class="${stage eq s ? 'current' : ''}">
+ <mm:link referids="s...@stage">
+ <mm:param name="sub">assessment</mm:param>
+ <a href="${_}"><di:translate key="assessment.${s}" /></a>
+ </mm:link>
+ </li>
+ </c:if>
+ </mm:context>
+ </c:forEach>
+ </ul>
+
<mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
- <mm:write session="firstopenlesson_${user}_${education}"
referid="firstopenlesson" />
+ <mm:write session="currentlesson_${user}_${education}"
referid="currentlesson" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
