search

JoomlaPolska / jezyk-J4

Język polski dla Joomla 4
GNU General Public License v2.0
3 stars 5 forks source link

[5.2] Usability: Back-end - Add item position and total count to Page Navigation #523

Open joomlapl-bot opened 3 months ago

joomlapl-bot commented 3 months ago

PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/43575 Poniżej zmiany w oryginale:

Click to expand the diff! ```diff diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini index 637d26c4feafe..695d505929b33 100644 --- a/administrator/language/en-GB/lib_joomla.ini +++ b/administrator/language/en-GB/lib_joomla.ini @@ -454,6 +454,7 @@ JLIB_HTML_NO_RECORDS_FOUND="No records found." JLIB_HTML_PAGE_CURRENT="Page %s" JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s" JLIB_HTML_PAGINATION="Pagination" +JLIB_HTML_PAGINATION_NUMBERS="%1$d - %2$d / %3$d items" JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list." JLIB_HTML_PUBLISH_ITEM="Publish Item" JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired." diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini index c26137e7ff318..99afcc73211ff 100644 --- a/language/en-GB/lib_joomla.ini +++ b/language/en-GB/lib_joomla.ini @@ -448,6 +448,7 @@ JLIB_HTML_NO_RECORDS_FOUND="No records found." JLIB_HTML_PAGE_CURRENT="Page %s" JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s" JLIB_HTML_PAGINATION="Pagination" +JLIB_HTML_PAGINATION_NUMBERS="%1$d - %2$d / %3$d items" JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list." JLIB_HTML_PUBLISH_ITEM="Publish Item" JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired." diff --git a/layouts/joomla/pagination/links.php b/layouts/joomla/pagination/links.php index 82747a4c87e1d..e103fb3c10c4b 100644 --- a/layouts/joomla/pagination/links.php +++ b/layouts/joomla/pagination/links.php @@ -16,12 +16,14 @@ $list = $displayData['list']; $pages = $list['pages']; +$total = $list['total']; $options = new Registry($displayData['options']); -$showLimitBox = $options->get('showLimitBox', false); -$showPagesLinks = $options->get('showPagesLinks', true); -$showLimitStart = $options->get('showLimitStart', true); +$showLimitBox = $options->get('showLimitBox', false); +$showPagesLinks = $options->get('showPagesLinks', true); +$showLimitStart = $options->get('showLimitStart', true); +$showItemPosition = $options->get('showItemPosition', true); // Calculate to display range of pages $currentPage = 1; @@ -43,12 +45,20 @@ $range = ceil($currentPage / $step); } } -?> - +$first = ($currentPage - 1) * $list['limit'] + 1; +$last = $first + $list['limit'] - 1; +$last = $last > $total ? $total : $last; - +?> +