* move tfoot at the end of the table.

* add 1 to the colspan if show_select_column is enable

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26747 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml

@@ -290,6 +290,36 @@
             <tal:replace tal:content="nothing">\n
               TODO: Move pagination pre-calcultion higher in that code.\n
             </tal:replace>\n
+              <tr class="tbody" tal:condition="line_list"\n
+                tal:repeat="line line_list" tal:define="checked_uid_set here/getCheckedUidSet">\n
+                <td tal:condition="python: show_select_column and not is_gadget_mode"\n
+                    class="DataA" style="width: 50px; text-align: center; vertical-align: middle"\n
+                    >\n
+                  <input tal:condition="python: not line.isSummary() and line.getObject() is not None"\n
+                         type="checkbox" value="checked" id="listbox_cb_1" name="uids:list"\n
+                         tal:attributes="checked python: line.getUid() in checked_uid_set;\n
+                         value line/getUid;\n
+                         id string:${field_id}_cb_${line/getUid}" />\n
+                  <tal:block tal:condition="python: line.isSummary() or line.getObject() is None"></tal:block>\n
+                </td>\n
+                \n
+                <tal:block tal:repeat="value line/render">\n
+                  <td tal:define="html               python: value[0];\n
+                                  original_value     python: value[1];\n
+                                  error              python: value[2];\n
+                                  editable_field     python: value[3];\n
+                                  editable_field_css python: editable_field != None and editable_field.get_value(\'css_class\');\n
+                                  empty              python: original_value in (\'\', None) and not request.get(\'editable_mode\')"\n
+                      tal:attributes="class python: empty and \'emptyCell\' or nothing">\n
+                    <tal:block tal:condition="empty"><span tal:attributes="class editable_field_css">-</span></tal:block>\n
+                    <input tal:condition="not: repeat/value/index"\n
+                           type="hidden" value="1" name="listbox_uid:list"\n
+                           tal:attributes="value python: line.getUid() or \'\';\n
+                                      name string:${field_id}_uid:list" />\n
+                    <tal:block tal:condition="not: empty" tal:replace="structure html">value</tal:block>\n
+                  </td>\n
+                </tal:block>\n
+              </tr>\n
               <tr tal:condition="python: int(here.total_size) > int(here.getMaxLineNumber())"\n
                 class="tfoot"\n
                 tal:define="max_lines      python: here.getMaxLineNumber();\n
@@ -301,7 +331,7 @@
                               ">\n
                 <td class="pageNavigation"\n
                     tal:condition = "not:is_gadget_mode"\n
-                    tal:attributes="colspan python: len(here.getSelectedColumnList())">\n
+                    tal:attributes="colspan python: len(here.getSelectedColumnList()) + bool(show_select_column)">\n
                   <tal:block tal:condition="python: current_page > 1">\n
           \n
                     <button title="First page: Page 1" name="firstPage:method"\n
@@ -342,7 +372,7 @@
 \n
                 <td class="pageNavigation"\n
                     tal:condition = "is_gadget_mode"\n
-                    tal:attributes="colspan python: len(here.getSelectedColumnList())">\n
+                    tal:attributes="colspan python: len(here.getSelectedColumnList()) + bool(show_select_column)">\n
 \n
                   <tal:block tal:condition="python: current_page > 1">\n
                     <button tal:define ="params python: {field_id+\'_firstPage:method\':\'\'}"\n
@@ -387,36 +417,6 @@
                 </td>\n
               </tr>\n
 \n
-              <tr class="tbody" tal:condition="line_list"\n
-                tal:repeat="line line_list" tal:define="checked_uid_set here/getCheckedUidSet">\n
-                <td tal:condition="python: show_select_column and not is_gadget_mode"\n
-                    class="DataA" style="width: 50px; text-align: center; vertical-align: middle"\n
-                    >\n
-                  <input tal:condition="python: not line.isSummary() and line.getObject() is not None"\n
-                         type="checkbox" value="checked" id="listbox_cb_1" name="uids:list"\n
-                         tal:attributes="checked python: line.getUid() in checked_uid_set;\n
-                         value line/getUid;\n
-                         id string:${field_id}_cb_${line/getUid}" />\n
-                  <tal:block tal:condition="python: line.isSummary() or line.getObject() is None"></tal:block>\n
-                </td>\n
-                \n
-                <tal:block tal:repeat="value line/render">\n
-                  <td tal:define="html               python: value[0];\n
-                                  original_value     python: value[1];\n
-                                  error              python: value[2];\n
-                                  editable_field     python: value[3];\n
-                                  editable_field_css python: editable_field != None and editable_field.get_value(\'css_class\');\n
-                                  empty              python: original_value in (\'\', None) and not request.get(\'editable_mode\')"\n
-                      tal:attributes="class python: empty and \'emptyCell\' or nothing">\n
-                    <tal:block tal:condition="empty"><span tal:attributes="class editable_field_css">-</span></tal:block>\n
-                    <input tal:condition="not: repeat/value/index"\n
-                           type="hidden" value="1" name="listbox_uid:list"\n
-                           tal:attributes="value python: line.getUid() or \'\';\n
-                                      name string:${field_id}_uid:list" />\n
-                    <tal:block tal:condition="not: empty" tal:replace="structure html">value</tal:block>\n
-                  </td>\n
-                </tal:block>\n
-              </tr>\n
 \n
           </table>\n
 \n

product/ERP5/bootstrap/erp5_xhtml_style/bt/revision

-734
\ No newline at end of file
+735
\ No newline at end of file