Author: michiel Date: 2010-03-04 13:35:13 +0100 (Thu, 04 Mar 2010) New Revision: 41262
Modified: didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-overview.jspx Log: indentation only Modified: didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-overview.jspx =================================================================== --- didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-overview.jspx 2010-03-04 11:52:14 UTC (rev 41261) +++ didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-overview.jspx 2010-03-04 12:35:13 UTC (rev 41262) @@ -7,130 +7,130 @@ > <jsp:output omit-xml-declaration="true" /> <mm:import id="currentlesson" from="session" externid="currentlesson_${user}_${education}" /> - + <h2>Echt belangrijk in mijn leven is</h2> <div class="goals"> - <mm:node number="$user"> - <ol> - <mm:relatednodes type="goals" role="posrel" orderby="posrel.pos"> - <mm:node> - <li><mm:field name="name" /><jsp:text> </jsp:text></li> - </mm:node> - </mm:relatednodes> - </ol> - </mm:node> + <mm:node number="$user"> + <ol> + <mm:relatednodes type="goals" role="posrel" orderby="posrel.pos"> + <mm:node> + <li><mm:field name="name" /><jsp:text> </jsp:text></li> + </mm:node> + </mm:relatednodes> + </ol> + </mm:node> </div> <!-- Now the problems, divided per type. --> - + <table cellspacing="0" width="100%"> <mm:node number="${education}"> <mm:import id="blocknames" escape="text/plain"> <!-- cache the block names, because they are repeated for every problem type --> <mm:nodelistfunction name="lessons" id="learnBlock"> - <!-- - If a relation learnBlock -classrel->user exists, then that means that this lesson is marked 'closed' (by this module) - --> - <mm:relation to="${user}" role="classrel" searchdir="source" notfound="null"> - - <td class="learnblockItemsTitle ${empty _node ? '' : 'closed'}"> - <jsp:text>|&nbsp;</jsp:text><mm:field name="name" node="learnBlock" /><mm:last><jsp:text>|</jsp:text></mm:last> - </td> - </mm:relation> + <!-- + If a relation learnBlock -classrel->user exists, then that means that this lesson is marked 'closed' (by this module) + --> + <mm:relation to="${user}" role="classrel" searchdir="source" notfound="null"> + + <td class="learnblockItemsTitle ${empty _node ? '' : 'closed'}"> + <jsp:text>|&nbsp;</jsp:text><mm:field name="name" node="learnBlock" /><mm:last><jsp:text>|</jsp:text></mm:last> + </td> + </mm:relation> </mm:nodelistfunction> <td class="learnblockItemsTitle"><jsp:text> </jsp:text></td> </mm:import> </mm:node> </table> - - <div class="mmxf"> - <div id="" class="float left note"> + + <div class="mmxf"> + <div id="" class="float left note"> <c:forEach items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s"> - <mm:context> + <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 test="${(currentlesson ge di:setting('assessment', settingname)) || (empty currentlesson)}"> - <mm:node number="vu_homework_assessment_${settingname}"> - <p><jsp:text><br/></jsp:text></p> - <mm:field name="body" escape="none" /> - </mm:node> - </c:if> - </c:if> + <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 test="${(currentlesson ge di:setting('assessment', settingname)) || (empty currentlesson)}"> + <mm:node number="vu_homework_assessment_${settingname}"> + <p><jsp:text><br/></jsp:text></p> + <mm:field name="body" escape="none" /> + </mm:node> + </c:if> + </c:if> </mm:context> - </c:forEach> + </c:forEach> </div> - - <div class="problemTable"> - <table cellspacing="0" class="TDProblem"> - <tr> - <td class="problemHeaderLeft"><h2>Mijn zorgen en problemen</h2> - - </td> - <td class="problemHeaderRight" colspan="7"><h2>Hoeveel last had ik er van</h2></td> - </tr> - - <c:set var="problemCount" value="4" /> - <mm:listnodes orderby="pos" type="problemtypes"> - <!-- stage2 show edit for solvable problems --> - <!-- stage3 show edit for solvable & unimportant problems --> - <!-- stage4 show edit for all problemtypes --> - <c:set var="evaluate" value="false" /> - <c:if test="${_node.key eq 'problemtype_solvable'}"> - <c:set var="stage_required" value="opens_stage2-problems" /> - </c:if> - <c:if test="${_node.key eq 'problemtype_unimportant'}"> - <c:set var="stage_required" value="opens_stage3-problems" /> - </c:if> - <c:if test="${_node.key eq 'problemtype_notsolvable'}"> - <c:set var="stage_required" value="opens_stage4-problems" /> - </c:if> - - <c:if test="${currentlesson ge di:setting('assessment', stage_required)}"> - <c:set var="evaluate" value="true" /> - </c:if> - <c:if test="${empty currentlesson}"> - <c:set var="evaluate" value="true" /> - </c:if> - - <tr class="problemItems"> - <td class="problemTypes">${problemCount}. <di:translate key="assessment.${_node.key}" /></td> - <mm:write referid="blocknames" escape="text/plain"/> - </tr> - <mm:import externid="sub" /> - <mm:import externid="stage" /> - <c:set var="problemCount" value="${problemCount + 1}" /> - <mm:relatednodescontainer path="related,problems,posrel,people" element="problems"> - <mm:addnode element="people" number="${user}" /> - <mm:sortorder field="posrel.pos" /> - <mm:size id="size" write="false"/> - <c:if test="${size eq 0}"> - <tr class="problemItem"><td colspan="7">--</td></tr> - </c:if> - <mm:relatednodes> - <mm:include page="/assessment/matrix.div.jspx" referids="sub?,stage?,_n...@source"> - <mm:param name="evaluate">${evaluate}</mm:param> - </mm:include> - <tr><td colspan="7"><jsp:text> </jsp:text></td></tr> - </mm:relatednodes> - </mm:relatednodescontainer> - <tr class="problemTypeSpacer"><td colspan="7"><jsp:text> </jsp:text></td></tr> - </mm:listnodes> - </table> -</div> + <div class="problemTable"> + <table cellspacing="0" class="TDProblem"> + <tr> + <td class="problemHeaderLeft"><h2>Mijn zorgen en problemen</h2> + </td> + <td class="problemHeaderRight" colspan="7"><h2>Hoeveel last had ik er van</h2></td> + </tr> -<di:include page="/assessment/closelesson.link.jspx" /> + <c:set var="problemCount" value="4" /> + <mm:listnodes orderby="pos" type="problemtypes"> + <!-- stage2 show edit for solvable problems --> + <!-- stage3 show edit for solvable & unimportant problems --> + <!-- stage4 show edit for all problemtypes --> + <c:set var="evaluate" value="false" /> + <c:if test="${_node.key eq 'problemtype_solvable'}"> + <c:set var="stage_required" value="opens_stage2-problems" /> + </c:if> + <c:if test="${_node.key eq 'problemtype_unimportant'}"> + <c:set var="stage_required" value="opens_stage3-problems" /> + </c:if> + <c:if test="${_node.key eq 'problemtype_notsolvable'}"> + <c:set var="stage_required" value="opens_stage4-problems" /> + </c:if> - </div> + <c:if test="${currentlesson ge di:setting('assessment', stage_required)}"> + <c:set var="evaluate" value="true" /> + </c:if> + <c:if test="${empty currentlesson}"> + <c:set var="evaluate" value="true" /> + </c:if> + <tr class="problemItems"> + <td class="problemTypes">${problemCount}. <di:translate key="assessment.${_node.key}" /></td> + <mm:write referid="blocknames" escape="text/plain"/> + </tr> + <mm:import externid="sub" /> + <mm:import externid="stage" /> + <c:set var="problemCount" value="${problemCount + 1}" /> + <mm:relatednodescontainer path="related,problems,posrel,people" element="problems"> + <mm:addnode element="people" number="${user}" /> + <mm:sortorder field="posrel.pos" /> + <mm:size id="size" write="false"/> + <c:if test="${size eq 0}"> + <tr class="problemItem"><td colspan="7">--</td></tr> + </c:if> + <mm:relatednodes> + <mm:include page="/assessment/matrix.div.jspx" referids="sub?,stage?,_n...@source"> + <mm:param name="evaluate">${evaluate}</mm:param> + </mm:include> + <tr><td colspan="7"><jsp:text> </jsp:text></td></tr> + </mm:relatednodes> + </mm:relatednodescontainer> + <tr class="problemTypeSpacer"><td colspan="7"><jsp:text> </jsp:text></td></tr> + </mm:listnodes> + + </table> + </div> + + + <di:include page="/assessment/closelesson.link.jspx" /> + + </div> + </jsp:root> \ No newline at end of file _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs