EduploneExam/skins/EduploneExam exam_questionHeader.pt,NONE,1.1 exam_freetext.pt,1.2,1.3 exam_matching.pt,1.4,1.5 exam_math.pt,1.3,1.4 exam_multiplechoice.pt,1.8,1.9 exam_singlechoice.pt,1.6,1.7 exam_texttask.pt,1.2,1.3 exam_truefalse.pt,1.6,1.7
Nils Haagen <[email protected]> Thu, 24 Feb 2005 15:45:11 +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-serv24275
Modified Files:
exam_freetext.pt exam_matching.pt exam_math.pt
exam_multiplechoice.pt exam_singlechoice.pt exam_texttask.pt
exam_truefalse.pt
Added Files:
exam_questionHeader.pt
Log Message:
swapped questionheaders (title, question, instruction ) to a macro for convenience
Index: exam_matching.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_matching.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** exam_matching.pt 24 Feb 2005 12:51:19 -0000 1.4
--- exam_matching.pt 24 Feb 2005 15:45:08 -0000 1.5
***************
*** 5,18 ****
<div>
! <h2 tal:content="currentQuestion/title" />
! <bR />
! <b tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
- <br/>
- <span tal:content="python: currentQuestion.getInstruction()" />
-
- <br/><br/>
<table border="0"
--- 5,10 ----
<div>
! <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
<table border="0"
Index: exam_freetext.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_freetext.pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** exam_freetext.pt 27 Dec 2004 14:22:43 -0000 1.2
--- exam_freetext.pt 24 Feb 2005 15:45:08 -0000 1.3
***************
*** 5,18 ****
<div>
! <h2 tal:content="currentQuestion/title" />
! <bR />
! <b tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
! <span tal:content="python: currentQuestion.getInstruction()" />
!
! <br/><br/>
<tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- 5,9 ----
<div>
! <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
<tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
Index: exam_math.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_math.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exam_math.pt 11 Jan 2005 11:15:25 -0000 1.3
--- exam_math.pt 24 Feb 2005 15:45:08 -0000 1.4
***************
*** 5,18 ****
<div>
! <h2 tal:content="currentQuestion/title" />
! <bR>
! <b tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
! <span tal:content="python: currentQuestion.getInstruction()" />
!
! <br/><br/>
<tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- 5,9 ----
<div>
! <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
<tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
Index: exam_multiplechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_multiplechoice.pt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** exam_multiplechoice.pt 24 Feb 2005 12:51:19 -0000 1.8
--- exam_multiplechoice.pt 24 Feb 2005 15:45:08 -0000 1.9
***************
*** 5,19 ****
<div>
! <h2 tal:content="currentQuestion/title" />
! <bR>
! <b tal:content="structure python:currentQuestion.getQuestion()" />
!
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
! <span tal:content="python: currentQuestion.getInstruction()" />
!
! <br/><br/>
<table border="0"
--- 5,9 ----
<div>
! <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
<table border="0"
Index: exam_texttask.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_texttask.pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** exam_texttask.pt 27 Dec 2004 14:22:43 -0000 1.2
--- exam_texttask.pt 24 Feb 2005 15:45:08 -0000 1.3
***************
*** 5,18 ****
<div>
! <h2 tal:content="currentQuestion/title" />
! <bR>
! <b tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
! <span tal:content="python: currentQuestion.getInstruction()" />
!
! <br/><br/>
<tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- 5,9 ----
<div>
! <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
<tal:define tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- NEW FILE: exam_questionHeader.pt ---
<div metal:define-macro="questionHeader"
tal:omit-tag="">
<h2 tal:content="currentQuestion/title" />
<bR />
<b tal:content="structure python:currentQuestion.getQuestion()" />
<div tal:condition="python:currentQuestion.getPicture()"
tal:content="structure python:currentQuestion.getPicture()" />
<br/>
<span tal:content="python: currentQuestion.getInstruction()" />
<br/><br/>
</div>
Index: exam_singlechoice.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_singlechoice.pt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** exam_singlechoice.pt 24 Feb 2005 12:51:19 -0000 1.6
--- exam_singlechoice.pt 24 Feb 2005 15:45:08 -0000 1.7
***************
*** 4,19 ****
<div>
-
- <h2 tal:content="currentQuestion/title" />
- <bR>
- <b tal:content="structure python:currentQuestion.getQuestion()" />
- <div tal:condition="python:currentQuestion.getPicture()"
- tal:content="structure python:currentQuestion.getPicture()" />
-
- <br/>
- <span tal:content="python: currentQuestion.getInstruction()" />
-
- <br/><br/>
<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"
tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
Index: exam_truefalse.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/skins/EduploneExam/exam_truefalse.pt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** exam_truefalse.pt 24 Feb 2005 12:51:19 -0000 1.6
--- exam_truefalse.pt 24 Feb 2005 15:45:08 -0000 1.7
***************
*** 5,18 ****
<div>
! <h2 tal:content="currentQuestion/title" />
! <bR />
! <b tal:content="structure python:currentQuestion.getQuestion()" />
! <div tal:condition="python:currentQuestion.getPicture()"
! tal:content="structure python:currentQuestion.getPicture()" />
!
! <br/>
! <span tal:content="python: currentQuestion.getInstruction()" />
!
! <br/><br/>
<table border="0" tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
--- 5,9 ----
<div>
! <div metal:use-macro="here/exam_questionHeader/macros/questionHeader" />
<table border="0" tal:define="responseObj python: context.deliverResponse(currentQuestion, create=False)">
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click