Update of /var/cvs/contributions/didactor2/src/education/templates/education/tests In directory james.mmbase.org:/tmp/cvs-serv24817
Modified Files: feedback.jsp Log Message: jspx See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/tests Index: feedback.jsp =================================================================== RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/tests/feedback.jsp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- feedback.jsp 9 Aug 2007 13:22:55 -0000 1.21 +++ feedback.jsp 5 Feb 2008 16:27:32 -0000 1.22 @@ -1,11 +1,19 @@ -<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0" prefix="mm" -%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0" prefix="di" -%><mm:content postprocessor="reducespace" expires="0"> +<jsp:root + xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" + xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" + xmlns:di="http://www.didactor.nl/ditaglib_1.0" > + <mm:content postprocessor="none" expires="0"> <mm:cloud rank="didactor user"> + <!-- + This JSP is + - much too big + - + --> <mm:import externid="tests" required="true"/> <mm:import externid="madetest" required="true"/> - <[EMAIL PROTECTED] file="/education/tests/definitions.jsp" %> + <jsp:directive.include file="/education/tests/definitions.jsp" /> + <mm:node referid="madetest"> <mm:field id="madetestscore" name="score" write="false"/> </mm:node> @@ -24,10 +32,10 @@ </mm:compare> </mm:field> - <%-- Which type of feedback: standard page or feedback per question --%> + <!-- Which type of feedback: standard page or feedback per question --> <mm:import id="feedback"><mm:field name="feedbackpage"/></mm:import> - <%-- What is the score of the made test --%> + <!-- What is the score of the made test --> <mm:relatednodescontainer type="madetests"> <mm:constraint field="number" referid="madetest"/> <mm:relatednodes id="my_madetest"/> @@ -51,7 +59,7 @@ <div class="score"> <di:translate key="education.feedback_testscore" arg0="${madetestscore}" /> <mm:compare referid="feedback" value="0"> - <%-- if madestestscore larger or equal than requiredscore --%> + <!-- if madestestscore larger or equal than requiredscore --> <mm:islessthan referid="madetestscore" referid2="requiredscore" inverse="true"> <div class="succeed"> <di:translate key="education.feedback_succeed" /> @@ -65,17 +73,16 @@ </mm:islessthan> </mm:compare> </div> - </div> - <%-- NODE provider is now "tests" --%> + <!-- NODE provider is now "tests" --> <mm:relatednodescontainer type="feedback"> - <mm:constraint field="maximalscore" referid="madetestscore" operator=">="/> - <mm:constraint field="minimalscore" referid="madetestscore" operator="<="/> + <mm:constraint field="maximalscore" referid="madetestscore" operator="ge" /> + <mm:constraint field="minimalscore" referid="madetestscore" operator="le" /> <mm:relatednodes> <h1><mm:field name="name"/></h1> <mm:relatednodes type="images"> - <img src="<mm:image template="s(150x150)"/>" title="<mm:field name="title"/>" alt="<mm:field name="title"/>"> + <mm:image mode="img" template="s(150x150)"/>" title="${_node.title}" /> </mm:relatednodes> <p><mm:field name="text" escape="none"/></p> @@ -91,17 +98,21 @@ <mm:node element="learnobjects"> <mm:import id="page" reset="true">/education/<mm:nodeinfo type="type"/>/index.jsp</mm:import> </mm:node> - <a target="content" href="<mm:treefile page="$page" objectlist="$includePath" referids="$referids"><mm:param name="learnobject"><mm:field name="learnobjects.number" /></mm:param><mm:param name="fb_madetest"><mm:write referid="madetest" /></mm:param></mm:treefile>"><mm:write referid="description"/> - </a> + <mm:treefile page="$page" objectlist="$includePath" referids="$referids" write="false" > + <mm:param name="learnobject"><mm:field name="learnobjects.number" /></mm:param> + <mm:param name="fb_madetest"><mm:write referid="madetest" /></mm:param> + <a target="content" href="${_}"><mm:write referid="description"/></a> + </mm:treefile> <br/> </mm:list> </mm:field> </mm:relatednodes> </mm:relatednodescontainer> </mm:isgreaterthan> + </div> </mm:node> - <%-- find workgroup --%> + <!-- find workgroup --> <mm:node number="$user"> <mm:relatedcontainer path="workgroups,classes" fields="workgroups.number,classes.number"> <mm:isnotempty referid="class"> @@ -114,7 +125,7 @@ </mm:relatedcontainer> </mm:node> - <%-- get printable string --%> + <!-- get printable string --> <mm:node referid="user"> <mm:import id="user_string"><di:person /></mm:import> </mm:node> @@ -137,19 +148,16 @@ <mm:present referid="teacherNo"> <mm:node referid="teacherNo"> - <mm:import jspvar="t_firstname"><mm:field name="html(firstname)" /></mm:import> - <mm:import jspvar="t_lastname"><mm:field name="html(lastname)" /></mm:import> - <di:translate key="education.feedback_teachernotify" arg0="<%=t_firstname%>" arg1="<%=t_lastname%>" /> - <mm:import jspvar="test_name"><mm:write referid="test_name" /></mm:import> - <mm:import jspvar="user_string"><mm:write referid="user_string" /></mm:import> + <di:translate key="education.feedback_teachernotify" arg0="${_node.firstname}" arg1="${_node.lastname}" /> <mm:treeinclude page="/email/write/write.jsp" objectlist="$includePath" referids="$referids"> <mm:param name="nooutput">true</mm:param> <mm:param name="to"><mm:field name="username"/></mm:param> - <mm:param name="subject"><di:translate key="education.feedback_mailsubject" arg0="<%=user_string%>" arg1="<%=test_name%>"/></mm:param> - <mm:param name="body"><di:translate key="education.feedback_mailbody" arg0="<%=user_string%>" arg1="<%=test_name%>" /></mm:param> + <mm:param name="subject"><di:translate key="education.feedback_mailsubject" arg0="${user_string}" arg1="${test_name}"/></mm:param> + <mm:param name="body"><di:translate key="education.feedback_mailbody" arg0="${user_string}" arg1="${test_name}" /></mm:param> </mm:treeinclude> </mm:node> </mm:present> -</mm:cloud> -</mm:content> + </mm:cloud> + </mm:content> +</jsp:root> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs