Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment In directory james.mmbase.org:/tmp/cvs-serv13984/assessment
Modified Files: closelesson.link.jspx stage2-editdifficulties.jspx stage2-evaluate.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.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- closelesson.link.jspx 16 Jan 2009 16:25:17 -0000 1.10 +++ closelesson.link.jspx 19 Jan 2009 13:46:25 -0000 1.11 @@ -43,9 +43,11 @@ ${feedback}<jsp:text> | </jsp:text> </c:if> <mm:link page="/education/"> + <c:set var="target" value="lessen" /> <c:if test="${!empty currentlesson}"> <mm:node number="${currentlesson}"> <c:set var="learnobject" value="${currentlesson}" /> + <c:set var="target" value="opdrachten" /> <!-- TODO: find a nicer/proper way to do this --> <mm:relatednodes type="xmlcontent" constraints="lower(name) = 'opdrachten'"> <mm:node> @@ -55,7 +57,7 @@ </mm:node> <mm:param name="learnobject">${learnobject}</mm:param> </c:if> - <input type="button" class="educationButton" value="terug naar de les" onclick="window.location='${_}'" name="" /> + <input type="button" class="educationButton" value="terug naar de ${target}" onclick="window.location='${_}'" name="" /> </mm:link> </form> Index: stage2-editdifficulties.jspx =================================================================== RCS file: /var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage2-editdifficulties.jspx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- stage2-editdifficulties.jspx 16 Jan 2009 09:54:21 -0000 1.2 +++ stage2-editdifficulties.jspx 19 Jan 2009 13:46:25 -0000 1.3 @@ -7,10 +7,11 @@ xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate" > <jsp:output omit-xml-declaration="true" /> - <table cellpadding="0" cellspacing="0"> <mm:content postprocessor="none" type="text/xml" expires="0"> + <form id="difficulties"> + <table cellpadding="0" cellspacing="0"> <mm:import externid="problem" required="true" /> <mm:import externid="submit" /> <mm:cloud method="asis"> @@ -21,7 +22,7 @@ </mm:nodelistfunction> </tr> <tr> - <form id="difficulties"> + <input type="hidden" name="problem" value="${problem}" /> <mm:nodelistfunction name="lessons"> <mm:relation to="${problem}"> @@ -32,13 +33,15 @@ <mm:fieldinfo field="pos${_node}" datatype="didactor_assessment_troubles" type="useinput" /> </mm:present> </mm:field> + <jsp:text> </jsp:text> </td> </mm:relation> </mm:nodelistfunction> - </form> + </tr> </mm:node> </mm:cloud> - </mm:content> </table> + </form> + </mm:content> </div> Index: stage2-evaluate.jspx =================================================================== RCS file: /var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage2-evaluate.jspx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- stage2-evaluate.jspx 15 Jan 2009 12:48:29 -0000 1.1 +++ stage2-evaluate.jspx 19 Jan 2009 13:46:25 -0000 1.2 @@ -54,7 +54,7 @@ <input type="button" class="educationButton" value="opslaan" onclick="window.location.reload()"/><jsp:text>&nbsp;|&nbsp;</jsp:text> <mm:link page="/homework/"> <mm:param name="sub">assessment_overview</mm:param> - <input type="button" class="educationButton" value="terug naar het overzicht" onclick="window.location='${_}'" name="" /> + <input type="button" class="educationButton" value="terug naar problemen aanpakken" onclick="window.location='${_}'" name="" /> </mm:link> </div> </div> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs