Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv19705
Modified Files:
matrix.div.jspx stage4-problems.jspx
Log Message:
changed to table, couldn't get the layout right
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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- matrix.div.jspx 8 Jan 2009 17:44:37 -0000 1.21
+++ matrix.div.jspx 9 Jan 2009 09:01:30 -0000 1.22
@@ -21,18 +21,18 @@
<!-- Display the problem itself -->
-<div class="problemItem">
- <mm:field name="name" /> &nbsp;
-</div>
+<tr class="problemItem">
+<td class="problemName"><mm:field name="name" />&nbsp;</td>
+
<mm:node id="problem" number="${_node}" /> <!-- give current node an id, and
put it in the current cloud -->
- <div class="learnblockProblemItems">
<!-- And, per lesson, how much trouble it gave -->
<mm:node number="${education}">
<mm:relatednodescontainer
element="learnblocks"
searchdirs="destination"
path="posrel,learnblocks${di:setting('assessment',
'relate_learnblocks') ? ',related,components' : ''}">
+ <mm:size id="blockCount" write="false"/>
<mm:sortorder field="posrel.pos" />
<c:if test="${di:setting('assessment', 'relate_learnblocks')}">
<mm:addnode element="components" number="component.assessment" />
@@ -82,8 +82,7 @@
this relation, or only _see_ (if 'closed' lesson).
That is, inidcate how much trouble the problem is now causing.
-->
-
-
+ <mm:import id="blockCount"
reset="true">${(blockCount+1)}</mm:import>
<mm:listrelationscontainer type="problems" role="posrel">
<mm:addnode element="problems" number="${problem}" />
@@ -91,7 +90,8 @@
<mm:field name="pos" write="false">
<!-- See MMB-1770 -->
<fmt:bundle basename="nl.didactor.resources.troubles">
- <span class="learnblockItems"><fmt:message key="${_}" /></span>
+ <td class="learnblockItems"><fmt:message key="${_}" /></td>
+ <mm:import id="blockCount"
reset="true">${(blockCount-1)}</mm:import>
</fmt:bundle>
</mm:field>
</mm:listrelations>
@@ -112,10 +112,9 @@
<mm:present referid="test">
<mm:link referids="test,_n...@problem,sub?">
<mm:param name="stage">stage5-evaluate</mm:param>
- <span class="learnblockItems"><a href="${_}">uitwerken</a></span>
+ <td colspan="${blockCount}" class="learnblockItems" align="right"><a
href="${_}">uitwerken</a></td>
</mm:link>
</mm:present>
- </div>
-
+</tr>
</jsp:root>
Index: stage4-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage4-problems.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- stage4-problems.jspx 8 Jan 2009 17:44:37 -0000 1.5
+++ stage4-problems.jspx 9 Jan 2009 09:01:30 -0000 1.6
@@ -15,6 +15,7 @@
<!--
show the learnblocks
-->
+ <table cellpadding="2" cellspacing="0" border="0">
<mm:node number="${education}">
<mm:relatednodescontainer
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ?
',related,components' : ''}" searchdirs="destination">
<mm:sortorder field="posrel.pos" />
@@ -22,19 +23,20 @@
<mm:addnode element="components" number="component.assessment" />
</c:if>
- <div class="learnblockNames">
+ <tr class="learnblockNames">
+ <td class="problemName">&nbsp;</td>
<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)
-->
<mm:relation to="${user}" role="classrel" searchdir="source"
notfound="null">
- <h4 class="learnblockItems">
+ <td class="learnblockItems">
<mm:field name="name" node="learnBlock" />
- </h4>
+ </td>
</mm:relation>
</mm:relatednodes>
- </div>
+ </tr>
</mm:relatednodescontainer>
@@ -46,8 +48,10 @@
They can be edited by the user
-->
<mm:listnodes orderby="pos" type="problemtypes">
- <h2 class="problemTypes"><di:translate key="assessment.${_node.key}"
/></h2>
+ <tr>
+ <td colspan="7"><h2 class="problemTypes"><di:translate
key="assessment.${_node.key}" /></h2></td>
+ </tr>
<mm:import externid="sub" />
<mm:import externid="stage" />
@@ -61,5 +65,8 @@
</mm:listnodes>
+ </table>
+
+
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
