EduploneExam/skins/EduploneExam exam_freetext.pt,1.3,1.4 exam_matching.pt,1.5,1.6 exam_math.pt,1.4,1.5 exam_multiplechoice.pt,1.9,1.10 exam_questionHeader.pt,1.1,1.2 exam_singlechoice.pt,1.7,1.8 exam_texttask.pt,1.3,1.4 exam_truefalse.pt,1.7,1.8
Nils Haagen <[email protected]> Thu, 24 Feb 2005 16:57:20 +0000
| Newsgroups | gmane.comp.web.zope.eduplone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/eduplone/EduploneExam/skins/EduploneExam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14093
Modified Files:
exam_freetext.pt exam_matching.pt exam_math.pt
exam_multiplechoice.pt exam_questionHeader.pt
exam_singlechoice.pt exam_texttask.pt exam_truefalse.pt
Log Message:
eval-headers are in a macro, too, now - and it does show score...
Index: exam_matching.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_matching.pt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** exam_matching.pt 24 Feb 2005 15:45:08 -0000 1.5
--- exam_matching.pt 24 Feb 2005 16:57:16 -0000 1.6
***************
*** 45,62 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
!
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
<table border="0"
class="listing"
! summary="user result"
! tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- 45,55 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
<table border="0"
class="listing"
! summary="user result" >
Index: exam_freetext.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_freetext.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exam_freetext.pt 24 Feb 2005 15:45:08 -0000 1.3
--- exam_freetext.pt 24 Feb 2005 16:57:16 -0000 1.4
***************
*** 24,38 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
! <bR />
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br>
!
! <tal tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- 24,30 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
***************
*** 47,53 ****
</span-->
-
- </tal>
-
</div>
--- 39,42 ----
Index: exam_math.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_math.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** exam_math.pt 24 Feb 2005 15:45:08 -0000 1.4
--- exam_math.pt 24 Feb 2005 16:57:16 -0000 1.5
***************
*** 22,36 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
! <bR />
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/><br/>
- <tal tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
<table class="listing"
--- 22,29 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
<table class="listing"
***************
*** 72,77 ****
- </tal>
-
</div>
--- 65,68 ----
Index: exam_multiplechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_multiplechoice.pt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** exam_multiplechoice.pt 24 Feb 2005 15:45:08 -0000 1.9
--- exam_multiplechoice.pt 24 Feb 2005 16:57:16 -0000 1.10
***************
*** 47,64 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
!
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
<table border="0"
class="listing"
! summary="user result"
! tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
<thead>
--- 47,57 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
<table border="0"
class="listing"
! summary="user result">
<thead>
Index: exam_texttask.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_texttask.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exam_texttask.pt 24 Feb 2005 15:45:08 -0000 1.3
--- exam_texttask.pt 24 Feb 2005 16:57:16 -0000 1.4
***************
*** 21,38 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
!
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br />
<table border="0"
class="listing"
! summary="user result"
! tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
<thead>
--- 21,31 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
<table border="0"
class="listing"
! summary="user result">
<thead>
Index: exam_questionHeader.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_questionHeader.pt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam_questionHeader.pt 24 Feb 2005 15:45:08 -0000 1.1
--- exam_questionHeader.pt 24 Feb 2005 16:57:16 -0000 1.2
***************
*** 2,6 ****
tal:omit-tag="">
! <h2 tal:content="currentQuestion/title" />
<bR />
<b tal:content="structure python:currentQuestion.getQuestion()" />
--- 2,10 ----
tal:omit-tag="">
! <h2><b tal:content="currentQuestion/title" />
! (<span tal:omit-tag=""
! tal:content="currentQuestion/maxScore" /> Punkte)
! </h2>
!
<bR />
<b tal:content="structure python:currentQuestion.getQuestion()" />
***************
*** 12,15 ****
--- 16,40 ----
<br/><br/>
+ </div>
+
+
+
+ <div metal:define-macro="evalHeader"
+ tal:omit-tag="">
+
+ <h2><span tal:omit-tag=""
+ tal:content="currentQuestion/title" />
+
+ (<b tal:content="python:responseObj.getScore()" />
+ /<span tal:omit-tag=""
+ tal:content="currentQuestion/maxScore" />)
+
+ </h2>
+
+ <span tal:content="structure python:currentQuestion.getQuestion()" />
+ <div tal:condition="python:currentQuestion.getPicture()"
+ tal:content="structure python:currentQuestion.getPicture()" />
+
+ <br/>
</div>
\ No newline at end of file
Index: exam_singlechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_singlechoice.pt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exam_singlechoice.pt 24 Feb 2005 15:45:08 -0000 1.7
--- exam_singlechoice.pt 24 Feb 2005 16:57:16 -0000 1.8
***************
*** 43,60 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
!
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
<table border="0"
class="listing"
! summary="user result"
! tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
<thead>
--- 43,53 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
<table border="0"
class="listing"
! summary="user result">
<thead>
Index: exam_truefalse.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_truefalse.pt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exam_truefalse.pt 24 Feb 2005 15:45:08 -0000 1.7
--- exam_truefalse.pt 24 Feb 2005 16:57:16 -0000 1.8
***************
*** 48,65 ****
tal:omit-tag="">
! <div>
! <h2 tal:content="currentQuestion/title" />
!
! <span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
<table border="0"
class="listing"
! summary="user result"
! tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
<thead>
--- 48,58 ----
tal:omit-tag="">
! <div tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
! <div metal:use-macro="here/exam_questionHeader/macros/evalHeader" />
<table border="0"
class="listing"
! summary="user result">
<thead>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click