EduploneExam/skins/EduploneExam exam_additionalstyles.css.dtml,1.1,1.2 exam_fillgap.pt,1.6,1.7 exam_fillgap_edit.cpt,1.7,1.8 exam_matching.pt,1.7,1.8 exam_math.pt,1.5,1.6 exam_multiplechoice.pt,1.11,1.12 exam_singlechoice.pt,1.9,1.10 exam_texttask.pt,1.4,1.5 exam_truefalse.pt,1.9,1.10 exam_view.cpt,1.7,1.8

"Fabian K." <[email protected]> Sat, 10 Sep 2005 18:24:10 +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-serv28538

Modified Files:
	exam_additionalstyles.css.dtml exam_fillgap.pt 
	exam_fillgap_edit.cpt exam_matching.pt exam_math.pt 
	exam_multiplechoice.pt exam_singlechoice.pt exam_texttask.pt 
	exam_truefalse.pt exam_view.cpt 
Log Message:
Made page templates XHTML valid

Index: exam_math.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_math.pt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** exam_math.pt	24 Feb 2005 16:57:16 -0000	1.5
--- exam_math.pt	10 Sep 2005 18:24:08 -0000	1.6
***************
*** 10,14 ****
              <input type="text" 
                     tal:attributes="name  python:currentQuestion.UID();
!                                    value python:responseObj[currentQuestion.UID()]">
          </tal:define>
  
--- 10,14 ----
              <input type="text" 
                     tal:attributes="name  python:currentQuestion.UID();
!                                    value python:responseObj[currentQuestion.UID()]" />
          </tal:define>
  
***************
*** 42,46 ****
                  <input type="text" disabled="disabled"
                         tal:attributes="name  python:currentQuestion.UID();
!                                        value python:responseObj[currentQuestion.UID()]">
              </td>
              <td> 
--- 42,46 ----
                  <input type="text" disabled="disabled"
                         tal:attributes="name  python:currentQuestion.UID();
!                                        value python:responseObj[currentQuestion.UID()]" />
              </td>
              <td> 
***************
*** 56,60 ****
                      tal:define="answer python:currentQuestion.contentValues()[0]">
      
!                     <span tal:content="structure python: test(answer.processValue(responseObj[currentQuestion.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                
                </span>
--- 56,60 ----
                      tal:define="answer python:currentQuestion.contentValues()[0]">
      
!                     <span tal:content="structure python: test(answer.processValue(responseObj[currentQuestion.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
                
                </span>

Index: exam_texttask.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_texttask.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** exam_texttask.pt	24 Feb 2005 16:57:16 -0000	1.4
--- exam_texttask.pt	10 Sep 2005 18:24:08 -0000	1.5
***************
*** 10,14 ****
              <input type="text" 
                     tal:attributes="name  python:currentQuestion.UID();
!                                    value python:responseObj[currentQuestion.UID()]">
          </tal:define>
  
--- 10,14 ----
              <input type="text" 
                     tal:attributes="name  python:currentQuestion.UID();
!                                    value python:responseObj[currentQuestion.UID()]" />
          </tal:define>
  
***************
*** 51,55 ****
  
              <td><tal:condition tal:condition="python:len(currentQuestion.contentValues()) > 0">
!                     <i tal:content="structure python: test(currentQuestion.contentValues()[0].processValue(responseObj[currentQuestion.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                   </tal:condition>
              </td>
--- 51,55 ----
  
              <td><tal:condition tal:condition="python:len(currentQuestion.contentValues()) > 0">
!                     <i tal:content="structure python: test(currentQuestion.contentValues()[0].processValue(responseObj[currentQuestion.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
                   </tal:condition>
              </td>

Index: exam_fillgap.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_fillgap.pt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** exam_fillgap.pt	11 Apr 2005 19:52:58 -0000	1.6
--- exam_fillgap.pt	10 Sep 2005 18:24:08 -0000	1.7
***************
*** 9,13 ****
              
               <tal:repeat repeat="word python: currentQuestion.getBasetextAsList()">
!                 <tal:isGap tal:condition="python: word.startswith('<id=\'') and word.endswith('\'>')">
                       <tal:def tal:define="answerId python:word[5:-2];
                                            answerObject python:currentQuestion[answerId];">
--- 9,13 ----
              
               <tal:repeat repeat="word python: currentQuestion.getBasetextAsList()">
