diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html index 056d51ce21fb5ba01aaafa3668dc4ebca0d40df8..2c6ee4dfbe5e224f445487ce44f4e10d303070c8 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html @@ -60,19 +60,19 @@ <dt class="ui-content-title ui-body-c ui-btn ui-btn-icon-left ui-icon-eye" data-i18n="Views">Views</dt> {{#each view_list}} <dd data-role="listview" data-theme="c" data-inset="true" class="document-listview"> - <a data-i18n="{{title}}" class="ui-body-inherit {{class_name}}" href="{{href}}">{{title}}</a> + <a class="ui-body-inherit {{class_name}}" href="{{href}}">{{title}}</a> </dd> {{/each}} <dt class="ui-content-title ui-body-c ui-btn ui-btn-icon-left ui-icon-random" data-i18n="Workflows">Workflows</dt> {{#each workflow_list}} <dd data-role="listview" data-theme="c" data-inset="true" class="document-listview"> - <a data-i18n="{{title}}" class="ui-body-inherit {{class_name}}" href="{{href}}">{{title}}</a> + <a class="ui-body-inherit {{class_name}}" href="{{href}}">{{title}}</a> </dd> {{/each}} <dt class="ui-content-title ui-body-c ui-btn ui-btn-icon-left ui-icon-cogs" data-i18n="Actions">Actions</dt> {{#each action_list}} <dd data-role="listview" data-theme="c" data-inset="true" class="document-listview"> - <a data-i18n="{{title}}" class="ui-body-inherit {{class_name}}" href="{{href}}">{{title}}</a> + <a class="ui-body-inherit {{class_name}}" href="{{href}}">{{title}}</a> </dd> {{/each}} </script> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml index 71d7506bbe1cdee75986dc3afc45b4111febfa0a..b36cee2bccde818a96e8096c422b405e6255090a 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>965.39086.65235.37700</string> </value> + <value> <string>965.45005.21388.22067</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1519039107.29</float> + <float>1523892174.29</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js index 9fc66fc0fe8e55e5d6ee0d760870d609b6ec253e..d2a5ff4cfbc0b76d50be4b620dbaba2c784a61a0 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js @@ -292,11 +292,14 @@ href: result_list[i + workflow_list.length + view_list.length] }); } - gadget.element.querySelector("dl").innerHTML = panel_template_body_desktop({ + return gadget.translateHtml(panel_template_body_desktop({ workflow_list: result_workflow_list, view_list: result_view_list, action_list: result_action_list - }); + })); + }) + .push(function (translated_html) { + gadget.element.querySelector("dl").innerHTML = translated_html; }); } } diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml index fb43b88d150322eeb665a6dd56fb44a3533ceaf7..73a4d269f885add23e190c7ae84527526f4e71d9 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>965.59353.60904.62617</string> </value> + <value> <string>966.58910.9997.17254</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1520010851.84</float> + <float>1523892386.86</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt index c6a202d26225b03b062804688cd7c1d33337afb6..1e4a9f6057aa622038a43879d2209d892daac7be 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt @@ -28,58 +28,97 @@ <tr> <td>verifyText</td> - <td>//a[@data-i18n="Home"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Home"]</td> <td>zhuye</td> </tr> <tr> <td>verifyText</td> - <td>//a[@data-i18n="Modules"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Modules"]</td> <td>mokuai</td> </tr> <tr> <td>verifyText</td> - <td>//a[@data-i18n="Worklists"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Worklists"]</td> <td>gongzhuoliebiao</td> </tr> <tr> <td>verifyText</td> - <td>//a[@data-i18n="History"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="History"]</td> <td>lishi</td> </tr> <tr> <td>verifyText</td> - <td>//a[@data-i18n="Search"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Search"]</td> <td>soushuo</td> </tr> <tr> <td>verifyText</td> - <td>//a[@data-i18n="Preferences"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Preferences"]</td> <td>pianai</td> </tr> <tr> <td>verifyText</td> - <td>//a[@data-i18n="Logout"]</td> + <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Logout"]</td> <td>tuichu</td> </tr> <tr> <td>verifyText</td> - <td>//div[@data-gadget-scope="erp5_checkbox"]//label</td> + <td>//div[@data-gadget-scope='panel']//div[@data-gadget-scope="erp5_checkbox"]//label</td> <td>bianxue</td> </tr> +<tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" /> + +<tr> + <td>open</td> + <td>${base_url}/web_site_module/renderjs_runner/wo/#/foo_module</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Title 1</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>link=Title 1</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Title 1</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-scope='panel']//dt[@data-i18n="Views"]</td> + <td></td> +</tr> +<tr> + <td>verifyText</td> + <td>//div[@data-gadget-scope='panel']//dt[@data-i18n="Views"]</td> + <td>shitu</td> +</tr> +<tr> + <td>assertElementPresent</td> + <td>//div[@data-gadget-scope='panel']//a[text()="yanzhen"]</td> + <td></td> +</tr> + </tbody></table> </body> </html> \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testPanelHighlightCurrentView.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testPanelHighlightCurrentView.zpt index 0dfa671ce63efa466249545f36a7e30a6658ba1e..bc743e2fdcdc7bf21ffbd39c14a56edb2e096f08 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testPanelHighlightCurrentView.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testPanelHighlightCurrentView.zpt @@ -53,7 +53,7 @@ <tr> <td>verifyElementPresent</td> - <td>//div[@data-gadget-scope='panel']//a[@data-i18n='View'][contains(@class, 'active')]</td> + <td>//div[@data-gadget-scope='panel']//a[text()='View' and contains(@class, 'active')]</td> <td></td> </tr> @@ -61,13 +61,13 @@ <tr> <td>verifyElementNotPresent</td> - <td>//div[@data-gadget-scope='panel']//a[@data-i18n='View'][contains(@class, 'active')]</td> + <td>//div[@data-gadget-scope='panel']//a[text()='View' and contains(@class, 'active')]</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@data-gadget-scope='panel']//a[@data-i18n='Relation Fields'][contains(@class, 'active')]</td> + <td>//div[@data-gadget-scope='panel']//a[text()='Relation Fields' and contains(@class, 'active')]</td> <td></td> </tr> @@ -103,13 +103,13 @@ <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='panel']//a[@data-i18n='Custom Dialog Action'][contains(@class, 'active')]</td> + <td>//div[@data-gadget-scope='panel']//a[text()='Custom Dialog Action' and contains(@class, 'active')]</td> <td></td> </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@data-gadget-scope='panel']//a[@data-i18n='Relation Fields'][contains(@class, 'active')]</td> + <td>//div[@data-gadget-scope='panel']//a[text()='Relation Fields' and contains(@class, 'active')]</td> <td></td> </tr>