Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv17973
Modified Files:
matrix.div.jspx student.jspx
Log Message:
rolled back check on component.assessment, not working, no way to edit yet
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: matrix.div.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- matrix.div.jspx 14 Aug 2008 15:10:30 -0000 1.7
+++ matrix.div.jspx 14 Aug 2008 20:09:06 -0000 1.8
@@ -38,7 +38,7 @@
<mm:node number="${education}">
<mm:relatednodes
id="learnBlock"
- element="learnblocks" path="posrel,learnblocks,components"
orderby="posrel.pos">
+ element="learnblocks" path="posrel,learnblocks" orderby="posrel.pos">
<mm:size id="size" write="false" />
<span class="col" style="width: ${60 / size}%">
@@ -97,8 +97,10 @@
But also a consequence of insisting to use posrel for
something which simply isn't.
I hate the people who 'designed' this.
- <mm:fieldinfo field="pos"
datatype="didactor_assessment_troubles" type="${empty _node ? 'input' :
'guivalue'}" />
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="${empty _node ? 'input' :
'guivalue'}" />
+
-->
+
<mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="input" />
<mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="errors" />
</mm:relation>
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- student.jspx 14 Aug 2008 15:10:30 -0000 1.10
+++ student.jspx 14 Aug 2008 20:09:06 -0000 1.11
@@ -34,8 +34,7 @@
<!-- show the learnblocks -->
<mm:node number="${education}">
<span class="head problem">&nbsp;</span>
- <mm:relatednodescontainer path="posrel,learnblocks,components">
- <mm:addnode element="components" number="component.assessment" />
+ <mm:relatednodescontainer path="posrel,learnblocks">
<mm:sortorder field="posrel.pos" />
<mm:relatednodes id="learnBlock" varStatus="status">
<mm:relation to="${user}" role="classrel" notfound="null">
@@ -81,7 +80,6 @@
</span>
<mm:node number="${education}">
<mm:relatednodes type="learnblocks" path="posrel,learnblocks"
orderby="posrel.pos" varStatus="status">
- <mm:relation to="component.assessment">
<span class="col" style="width: ${60 / (status.count + 1)}%"> <!--
the +1 helps IE, but is logically not necessary -->
<mm:relation role="classrel" to="${user}">
@@ -106,7 +104,6 @@
</mm:treefile>
</mm:present>
</span>
- </mm:relation>
</mm:relatednodes>
</mm:node>
</div>
@@ -115,7 +112,7 @@
Finally, the user is given the option to 'close' the last open lesson
-->
- <div>
+ <div style="clear: both;">
<mm:import externid="step" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