!                 <tal:isGap tal:condition="python: word.startswith('&lt;id=\'') and word.endswith('\'&gt;')">
                       <tal:def tal:define="answerId python:word[5:-2];
                                            answerObject python:currentQuestion[answerId];">
***************
*** 29,34 ****
                  </tal:isGap>
  
!                 <tal:isNotGap tal:condition="python: word.startswith('<id=\'')==False and word.endswith('\'>')==False"
!                               tal:omit-tag
                                tal:replace="word" />
  
--- 29,34 ----
                  </tal:isGap>
  
!                 <tal:isNotGap tal:condition="python: word.startswith('&lt;id=\'')==False and word.endswith('\'&gt;')==False"
!                               tal:omit-tag=""
                                tal:replace="word" />
  
***************
*** 51,55 ****
          
              <tal:repeat repeat="word python: currentQuestion.getBasetextAsList()">
!                 <tal:isGap tal:condition="python: word.startswith('<id=\'') and word.endswith('\'>')">
                       <tal:def tal:define="answerId python:word[5:-2];
                                            answerObject python:currentQuestion[answerId];">
--- 51,55 ----
          
              <tal:repeat repeat="word python: currentQuestion.getBasetextAsList()">
!                 <tal:isGap tal:condition="python: word.startswith('&lt;id=\'') and word.endswith('\'&gt;')">
                       <tal:def tal:define="answerId python:word[5:-2];
                                            answerObject python:currentQuestion[answerId];">
***************
*** 69,74 ****
                  </tal:isGap>
  
!                 <tal:isNotGap tal:condition="python: word.startswith('<id=\'')==False and word.endswith('\'>')==False"
!                               tal:omit-tag
                                tal:replace="word" />
  
--- 69,74 ----
                  </tal:isGap>
  
!                 <tal:isNotGap tal:condition="python: word.startswith('&lt;id=\'')==False and word.endswith('\'&gt;')==False"
!                               tal:omit-tag=""
                                tal:replace="word" />
  
***************
*** 95,99 ****
          <td tal:condition="python: answer.portal_type == 'ChoiceGapAnswer'"
              tal:content="python: answer.getCorrect()" />
!     <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
  </tr>
  
--- 95,99 ----
          <td tal:condition="python: answer.portal_type == 'ChoiceGapAnswer'"
              tal:content="python: answer.getCorrect()" />
!     <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
  </tr>
  

Index: exam_singlechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_singlechoice.pt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** exam_singlechoice.pt	9 Jun 2005 09:21:52 -0000	1.9
--- exam_singlechoice.pt	10 Sep 2005 18:24:08 -0000	1.10
***************
*** 66,70 ****
                                         checked python:test(responseObj[answer.UID()], 'checked', None)" />
              </td>
!             <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                  
            </tr>
--- 66,70 ----
                                         checked python:test(responseObj[answer.UID()], 'checked', None)" />
              </td>
!             <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
                  
            </tr>

Index: exam_matching.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_matching.pt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exam_matching.pt	9 Jun 2005 09:21:52 -0000	1.7
--- exam_matching.pt	10 Sep 2005 18:24:08 -0000	1.8
***************
*** 83,87 ****
  
                  <td tal:content="python: answer.getCorrect()" />
!                 <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
              </tal:condition>    
              
--- 83,87 ----
  
                  <td tal:content="python: answer.getCorrect()" />
!                 <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
              </tal:condition>    
              

Index: exam_view.cpt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_view.cpt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exam_view.cpt	9 Jun 2005 09:21:52 -0000	1.7
--- exam_view.cpt	10 Sep 2005 18:24:08 -0000	1.8
***************
*** 6,10 ****
    <body>
  
- 
      <link metal:fill-slot="css_slot"
            rel="stylesheet" 
--- 6,9 ----
***************
*** 13,22 ****
            tal:attributes="href python:here.absolute_url()+'/exam_additionalstyles.css'" />
  
!     <div metal:fill-slot="main"
!          tal:define="portal_type python:here.getPortalTypeName().lower();
                       view_template python:'%s_view' % portal_type;
!                      view_macros python:path('here/%s/macros|nothing' % view_template);
!                      body_macro view_macros/body|nothing;
                       ">
  
          <div metal:define-macro="main"
--- 12,23 ----
            tal:attributes="href python:here.absolute_url()+'/exam_additionalstyles.css'" />
  
!     <div metal:fill-slot="main">
! 
! <!--         tal:define="portal_type python:here.getPortalTypeName().lower();
                       view_template python:'%s_view' % portal_type;
