pagy 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaccfe046308ce3c557a15667281d10a5ba7e9764a172d89327ae6a0bcdabf36
-  data.tar.gz: 1645173e3c7f86034890f86d3a043a46068df6018111d439dc5be3ca4a4b5799
+  metadata.gz: 67bf0b9d4c13c5ca1e0698f6e4fd928e07eaad4fd3e8dfe2ef8d95612e5eb8d9
+  data.tar.gz: 40fae4aadf56256885e813847a0df296bb857ea48ed629a49d6fd20092fe4dbf
 SHA512:
-  metadata.gz: 243dd49c86053bf02eec713e8d78dbba391c3c0f8f62858a9e9924e3328dc0a44b6718fd3dfd95260ffd41c5c0b7d24256ad11f44f46eeff414dcfd6b95c566f
-  data.tar.gz: c112e2f1f94337bea11c0707014fd7d98f8623844aabfc5ccdc8c0b0ff09cb0c9466801e7cf052ca9dfcb63f5767f98cbafe0b240a98ec7ba10d6fdc0f3f0683
+  metadata.gz: c2408b52d3e5cf97ea5d32cc2da809f2e9e38802767555b3ecd94a7947d9e52adf45e623c992acf2c1a12dcacf081f01823bc0e59fd97a6c980d68d08af1b8ea
+  data.tar.gz: d0ffa69cc1cff5e0d5eb767e77d8abe63fe1df47f19c6535677c481c87ea3bd0fdc81042571fb02b3015b72377d9a7b9aa738bce0353d8e8ec62120608927ffe

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.7.0)
+# Pagy initializer file (4.7.1)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

data/lib/javascripts/pagy.js

@@ -2,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '4.7.0'
+Pagy.version = '4.7.1'
 
 Pagy.delay = 100
 

data/lib/locales/bg.yml

@@ -17,6 +17,6 @@ bg:
       single_page: "Показани са <b>%{count}</b> %{item_name}"
       multiple_pages: "Показани са %{item_name} <b>%{from}-%{to}</b> от <b>%{count}</b> общо"
 
-    combo_nav_js: "<label>Страница %{page_input}</label> от %{pages}"
+    combo_nav_js: "<label>Страница %{page_input} от %{pages}</label>"
 
     items_selector_js: "<label>Покажи %{items_input} %{item_name} на страница</label>"

data/lib/locales/bs.yml

@@ -19,6 +19,6 @@ bs:
       single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
       multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
 
-    combo_nav_js: "<label>Stranica %{page_input}</label> od %{pages}"
+    combo_nav_js: "<label>Stranica %{page_input} od %{pages}</label>"
 
     items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"

data/lib/locales/ca.yml

@@ -17,6 +17,6 @@ ca:
       single_page: "Mostrant <b>%{count}</b> %{item_name}"
       multiple_pages: "Mostrant %{item_name} <b>%{from}-%{to}</b> de <b>%{count}</b> en total"
 
-    combo_nav_js: "<label>Pàgina %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Pàgina %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostra %{items_input} %{item_name} per pàgina</label>"

data/lib/locales/cs.yml

@@ -17,6 +17,6 @@ cs:
       single_page: "Zobrazeno <b>%{count}</b> %{item_name}"
       multiple_pages: "Zobrazeno %{item_name} <b>%{from}-%{to}</b> z <b>%{count}</b> celkem"
 
-    combo_nav_js: "<label>Strana %{page_input}</label> z %{pages}"
+    combo_nav_js: "<label>Strana %{page_input} z %{pages}</label>"
 
     items_selector_js: "<label>Zobrazit %{items_input} %{item_name} na stránce</label>"

data/lib/locales/da.yml

@@ -17,6 +17,6 @@ da:
       single_page: "Viser <b>%{count}</b> %{item_name}"
       multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> til <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Side %{page_input}</label> of %{pages}"
+    combo_nav_js: "<label>Side %{page_input} of %{pages}</label>"
 
     items_selector_js: "<label>Antal %{items_input} %{item_name} per side</label>"

data/lib/locales/de.yml

@@ -17,6 +17,6 @@ de:
       single_page: "Zeige <b>%{count}</b> %{item_name}"
       multiple_pages: "Zeige %{item_name} <b>%{from}-%{to}</b> von <b>%{count}</b> gesamt"
 
-    combo_nav_js: "<label>Seite %{page_input}</label> von %{pages}"
+    combo_nav_js: "<label>Seite %{page_input} von %{pages}</label>"
 
     items_selector_js: "<label>Zeige %{items_input} %{item_name} pro Seite</label>"

data/lib/locales/en.yml

@@ -17,6 +17,6 @@ en:
       single_page: "Displaying <b>%{count}</b> %{item_name}"
       multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
 
-    combo_nav_js: "<label>Page %{page_input}</label> of %{pages}"
+    combo_nav_js: "<label>Page %{page_input} of %{pages}</label>"
 
     items_selector_js: "<label>Show %{items_input} %{item_name} per page</label>"

data/lib/locales/es.yml

@@ -17,6 +17,6 @@ es:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
 
-    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/fr.yml

@@ -17,6 +17,6 @@ fr:
       single_page: "Affichage de <b>%{count}</b> %{item_name}"
       multiple_pages: "Affichage des %{item_name} <b>%{from} à %{to}</b> sur <b>%{count}</b> au total"
 
-    combo_nav_js: "<label>Page %{page_input}</label> sur %{pages}"
+    combo_nav_js: "<label>Page %{page_input} sur %{pages}</label>"
 
     items_selector_js: "<label>Afficher %{items_input} %{item_name} par page</label>"

data/lib/locales/hr.yml

@@ -19,6 +19,6 @@ hr:
       single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
       multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
 
-    combo_nav_js: "<label>Stranica %{page_input}</label> od %{pages}"
+    combo_nav_js: "<label>Stranica %{page_input} od %{pages}</label>"
 
     items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"

data/lib/locales/id.yml

@@ -15,6 +15,6 @@ id:
       single_page: "Menampilkan <b>%{count}</b> %{item_name}"
       multiple_pages: "Menampilkan %{item_name} <b>%{from}-%{to}</b> dari total <b>%{count}</b>"
 
-    combo_nav_js: "<label>Halaman %{page_input}</label> dari %{pages}"
+    combo_nav_js: "<label>Halaman %{page_input} dari %{pages}</label>"
 
     items_selector_js: "<label>Tampilkan %{items_input} %{item_name} per halaman</label>"

data/lib/locales/it.yml

@@ -17,6 +17,6 @@ it:
       single_page: "Visualizzazione di <b>%{count}</b> %{item_name}"
       multiple_pages: "Visualizzazione %{item_name} <b>%{from}-%{to}</b> di <b>%{count}</b> in totale"
 
-    combo_nav_js: "<label>Pagina %{page_input}</label> di %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} di %{pages}</label>"
 
     items_selector_js: "<label>Mostra %{items_input} %{item_name} per pagina</label>"

data/lib/locales/ja.yml

@@ -15,6 +15,6 @@ ja:
       single_page: "<b>%{count}</b> 件の%{item_name}"
       multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
 
-    combo_nav_js: "<label>%{page_input}</label> / %{pages} ページ"
+    combo_nav_js: "<label>%{page_input} / %{pages} ページ</label>"
 
     items_selector_js: "<label>%{items_input} 件ずつ表示</label>"

data/lib/locales/km.yml

@@ -14,6 +14,6 @@ km:
       single_page: "បង្ហាញ <b>%{count}</b> %{item_name}"
       multiple_pages: "បង្ហាញ %{item_name} <b>%{from}-%{to}</b> នៃ <b>%{count}</b> ជាចំនួនសរុប"
 
-    combo_nav_js: "<label>ទំព័រ %{page_input}</label> នៃ %{pages}"
+    combo_nav_js: "<label>ទំព័រ %{page_input} នៃ %{pages}</label>"
 
     items_selector_js: "<label>បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ</label>"

data/lib/locales/ko.yml

@@ -15,6 +15,6 @@ ko:
       single_page: "<b>%{count}</b>개의 %{item_name} 표시됨"
       multiple_pages: "총 <b>%{count}</b>개의 %{item_name} 중 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>총 %{pages} 중 %{page_input}</label> 페이지"
+    combo_nav_js: "<label>총 %{pages} 중 %{page_input} 페이지</label>"
 
     items_selector_js: "<label>페이지 당 %{items_input}개 표시%</label>"

data/lib/locales/nb.yml

@@ -17,6 +17,6 @@ nb:
       single_page: "Viser <b>%{count}</b> %{item_name}"
       multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
 
-    combo_nav_js: "<label>Side %{page_input}</label> av %{pages}"
+    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
 
     items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"

data/lib/locales/nl.yml

@@ -17,6 +17,6 @@ nl:
       single_page: "Toont <b>%{count}</b> %{item_name}"
       multiple_pages: "Toont <b>%{from}-%{to}</b> %{item_name} van <b>%{count}</b> in totaal"
 
-    combo_nav_js: "<label>Pagina %{page_input}</label> van %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} van %{pages}</label>"
 
     items_selector_js: "<label>Toont %{items_input} %{item_name} per pagina</label>"

data/lib/locales/pl.yml

@@ -19,6 +19,6 @@ pl:
       single_page: "Wyświetlono <b>%{count}</b> %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} <b>%{from}-%{to}</b> z wszystkich <b>%{count}</b>"
 
-    combo_nav_js: "<label>Strona %{page_input}</label> z %{pages}"
+    combo_nav_js: "<label>Strona %{page_input} z %{pages}</label>"
 
     items_selector_js: "<label>Pokaż %{items_input} %{item_name} na stronie</label>"

data/lib/locales/pt-BR.yml

@@ -17,6 +17,6 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
 
-    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/pt.yml

@@ -17,6 +17,6 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
 
-    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/ru.yml

@@ -19,6 +19,6 @@ ru:
       single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
 
-    combo_nav_js: "<label>Страница %{page_input}</label> из %{pages}"
+    combo_nav_js: "<label>Страница %{page_input} из %{pages}</label>"
 
     items_selector_js: "<label>Показать %{items_input} %{item_name} на странице</label>"

data/lib/locales/sr.yml

@@ -18,6 +18,6 @@ sr:
       single_page: "Приказује се <b>%{count}</b> %{item_name}"
       multiple_pages: "Приказ %{item_name} <b>%{from}-%{to}</b> од <b>%{count}</b> укупно"
 
-    combo_nav_js: "<label>Страниca %{page_input}</label> од %{pages}"
+    combo_nav_js: "<label>Страниca %{page_input} од %{pages}</label>"
 
     items_selector_js: "<label>Прикажи %{items_input} %{item_name} по страниcи</label>"

data/lib/locales/sv-SE.yml

@@ -18,6 +18,6 @@ sv-SE:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Sida %{page_input}</label> av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
     items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sv.yml

@@ -18,6 +18,6 @@ sv:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Sida %{page_input}</label> av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
     items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sw.yml

@@ -17,6 +17,6 @@ sw:
       single_page: "Inaonyesha %{item_name} <b>%{count}</b>"
       multiple_pages: "Inaonyesha %{item_name} <b>%{from}-%{to}</b> ya <b>%{count}</b> kwa jumla"
 
-    combo_nav_js: "<label>Kurasa %{page_input}</label> ya %{pages}"
+    combo_nav_js: "<label>Kurasa %{page_input} ya %{pages}</label>"
 
     items_selector_js: "<label>Onyesha %{items_input} %{item_name} kwa kila ukurasa</label>"

data/lib/locales/tr.yml

@@ -15,6 +15,6 @@ tr:
       single_page: "Toplam <b>%{count}</b> %{item_name} gösteriliyor"
       multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor"
 
-    combo_nav_js: "<label>Sayfa %{page_input}</label> / %{pages}"
+    combo_nav_js: "<label>Sayfa %{page_input} / %{pages}</label>"
 
     items_selector_js: "<label>Sayfada %{items_input} %{item_name} göster</label>"

data/lib/locales/uk.yml

@@ -19,6 +19,6 @@ uk:
       single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Загалом <b>%{count}</b> %{item_name}, показані з <b>%{from}</b> по <b>%{to}</b>"
 
-    combo_nav_js: "<label>Сторінка %{page_input}</label> з %{pages}"
+    combo_nav_js: "<label>Сторінка %{page_input} з %{pages}</label>"
 
     items_selector_js: "<label>Показати %{items_input} %{item_name} на сторінці</label>"

data/lib/locales/zh-CN.yml

@@ -15,6 +15,6 @@ zh-CN:
       single_page: "显示<b>%{count}</b> 项%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 项%{item_name}，显示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 页"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 页</label>"
 
     items_selector_js: "<label>每页显示 %{items_input} 条%</label>"

data/lib/locales/zh-HK.yml

@@ -15,6 +15,6 @@ zh-HK:
       single_page: "顯示 <b>%{count}</b> %{item_name}"
       multiple_pages: "共 <b>%{count}</b>  %{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 頁"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
 
     items_selector_js: "<label>每頁顯示 %{items_input} 記錄</label>"

data/lib/locales/zh-TW.yml

@@ -15,6 +15,6 @@ zh-TW:
       single_page: "顯示 <b>%{count}</b> 項%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 項%{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 頁"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
 
-    items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}"
+    items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}</label>"

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.7.0'
+  VERSION = '4.7.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

data/lib/pagy/extras/materialize.rb

@@ -46,18 +46,18 @@ class Pagy
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      style   = ' style="vertical-align: middle;"'
-      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      style   = ' style="vertical-align: middle"'
+      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<div#{p_id} class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="pagy-compact-chip" role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin: 0" #{
+      %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" aria-label="pager" style="padding-right: 0" #{
           pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
       }>#{
           pagy_materialize_prev_html pagy, link, style
-      }<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{
+      }<li class="pagy-combo-input">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</div>#{
+      }</li>#{
           pagy_materialize_next_html pagy, link, style
-      }</ul></div>)
+      }</ul>)
     end
 
     private

data/lib/pagy/extras/uikit.rb

@@ -44,29 +44,19 @@ class Pagy
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="uk-input" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<div#{p_id} class="pagy-uikit-combo-nav-js uk-button-group" #{
+      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
           pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
       }>#{
-          if (p_prev = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'), 'class="uk-button uk-button-default"'
-          else
-            %(<button class="uk-button uk-button-default" disabled>#{pagy_t 'pagy.nav.prev'}</button>)
-          end
-      }<div class="uk-text-middle uk-margin-left uk-margin-right">#{
+          pagy_uikit_prev_html pagy, link
+      }<li>#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</div>#{
-          if (p_next = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'class="uk-button uk-button-default"'
-          else
-            %(<button class="uk-button uk-button-default" disabled>#{pagy_t 'pagy.nav.next'}</button>)
-          end
-      }</div>)
+      }</li>#{
+          pagy_uikit_next_html pagy, link
+      }</ul>)
     end
 
-
-
     private
 
       def pagy_uikit_prev_html(pagy, link)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,