Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv1330
Modified Files:
index.jsp matrix.div.jspx stage4-problems.jspx
Added Files:
stage5-evaluate.jspx
Removed Files:
evaluate.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
stage5-evaluate.jspx is new
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/index.jsp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- index.jsp 9 Oct 2008 11:38:45 -0000 1.33
+++ index.jsp 8 Jan 2009 13:29:34 -0000 1.34
@@ -1,12 +1,14 @@
<?xml version="1.0"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.0">
- <di:html xmlns:jsp="http://java.sun.com/JSP/Page";
+ <di:html
+ xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
expires="0"
styleClass="assessment"
title_key="assessment.assessment_matrix"
- css="/assessment/css/base.css" component="assessmment">
+ css="/assessment/css/base.css"
+ component="assessmment">
<mm:import externid="coachmode">
<di:hasrole role="teacher">true</di:hasrole>
<di:hasrole role="teacher" inverse="true">false</di:hasrole>
Index: matrix.div.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- matrix.div.jspx 8 Jan 2009 12:28:08 -0000 1.18
+++ matrix.div.jspx 8 Jan 2009 13:29:34 -0000 1.19
@@ -94,6 +94,7 @@
<mm:addnode element="problems" number="${problem}" />
<mm:listrelations id="relation">
<mm:field name="pos" write="false">
+ <!-- See MMB-1770 -->
<fmt:bundle basename="nl.didactor.resources.troubles">
<fmt:message key="${_}" />
</fmt:bundle>
@@ -108,13 +109,15 @@
</mm:relatednodescontainer>
</mm:node>
+ <mm:import externid="stage" />
+ <mm:import externid="sub" />
+
<span class="col">
<jsp:text> </jsp:text>
<mm:present referid="test">
- <mm:link referids="test,_n...@problem">
- <mm:param name="sub">assessment</mm:param>
- <mm:param name="subsub">evaluate</mm:param>
+ <mm:link referids="test,_n...@problem,sub?">
+ <mm:param name="stage">stage5-evaluate</mm:param>
<a href="${_}">Werk dit probleem uit</a>
</mm:link>
</mm:present>
Index: stage4-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage4-problems.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- stage4-problems.jspx 8 Jan 2009 12:01:31 -0000 1.2
+++ stage4-problems.jspx 8 Jan 2009 13:29:34 -0000 1.3
@@ -43,17 +43,18 @@
<mm:listnodes orderby="pos" type="problemtypes">
<div class="inter"><di:translate key="assessment.${_node.key}" /></div>
+ <mm:import externid="sub" />
+ <mm:import externid="stage" />
<mm:treefile
write="false"
page="/mmbase/style/images/" objectlist="${includePath}"
absolute="context">
- <mm-sr:relatednodes
- item="/assessment/matrix.div.jspx?sub=${sub}"
- icondir="${_}"
- path="related,problems,posrel,people" orderby="posrel.pos"
type="problems">
- <jsp:attribute name="constraints">
+ <mm:relatednodescontainer path="related,problems,posrel,people"
element="problems">
<mm:addnode element="people" number="${user}" />
- </jsp:attribute>
- </mm-sr:relatednodes>
+ <mm:sortorder field="posrel.pos" />
+ <mm:relatednodes>
+ <mm:include page="/assessment/matrix.div.jspx"
referids="sub?,stage?,_n...@source" />
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
</mm:treefile>
</mm:listnodes>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
