EduploneTest/skins/EduploneTest batch_parent_macros.pt,1.4,1.5 task_view.pt,1.12,1.13

Nils Haagen <[email protected]> Wed, 05 Jan 2005 19:01:43 +0000
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-serv25610/skins/EduploneTest

Modified Files:
	batch_parent_macros.pt task_view.pt 
Log Message:
nextTask/previousTask now submits the form.

Index: task_view.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/task_view.pt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** task_view.pt	5 Jan 2005 00:36:30 -0000	1.12
--- task_view.pt	5 Jan 2005 19:01:41 -0000	1.13
***************
*** 28,32 ****
  
              <form tal:attributes="action python:'answerAndForward';
!                                   method python:'post';"
                    tal:define=    "taskitems  python:here.objectValues();
                                    cUser      python:here.getCurrentUser().id;
--- 28,33 ----
  
              <form tal:attributes="action python:'answerAndForward';
!                                   method python:'post';
!                                   name string:eXamTaskForm;"
                    tal:define=    "taskitems  python:here.objectValues();
                                    cUser      python:here.getCurrentUser().id;
***************
*** 94,98 ****
  
              <form tal:attributes="action python:'answerAndForward';
!                                   method python:'post';"
                    tal:define=    "taskitems  python:here.contentValues();
                                    cUser      python:here.getCurrentUser().id;
--- 95,100 ----
  
              <form tal:attributes="action python:'answerAndForward';
!                                   method python:'post';
!                                   name string:eXamTaskForm;"
                    tal:define=    "taskitems  python:here.contentValues();
                                    cUser      python:here.getCurrentUser().id;
***************
*** 184,188 ****
  
               <form tal:attributes="action python:'answerAndForward';
!                                    method python:'post';"
                     tal:define=    "taskitems  python:here.objectValues();
                                     tId        python:here.id;
--- 186,191 ----
  
               <form tal:attributes="action python:'answerAndForward';
!                                    method python:'post';
!                                    name string:eXamTaskForm;"
                     tal:define=    "taskitems  python:here.objectValues();
                                     tId        python:here.id;
***************
*** 229,233 ****
  
               <form tal:attributes="action python:'answerAndForward';
!                                    method python:'post';"
                     tal:define=    "taskitems  python:here.objectValues();
                                     tId        python:here.id;
--- 232,237 ----
  
               <form tal:attributes="action python:'answerAndForward';
!                                    method python:'post';
!                                    name string:eXamTaskForm;"
                     tal:define=    "taskitems  python:here.objectValues();
                                     tId        python:here.id;

Index: batch_parent_macros.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/batch_parent_macros.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** batch_parent_macros.pt	20 Nov 2004 19:26:59 -0000	1.4
--- batch_parent_macros.pt	5 Jan 2005 19:01:26 -0000	1.5
***************
*** 67,73 ****
            tal:define="p python:here.sequence_getLast(here.getId())"
            tal:condition="python: (p != -1)">
!             <a href=""
!                tal:attributes="href python: '%s/%s' % (here[p].absolute_url(), template.id)">
! 
                 &laquo;&laquo;
  
--- 67,73 ----
            tal:define="p python:here.sequence_getLast(here.getId())"
            tal:condition="python: (p != -1)">
!             <!--a href=""
!                tal:attributes="href python: '%s/%s' % (here[p].absolute_url(), template.id)"-->
!             <a href="javascript:document.forms['eXamTaskForm'].action='answerAndBackward'; document.forms['eXamTaskForm'].submit();">
                 &laquo;&laquo;
  
***************
*** 84,90 ****
            <tal:cond tal:condition="python: (p != -1)">
  
!             <a href=""
!                tal:attributes="href python: '%s/%s' % (here[p].absolute_url(), template.id)">
! 
                 <span i18n:translate="batch_next_item">
                     Next item
--- 84,90 ----
            <tal:cond tal:condition="python: (p != -1)">
  
!             <!--a href=""
!                tal:attributes="href python: '%s/%s' % (here[p].absolute_url(), template.id)"-->
!             <a href="javascript:document.forms['eXamTaskForm'].submit();">
                 <span i18n:translate="batch_next_item">
                     Next item
***************
*** 97,102 ****
            <tal:cond tal:condition="python: (p == -1) and (here.getCurrentUser().id in here.aq_parent.users.objectIds()) ">
  
!               <a href=""
!                  tal:attributes="href python: here.aq_parent.users.absolute_url() + '/' + here.getCurrentUser().id + '/test_environment_feedback'">
  
                   <span i18n:translate="batch_end_item">
--- 97,103 ----
            <tal:cond tal:condition="python: (p == -1) and (here.getCurrentUser().id in here.aq_parent.users.objectIds()) ">
  
!               <!--a href=""
!                  tal:attributes="href python: here.aq_parent.users.absolute_url() + '/' + here.getCurrentUser().id + '/test_environment_feedback'"-->
!               <a href="javascript:document.forms['eXamTaskForm'].submit();">
  
                   <span i18n:translate="batch_end_item">
***************
*** 108,111 ****
--- 109,113 ----
             </tal:cond>
  
+ 
          </span>
  



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt