EduploneTest/skins/EduploneTest eduplone_fillgap_edit.pt,1.3,1.4 eduplone_testingResults.pt,1.7,1.8 eduplone_testingResults_global.pt,1.2,1.3 eduplone_userResults2.pt,1.4,1.5 test_environment_feedback.pt,1.3,1.4 test_environment_listing.pt,1.6,1.7 eduplone_testingResult2.pt,1.3,NONE
Nils Haagen <[email protected]>
| Newsgroups | gmane.comp.web.zope.eduplone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/eduplone/EduploneTest/skins/EduploneTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7336/skins/EduploneTest
Modified Files:
eduplone_fillgap_edit.pt eduplone_testingResults.pt
eduplone_testingResults_global.pt eduplone_userResults2.pt
test_environment_feedback.pt test_environment_listing.pt
Removed Files:
eduplone_testingResult2.pt
Log Message:
fixed HTML for i18ndude, new .pot
Index: eduplone_userResults2.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_userResults2.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eduplone_userResults2.pt 8 Nov 2004 16:34:17 -0000 1.4
--- eduplone_userResults2.pt 13 Nov 2004 11:16:45 -0000 1.5
***************
*** 5,10 ****
>
! <body
! >
<div metal:fill-slot="main">
<tal metal:define-macro="main">
--- 5,9 ----
>
! <body>
<div metal:fill-slot="main">
<tal metal:define-macro="main">
***************
*** 12,18 ****
<div class="contentHeader">
<h1>
! <small i18n:translate="label_results_for_users">Results for user:</small>
! <span tal:content="structure python:here.title_or_id()">
! Title or id</span></h1>
</div>
--- 11,17 ----
<div class="contentHeader">
<h1>
! <small i18n:translate="label_results_for_users">Results for user:</small>
! <span tal:content="structure python:here.title_or_id()">Title or id</span>
! </h1>
</div>
***************
*** 22,26 ****
defcolors python:['red','green'];
defimages python:['wrong_answer.gif','right_answer.gif']">
-
<!-- ===== -->
--- 21,24 ----
***************
*** 29,33 ****
<fieldset>
<legend>
! <img src="questionmark.gif">
<span style="text-decoration:underline; font-weight: bold;">
--- 27,31 ----
<fieldset>
<legend>
! <img src="questionmark.gif" border="0" />
<span style="text-decoration:underline; font-weight: bold;">
***************
*** 50,58 ****
<small style="font-weight:normal;" tal:content="structure quest/question" />
! <br/><br/>
<tal:typeswitch tal:condition="python: quest.meta_type == 'eduplone FillGap'">
<b tal:content="structure python: quest.getRenderedText(render_as='tutor_noLinks')" />
! <bR><bR>
</tal:typeswitch>
--- 48,57 ----
<small style="font-weight:normal;" tal:content="structure quest/question" />
!
! <br/><br/>
<tal:typeswitch tal:condition="python: quest.meta_type == 'eduplone FillGap'">
<b tal:content="structure python: quest.getRenderedText(render_as='tutor_noLinks')" />
! <bR/><bR/>
</tal:typeswitch>
***************
*** 61,65 ****
<tal:typeswitch tal:condition="python: quest.meta_type == 'eduplone FreeText'">
<b tal:content="structure python: here.evalFreeTextAnswer(quest.getId(), here.getSingleAnswer(quest.getId(), quest.getId()))" />
! <bR><bR>
<table border="1" tal:define="qId python:quest.getId();
--- 60,64 ----
<tal:typeswitch tal:condition="python: quest.meta_type == 'eduplone FreeText'">
<b tal:content="structure python: here.evalFreeTextAnswer(quest.getId(), here.getSingleAnswer(quest.getId(), quest.getId()))" />
! <bR/><bR/>
<table border="1" tal:define="qId python:quest.getId();
***************
*** 75,82 ****
<td>
<tal tal:repeat="answer python:answerObj.getCorrectAnswer()">
! <span tal:content="answer" /> <br>
</tal>
</td>
! <td >
<img src="" tal:attributes="src python:defimages[evalFTA[answerObj.getId()]]" />
</td>
--- 74,81 ----
<td>
<tal tal:repeat="answer python:answerObj.getCorrectAnswer()">
! <span tal:content="answer" /> <br/>
</tal>
</td>
! <td>
<img src="" tal:attributes="src python:defimages[evalFTA[answerObj.getId()]]" />
</td>
***************
*** 112,124 ****
</td>
<td>
! <!--b tal:condition="python: answer.getId()==here.getSingleAnswer(quest.getId(),answer.getId()) or answer.getCorrectAnswer()==True"-->
!
! <img src="" tal:condition="python: answer.getId()==here.getSingleAnswer(quest.getId(),answer.getId())"
! tal:attributes="src python:defimages[here.evalAnswer(quest.getId(), answer.getId(), here.getSingleAnswer(quest.getId(), answer.getId()))]"/>
! <img src="" tal:condition="python: answer.getId()!=here.getSingleAnswer(quest.getId(),answer.getId()) and answer.getCorrectAnswer()==True"
! tal:attributes="src python:defimages[1]"/>
!
! <!--/b-->
</td>
<td>
--- 111,119 ----
</td>
<td>
! <img src="" tal:condition="python: answer.getId()==here.getSingleAnswer(quest.getId(),answer.getId())"
! tal:attributes="src python:defimages[here.evalAnswer(quest.getId(), answer.getId(), here.getSingleAnswer(quest.getId(), answer.getId()))]"/>
! <img src="" tal:condition="python: answer.getId()!=here.getSingleAnswer(quest.getId(),answer.getId()) and answer.getCorrectAnswer()==True"
! tal:attributes="src python:defimages[1]"/>
</td>
<td>
***************
*** 145,150 ****
<td>
<span tal:repeat="answerLine python: answer.getCorrectAnswer()">
! <b tal:replace="answerLine" /><br>
</span>
<td tal:content="python: here.getSingleAnswer(quest.getId(),answer.getId())" />
<td>
--- 140,146 ----
<td>
<span tal:repeat="answerLine python: answer.getCorrectAnswer()">
! <b tal:replace="answerLine" /><br/>
</span>
+ </td>
<td tal:content="python: here.getSingleAnswer(quest.getId(),answer.getId())" />
<td>
Index: eduplone_testingResults_global.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_testingResults_global.pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eduplone_testingResults_global.pt 7 Nov 2004 20:42:08 -0000 1.2
--- eduplone_testingResults_global.pt 13 Nov 2004 11:16:45 -0000 1.3
***************
*** 6,61 ****
<body>
<div metal:fill-slot="main">
! <tal tal:define="env python:here">
! <tal metal:define-macro="main">
!
! <div class="contentHeader">
! <h1 tal:content="structure python:here.aq_parent.title_or_id()">Title or id</h1>
! </div>
! <br>
!
! <div id="bodyContent"
tal:define="allusers python:here.users.objectValues()">
-
<a tal:attributes="href python:here.users.absolute_url() + '/eduplone_testingResults'">
» <span i18n:translate="label_user_results_detail">Ergebnisse der Teilnehmer pro Frage</span></a>
! <br><bR>
- <!--================================================-->
-
<table border="1"
id="sortable"
class="listing"
summary="UserResults">
! <thead>
! <tr><th i18n:translate="label_user"><b>User</b></th>
! <th i18n:translate="label_totalScore"><b>Score (total)</b></th>
! <th i18n:translate="label_score_percent"><b>Percent</b></th>
! </tr>
</thead>
! <div tal:repeat="user allusers">
! <tr tal:define="answers python:user.getAnswers();
! userId python: user.getId()">
! <td valign="top">
! <a tal:content="python: user.getId()"
! tal:attributes="href python:here.users.absolute_url() + '/' + user.id + '/eduplone_userResults2'" /> :
! </td>
!
! <td align="right"> <b tal:content="python: round(here.score_CalculateTotal(userId), 2)" /> /
! <i tal:replace="python: here.getTotalAvailableScore()" /></td>
!
! <td align="right"><b tal:content="python: round(here.getUserScoreInPercent(userId), 1)"/><b>%</b></td>
! </tr>
! </div>
!
! </table>
! <!--=======================================================-->
!
! </div>
! </tal>
! </tal>
! </div>
! </body>
</html>
\ No newline at end of file
--- 6,62 ----
<body>
<div metal:fill-slot="main">
! <tal tal:define="env python:here">
! <tal metal:define-macro="main">
!
! <div class="contentHeader">
! <h1 tal:content="structure python:here.aq_parent.title_or_id()">Title or id</h1>
! </div>
!
! <br/>
!
! <div id="bodyContent"
tal:define="allusers python:here.users.objectValues()">
<a tal:attributes="href python:here.users.absolute_url() + '/eduplone_testingResults'">
» <span i18n:translate="label_user_results_detail">Ergebnisse der Teilnehmer pro Frage</span></a>
! <br/><bR/>
<table border="1"
id="sortable"
class="listing"
summary="UserResults">
!
! <thead>
! <tr><th i18n:translate="label_user"><b>User</b></th>
! <th i18n:translate="label_totalScore"><b>Score (total)</b></th>
! <th i18n:translate="label_score_percent"><b>Percent</b></th>
! </tr>
</thead>
! <tr tal:repeat="user allusers">
!
! <td valign="top">
! <a tal:content="python: user.getId()"
! tal:attributes="href python:here.users.absolute_url() + '/' + user.getId() + '/eduplone_userResults2'" /> :
! </td>
!
! <td align="right">
! <b tal:content="python: round(here.score_CalculateTotal(user.getId()), 2)" /> /
! <i tal:replace="python: here.getTotalAvailableScore()" />
! </td>
!
! <td align="right">
! <b tal:content="python: round(here.getUserScoreInPercent(user.getId()), 1)"/><b>%</b>
! </td>
! </tr>
!
! </table>
!
! </div>
!
! </tal>
! </tal>
! </div>
! </body>
</html>
\ No newline at end of file
Index: test_environment_feedback.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/test_environment_feedback.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_environment_feedback.pt 8 Nov 2004 16:34:17 -0000 1.3
--- test_environment_feedback.pt 13 Nov 2004 11:16:45 -0000 1.4
***************
*** 25,29 ****
<span i18n:translate="label_total_available_score">Total available Score:</span>
<b tal:content="python: here.getTotalAvailableScore()" />
! <bR>
<span i18n:translate="label_user_score">TeilnehmerPunkte:</span>
<b tal:content="python: here.score_CalculateTotal(userId)" />
--- 25,29 ----
<span i18n:translate="label_total_available_score">Total available Score:</span>
<b tal:content="python: here.getTotalAvailableScore()" />
! <bR/>
<span i18n:translate="label_user_score">TeilnehmerPunkte:</span>
<b tal:content="python: here.score_CalculateTotal(userId)" />
Index: eduplone_testingResults.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_testingResults.pt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** eduplone_testingResults.pt 7 Nov 2004 20:42:08 -0000 1.7
--- eduplone_testingResults.pt 13 Nov 2004 11:16:45 -0000 1.8
***************
*** 24,34 ****
allquest python:here.fixedObjectValues()">
! <p><span i18n:translate="label_total_available_score">Total available:</span>
! <b tal:content="python:here.getTotalAvailableScore()" />
</p>
<a tal:attributes="href python:here.users.absolute_url() + '/eduplone_testingResults_global'">
» <span i18n:translate="label_user_results_global">Übersicht der Ergebnisse</span></a>
! <br><bR>
! <!--================================================-->
<table border="1"
--- 24,36 ----
allquest python:here.fixedObjectValues()">
! <p>
! <span i18n:translate="label_total_available_score">Total available:</span>
! <b tal:content="python:here.getTotalAvailableScore()" />
</p>
+
<a tal:attributes="href python:here.users.absolute_url() + '/eduplone_testingResults_global'">
» <span i18n:translate="label_user_results_global">Übersicht der Ergebnisse</span></a>
! <br/><bR/>
!
<table border="1"
***************
*** 38,43 ****
<thead>
! <metal:block tal:condition="batch|not:standalone|nothing">
!
<tr><th i18n:translate="label_user"><b>User</b></th>
<th i18n:translate="label_totalScore"><b>Score (total)</b></th>
--- 40,44 ----
<thead>
! <metal:block tal:condition="batch|not:standalone|nothing">
<tr><th i18n:translate="label_user"><b>User</b></th>
<th i18n:translate="label_totalScore"><b>Score (total)</b></th>
***************
*** 45,53 ****
tal:content="quest/title" />
</tr>
! </metal:block>
</thead>
! <tr tal:repeat="user allusers">
! <tal tal:define="answers python:user.getAnswers()">
<td valign="top">
<nobr>
--- 46,54 ----
tal:content="quest/title" />
</tr>
! </metal:block>
</thead>
! <tr tal:repeat="user allusers">
! <tal tal:define="answers python:user.getAnswers()">
<td valign="top">
<nobr>
***************
*** 71,78 ****
</nobr>
</td>
! </tal>
! </tr>
</table>
- <!--=======================================================-->
</div>
--- 72,78 ----
</nobr>
</td>
! </tal>
! </tr>
</table>
</div>
--- eduplone_testingResult2.pt DELETED ---
Index: eduplone_fillgap_edit.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_fillgap_edit.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eduplone_fillgap_edit.pt 14 Oct 2004 12:20:18 -0000 1.3
--- eduplone_fillgap_edit.pt 13 Nov 2004 11:16:45 -0000 1.4
***************
*** 22,56 ****
<div id="bodyContent">
- <!--==============================================-->
-
<span i18n:translate="text_gap">
! every word is a link. click on one to generate a gap.
! <br/><br/>
! red words are allready existing gaps. they will bring you
! to the edit-form of the answer.
! <br/><br/>
</span>
<p tal:content="structure python: here.getRenderedText('tutor')" />
! <br><bR>
<form action="removeGaps">
<table>
! <tr tal:repeat="answerObj python:here.objectValues()">
<td><input tal:attributes="type python:'checkbox';
name python:'ids:list';
! value python:answerObj.id"></td>
<td><a tal:content="python: answerObj.title"
tal:attributes="href python:answerObj.getId() + '/base_edit'"
! /></td>
<td><b tal:content="python: str(answerObj.correctAnswer[0])" /></td>
! </tr>
</table>
! <input type=submit value="loeschen">
</form>
- <!--==============================================-->
-
</div>
</tal>
--- 22,55 ----
<div id="bodyContent">
<span i18n:translate="text_gap">
! every word is a link. click on one to generate a gap.
! <br/><br/>
! red words are allready existing gaps. they will bring you
! to the edit-form of the answer.
! <br/><br/>
</span>
<p tal:content="structure python: here.getRenderedText('tutor')" />
! <br/><bR/>
!
<form action="removeGaps">
<table>
! <tr tal:repeat="answerObj python:here.objectValues()">
<td><input tal:attributes="type python:'checkbox';
name python:'ids:list';
! value python:answerObj.id"/>
! </td>
<td><a tal:content="python: answerObj.title"
tal:attributes="href python:answerObj.getId() + '/base_edit'"
! />
! </td>
<td><b tal:content="python: str(answerObj.correctAnswer[0])" /></td>
! </tr>
</table>
! <input type="submit" value="loeschen" />
</form>
</div>
</tal>
Index: test_environment_listing.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/test_environment_listing.pt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_environment_listing.pt 8 Nov 2004 16:34:17 -0000 1.6
--- test_environment_listing.pt 13 Nov 2004 11:16:45 -0000 1.7
***************
*** 52,60 ****
<span i18n:translate="text_test_started">The test has begun.</span>
! <bR><bR>
<a tal:attributes="href python: here.fixedObjectValues()[0].absolute_url() + '/task_view'"
i18n:translate="text_click_here">Click here to start.</a>
! <bR>
<a tal:attributes="href python:'#';
onClick python:'javascript:startTest(\'' + here.fixedObjectValues()[0].absolute_url() + '/task_view\')'"
--- 52,60 ----
<span i18n:translate="text_test_started">The test has begun.</span>
! <br /><br />
<a tal:attributes="href python: here.fixedObjectValues()[0].absolute_url() + '/task_view'"
i18n:translate="text_click_here">Click here to start.</a>
! <br />
<a tal:attributes="href python:'#';
onClick python:'javascript:startTest(\'' + here.fixedObjectValues()[0].absolute_url() + '/task_view\')'"
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8