Update of
/var/cvs/contributions/didactor2/src/education/templates/education/openquestions
In directory james.mmbase.org:/tmp/cvs-serv12830/openquestions
Modified Files:
index.jsp rateopenquestions.jsp
Log Message:
some rationalizations
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/openquestions
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/openquestions/index.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- index.jsp 10 Nov 2008 17:54:02 -0000 1.17
+++ index.jsp 13 Nov 2008 10:17:10 -0000 1.18
@@ -1,55 +1,37 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.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:c="http://java.sun.com/jsp/jstl/core";
xmlns:di="http://www.didactor.nl/ditaglib_1.0"; >
<mm:content>
<mm:cloud rank="didactor user">
- <mm:import externid="question" required="true"/>
- <mm:import externid="madetest">-1</mm:import>
- <mm:node number="$question">
-
- <mm:isnotempty referid="madetest">
- <mm:relatednodescontainer path="givenanswers,madetests"
element="givenanswers">
- <mm:constraint field="madetests.number" value="$madetest"/>
- <mm:relatednodes>
+ <di:question>
+ <mm:present referid="answernode">
+ <mm:node referid="answernode">
<mm:field name="text" id="answer" write="false"/>
- </mm:relatednodes>
- </mm:relatednodescontainer>
- </mm:isnotempty>
-
- <mm:field name="showtitle">
- <mm:compare value="1">
- <h2><mm:field name="title"/></h2>
- </mm:compare>
- </mm:field>
-
- <p/> <!-- wtf -->
- <mm:field name="text" escape="tagstripper(XSS)"/>
- <p/><!-- wtf -->
-
- <mm:import id="layout"><mm:field name="layout"/></mm:import>
+ </mm:node>
+ </mm:present>
+ <c:choose>
+ <c:when test="${_node.layout eq 0}">
<!-- Generate large input field -->
- <mm:compare referid="layout" value="0">
<textarea name="${question}"
class="question mm_validate mm_dt_requiredfield"
cols="80" rows="5">
<mm:present referid="answer"><mm:write referid="answer"
escape="text/plain"/></mm:present>
<jsp:text> </jsp:text>
</textarea>
- <br/> <!-- wtf -->
- </mm:compare>
-
+ </c:when>
+ <c:otherwise>
<!-- Generate small input field -->
- <mm:compare referid="layout" value="1">
<input type="text" size="100"
class="question mm_validate mm_dt_requiredfield"
name="${question}" value="${answer}"/>
- <br/><!-- wtf -->
- </mm:compare>
+ </c:otherwise>
+ </c:choose>
-
- </mm:node>
+ </di:question>
</mm:cloud>
</mm:content>
</jsp:root>
Index: rateopenquestions.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/openquestions/rateopenquestions.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- rateopenquestions.jsp 10 Nov 2008 17:54:02 -0000 1.17
+++ rateopenquestions.jsp 13 Nov 2008 10:17:10 -0000 1.18
@@ -11,14 +11,17 @@
<mm:import externid="question" required="true"/>
<mm:import externid="madetest" required="true"/>
- <mm:import externid="givenanswer" />
- <mm:notpresent referid="givenanswer">
+ <mm:import externid="answernode" />
+
+ <mm:notpresent referid="answernode">
+ <mm:remove referid="answernode" />
<mm:createnode id="answernode" type="givenanswers" />
- <mm:createrelation role="related" source="madetest"
destination="givenanswer"/>
- <mm:createrelation role="related" source="question"
destination="givenanswer"/>
+ <mm:createrelation role="related" source="madetest"
destination="answernode"/>
+ <mm:createrelation role="related" source="question"
destination="answernode"/>
</mm:notpresent>
- <mm:present referid="givenanswer">
- <mm:node id="answernode" referid="givenanswer" />
+
+ <mm:present referid="answernode">
+ <mm:node id="answernode" referid="answernode" />
</mm:present>
<jsp:directive.include file="/education/tests/definitions.jsp" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
