Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv23433/templates/assessment
Modified Files:
student.jspx
Added Files:
closelesson.link.jspx stage1-goals.jspx stage2-problems.jspx
stage3-problems.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
closelesson.link.jspx is new
stage1-goals.jspx is new
stage2-problems.jspx is new
stage3-problems.jspx is new
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- student.jspx 5 Dec 2008 15:57:23 -0000 1.24
+++ student.jspx 7 Jan 2009 17:05:48 -0000 1.25
@@ -3,45 +3,23 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
- xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
class="student">
<jsp:output omit-xml-declaration="true" />
- <!--
-
- xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
- -->
- <!--
- Let her administrate her 'goals'.
- -->
- <h2><di:translate key="assessment.goals" /></h2>
+ <mm:import externid="stage">stage1-goals</mm:import>
- <div class="goals">
- <mm:node number="$user">
- <mm:treefile write="false" page="/mmbase/style/images/"
objectlist="${includePath}" absolute="context">
- <mm-sr:relatednodes type="goals"
- icondir="${_}"
- role="posrel" orderby="posrel.pos" />
- </mm:treefile>
+ <mm:node number="$education">
+ <mm:function name="tree" />
</mm:node>
- </div>
-
- <h2><di:translate key="assessment.problems" /></h2>
- <div class="problems">
- <!--
- show the learnblocks
- -->
<mm:node number="${education}">
- <span class="head problem">&nbsp;</span>
<mm:relatednodescontainer
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ?
',related,components' : ''}" searchdirs="destination">
<mm:sortorder field="posrel.pos" />
<c:if test="${di:setting('assessment', 'relate_learnblocks')}">
<mm:addnode element="components" number="component.assessment" />
</c:if>
-
<mm:relatednodes id="learnBlock" varStatus="status">
<!--
If a relation learnBlock -classrel->user exists, then that
means that this lesson is marked 'closed' (by this module)
@@ -51,89 +29,33 @@
<c:if test="${empty _node and empty firstopenlesson}">
<mm:node node="learnBlock" id="firstopenlesson" />
</c:if>
- <span class="head ${empty _node ? '' : 'closed'}" style="width:
${60 / status.count}%">
- <mm:field name="name" node="learnBlock" />
- </span>
</mm:relation>
</mm:relatednodes>
</mm:relatednodescontainer>
-
- <span class="head delete">&nbsp;</span>
</mm:node>
+ FO: ${firstopenlesson}
- <!--
- Now the problems, divided per type.
- They can be edited by the user
- -->
- <mm:listnodes orderby="pos" type="problemtypes">
- <div class="inter"><di:translate key="assessment.${_node.key}" /></div>
+ <ul class="tabs">
+ <c:forEach items="stage1-goals,stage2-problems,stage3-problems" var="s">
+ <c:set var="settingname" value="opens_${s}" />
- <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:addnode element="people" number="${user}" />
- </jsp:attribute>
- </mm-sr:relatednodes>
- </mm:treefile>
- </mm:listnodes>
+ <c:if test="${! empty di:setting('assessment', settingname)}">
- <!--
- Now links to the feed back pages
- -->
- <div>
- <span class="head problem">
- <di:translate key="assessment.feedback_coach" />:
- <mm:link page="/c/shoutbox/index/">
- <a href="${_}" name=""><di:translate key="assessment.messages"/></a>
+ </c:if>
+ <c:if test="${empty di:setting('assessment', settingname)}">
+ <li class="${stage eq s ? 'current' : ''}">
+ <mm:link referids="s...@stage">
+ <mm:param name="sub">assessment</mm:param>
+ <a href="${_}"><di:translate key="assessment.${s}" /></a>
</mm:link>
- </span>
-
- </div>
-
- <!--
- Finally, the user is given the option to 'close' the last open lesson
- -->
-
- <div style="clear: both;">
+ </li>
+ </c:if>
+ </c:forEach>
+ </ul>
- <mm:import externid="step" />
+ <di:include page="/assessment/${stage}.jspx" />
- <c:if test="${! empty firstopenlesson}">
+ <di:include page="/assessment/closelesson.link.jspx" />
- <mm:node number="$user">
- <mm:function name="canCloseLesson" referids="firstopenles...@lesson">
- <c:choose>
- <c:when test="${_}">
-
- <mm:treefile page="/assessment/closelesson.jsp"
- objectlist="$includePath"
- write="false"
- >
-
- <form name="closelessonform" action="${_}" method="post">
- <input type="hidden" name="coachmode" value="false" />
- <input type="hidden" name="lesson"
value="${firstopenlesson}" />
- <di:translate key="assessment.close_and_send_to_coach"
arg0="${firstopenlesson.name}">
- <input type="submit" class="formbutton" value="${_}" />
- </di:translate>
- </form>
- </mm:treefile>
-
-
- </c:when>
- <c:otherwise>
- <p><di:translate key="assessment.waitforfeedback" /></p>
- </c:otherwise>
- </c:choose>
- </mm:function>
- </mm:node>
- </c:if>
- </div>
- </div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
