diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml index 027ef1bceac2a513440d571a6752df1c70269006..9f2a3874e852dc05a318c1b29020da76823c9379 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml @@ -126,27 +126,26 @@ \n <!-- Number of listbox records -->\n <div class="listbox-number-of-records"\n - metal:define-macro="listbox_number_of_records"\n - tal:define="is_default_listbox_field python: field_id==\'listbox\';">\n + metal:define-macro="listbox_number_of_records">\n \n <span class="listbox-current-page-start-number"\n tal:content="current_page_start"/> - \n <span class="listbox-current-page-stop-number"\n tal:content="current_page_stop"/> \n <span i18n:translate="" i18n:domain="ui">of</span>\n +\n <span class="listbox-current-page-total-number"\n - tal:content="total_line"\n - tal:attributes="class python: test(is_default_listbox_field, \'listbox-current-page-total-number\', \'listbox-current-page-total-number %s-current-page-total-number\' %field_id)" />\n - <span i18n:translate="" i18n:domain="ui">records</span> \n + tal:attributes="class python: test(is_default_listbox_field, \'listbox-current-page-total-number\', \'listbox-current-page-total-number %s-current-page-total-number\' %field_id)"\n + i18n:translate="" i18n:domain="ui">\n + <tal:block tal:replace="total_line" i18n:name="number">0</tal:block> records\n + </span>\n \n - <tal:block tal:condition="show_select_column"> - \n - <span class="listbox-current-item-number"\n - tal:attributes="class string:${field_id}-current-item-number"\n - i18n:translate="" i18n:domain="ui">\n - <tal:block tal:replace="python: len(here.getCheckedUidList())" i18n:name="number">0</tal:block>\n - </span>\n - <span i18n:translate="" i18n:domain="ui">items selected</span>\n - </tal:block>\n + <span class="listbox-current-item-number"\n + tal:condition="show_select_column"\n + tal:attributes="class string:${field_id}-current-item-number"\n + i18n:translate="" i18n:domain="ui">\n + - <tal:block tal:replace="python: len(here.getCheckedUidList())" i18n:name="number">0</tal:block> items selected\n + </span>\n \n </div>\n \n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml index 7bc5c8c873d1fddc81a17750ac7b44706f5cc80a..55e6d6f0e944601a5a15620638abda832370f319 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml @@ -201,8 +201,7 @@ <tal:block metal:define-macro="text_navigation"\n tal:define="offset python: 7;\n all_page_index_list python: range(1, here.total_pages + 1);\n - page_index_list python: all_page_index_list[max(current_page-offset, 1)-1: min(current_page+offset, len(all_page_index_list))];\n - is_default_listbox_field python: field_id==\'listbox\';">\n + page_index_list python: all_page_index_list[max(current_page-offset, 1)-1: min(current_page+offset, len(all_page_index_list))];">\n \n <!-- Non gadget mode -->\n <tal:block tal:condition="not: is_gadget_mode">\n @@ -227,8 +226,7 @@ </tal:block>\n \n <!-- Slider navigation with input (i.e. first, previous, next, last links)-->\n - <tal:block metal:define-macro="page_navigation"\n - tal:define="is_default_listbox_field python: field_id==\'listbox\';">\n + <tal:block metal:define-macro="page_navigation">\n <tal:block tal:condition="python: here.total_pages > 1">\n \n <!-- Non gadget mode -->\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 546440c6fd2ec6b50366e195d3440ae3638e11e1..a141b9a0cb0bd69f4cf3b514b9b2974bfe63b9ee 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -1005 \ No newline at end of file +1006 \ No newline at end of file