!                      XXXview_macros python:path('here/%s/macros|nothing' % view_template);
!                      XXXsbody_macro view_macros/body|nothing;
                       ">
+ -->
  
          <div metal:define-macro="main"
***************
*** 38,42 ****
                  <form method="post" action="">
                      
!                     <input type="hidden" name="form.submitted" value="1">
  
                      <input type="hidden" name="ContextUID"
--- 39,43 ----
                  <form method="post" action="">
                      
!                     <input type="hidden" name="form.submitted" value="1" />
  
                      <input type="hidden" name="ContextUID"

Index: exam_multiplechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_multiplechoice.pt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** exam_multiplechoice.pt	9 Jun 2005 09:21:52 -0000	1.11
--- exam_multiplechoice.pt	10 Sep 2005 18:24:08 -0000	1.12
***************
*** 73,77 ****
                                         checked python:test(responseObj[answer.UID()]=='on','checked', None)" />
              </td>
!             <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                  
            </tr>
--- 73,77 ----
                                         checked python:test(responseObj[answer.UID()]=='on','checked', None)" />
              </td>
!             <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
                  
            </tr>

Index: exam_truefalse.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_truefalse.pt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** exam_truefalse.pt	9 Jun 2005 09:21:52 -0000	1.9
--- exam_truefalse.pt	10 Sep 2005 18:24:08 -0000	1.10
***************
*** 80,90 ****
                  <input type="radio" value="0" disabled="disabled"
                         tal:attributes="name  python:'##'.join((currentQuestion.UID(), answer.UID()));
!                                        checked python:test(responseObj[answer.UID()]in ['0', None],
!                                                       'checked', None)"/>
                      <small i18n:translate="label_incorrect">incorrect</small>
  
  
              </td>
!             <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '<img src=right_answer.gif>', '<img src=wrong_answer.gif>')" />
                  
  
--- 80,89 ----
                  <input type="radio" value="0" disabled="disabled"
                         tal:attributes="name  python:'##'.join((currentQuestion.UID(), answer.UID()));
!                                        checked python:test(responseObj[answer.UID()]in ['0', None],'checked', None)"/>
                      <small i18n:translate="label_incorrect">incorrect</small>
  
  
              </td>
!             <td tal:content="structure python: test(answer.processValue(responseObj[answer.UID()]), '&lt;img src=right_answer.gif&gt;', '&lt;img src=wrong_answer.gif&gt;')" />
                  
  

Index: exam_fillgap_edit.cpt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_fillgap_edit.cpt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exam_fillgap_edit.cpt	9 Apr 2005 06:21:49 -0000	1.7
--- exam_fillgap_edit.cpt	10 Sep 2005 18:24:08 -0000	1.8
***************
*** 108,113 ****
  
                <tal:block tal:repeat="word BaseTextList">
!               <tal:def tal:define="isCurrent python:word=='<id=\'%s\'>' % here.getId();
!                                    isGap     python:word.startswith('<id=') and word.endswith('>');">
  
                    <a tal:condition="isCurrent"
--- 108,113 ----
  
                <tal:block tal:repeat="word BaseTextList">
!               <tal:def tal:define="isCurrent python:word=='&lt;id=\'%s\'&gt;' % here.getId();
!                                    isGap     python:word.startswith('&lt;id=') and word.endswith('&gt;');">
  
                    <a tal:condition="isCurrent"
***************
*** 139,143 ****
        tal:attributes="action python:here.absolute_url()+'/'+template.id" >
  
!           <input type="hidden" name="form.submitted" value="1">
            <input type="hidden" name="gapWordIndex" tal:attributes="value python:here.getGapPosition(here.getId())" />
  
--- 139,143 ----
        tal:attributes="action python:here.absolute_url()+'/'+template.id" >
  
!           <input type="hidden" name="form.submitted" value="1" />
            <input type="hidden" name="gapWordIndex" tal:attributes="value python:here.getGapPosition(here.getId())" />
  

Index: exam_additionalstyles.css.dtml
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_additionalstyles.css.dtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam_additionalstyles.css.dtml	9 Jun 2005 09:21:52 -0000	1.1
--- exam_additionalstyles.css.dtml	10 Sep 2005 18:24:08 -0000	1.2
***************
*** 5,8 ****
  }
  
- 
  </dtml-with>
\ No newline at end of file
--- 5,7 ----



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf