Commit 633efffd authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

improve listbox pagination.

* use text area instead of (possibly long) pull-down menu, that will increase the rendering view and decrease the size of output HTML.
* update functional tests.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26667 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fa8dc9bc
...@@ -219,14 +219,19 @@ Test Transactions related to an Organisation, with start date\n ...@@ -219,14 +219,19 @@ Test Transactions related to an Organisation, with start date\n
\n \n
<!-- Second page {{{ -->\n <!-- Second page {{{ -->\n
<tr>\n <tr>\n
<td>assertSelected</td>\n <td>assertValue</td>\n
<td>listbox_page_selection</td>\n <td>listbox_set_page</td>\n
<td>1 of 3</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>label=2 of 3</td>\n <td>2</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
......
...@@ -110,14 +110,19 @@ Test Transactions related to an Organisation, with multiple pages and date range ...@@ -110,14 +110,19 @@ Test Transactions related to an Organisation, with multiple pages and date range
\n \n
<!-- {{{ check second page -->\n <!-- {{{ check second page -->\n
<tr>\n <tr>\n
<td>assertSelected</td>\n <td>assertValue</td>\n
<td>listbox_page_selection</td>\n <td>listbox_set_page</td>\n
<td>1 of 3</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>label=2 of 3</td>\n <td>2</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
......
...@@ -220,14 +220,19 @@ Test Transactions related to an Organisation, with start date\n ...@@ -220,14 +220,19 @@ Test Transactions related to an Organisation, with start date\n
\n \n
<!-- Second page {{{ -->\n <!-- Second page {{{ -->\n
<tr>\n <tr>\n
<td>assertSelected</td>\n <td>assertValue</td>\n
<td>listbox_page_selection</td>\n <td>listbox_set_page</td>\n
<td>label=1 of 3</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>label=2 of 3</td>\n <td>2</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
......
...@@ -110,14 +110,19 @@ Test Transactions related to an Organisation, with multiple pages and date range ...@@ -110,14 +110,19 @@ Test Transactions related to an Organisation, with multiple pages and date range
\n \n
<!-- {{{ check second page -->\n <!-- {{{ check second page -->\n
<tr>\n <tr>\n
<td>assertSelected</td>\n <td>assertValue</td>\n
<td>listbox_page_selection</td>\n <td>listbox_set_page</td>\n
<td>1 of 3</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>label=2 of 3</td>\n <td>2</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
......
126 127
\ No newline at end of file \ No newline at end of file
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementNotPresent</td>\n \t<td>verifyElementNotPresent</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -135,9 +135,9 @@ ...@@ -135,9 +135,9 @@
\t<td> - 0 item(s) selected</td>\n \t<td> - 0 item(s) selected</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>1 of 4</td>\n \t<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -197,9 +197,9 @@ ...@@ -197,9 +197,9 @@
<!--tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" /-->\n <!--tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" /-->\n
\n \n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>2 of 4</td>\n \t<td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -241,9 +241,9 @@ ...@@ -241,9 +241,9 @@
</tr>\n </tr>\n
<tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" />\n <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" />\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>1 of 4</td>\n \t<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -278,9 +278,14 @@ ...@@ -278,9 +278,14 @@
\n \n
<!-- Select page -->\n <!-- Select page -->\n
<tr>\n <tr>\n
\t<td>selectAndWait</td>\n \t<td>type</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>4 of 4</td>\n \t<td>4</td>\n
</tr>\n
<tr>\n
\t<td>keyPressAndWait</td>\n
\t<td>id=listbox_set_page</td>\n
\t<td>\\13</td>\n
</tr>\n </tr>\n
<!--tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" /-->\n <!--tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" /-->\n
<tr>\n <tr>\n
...@@ -299,9 +304,9 @@ ...@@ -299,9 +304,9 @@
\t<td> - 1 item(s) selected</td>\n \t<td> - 1 item(s) selected</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>4 of 4</td>\n \t<td>4</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementNotPresent</td>\n \t<td>verifyElementNotPresent</td>\n
...@@ -341,9 +346,9 @@ ...@@ -341,9 +346,9 @@
\t<td> - 0 item(s) selected</td>\n \t<td> - 0 item(s) selected</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>1 of 3</td>\n \t<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<head>\n <head>\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title>Test View Mode</title>\n <title>Test Not Existing Selection</title>\n
</head>\n </head>\n
<body>\n <body>\n
<table cellpadding="1" cellspacing="1" border="1">\n <table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n <thead>\n
<tr><td rowspan="1" colspan="3">Test View Mode</td></tr>\n <tr><td rowspan="1" colspan="3">Test Not Existing Selection</td></tr>\n
</thead><tbody>\n </thead><tbody>\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n
\n \n
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementNotPresent</td>\n \t<td>verifyElementNotPresent</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -158,9 +158,9 @@ ...@@ -158,9 +158,9 @@
\t<td> - 0 item(s) selected</td>\n \t<td> - 0 item(s) selected</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>1 of 4</td>\n \t<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -199,9 +199,9 @@ ...@@ -199,9 +199,9 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>2 of 4</td>\n \t<td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -240,9 +240,9 @@ ...@@ -240,9 +240,9 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>1 of 4</td>\n \t<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -276,14 +276,19 @@ ...@@ -276,14 +276,19 @@
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
\t<td>selectAndWait</td>\n \t<td>type</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>4 of 4</td>\n \t<td>4</td>\n
</tr>\n
<tr>\n
\t<td>keyPressAndWait</td>\n
\t<td>id=listbox_set_page</td>\n
\t<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>4 of 4</td>\n \t<td>4</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementNotPresent</td>\n \t<td>verifyElementNotPresent</td>\n
...@@ -327,9 +332,9 @@ ...@@ -327,9 +332,9 @@
\t<td> - 0 item(s) selected</td>\n \t<td> - 0 item(s) selected</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>3 of 3</td>\n \t<td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementNotPresent</td>\n \t<td>verifyElementNotPresent</td>\n
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<head>\n <head>\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title>Test Pager</title>\n <title>Test Pager in View Mode</title>\n
</head>\n </head>\n
<body>\n <body>\n
<table cellpadding="1" cellspacing="1" border="1">\n <table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n <thead>\n
<tr><td rowspan="1" colspan="3">Test Pager</td></tr>\n <tr><td rowspan="1" colspan="3">Test Pager in View Mode</td></tr>\n
</thead><tbody>\n </thead><tbody>\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n
<tr>\n <tr>\n
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tal:block tal:define="prefix string:x0_listbox;\n <tal:block tal:define="prefix string:x0_listbox;\n
list_start python:0">\n set_page python:1">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:repeat="prefix python:range(3)">\n <tal:block tal:repeat="prefix python:range(3)">\n
...@@ -108,32 +108,37 @@ ...@@ -108,32 +108,37 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tal:block tal:define="prefix string:x0_listbox;\n <tal:block tal:define="prefix string:x0_listbox;\n
list_start python:1">\n set_page python:2">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="prefix string:x1_listbox;\n <tal:block tal:define="prefix string:x1_listbox;\n
list_start python:0">\n set_page python:1">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="prefix string:x2_listbox;\n <tal:block tal:define="prefix string:x2_listbox;\n
list_start python:0">\n set_page python:1">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tr>\n <tr>\n
\t<td>selectAndWait</td>\n \t<td>type</td>\n
\t<td>name=x1_listbox_list_start</td>\n \t<td>id=x1_listbox_set_page</td>\n
\t<td>5 of 10</td>\n \t<td>5</td>\n
</tr>\n
<tr>\n
\t<td>keyPressAndWait</td>\n
\t<td>id=x1_listbox_set_page</td>\n
\t<td>\\13</td>\n
</tr>\n </tr>\n
<tal:block tal:define="prefix string:x0_listbox;\n <tal:block tal:define="prefix string:x0_listbox;\n
list_start python:1">\n set_page python:2">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="prefix string:x1_listbox;\n <tal:block tal:define="prefix string:x1_listbox;\n
list_start python:4">\n set_page python:5">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="prefix string:x2_listbox;\n <tal:block tal:define="prefix string:x2_listbox;\n
list_start python:0">\n set_page python:1">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tr>\n <tr>\n
...@@ -142,15 +147,15 @@ ...@@ -142,15 +147,15 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tal:block tal:define="prefix string:x0_listbox;\n <tal:block tal:define="prefix string:x0_listbox;\n
list_start python:1">\n set_page python:2">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="prefix string:x1_listbox;\n <tal:block tal:define="prefix string:x1_listbox;\n
list_start python:3">\n set_page python:4">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="prefix string:x2_listbox;\n <tal:block tal:define="prefix string:x2_listbox;\n
list_start python:0">\n set_page python:1">\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
</tal:block>\n </tal:block>\n
</tbody></table>\n </tbody></table>\n
......
...@@ -145,9 +145,9 @@ ...@@ -145,9 +145,9 @@
<td>10 record(s)</td>\n <td>10 record(s)</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifySelected</td>\n <td>verifyValue</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>1 of 4</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyValue</td>\n <td>verifyValue</td>\n
...@@ -191,9 +191,9 @@ ...@@ -191,9 +191,9 @@
<td>10 record(s)</td>\n <td>10 record(s)</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifySelected</td>\n <td>verifyValue</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>2 of 4</td>\n <td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyValue</td>\n <td>verifyValue</td>\n
...@@ -221,9 +221,14 @@ ...@@ -221,9 +221,14 @@
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>4 of 4</td>\n <td>4</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyAbsoluteLocation</td>\n <td>verifyAbsoluteLocation</td>\n
...@@ -237,9 +242,9 @@ ...@@ -237,9 +242,9 @@
<td>10 record(s)</td>\n <td>10 record(s)</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifySelected</td>\n <td>verifyValue</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>4 of 4</td>\n <td>4</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyValue</td>\n <td>verifyValue</td>\n
...@@ -273,9 +278,9 @@ ...@@ -273,9 +278,9 @@
<td>10 record(s)</td>\n <td>10 record(s)</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifySelected</td>\n <td>verifyValue</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>3 of 4</td>\n <td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyValue</td>\n <td>verifyValue</td>\n
...@@ -303,9 +308,14 @@ ...@@ -303,9 +308,14 @@
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>1 of 4</td>\n <td>1</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyAbsoluteLocation</td>\n <td>verifyAbsoluteLocation</td>\n
...@@ -318,9 +328,9 @@ ...@@ -318,9 +328,9 @@
<td>10 record(s)</td>\n <td>10 record(s)</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifySelected</td>\n <td>verifyValue</td>\n
<td>id=listbox_page_selection</td>\n <td>id=listbox_set_page</td>\n
<td>1 of 4</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyValue</td>\n <td>verifyValue</td>\n
......
...@@ -107,9 +107,9 @@ ...@@ -107,9 +107,9 @@
\t<td> - 0 item(s) selected</td>\n \t<td> - 0 item(s) selected</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>1 of 4</td>\n \t<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -203,9 +203,9 @@ ...@@ -203,9 +203,9 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>2 of 4</td>\n \t<td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
...@@ -299,9 +299,9 @@ ...@@ -299,9 +299,9 @@
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifySelected</td>\n \t<td>verifyValue</td>\n
\t<td>id=listbox_page_selection</td>\n \t<td>id=listbox_set_page</td>\n
\t<td>2 of 4</td>\n \t<td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>verifyElementPresent</td>\n \t<td>verifyElementPresent</td>\n
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n
<tr>\n <tr>\n
<td>open</td>\n <td>open</td>\n
<td tal:content="string: ${here/portal_url}/foo_module/1/view">/erp5/foo_module/1/view</td>\n <td>${base_url}/foo_module/1/view</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<head>\n <head>\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title>Test Simple Relation Field Search Dialog Change Page</title>\n <title>Test Multiple Relation Field Search Dialog Change Page</title>\n
</head>\n </head>\n
<body>\n <body>\n
<table cellpadding="1" cellspacing="1" border="1">\n <table cellpadding="1" cellspacing="1" border="1">\n
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
...@@ -136,8 +136,8 @@ ...@@ -136,8 +136,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>20</td>\n <td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
...@@ -152,19 +152,24 @@ ...@@ -152,19 +152,24 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=0</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>keyPressAndWait</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>id=listbox_set_page</td>\n
<td>0</td>\n <td>\\13</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>id=listbox_set_page</td>\n
<td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
...@@ -173,14 +178,19 @@ ...@@ -173,14 +178,19 @@
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=20</td>\n <td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>keyPressAndWait</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>id=listbox_set_page</td>\n
<td>20</td>\n <td>\\13</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>id=listbox_set_page</td>\n
<td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
......
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertText</td>\n <td>assertText</td>\n
......
...@@ -107,8 +107,8 @@ ...@@ -107,8 +107,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
...@@ -118,8 +118,8 @@ ...@@ -118,8 +118,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>20</td>\n <td>3</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
...@@ -129,19 +129,24 @@ ...@@ -129,19 +129,24 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=0</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>keyPressAndWait</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>id=listbox_set_page</td>\n
<td>0</td>\n <td>\\13</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>id=listbox_set_page</td>\n
<td>1</td>\n
</tr>\n </tr>\n
\n \n
\n \n
......
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
...@@ -110,8 +110,8 @@ ...@@ -110,8 +110,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>20</td>\n <td>3</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
...@@ -121,30 +121,40 @@ ...@@ -121,30 +121,40 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=0</td>\n <td>1</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>0</td>\n <td>1</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=20</td>\n <td>3</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>20</td>\n <td>3</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
......
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
...@@ -125,8 +125,8 @@ ...@@ -125,8 +125,8 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>20</td>\n <td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
...@@ -141,19 +141,24 @@ ...@@ -141,19 +141,24 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>10</td>\n <td>2</td>\n
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=0</td>\n <td>1</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>0</td>\n <td>1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
...@@ -162,14 +167,19 @@ ...@@ -162,14 +167,19 @@
</tr>\n </tr>\n
\n \n
<tr>\n <tr>\n
<td>selectAndWait</td>\n <td>type</td>\n
<td>listbox_list_start</td>\n <td>id=listbox_set_page</td>\n
<td>value=20</td>\n <td>3</td>\n
</tr>\n
<tr>\n
<td>keyPressAndWait</td>\n
<td>id=listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td>//select[@name="listbox_list_start"]</td>\n <td>//input[@id="listbox_set_page"]</td>\n
<td>20</td>\n <td>3</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
......
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
<tal:block metal:define-macro="checkCurrentPage">\n <tal:block metal:define-macro="checkCurrentPage">\n
<tr>\n <tr>\n
<td>assertValue</td>\n <td>assertValue</td>\n
<td tal:content="python: \'name=%s_list_start\' % (prefix, )"></td>\n <td tal:content="python: \'id=%s_set_page\' % (prefix, )"></td>\n
<td tal:content="list_start"></td>\n <td tal:content="set_page"></td>\n
</tr>\n </tr>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
......
426 427
\ No newline at end of file \ No newline at end of file
...@@ -118,7 +118,16 @@ ...@@ -118,7 +118,16 @@
<tal:block tal:condition="python: here.total_pages > 1">\n <tal:block tal:condition="python: here.total_pages > 1">\n
<tal:block tal:condition="not: is_gadget_mode">\n <tal:block tal:condition="not: is_gadget_mode">\n
<td style="white-space: nowrap; vertical-align: middle; text-align: center;">\n <td style="white-space: nowrap; vertical-align: middle; text-align: center;">\n
<input tal:condition="python: here.current_page > 0"\n <tal:block tal:condition="python: here.current_page > 0">\n
<input\n
id="listbox_first_page" type="image" src="2leftarrowv.png"\n
title="First Page" name="firstPage:method"\n
class="listbox_first_page"\n
tal:attributes="id string:${field_id}_first_page;\n
name string:${field_id}_firstPage:method;\n
src string:${portal_url_string}/images/2leftarrowv.png"\n
i18n:domain="ui" i18n:attributes="title" />\n
<input\n
id="listbox_previous_page" type="image" src="1leftarrowv.png"\n id="listbox_previous_page" type="image" src="1leftarrowv.png"\n
title="Previous Page" name="previousPage:method"\n title="Previous Page" name="previousPage:method"\n
class="listbox_previous_page"\n class="listbox_previous_page"\n
...@@ -126,30 +135,34 @@ ...@@ -126,30 +135,34 @@
name string:${field_id}_previousPage:method;\n name string:${field_id}_previousPage:method;\n
src string:${portal_url_string}/images/1leftarrowv.png"\n src string:${portal_url_string}/images/1leftarrowv.png"\n
i18n:domain="ui" i18n:attributes="title" />\n i18n:domain="ui" i18n:attributes="title" />\n
</tal:block>\n
</td>\n </td>\n
<td style="white-space: nowrap; vertical-align: middle; text-align: center">\n <td style="white-space: nowrap; vertical-align: middle; text-align: center">\n
<select id="listbox_page_selection" name="list_start" title="Change Page" size="1"\n <input id="listbox_set_page" name="page_start" onblur="this.value=this.defaultValue"\n
class="listbox_page_selection"\n tal:attributes="id string:${field_id}_set_page;\n
tal:define="lines here/getMaxLineNumber"\n name string:${field_id}_page_start;\n
tal:attributes="id string:${field_id}_page_selection;\n value python:here.current_page + 1;\n
name string:${field_id}_list_start;\n size python:len(str(here.total_pages));\n
onChange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n onkeypress string:submitFormOnEnter(event, this.form, \'${field_id}_setPage\')" />\n
i18n:domain="ui" i18n:attributes="title">\n / <tal:block content="here/total_pages" />\n
<option value="0"\n
tal:repeat="p python: range(0, here.total_pages)"\n
tal:attributes="selected python: p == here.current_page;\n
value python: p * lines"\n
i18n:domain="ui" i18n:translate=""><tal:block tal:replace="python: p + 1" i18n:name="page">0</tal:block> of <tal:block tal:replace="here/total_pages" i18n:name="total_pages">1</tal:block></option>\n
</select>\n
</td>\n </td>\n
<td style="white-space: nowrap; vertical-align: middle; text-align: center">\n <td style="white-space: nowrap; vertical-align: middle; text-align: center">\n
<input tal:condition="python: here.current_page < here.total_pages - 1"\n <tal:block tal:condition="python: here.current_page < here.total_pages - 1">\n
<input\n
id="listbox_next_page" type="image" src="1rightarrowv.png"\n id="listbox_next_page" type="image" src="1rightarrowv.png"\n
title="Next Page" name="nextPage:method" class="listbox_next_page"\n title="Next Page" name="nextPage:method" class="listbox_next_page"\n
tal:attributes="id string:${field_id}_next_page;\n tal:attributes="id string:${field_id}_next_page;\n
name string:${field_id}_nextPage:method;\n name string:${field_id}_nextPage:method;\n
src string:${portal_url_string}/images/1rightarrowv.png"\n src string:${portal_url_string}/images/1rightarrowv.png"\n
i18n:domain="ui" i18n:attributes="title" />\n i18n:domain="ui" i18n:attributes="title" />\n
<input\n
id="listbox_last_page" type="image" src="2rightarrowv.png"\n
title="Last Page" name="lastPage:method" class="listbox_last_page"\n
tal:attributes="id string:${field_id}_last_page;\n
name string:${field_id}_lastPage:method;\n
src string:${portal_url_string}/images/2rightarrowv.png"\n
i18n:domain="ui" i18n:attributes="title" />\n
</tal:block>\n
</td>\n </td>\n
</tal:block> \n </tal:block> \n
\n \n
......
...@@ -1125,15 +1125,6 @@ a.tree_closed {\n ...@@ -1125,15 +1125,6 @@ a.tree_closed {\n
display: none;\n display: none;\n
}\n }\n
\n \n
.ListSummary .listbox_next_page,\n
.ListSummary .listbox_previous_page {\n
display: block;\n
font-size: 0;\n
width: 22px;\n
height: 22px;\n
background-repeat: no-repeat;\n
}\n
\n
.listbox {\n .listbox {\n
color: #000;\n color: #000;\n
background-color: <dtml-var document_background_color>;\n background-color: <dtml-var document_background_color>;\n
......
714 715
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment