EduploneExam/skins/EduploneExam exam_matching.pt,1.11,1.12 exam_multiplechoice.pt,1.15,1.16 exam_questionHeader.pt,1.7,1.8 exam_singlechoice.pt,1.13,1.14

Update of /cvsroot/eduplone/EduploneExam/skins/EduploneExam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24668/skins/EduploneExam

Modified Files:
	exam_matching.pt exam_multiplechoice.pt exam_questionHeader.pt 
	exam_singlechoice.pt 
Log Message:
fix if no picture is uploaded  view breaks because returned is a string and there is no size avaliable and fix lineendings in truefalse

Index: exam_matching.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_matching.pt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** exam_matching.pt	11 Sep 2005 16:22:43 -0000	1.11
--- exam_matching.pt	19 Oct 2005 14:28:04 -0000	1.12
***************
*** 15,20 ****
                  <tr tal:condition="answer/challenge">
                      <td>
!                         <span tal:condition="python:answer.getPicture().getSize() > 0"
!                               tal:content="structure python:answer.getPicture()" />
                
                          <span tal:content="python: answer.getChallenge()" />
--- 15,21 ----
                  <tr tal:condition="answer/challenge">
                      <td>
!                         <span tal:define="picture answer/getPicture"
!                               tal:condition="picture"
!                               tal:content="structure picture" />
                
                          <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
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exam_questionHeader.pt	28 Sep 2005 06:39:29 -0000	1.7
--- exam_questionHeader.pt	19 Oct 2005 14:28:04 -0000	1.8
***************
*** 16,21 ****
  
          <b tal:content="structure python:currentQuestion.getQuestion()" />
!         <div tal:condition="python:currentQuestion.getPicture().getSize() > 0"
!              tal:content="structure python:currentQuestion.getPicture()" />
  
          <br tal:condition="python:currentQuestion.getQuestion() != ''" />
--- 16,22 ----
  
          <b tal:content="structure python:currentQuestion.getQuestion()" />
!         <span tal:define="picture currentQuestion/getPicture"
!               tal:condition="picture"
!               tal:content="structure picture" />
  
          <br tal:condition="python:currentQuestion.getQuestion() != ''" />
***************
*** 46,51 ****
  
          <span tal:content="structure python:currentQuestion.getQuestion()" />
!         <div tal:condition="python:currentQuestion.getPicture().getSize() > 0"
!              tal:content="structure python:currentQuestion.getPicture()" />
  
          <br/>
--- 47,53 ----
  
          <span tal:content="structure python:currentQuestion.getQuestion()" />
!         <span tal:define="picture currentQuestion/getPicture"
!               tal:condition="picture"
!               tal:content="structure picture" />
  
          <br/>

Index: exam_singlechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_singlechoice.pt,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** exam_singlechoice.pt	11 Sep 2005 16:22:43 -0000	1.13
--- exam_singlechoice.pt	19 Oct 2005 14:28:04 -0000	1.14
***************
*** 19,24 ****
                  </td>
                  <td>
!                     <span tal:condition="python: answer.getPicture().getSize() > 0"
!                           tal:content="structure python:answer.getPicture()" />
  
                      <span tal:content="python: answer.getChallenge()" />
--- 19,25 ----
                  </td>
                  <td>
!                     <span tal:define="picture answer/getPicture"
!                           tal:condition="picture"
!                           tal:content="structure picture" />
  
                      <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
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** exam_multiplechoice.pt	11 Sep 2005 16:22:43 -0000	1.15
--- exam_multiplechoice.pt	19 Oct 2005 14:28:04 -0000	1.16
***************
*** 20,25 ****
                  </td>
                  <td>
!                     <span tal:condition="python:answer.getPicture().getSize() > 0"
!                           tal:content="structure python:answer.getPicture()" />
  
                      <span tal:content="python: answer.getChallenge()" />
--- 20,26 ----
                  </td>
                  <td>
!                     <span tal:define="picture answer/getPicture"
!                           tal:condition="picture"
!                           tal:content="structure picture" />
  
                      <span tal:content="python: answer.getChallenge()" />



-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl