Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv21559
Modified Files:
closelesson.link.jspx problem.item.jspx stage2-problems.jspx
student.jspx
Added Files:
stage1-goals_problems.jspx stage2-overview.jspx
student_old.jspx student_overview.jspx
Log Message:
changed layout again
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
stage1-goals_problems.jspx is new
stage2-overview.jspx is new
student_old.jspx is new
student_overview.jspx is new
Index: closelesson.link.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/closelesson.link.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- closelesson.link.jspx 9 Jan 2009 11:56:03 -0000 1.7
+++ closelesson.link.jspx 14 Jan 2009 19:11:24 -0000 1.8
@@ -4,12 +4,12 @@
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";
- style="clear: both;"
- class="closelesson">
+ class="submitItems">
<jsp:output omit-xml-declaration="true" />
<mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
+ <input type="button" class="educationButton" value="opslaan"
onclick="window.location.reload()"/><jsp:text> | </jsp:text>
<c:if test="${! empty currentlesson}">
<mm:node referid="currentlesson" id="currentlesson" />
@@ -28,12 +28,14 @@
<input type="hidden" name="coachmode" value="false" />
<input type="hidden" name="lesson" value="${currentlesson}" />
<di:translate key="assessment.close_and_send_to_coach"
arg0="${currentlesson.name}">
- <input type="submit" class="formbutton" value="${_}" />
+
+ <input type="submit" class="educationButton" value="${_}"
/><jsp:text> | </jsp:text>
</di:translate>
</form>
</mm:treefile>
+
</c:when>
<c:otherwise>
<p><di:translate key="assessment.waitforfeedback" /></p>
@@ -42,4 +44,20 @@
</mm:function>
</mm:node>
</c:if>
+
+ <mm:link
page="/education/">
+ <c:if test="${!empty
currentlesson}">
+ <mm:node
number="${currentlesson}">
+ <c:set
var="learnobject" value="${currentlesson}" />
+ <!--
TODO: find a nicer/proper way to do this -->
+
<mm:relatednodes type="xmlcontent" constraints="lower(name) = 'opdrachten'">
+
<mm:node>
+
<c:set var="learnobject" value="${_node}" />
+
</mm:node>
+
</mm:relatednodes>
+ </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="" />
+ </mm:link>
</div>
Index: problem.item.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/problem.item.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- problem.item.jspx 9 Jan 2009 14:46:51 -0000 1.7
+++ problem.item.jspx 14 Jan 2009 19:11:24 -0000 1.8
@@ -11,14 +11,18 @@
<mm:import externid="source" required="true" />
<mm:import externid="confirm" />
<mm:import externid="icondir" />
+ <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
+<li>
<mm:node id="problem">
- <mm:fieldlist fields="name,type">
+
+ <mm:field name="name" />
+ <br/>
+
+ <mm:field name="type">
<mm:fieldinfo type="input" />
<mm:fieldinfo type="errors" />
- </mm:fieldlist>
-
- <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
+ </mm:field>
<mm:present referid="currentlesson">
<mm:isnotempty referid="currentlesson">
@@ -29,7 +33,7 @@
<mm:node number="${problem}" id="dest" />
<mm:createrelation id="new" source="ll" destination="dest"
role="posrel" commitonclose="true">
<!-- default value of how much trouble -->
- <mm:setfield name="pos">4</mm:setfield>
+ <mm:setfield name="pos">-1</mm:setfield>
</mm:createrelation>
</mm:cloud>
</c:if>
@@ -45,8 +49,10 @@
</mm:listrelations>
</mm:listrelationscontainer>
</mm:isnotempty>
+
</mm:present>
- <mm-sr:delete source="${source}" confirm="${confirm}" icondir="${icondir}"
/>
</mm:node>
+ <br/>
+</li>
</jsp:root>
Index: stage2-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage2-problems.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- stage2-problems.jspx 8 Jan 2009 17:44:37 -0000 1.4
+++ stage2-problems.jspx 14 Jan 2009 19:11:24 -0000 1.5
@@ -12,7 +12,6 @@
<div>
<p>Maak een lijst van je zorgen en problemen.</p>
-
</div>
<mm:node number="${user}">
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- student.jspx 11 Jan 2009 21:00:02 -0000 1.41
+++ student.jspx 14 Jan 2009 19:11:24 -0000 1.42
@@ -7,11 +7,10 @@
<jsp:output omit-xml-declaration="true" />
- <mm:import externid="stage">stage1-goals</mm:import>
+ <mm:import externid="stage">stage1-goals_problems</mm:import>
<mm:node number="${education}">
-
<mm:nodelistfunction id="learnBlock" name="lessons">
<mm:listrelationscontainer type="learnblocks" role="posrel">
<mm:listrelations>
@@ -42,49 +41,6 @@
</mm:nodelistfunction>
</mm:node>
-
-
- <ul class="tabs">
- <c:forEach
items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s">
- <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>
-
- <c:if test="${empty di:setting('assessment', settingname) or reached
ge stage_required}">
- <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>
- </li>
- </c:if>
- </mm:context>
- </c:forEach>
- </ul>
-
- <mm:link page="/education/">
- <c:if test="${!empty currentlesson}">
- <mm:node number="${currentlesson}">
- <c:set var="learnobject" value="${currentlesson}" />
- <!-- TODO: find a nicer/proper way to do this -->
- <mm:relatednodes type="xmlcontent"
constraints="lower(name) = 'opdrachten'">
- <mm:node>
- <c:set var="learnobject"
value="${_node}" />
- </mm:node>
- </mm:relatednodes>
-
- </mm:node>
-
- <mm:param name="learnobject">${learnobject}</mm:param>
- </c:if>
- <a href="${_}" name="">&lt;&lt; terug naar de les</a>
- </mm:link>
-
<mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
<mm:write session="currentlesson_${user}_${education}"
value="${currentlesson}" />
@@ -92,23 +48,9 @@
<di:include page="/assessment/${stage}.jspx" />
- <!--
- Now links to the feed back pages
- -->
- <div class="problemFeedback">
- <p>
- <h4 class="problemFeedback"><di:translate
key="assessment.feedback_coach" />:
- <mm:link page="/c/shoutbox/index/">
- <c:if test="${!empty currentlesson}">
- <mm:param name="_reference">${currentlesson}</mm:param>
- </c:if>
- <mm:param name="self">not</mm:param>
- <a href="${_}" name="">bekijk <di:translate
key="assessment.messages"/> voor deze les</a>
- </mm:link>
- </h4>
- </p>
- </div>
+ <p>
<di:include page="/assessment/closelesson.link.jspx" />
-
+ </p>
+ <p><jsp:text> </jsp:text></p>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
