Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv14741
Modified Files:
matrix.div.jspx stage1-goals.jspx stage2-problems.jspx
stage3-problems.jspx stage4-problems.jspx stage5.js.jsp
Log Message:
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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- matrix.div.jspx 8 Jan 2009 14:41:28 -0000 1.20
+++ matrix.div.jspx 8 Jan 2009 17:44:37 -0000 1.21
@@ -21,16 +21,12 @@
<!-- Display the problem itself -->
-
- <span class="col problem">
- <div class="intro">
- <mm:field name="name" />
- </div>
-
- </span>
-
+<div class="problemItem">
+ <mm:field name="name" /> &nbsp;
+</div>
<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
@@ -44,7 +40,6 @@
<mm:size id="size" write="false" />
<mm:relatednodes id="learnBlock">
- <span class="col" style="width: ${60 / size}%">
<!--
Create the relation problem-posrel->learnBlock if that does not
exist yet. The
@@ -88,36 +83,39 @@
That is, inidcate how much trouble the problem is now causing.
-->
+
<mm:listrelationscontainer type="problems" role="posrel">
<mm:addnode element="problems" number="${problem}" />
+
<mm:listrelations id="relation">
<mm:field name="pos" write="false">
<!-- See MMB-1770 -->
<fmt:bundle basename="nl.didactor.resources.troubles">
- <fmt:message key="${_}" />
+ <span class="learnblockItems"><fmt:message key="${_}" /></span>
</fmt:bundle>
</mm:field>
</mm:listrelations>
+
</mm:listrelationscontainer>
- <jsp:text>&#160;</jsp:text>
- </span>
+
+
</mm:relatednodes>
</mm:relatednodescontainer>
+
</mm:node>
<mm:import externid="stage" />
<mm:import externid="sub" />
- <span class="col">
-
- <jsp:text> </jsp:text>
<mm:present referid="test">
<mm:link referids="test,_n...@problem,sub?">
<mm:param name="stage">stage5-evaluate</mm:param>
- <a href="${_}">Werk dit probleem uit</a>
+ <span class="learnblockItems"><a href="${_}">uitwerken</a></span>
</mm:link>
</mm:present>
- </span>
+ </div>
+
+
</jsp:root>
Index: stage1-goals.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage1-goals.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- stage1-goals.jspx 7 Jan 2009 17:05:48 -0000 1.1
+++ stage1-goals.jspx 8 Jan 2009 17:44:37 -0000 1.2
@@ -12,6 +12,12 @@
-->
<h2><di:translate key="assessment.goals" /></h2>
+ <div>
+
+ <p>Som de dingen op die echt belangrijk zijn in jouw leven.</p>
+
+ </div>
+
<mm:node number="$user">
<mm:treefile write="false" page="/mmbase/style/images/"
objectlist="${includePath}" absolute="context">
<mm-sr:relatednodes type="goals"
Index: stage2-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage2-problems.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- stage2-problems.jspx 8 Jan 2009 09:33:28 -0000 1.3
+++ stage2-problems.jspx 8 Jan 2009 17:44:37 -0000 1.4
@@ -9,6 +9,12 @@
<h2><di:translate key="assessment.problems" /></h2>
+ <div>
+
+ <p>Maak een lijst van je zorgen en problemen.</p>
+
+ </div>
+
<mm:node number="${user}">
<mm:treefile
write="false"
Index: stage3-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage3-problems.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- stage3-problems.jspx 8 Jan 2009 12:01:31 -0000 1.6
+++ stage3-problems.jspx 8 Jan 2009 17:44:37 -0000 1.7
@@ -14,16 +14,17 @@
<div>
<mm:node referid="currentlesson">
- Hoeveel last in <mm:nodeinfo type="gui" />
+ <p>Geef per probleem aan wat voor soort probleem het is en hoe veel last
heb je op dit moment (tijdens <mm:nodeinfo type="gui" />) van dit probleem
hebt.</p>
</mm:node>
</div>
- <h4 class="mm_f_name">probleem</h4>
- <h4 class="mm_f_type">soort</h4>
- <h4 class="mm_dt_didactor_assessment_troubles">hoe veel last</h4>
+ <h4 class="mm_f_name">Probleem</h4>
+ <h4 class="mm_f_type">Soort</h4>
+ <h4 class="mm_dt_didactor_assessment_troubles">Hoe veel last</h4>
+ <p>
<mm:node number="${user}">
<mm:treefile
write="false"
@@ -36,5 +37,5 @@
</mm-sr:relatednodes>
</mm:treefile>
</mm:node>
-
+ </p>
</div>
Index: stage4-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage4-problems.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- stage4-problems.jspx 8 Jan 2009 14:41:28 -0000 1.4
+++ stage4-problems.jspx 8 Jan 2009 17:44:37 -0000 1.5
@@ -8,31 +8,36 @@
<jsp:output omit-xml-declaration="true" />
<h2><di:translate key="assessment.problems" /></h2>
+
+ <div>
+ <p>Dit is een overzicht van de problemen die je eerder hebt ingevoerd,
en hoeveel last je er per les van had. Werk eventueel per probleem uit hoe je
het gaat aanpakken (zie les 2).</p>
+ </div>
<!--
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>
+ <div class="learnblockNames">
<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">
- <span class="head ${empty _node ? '' : 'closed'}" style="width: ${60
/ status.count}%">
+ <h4 class="learnblockItems">
<mm:field name="name" node="learnBlock" />
- </span>
+ </h4>
</mm:relation>
</mm:relatednodes>
+ </div>
</mm:relatednodescontainer>
- <span class="head delete">&nbsp;</span>
+
</mm:node>
@@ -41,10 +46,11 @@
They can be edited by the user
-->
<mm:listnodes orderby="pos" type="problemtypes">
- <div class="inter"><di:translate key="assessment.${_node.key}" /></div>
+ <h2 class="problemTypes"><di:translate key="assessment.${_node.key}"
/></h2>
<mm:import externid="sub" />
<mm:import externid="stage" />
+
<mm:relatednodescontainer path="related,problems,posrel,people"
element="problems">
<mm:addnode element="people" number="${user}" />
<mm:sortorder field="posrel.pos" />
@@ -55,17 +61,5 @@
</mm:listnodes>
- <!--
- 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>
- </mm:link>
- </span>
-
- </div>
</div>
Index: stage5.js.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage5.js.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- stage5.js.jsp 8 Jan 2009 15:16:20 -0000 1.3
+++ stage5.js.jsp 8 Jan 2009 17:44:37 -0000 1.4
@@ -7,8 +7,10 @@
// Save difficulties first.
var params = {};
+
$("#difficulties input[type='hidden']").each(function() {
params[this.name || this.id || this.parentNode.name ||
this.parentNode.id ] = this.value;
+
});
$("#difficulties input").each(function() {
if (this.checked || this.type == 'text' || this.type == 'hidden' ||
this.type == 'password') {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
