EduploneExam/skins/EduploneExam exam_fillgap_process.cpy,1.3,1.3.2.1 exam_questionHeader.pt,1.7,1.7.2.1 exam_view.cpt,1.10,1.10.2.1

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

Modified Files:
      Tag: exam-1_1
	exam_fillgap_process.cpy exam_questionHeader.pt exam_view.cpt 
Log Message:
exam-1_1 init. moving to the next version...

Index: exam_questionHeader.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_questionHeader.pt,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** exam_questionHeader.pt	28 Sep 2005 06:39:29 -0000	1.7
--- exam_questionHeader.pt	2 Oct 2005 21:21:12 -0000	1.7.2.1
***************
*** 7,11 ****
                         tal:condition="python: here.getParam_ShowScore()">
                  (<span tal:omit-tag=""
!                        tal:content="currentQuestion/maxScore" /> <i i18n:translate="label_points"> points</i>)
              </tal:block>
          </h2>
--- 7,12 ----
                         tal:condition="python: here.getParam_ShowScore()">
                  (<span tal:omit-tag=""
!                        tal:content="currentQuestion/maxScore" /> <i i18n:translate=""
!                                                                     i18n:domain="EduploneExam"> points</i>)
              </tal:block>
          </h2>
***************
*** 16,20 ****
  
          <b tal:content="structure python:currentQuestion.getQuestion()" />
!         <div tal:condition="python:currentQuestion.getPicture().getSize() > 0"
               tal:content="structure python:currentQuestion.getPicture()" />
  
--- 17,21 ----
  
          <b tal:content="structure python:currentQuestion.getQuestion()" />
!         <div tal:condition="python:currentQuestion.getPicture()"
               tal:content="structure python:currentQuestion.getPicture()" />
  
***************
*** 46,50 ****
  
          <span tal:content="structure python:currentQuestion.getQuestion()" />
!         <div tal:condition="python:currentQuestion.getPicture().getSize() > 0"
               tal:content="structure python:currentQuestion.getPicture()" />
  
--- 47,51 ----
  
          <span tal:content="structure python:currentQuestion.getQuestion()" />
!         <div tal:condition="python:currentQuestion.getPicture()"
               tal:content="structure python:currentQuestion.getPicture()" />
  

Index: exam_view.cpt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_view.cpt,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** exam_view.cpt	26 Sep 2005 07:04:24 -0000	1.10
--- exam_view.cpt	2 Oct 2005 21:21:12 -0000	1.10.2.1
***************
*** 24,28 ****
               tal:omit-tag="">
  
- 
              <div metal:define-macro="page_nav"
                  tal:define="results python:here.objectValues(here.getRegisteredQuestionTypes().keys());
--- 24,27 ----
***************
*** 34,41 ****
                              batch python:Batch(results, b_size, int(b_start), orphan=0, pagerange=2);">
  
- 
                  <div metal:use-macro="here/batch_macros/macros/navigation" />
  
-                 
                  <form method="post" action="">
                      
--- 33,38 ----
***************
*** 58,61 ****
--- 55,59 ----
              
                          </fieldset>
+ 
                      </tal:repeat>
  

Index: exam_fillgap_process.cpy
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_fillgap_process.cpy,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** exam_fillgap_process.cpy	11 Sep 2005 14:03:41 -0000	1.3
--- exam_fillgap_process.cpy	2 Oct 2005 21:21:12 -0000	1.3.2.1
***************
*** 6,51 ****
  ##bind script=script
  ##bind subpath=traverse_subpath
! ##parameters=id=''
! 
! request = context.REQUEST
! 
! answerTitle = request.get("title")
! answerCorrect = request.get("correct")
! answerCaseSensitive = request.get("caseSensitive")
! answer = context
! gapWordIndex = int(request.get("gapWordIndex"))
! 
! parent=context.aq_parent
! 
! answerId = context.getId() #request.get("id")
! basetext = parent.getBasetextAsList()
! options=request.get("options")
! 
! 
! # Re-render basetext with newly added gap.
! basetext_new = []
! counter=0
! for i in basetext:
!     # Check if gap position has changed and move gap if so.
!     if parent.getGapPosition(answerId) != gapWordIndex and i == "<id='%s'>" % answerId:
!         basetext_new.append(answer.getCorrect()[0])
!     else:
!         if gapWordIndex == counter:
!             basetext_new.append("<id='%s'>" % answerId)
!         else:
!             basetext_new.append(i)
!     counter+=1
! 
! # Save settings
! parent.setBasetext(" ".join(basetext_new))
! answer.setTitle(answerTitle)
! answer.setCorrect(answerCorrect)
! 
! if answer.meta_type=="BlindGapAnswer":
!     answer.setCaseSensitive(answerCaseSensitive)
! 
! if answer.meta_type=="ChoiceGapAnswer":
!     answer.setOptions(options)
! 
! # Return to fillgap task
  request.RESPONSE.redirect("%s" % context.absolute_url())
--- 6,51 ----
  ##bind script=script
  ##bind subpath=traverse_subpath
! ##parameters=id=''
! 
! request = context.REQUEST
! 
! answerTitle = request.get("title")
! answerCorrect = request.get("correct")
! answerCaseSensitive = request.get("caseSensitive")
! answer = context
! gapWordIndex = int(request.get("gapWordIndex"))
! 
! parent=context.aq_parent
! 
! answerId = context.getId() #request.get("id")
! basetext = parent.getBasetextAsList()
! options=request.get("options")
! 
! 
! # Re-render basetext with newly added gap.
! basetext_new = []
! counter=0
! for i in basetext:
!     # Check if gap position has changed and move gap if so.
!     if parent.getGapPosition(answerId) != gapWordIndex and i == "<id='%s'>" % answerId:
!         basetext_new.append(answer.getCorrect()[0])
!     else:
!         if gapWordIndex == counter:
!             basetext_new.append("<id='%s'>" % answerId)
!         else:
!             basetext_new.append(i)
!     counter+=1
! 
! # Save settings
! parent.setBasetext(" ".join(basetext_new))
! answer.setTitle(answerTitle)
! answer.setCorrect(answerCorrect)
! 
! if answer.meta_type=="BlindGapAnswer":
!     answer.setCaseSensitive(answerCaseSensitive)
! 
! if answer.meta_type=="ChoiceGapAnswer":
!     answer.setOptions(options)
! 
! # Return to fillgap task
  request.RESPONSE.redirect("%s" % context.absolute_url())



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