From 00622a11550c8381de9f7a06d392cab753afba04 Mon Sep 17 00:00:00 2001 From: Kent Riboe Date: Mon, 27 Jul 2026 21:14:24 +0300 Subject: [PATCH] Add reusable _pagination.tpl partial, use it in viewlog (#1064) (#1090) adds templates/_pagination.tpl - bootstrap 5 shared pagination component. migrates viewlog to use it. See #1064 (thanks @TrapoSAMA and @Knofte) --- languages/bg.lang | 1 + languages/ca.lang | 1 + languages/cn.lang | 1 + languages/cs.lang | 1 + languages/da.lang | 1 + languages/de.lang | 1 + languages/en.lang | 1 + languages/es.lang | 1 + languages/et.lang | 1 + languages/eu.lang | 1 + languages/fi.lang | 1 + languages/fo.lang | 1 + languages/fr.lang | 1 + languages/gl.lang | 1 + languages/hr.lang | 1 + languages/hu.lang | 1 + languages/is.lang | 1 + languages/it.lang | 1 + languages/ja.lang | 1 + languages/lt.lang | 1 + languages/mk.lang | 1 + languages/nb.lang | 1 + languages/nl.lang | 1 + languages/nn.lang | 1 + languages/pl.lang | 1 + languages/pt-br.lang | 1 + languages/pt-pt.lang | 1 + languages/ro.lang | 1 + languages/ru.lang | 1 + languages/sk.lang | 1 + languages/sl.lang | 1 + languages/sv.lang | 1 + languages/tr.lang | 1 + languages/tw.lang | 1 + languages/ua.lang | 1 + public/viewlog.php | 34 ++++++++++++++++++++++++++-------- templates/_pagination.tpl | 29 +++++++++++++++++++++++++++++ templates/viewlog.tpl | 37 ++----------------------------------- 38 files changed, 92 insertions(+), 43 deletions(-) create mode 100644 templates/_pagination.tpl diff --git a/languages/bg.lang b/languages/bg.lang index 281df25f..89ba295c 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -227,6 +227,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Дата'; $PALANG['pViewlog_action'] = 'Действие'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Данни'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index ba0c2bc2..1eb135ef 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -225,6 +225,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data/Hora'; $PALANG['pViewlog_action'] = 'Acció'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Dades'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index 4d4f9b1c..fa3a41a7 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = '时间'; $PALANG['pViewlog_action'] = '操作'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = '内容'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/cs.lang b/languages/cs.lang index d7020934..bdd3e837 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -236,6 +236,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Časová značka'; $PALANG['pViewlog_action'] = 'Akce'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Poznámka'; $PALANG['pViewlog_action_create_domain'] = 'vytvoření domény'; $PALANG['pViewlog_action_delete_domain'] = 'smazání domény'; diff --git a/languages/da.lang b/languages/da.lang index cb9a7d75..d30cc159 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -233,6 +233,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Tidsstempel'; $PALANG['pViewlog_action'] = 'Handling'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Data'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/de.lang b/languages/de.lang index 913d3fa4..2903b70c 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -236,6 +236,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Zeitpunkt'; $PALANG['pViewlog_action'] = 'Aktion'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Daten'; $PALANG['pViewlog_action_create_domain'] = 'Domain erstellen'; diff --git a/languages/en.lang b/languages/en.lang index db1f8f30..15891d5f 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -290,6 +290,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Timestamp'; $PALANG['pViewlog_action'] = 'Action'; +$PALANG['pViewlog_pagination'] = 'Log pages'; $PALANG['pViewlog_data'] = 'Data'; $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; diff --git a/languages/es.lang b/languages/es.lang index d82d3b99..9995786f 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -227,6 +227,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Fecha/Hora'; $PALANG['pViewlog_action'] = 'Acción'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Datos'; $PALANG['pViewlog_action_create_domain'] = 'crear dominio'; $PALANG['pViewlog_action_delete_domain'] = 'borrar dominio'; diff --git a/languages/et.lang b/languages/et.lang index f0b129bb..f1fadb44 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Ajatempel'; $PALANG['pViewlog_action'] = 'Toiming'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Andmed'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index 4818eb28..9fa6bd0b 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -224,6 +224,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data/ordua'; $PALANG['pViewlog_action'] = 'Ekintza'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Datuak'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index de8fd57c..ececead2 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Aikaleima'; $PALANG['pViewlog_action'] = 'Tapahtuma'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Tiedot'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/fo.lang b/languages/fo.lang index 7bbf0197..84bc226f 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Tíðarstempul'; $PALANG['pViewlog_action'] = 'Hending'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Dáta'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index e9657e44..b82851dc 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -230,6 +230,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Date/Heure'; $PALANG['pViewlog_action'] = 'Action'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Information'; $PALANG['pViewlog_action_create_domain'] = 'créer le domaine'; $PALANG['pViewlog_action_delete_domain'] = 'supprimer le domaine'; diff --git a/languages/gl.lang b/languages/gl.lang index add43850..2f37939e 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -225,6 +225,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data/Hora'; $PALANG['pViewlog_action'] = 'Acción'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Datos'; $PALANG['pViewlog_action_create_domain'] = 'crear domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'borrar domain'; # XXX diff --git a/languages/hr.lang b/languages/hr.lang index df82579c..1b6722ba 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -225,6 +225,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Vrijeme'; $PALANG['pViewlog_action'] = 'Akcija'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Podaci'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 1726e426..9793bc03 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -230,6 +230,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Idõbélyeg'; $PALANG['pViewlog_action'] = 'Akció'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Adat'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/is.lang b/languages/is.lang index 5edad985..af8c2419 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Tími'; $PALANG['pViewlog_action'] = 'aðgerð'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'gögn'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/it.lang b/languages/it.lang index c22c1c74..5d81ca7b 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -227,6 +227,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Orario'; $PALANG['pViewlog_action'] = 'Azione'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Dati'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/ja.lang b/languages/ja.lang index 5deb3283..28bcfab5 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -230,6 +230,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'タイムスタンプ'; $PALANG['pViewlog_action'] = 'アクション'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'データ'; $PALANG['pViewlog_action_create_domain'] = 'ドメインを作成'; $PALANG['pViewlog_action_delete_domain'] = 'ドメインを削除'; diff --git a/languages/lt.lang b/languages/lt.lang index 5015aa48..9365600b 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -227,6 +227,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Laikas'; $PALANG['pViewlog_action'] = 'Veiksmas'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Duomenys'; $PALANG['pViewlog_action_create_domain'] = 'sukurta sritis'; $PALANG['pViewlog_action_delete_domain'] = 'panaikinta sritis'; diff --git a/languages/mk.lang b/languages/mk.lang index af128287..ddc16da1 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Маркер (Timestamp)'; $PALANG['pViewlog_action'] = 'Операција'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Датум'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index cac7b0ae..0d6ada89 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -227,6 +227,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Klokkeslett'; $PALANG['pViewlog_action'] = 'Handling'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Data'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/nl.lang b/languages/nl.lang index 4000595a..d84d9911 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -229,6 +229,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Tijd'; $PALANG['pViewlog_action'] = 'Actie'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Aanpassing'; $PALANG['pViewlog_action_create_domain'] = 'domein toegevoegd'; $PALANG['pViewlog_action_delete_domain'] = 'domein verwijderd'; diff --git a/languages/nn.lang b/languages/nn.lang index ec5756b6..048595b7 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -225,6 +225,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Klokkeslett'; $PALANG['pViewlog_action'] = 'Handling'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Data'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 99b56b71..e175ae52 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -229,6 +229,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data'; $PALANG['pViewlog_action'] = 'Działanie'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Dane'; $PALANG['pViewlog_action_create_domain'] = 'utwórz domenę'; $PALANG['pViewlog_action_delete_domain'] = 'skasuj domenę'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index beebc332..8069607e 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -232,6 +232,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data/Hora'; $PALANG['pViewlog_action'] = 'Ação'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Descrição'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index c1b51ae6..5fd1e329 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -232,6 +232,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data/Hora'; $PALANG['pViewlog_action'] = 'Acção'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Descrição'; $PALANG['pViewlog_action_create_domain'] = 'criar domínio'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'remover domínio'; # XXX diff --git a/languages/ro.lang b/languages/ro.lang index 0525daa4..f6e4e364 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -230,6 +230,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Data si ora'; $PALANG['pViewlog_action'] = 'Operatie'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Detalii'; $PALANG['pViewlog_action_create_domain'] = 'creare domeniu'; diff --git a/languages/ru.lang b/languages/ru.lang index 8ae114ef..0db8d405 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -233,6 +233,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Время создания/модификации'; $PALANG['pViewlog_action'] = 'Действие'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Данные'; $PALANG['pViewlog_action_create_domain'] = 'создание домена'; diff --git a/languages/sk.lang b/languages/sk.lang index b1d6087c..13c64ea1 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -227,6 +227,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Časová značka'; $PALANG['pViewlog_action'] = 'Akcia'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Podrobnosti'; $PALANG['pViewlog_action_create_domain'] = 'vytvorenie domény'; $PALANG['pViewlog_action_delete_domain'] = 'zrušenie domény'; diff --git a/languages/sl.lang b/languages/sl.lang index dad80f2d..b41f2787 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Čas'; $PALANG['pViewlog_action'] = 'Operacija'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Podatki'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index 8e1e9c95..cfb0ed5e 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -231,6 +231,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Tidpunkt'; $PALANG['pViewlog_action'] = 'Åtgärd'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Data'; $PALANG['pViewlog_action_create_domain'] = 'skapa domän'; diff --git a/languages/tr.lang b/languages/tr.lang index 05e0c5e7..76e0600a 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -226,6 +226,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Timestamp'; # XXX $PALANG['pViewlog_action'] = 'Hareket'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Veri'; $PALANG['pViewlog_action_create_domain'] = 'domain oluştur'; $PALANG['pViewlog_action_delete_domain'] = 'domain sil'; diff --git a/languages/tw.lang b/languages/tw.lang index b2af57b3..578da0d9 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -228,6 +228,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = '時間'; $PALANG['pViewlog_action'] = '操作'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = '內容'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX diff --git a/languages/ua.lang b/languages/ua.lang index d8d7f463..e2cced8c 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -232,6 +232,7 @@ $PALANG['pViewlog_all_domains'] = 'All domains'; $PALANG['pViewlog_per_page'] = 'Per page:'; $PALANG['pViewlog_timestamp'] = 'Час створення/модифікації'; $PALANG['pViewlog_action'] = 'Дія'; +$PALANG['pViewlog_pagination'] = 'Log pages'; # XXX $PALANG['pViewlog_data'] = 'Данні'; $PALANG['pViewlog_action_create_domain'] = 'створення домену'; diff --git a/public/viewlog.php b/public/viewlog.php index dfbcbd20..8a1f5d44 100644 --- a/public/viewlog.php +++ b/public/viewlog.php @@ -139,7 +139,7 @@ if ($error != 1) { foreach ($result as $r) { $number_of_logs = $r['number_of_logs']; } - $number_of_pages = ceil($number_of_logs / $page_size); + $number_of_pages = (int) ceil($number_of_logs / $page_size); # An empty result set (no matching log entries) has 0 pages; page 1 should # then be accepted (the template simply shows no log rows) rather than throwing. @@ -147,7 +147,7 @@ if ($error != 1) { throw new InvalidArgumentException('Unknown page number'); } - $page_window = pagination_window($page_number, (int)$number_of_pages, 5); + $page_window = pagination_window($page_number, $number_of_pages, 5); if ($page_number == 1) { $offset = 0; @@ -180,20 +180,38 @@ foreach ($tLog as $k => $v) { //get url $url = explode("?", (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]")[0]; +# Build the pagination items for the shared _pagination.tpl partial. Each entry +# is a plain page link (real href, so it works without JavaScript); disabled +# arrows and the current page render as non-clickable spans. +$domain_param = $show_all ? $all_domains_value : $fDomain; +$pagination = array(); +if ($number_of_pages > 1) { + $base = $url . '?fDomain=' . urlencode($domain_param) . '&page_size=' . $page_size . '&page='; + $on_first = ($page_number <= 1); + $on_last = ($page_number >= $number_of_pages); + + $pagination[] = array('label' => '«', 'url' => $base . 1, 'disabled' => $on_first, 'aria' => 'First'); + $pagination[] = array('label' => '‹', 'url' => $base . ($page_number - 1), 'disabled' => $on_first, 'aria' => 'Previous'); + foreach ($page_window as $p) { + if ($p === null) { + $pagination[] = array('ellipsis' => true); + } else { + $pagination[] = array('label' => $p, 'url' => $base . $p, 'active' => ($p == $page_number)); + } + } + $pagination[] = array('label' => '›', 'url' => $base . ($page_number + 1), 'disabled' => $on_last, 'aria' => 'Next'); + $pagination[] = array('label' => '»', 'url' => $base . $number_of_pages, 'disabled' => $on_last, 'aria' => 'Last'); +} + $smarty->assign('domain_list', $list_domains); $smarty->assign('domain_selected', $fDomain); $smarty->assign('tLog', $tLog, false); $smarty->assign('fDomain', $fDomain); $smarty->assign('show_all', $show_all); $smarty->assign('all_domains_value', $all_domains_value); -$smarty->assign('domain_param', $show_all ? $all_domains_value : $fDomain); $smarty->assign('page_size', $page_size); $smarty->assign('page_size_options', $page_size_options); -$smarty->assign('page_window', $page_window); - -$smarty->assign('number_of_pages', $number_of_pages); -$smarty->assign('page_number', $page_number); -$smarty->assign('url', $url); +$smarty->assign('pagination', $pagination); $smarty->assign('smarty_template', 'viewlog'); $smarty->display('index.tpl'); diff --git a/templates/_pagination.tpl b/templates/_pagination.tpl new file mode 100644 index 00000000..ae3290ed --- /dev/null +++ b/templates/_pagination.tpl @@ -0,0 +1,29 @@ +{* + * Reusable Bootstrap 5 pagination. + * + * $pagination - array of items; each item is an array with keys: + * label - text/entity to display + * url - href (used unless disabled/active/ellipsis) + * active - bool, marks the current page + * disabled - bool, rendered as a non-clickable span + * ellipsis - bool, rendered as a "..." gap + * aria - optional aria-label (for nav arrows) + * $pagination_label - optional aria-label for the