EduploneExam/skins/EduploneExam exam_matching.pt,1.11.2.7,1.11.2.8 exam_multiplechoice.pt,1.15.2.6,1.15.2.7 exam_questionHeader.pt,1.7.2.8,1.7.2.9 exam_singlechoice.pt,1.13.2.8,1.13.2.9 exam_truefalse.pt,1.13.2.7,1.13.2.8
Thomas Zeleny <[email protected]> Wed, 05 Apr 2006 09:53:46 +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-serv21812/skins/EduploneExam
Modified Files:
Tag: exam-1_1
exam_matching.pt exam_multiplechoice.pt exam_questionHeader.pt
exam_singlechoice.pt exam_truefalse.pt
Log Message:
these change where also made in the Head release a while ago... baybe it was forgotton. If no image is put in the get_size fails so i putted a test in if the image exists
Index: exam_matching.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_matching.pt,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -C2 -d -r1.11.2.7 -r1.11.2.8
*** exam_matching.pt 4 Mar 2006 17:41:04 -0000 1.11.2.7
--- exam_matching.pt 5 Apr 2006 09:53:44 -0000 1.11.2.8
***************
*** 15,20 ****
<tr tal:condition="answer/challenge">
<td>
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
<span tal:content="python: answer.getChallenge()" />
--- 15,21 ----
<tr tal:condition="answer/challenge">
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
***************
*** 67,74 ****
<tal:condition tal:condition="answer/challenge">
<td>
!
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
!
<span tal:content="python: answer.getChallenge()" />
--- 68,75 ----
<tal:condition tal:condition="answer/challenge">
<td>
!
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
Index: exam_questionHeader.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_questionHeader.pt,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -C2 -d -r1.7.2.8 -r1.7.2.9
*** exam_questionHeader.pt 27 Feb 2006 23:23:38 -0000 1.7.2.8
--- exam_questionHeader.pt 5 Apr 2006 09:53:44 -0000 1.7.2.9
***************
*** 17,22 ****
<span tal:replace="structure currentQuestion/question" />
! <div tal:condition="python:currentQuestion.getField('picture').get_size(currentQuestion) > 0"
! tal:content="structure python: currentQuestion.getPicture()"/>
--- 17,23 ----
<span tal:replace="structure currentQuestion/question" />
! <img tal:define="image currentQuestion/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
***************
*** 51,59 ****
<span tal:content="structure python:currentQuestion.getQuestion()" />
!
! <div tal:condition="python:currentQuestion.getField('picture').get_size(currentQuestion) > 0 and currentQuestion.getField('exemplar_picture').get_size(currentQuestion) <= 0"
! tal:content="structure python: currentQuestion.getPicture()"/>
! <div tal:condition="python:currentQuestion.getField('exemplar_picture').get_size(currentQuestion) > 0"
! tal:content="structure python: currentQuestion.getExemplar_picture()"/>
<br/>
</div>
\ No newline at end of file
--- 52,65 ----
<span tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:define="image currentQuestion/getPicture | nothing"
! tal:condition="python:image and image.get_size(currentQuestion) > 0"
! tal:content="structure python: image"/>
! <tal:block tal:define="picture currentQuestion/getPicture | nothing;
! example_picture currentQuestion/getExample_picture | nothing">
! <img tal:condition="python:picture and picture.get_size() > 0 and example_picture and example_picture.get_size() <= 0"
! tal:replace="structure picture"/>
! <img tal:condition="python:example_picture and example_picture.get_size(currentQuestion) > 0"
! tal:replace="structure example_picture "/>
! </tal:block>
<br/>
</div>
\ No newline at end of file
Index: exam_truefalse.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_truefalse.pt,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -C2 -d -r1.13.2.7 -r1.13.2.8
*** exam_truefalse.pt 4 Mar 2006 17:41:04 -0000 1.13.2.7
--- exam_truefalse.pt 5 Apr 2006 09:53:44 -0000 1.13.2.8
***************
*** 12,17 ****
<td>
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
<span tal:content="python: answer.getChallenge()" />
--- 12,18 ----
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
***************
*** 65,70 ****
<td>
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
--- 66,72 ----
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
Index: exam_singlechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_singlechoice.pt,v
retrieving revision 1.13.2.8
retrieving revision 1.13.2.9
diff -C2 -d -r1.13.2.8 -r1.13.2.9
*** exam_singlechoice.pt 4 Mar 2006 17:41:04 -0000 1.13.2.8
--- exam_singlechoice.pt 5 Apr 2006 09:53:44 -0000 1.13.2.9
***************
*** 20,25 ****
</td>
<td>
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
<span tal:content="python: answer.getChallenge()" />
--- 20,26 ----
</td>
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
***************
*** 57,63 ****
<td>
!
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
<span tal:content="python: answer.getChallenge()" />
--- 58,64 ----
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
Index: exam_multiplechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_multiplechoice.pt,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -d -r1.15.2.6 -r1.15.2.7
*** exam_multiplechoice.pt 4 Mar 2006 17:41:04 -0000 1.15.2.6
--- exam_multiplechoice.pt 5 Apr 2006 09:53:44 -0000 1.15.2.7
***************
*** 20,25 ****
</td>
<td>
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
<span tal:content="python: answer.getChallenge()" />
--- 20,26 ----
</td>
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
***************
*** 64,69 ****
<td>
! <span tal:condition="python:answer.getField('picture').get_size(answer) > 0"
! tal:content="structure python: answer.getPicture()"/>
<span tal:content="python: answer.getChallenge()" />
--- 65,71 ----
<td>
! <img tal:define="image answer/getPicture | nothing"
! tal:condition="python:image and image.get_size() > 0"
! tal:replace="structure image"/>
<span tal:content="python: answer.getChallenge()" />
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642