paging in classhelp popup was broken

Richard Jones · Richard Jones · commit 84d3478dc5ab · 2004-04-07T01:32:59.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,11 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2004-??-?? 0.6.9
+Fixed:
+- paging in classhelp popup was broken
+
+
 2004-04-01 0.6.8
 Fixed:
 - existing trackers (ie. live ones) may be used as templates for new
diff --git a/templates/classic/html/_generic.help.html b/templates/classic/html/_generic.help.html
@@ -14,13 +14,13 @@
       //--></script>
       </tal:block>
   </head>
- <body class="body" marginwidth="0" marginheight="0" onload="resetList();">
- <form name="frm_help" action=""
+ <body class="body" onload="resetList();">
+ <form name="frm_help" tal:attributes="action request/base"
        tal:define="start python:int(request.form[':startwith'].value);
                    batch python:utils.Batch(context.list(), 500, start);
                    props python:request.form['properties'].value.split(',')">
      
-     <div id="classhelp-controls" tal:condition="python:start==0">
+     <div id="classhelp-controls">
        <!--input type="button" name="btn_clear" 
               value="Clear" onClick="clearList()"/ -->
        <input type="text" name="text_preview" size="24" class="preview"
@@ -37,18 +37,18 @@
            <th tal:repeat="prop props" tal:content="prop"></th>
        </tr>
        <tr tal:repeat="item batch">
-           <td>
-               <input type="checkbox" name="check" 
-               onclick="updatePreview();"
-               tal:condition="python:start==0"
-               tal:define="attr python:item[props[0]]"
-               tal:attributes="value attr; id attr" />
-           </td>
-           <td tal:repeat="prop props">
-               <label class="classhelp-label"
-                      tal:attributes="for python:item[props[0]]" 
-                      tal:content="structure python:item[prop]"></label>
-           </td>
+           <tal:block tal:define="attr python:item[props[0]]">
+             <td>
+                 <input type="checkbox" name="check" 
+                 onclick="updatePreview();"
+                 tal:attributes="value attr; id string:id_$attr" />
+             </td>
+             <td tal:repeat="prop props">
+                 <label class="classhelp-label"
+                        tal:attributes="for string:id_$attr"
+                        tal:content="structure python:item[prop]"></label>
+             </td>
+           </tal:block>
        </tr>
        <tr>
            <th>&nbsp;<b>x</b></th>
@@ -59,14 +59,14 @@
       <tr class="navigation">
        <th>
         <a tal:define="prev batch/previous" tal:condition="prev"
-           tal:attributes="href string:${request/classname}?:template=help&:startwith=${prev/first}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
+            tal:attributes="href string:${request/classname}?:template=help&:startwith=${prev/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
         &nbsp;
        </th>
        <th tal:content="python: '%d...%d out of %d'%(batch.start,
                batch.start+batch.length-1, batch.sequence_length)">current</th>
        <th>
         <a tal:define="next batch/next" tal:condition="next"
-           tal:attributes="href string:${request/classname}?:template=help&:startwith=${next/first}&properties=${request/form/properties/value}">next &gt;&gt;</a>
+            tal:attributes="href string:${request/classname}?:template=help&:startwith=${next/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">next &gt;&gt;</a>
         &nbsp;
        </th>
       </tr>
diff --git a/templates/minimal/html/_generic.help.html b/templates/minimal/html/_generic.help.html
@@ -14,13 +14,13 @@
       //--></script>
       </tal:block>
   </head>
- <body class="body" marginwidth="0" marginheight="0" onload="resetList();">
- <form name="frm_help" action=""
+ <body class="body" onload="resetList();">
+ <form name="frm_help" tal:attributes="action request/base"
        tal:define="start python:int(request.form[':startwith'].value);
                    batch python:utils.Batch(context.list(), 500, start);
                    props python:request.form['properties'].value.split(',')">
      
-     <div id="classhelp-controls" tal:condition="python:start==0">
+     <div id="classhelp-controls">
        <!--input type="button" name="btn_clear" 
               value="Clear" onClick="clearList()"/ -->
        <input type="text" name="text_preview" size="24" class="preview"
@@ -37,18 +37,18 @@
            <th tal:repeat="prop props" tal:content="prop"></th>
        </tr>
        <tr tal:repeat="item batch">
-           <td>
-               <input type="checkbox" name="check" 
-               onclick="updatePreview();"
-               tal:condition="python:start==0"
-               tal:define="attr python:item[props[0]]"
-               tal:attributes="value attr; id attr" />
-           </td>
-           <td tal:repeat="prop props">
-               <label class="classhelp-label"
-                      tal:attributes="for python:item[props[0]]" 
-                      tal:content="structure python:item[prop]"></label>
-           </td>
+           <tal:block tal:define="attr python:item[props[0]]">
+             <td>
+                 <input type="checkbox" name="check" 
+                 onclick="updatePreview();"
+                 tal:attributes="value attr; id string:id_$attr" />
+             </td>
+             <td tal:repeat="prop props">
+                 <label class="classhelp-label"
+                        tal:attributes="for string:id_$attr"
+                        tal:content="structure python:item[prop]"></label>
+             </td>
+           </tal:block>
        </tr>
        <tr>
            <th>&nbsp;<b>x</b></th>
@@ -59,14 +59,14 @@
       <tr class="navigation">
        <th>
         <a tal:define="prev batch/previous" tal:condition="prev"
-           tal:attributes="href string:${request/classname}?:template=help&:startwith=${prev/first}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
+            tal:attributes="href string:${request/classname}?:template=help&:startwith=${prev/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
         &nbsp;
        </th>
        <th tal:content="python: '%d...%d out of %d'%(batch.start,
                batch.start+batch.length-1, batch.sequence_length)">current</th>
        <th>
         <a tal:define="next batch/next" tal:condition="next"
-           tal:attributes="href string:${request/classname}?:template=help&:startwith=${next/first}&properties=${request/form/properties/value}">next &gt;&gt;</a>
+            tal:attributes="href string:${request/classname}?:template=help&:startwith=${next/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">next &gt;&gt;</a>
         &nbsp;
        </th>
       </tr>
