EduploneTest/skins/EduploneTest eduplone_students.pt,1.3,1.4 eduplone_testingResults_global.pt,1.3,1.4 test_environment_listing.pt,1.7,1.8
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-serv14785/skins/EduploneTest
Modified Files:
eduplone_students.pt eduplone_testingResults_global.pt
test_environment_listing.pt
Log Message:
still shaky, but users can participate in public test, now... important for demo
Index: eduplone_testingResults_global.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_testingResults_global.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eduplone_testingResults_global.pt 13 Nov 2004 11:16:45 -0000 1.3
--- eduplone_testingResults_global.pt 16 Nov 2004 01:03:15 -0000 1.4
***************
*** 1,9 ****
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
! lang="en-US"
! metal:use-macro="here/main_template/macros/master"
! i18n:domain="eduplone"
! >
! <body>
! <div metal:fill-slot="main">
<tal tal:define="env python:here">
<tal metal:define-macro="main">
--- 1,10 ----
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
! lang="en-US"
! metal:use-macro="here/main_template/macros/master"
! i18n:domain="eduplone"
! >
!
! <body>
! <div metal:fill-slot="main">
<tal tal:define="env python:here">
<tal metal:define-macro="main">
***************
*** 29,35 ****
<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>
--- 30,37 ----
<thead>
! <tr><th i18n:translate="label_user">User</th>
! <th i18n:translate="label_totalScore">Score (total)</th>
! <th i18n:translate="label_score_percent">Percent</th>
! <th i18n:translate="label_score_grade">Points/Grade</th>
</tr>
</thead>
***************
*** 39,43 ****
<td valign="top">
<a tal:content="python: user.getId()"
! tal:attributes="href python:here.users.absolute_url() + '/' + user.getId() + '/eduplone_userResults2'" /> :
</td>
--- 41,45 ----
<td valign="top">
<a tal:content="python: user.getId()"
! tal:attributes="href python:here.users.absolute_url() + '/' + user.getId() + '/eduplone_userResults2'" /> :
</td>
***************
*** 50,53 ****
--- 52,60 ----
<b tal:content="python: round(here.getUserScoreInPercent(user.getId()), 1)"/><b>%</b>
</td>
+
+ <td align="right">
+ <b tal:content="python: here.getUserScoreAsGrade(user.getId())"/>
+ </td>
+
</tr>
Index: eduplone_students.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_students.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eduplone_students.pt 27 Oct 2004 20:02:12 -0000 1.3
--- eduplone_students.pt 16 Nov 2004 01:03:15 -0000 1.4
***************
*** 19,23 ****
<div id="bodyContent"
! tal:define="ploneUsers portal/acl_users/getUsers;
verifiedTestMembers python:here.getTestMembers(2);
waitingTestMembers python:here.getTestMembers(1)">
--- 19,23 ----
<div id="bodyContent"
! tal:define="ploneUsers python: portal.acl_users.getUsers() + here.acl_users.getUsers();
verifiedTestMembers python:here.getTestMembers(2);
waitingTestMembers python:here.getTestMembers(1)">
Index: test_environment_listing.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/test_environment_listing.pt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_environment_listing.pt 13 Nov 2004 11:16:45 -0000 1.7
--- test_environment_listing.pt 16 Nov 2004 01:03:15 -0000 1.8
***************
*** 76,89 ****
<div tal:condition="python: currentUser.getId() not in here.users.objectIds()">
<div tal:condition="python: here['public'] == 1">
! <span i18n:translate="text_participate">This test has been decided to be public.
! <br />
! You can list yourself <span i18n:name="here_text"><a tal:attributes="href python:here.absolute_url() + '/applyForTest'" i18n:translate="text_here_text">here</a></span> as a participant in the test:
! </span>
! <p />
! <form tal:attributes="action python:here.absolute_url() + '/applyForTest';
! method python:'post'">
! <input type="submit" i18n:attributes="value" value="Enter"/>
! </form>
</div>
<div tal:condition="python: here['public'] != 1" i18n:translate="text_test_not_public">
--- 76,111 ----
<div tal:condition="python: currentUser.getId() not in here.users.objectIds()">
<div tal:condition="python: here['public'] == 1">
!
! <span i18n:translate="text_test_is_public">This test has been decided to be public.</span>
! <br /><br />
!
! <div tal:condition="python: isAnon">
!
! <span i18n:translate="text_anon_please_register"> Before you can participate, you must register as portal user or log in.</span>
! <br /><bR />
! <a tal:attributes="href python:here.absolute_url() + '/join_form?came_from=' + here.absolute_url()"
! i18n:translate="text_click_here_2_join">Click here, if you are not a portalmember, yet</a>
! <br /><br />
! <a tal:attributes="href python:here.absolute_url() + '/login_form'"
! i18n:translate="text_click_here_2_login">Click here, if you are already a portalmember, and you want to log in now</a>
!
! </div>
!
!
! <div tal:condition="python: not isAnon">
! <span i18n:translate="text_you_can_list_yourself">You can list yourself </span>
! <a tal:attributes="href python:here.absolute_url() + '/applyForTest'"
! i18n:translate="text_here_text">here</a>
!
! <span i18n:translate="text_as_participiant"> as a participiant in the test </span>
!
! </div>
!
!
! <br /><bR />
!
!
!
</div>
<div tal:condition="python: here['public'] != 1" i18n:translate="text_test_not_public">
-------------------------------------------------------
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