EduploneExam/skins/EduploneExam exam_additionalstyles.css.dtml,NONE,1.1 exam_finished.pt,1.1,1.2 exam_freetext.pt,1.4,1.5 exam_matching.pt,1.6,1.7 exam_multiplechoice.pt,1.10,1.11 exam_singlechoice.pt,1.8,1.9 exam_truefalse.pt,1.8,1.9 exam_view.cpt,1.6,1.7

Nils Haagen <[email protected]> Thu, 09 Jun 2005 09:21:55 +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-serv3532/skins/EduploneExam

Modified Files:
	exam_finished.pt exam_freetext.pt exam_matching.pt 
	exam_multiplechoice.pt exam_singlechoice.pt exam_truefalse.pt 
	exam_view.cpt 
Added Files:
	exam_additionalstyles.css.dtml 
Log Message:
score as float, GUI-fixes, implementation of 'strict'-parameter, additional css-file

Index: exam_matching.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_matching.pt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** exam_matching.pt	24 Feb 2005 16:57:16 -0000	1.6
--- exam_matching.pt	9 Jun 2005 09:21:52 -0000	1.7
***************
*** 8,12 ****
  
  
!         <table border="0"
                 tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
--- 8,12 ----
  
  
!         <table border="0" cellspacing="0" cellpadding="0" 
                 tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
***************
*** 16,22 ****
                          <span tal:condition="python:answer.getPicture()"
                                tal:content="structure python:answer.getPicture()" />
!         
!                          &nbsp; &nbsp; 
!         
                          <span tal:content="python: answer.getChallenge()" />
                      </td>
--- 16,20 ----
                          <span tal:condition="python:answer.getPicture()"
                                tal:content="structure python:answer.getPicture()" />
!               
                          <span tal:content="python: answer.getChallenge()" />
                      </td>
***************
*** 70,75 ****
                            tal:content="structure python:answer.getPicture()" />
  
-                     &nbsp; &nbsp; 
- 
                      <span tal:content="python: answer.getChallenge()" />
                  </td>
--- 68,71 ----

Index: exam_view.cpt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_view.cpt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** exam_view.cpt	25 Feb 2005 13:42:55 -0000	1.6
--- exam_view.cpt	9 Jun 2005 09:21:52 -0000	1.7
***************
*** 6,9 ****
--- 6,16 ----
    <body>
  
+ 
+     <link metal:fill-slot="css_slot"
+           rel="stylesheet" 
+           type="text/css"
+           media="all"
+           tal:attributes="href python:here.absolute_url()+'/exam_additionalstyles.css'" />
+ 
      <div metal:fill-slot="main"
           tal:define="portal_type python:here.getPortalTypeName().lower();

Index: exam_truefalse.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_truefalse.pt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** exam_truefalse.pt	24 Feb 2005 16:57:16 -0000	1.8
--- exam_truefalse.pt	9 Jun 2005 09:21:52 -0000	1.9
***************
*** 7,11 ****
          <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
  
!         <table border="0" tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
          <tr tal:repeat="answer python:currentQuestion.contentValues()">
--- 7,11 ----
          <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
  
!         <table border="0" cellspacing="0" cellpadding="0" tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
          <tr tal:repeat="answer python:currentQuestion.contentValues()">
***************
*** 15,23 ****
                        tal:content="structure python:answer.getPicture()" />
  
-                 &nbsp; &nbsp; 
- 
                  <span tal:content="python: answer.getChallenge()" />
              </td>
!             <td width="10"></td>
              <td>
                  <input type="radio" value="1"
--- 15,21 ----
                        tal:content="structure python:answer.getPicture()" />
  
                  <span tal:content="python: answer.getChallenge()" />
              </td>
!             <td width="15"></td>
              <td>
                  <input type="radio" value="1"
***************
*** 69,74 ****
                         tal:content="structure python:answer.getPicture()" />
  
-                  &nbsp; &nbsp; 
- 
                   <span tal:content="python: answer.getChallenge()" />
              </td>
--- 67,70 ----

Index: exam_freetext.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_freetext.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** exam_freetext.pt	24 Feb 2005 16:57:16 -0000	1.4
--- exam_freetext.pt	9 Jun 2005 09:21:52 -0000	1.5
***************
*** 9,13 ****
          <tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
              
!             <textarea tal:attributes="name  python:currentQuestion.UID()"><tal tal:replace="python:responseObj[currentQuestion.UID()]"/></textarea>
                                     
          </tal:define>
--- 9,14 ----
          <tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
              
!             <textarea tal:attributes="name python:currentQuestion.UID();
!                                       rows string:5"><tal tal:replace="python:responseObj[currentQuestion.UID()]"/></textarea>
                                     
          </tal:define>

Index: exam_finished.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_finished.pt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam_finished.pt	27 Dec 2004 11:40:33 -0000	1.1
--- exam_finished.pt	9 Jun 2005 09:21:52 -0000	1.2
***************
*** 6,9 ****
--- 6,16 ----
    <body>
  
+ 
+     <link metal:fill-slot="css_slot"
+           rel="stylesheet" 
+           type="text/css"
+           media="all"
+           tal:attributes="href python:here.absolute_url()+'/exam_additionalstyles.css'" />
+ 
      <div metal:fill-slot="main"
           tal:define="portal_type python:here.getPortalTypeName().lower();

--- NEW FILE: exam_additionalstyles.css.dtml ---
<dtml-with base_properties>

b {
    color:black;
}


</dtml-with>
Index: exam_multiplechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_multiplechoice.pt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** exam_multiplechoice.pt	24 Feb 2005 16:57:16 -0000	1.10
--- exam_multiplechoice.pt	9 Jun 2005 09:21:52 -0000	1.11
***************
*** 7,11 ****
          <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
  
!         <table border="0" 
                 tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
--- 7,11 ----
          <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
  
!         <table border="0" cellspacing="0" cellpadding="0" 
                 tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
***************
*** 17,21 ****
                                         checked python:test(responseObj[answer.UID()]=='on','checked', None)" />
  
-               
                  </td>
                  <td>
--- 17,20 ----
***************
*** 23,28 ****
                            tal:content="structure python:answer.getPicture()" />
  
-                     &nbsp; &nbsp; 
- 
                      <span tal:content="python: answer.getChallenge()" />
                  </td>
--- 22,25 ----
***************
*** 64,76 ****
            <tr tal:repeat="answer python:currentQuestion.contentValues()">
  
- 
- 
- 
              <td>
                   <span tal:condition="python:answer.getPicture()"
                         tal:content="structure python:answer.getPicture()" />
  
-                  &nbsp; &nbsp; 
- 
                   <span tal:content="python: answer.getChallenge()" />
              </td>
--- 61,68 ----
***************
*** 83,91 ****
              <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                  
- 
            </tr>
          </table>        
  
- 
      </div>
  
--- 75,81 ----

Index: exam_singlechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_singlechoice.pt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** exam_singlechoice.pt	24 Feb 2005 16:57:16 -0000	1.8
--- exam_singlechoice.pt	9 Jun 2005 09:21:52 -0000	1.9
***************
*** 4,11 ****
  
      <div>
- 
          <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
            
!         <table border="0"
                 tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
--- 4,10 ----
  
      <div>
          <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
            
!         <table border="0" cellspacing="0" cellpadding="0" 
                 tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
  
***************
*** 22,36 ****
                            tal:content="structure python:answer.getPicture()" />
  
-                     &nbsp; &nbsp; 
- 
                      <span tal:content="python: answer.getChallenge()" />
- 
                  </td>
- 
- 
          </tr>
          </table>
  
- 
      </div>
  
--- 21,29 ----
***************
*** 64,69 ****
                         tal:content="structure python:answer.getPicture()" />
  
-                  &nbsp; &nbsp; 
- 
                   <span tal:content="python: answer.getChallenge()" />
              </td>
--- 57,60 ----
***************
*** 77,81 ****
              <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                  
- 
            </tr>
          </table>        
--- 68,71 ----



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20