diff --git a/ecrire/public/fonctions.php b/ecrire/public/fonctions.php index 1ac43f95995edad00e3b289032809d109ace3ec7..a0b0b9d8ac35acafba3a7b6e120ccf05edc4e2a5 100644 --- a/ecrire/public/fonctions.php +++ b/ecrire/public/fonctions.php @@ -262,8 +262,13 @@ function filtre_pagination_affiche_page($type_pagination, $numero_page, $rang_it return $rang_item ? $rang_item : 1; // 1 10 20 30... case 'rang': return $rang_item; // 0 10 20 30... + case 'page': + case 'prive': default: + if ($numero_page === '*') { + return '+'; + } return $numero_page; // 1 2 3 4 5... } } diff --git a/prive/modeles/pagination.html b/prive/modeles/pagination.html index 726bf0f3cb1339f81a623c965aa5f07f1c4b1905..3e1af507275a728571d7a914bf0c60e1c8a2738a 100644 --- a/prive/modeles/pagination.html +++ b/prive/modeles/pagination.html @@ -27,5 +27,13 @@ href="[(#ENV{url}|parametre_url{#ENV{debut},#GET{item}}|ancre_url{#ENV{ancre}})]" class="pagination-lien lien_pagination" rel="nofollow">(#GET{derniere}|<{#ENV{nombre_pages}}|?{#GET{type}|pagination_affiche_page{#ENV{nombre_pages},#GET{item}}})</a></li>] + + [(#ENV{afficher_lien_tous,0}|ou{#GET{type}|=={prive}}|oui) + [<li class="pagination-item all[(#ENV{page_courante}|=={0}|oui)on active]">(#ENV{url} + |parametre_url{#ENV{debut},-1} + |ancre_url{#ENV{ancre}} + |lien_ou_expose{#ENV{label_tous,#GET{type}|pagination_affiche_page{*,#GET{item}}},#ENV{page_courante}|=={0}|?{span.pagination-lien},pagination-lien lien_pagination,'',nofollow} + |inserer_attribut{title,<:lien_tout_afficher:>} + )</li>]] </ul> </B_pages> diff --git a/prive/modeles/pagination_prive.html b/prive/modeles/pagination_prive.html deleted file mode 100644 index e74ecb7ba9919d6758fa69b13404a92caa832ddc..0000000000000000000000000000000000000000 --- a/prive/modeles/pagination_prive.html +++ /dev/null @@ -1,37 +0,0 @@ -#ENV*{bloc_ancre} -#SET{bornes,#ENV{page_courante}|bornes_pagination{#ENV{nombre_pages},#ENV{nombre_liens_max,#CONST{_PAGINATION_NOMBRE_LIENS_MAX_ECRIRE}}|max{3}}} -#SET{premiere, #GET{bornes}|reset} -#SET{derniere, #GET{bornes}|end} -#SET{pages,#GET{premiere}|range{#GET{derniere}}} -#SET{sep,#ENV{separateur,' | '}} -<B_pages> - [<span class="pagination-label"><span class="label">(#ENV{label})</span></span>] - <ul class="pagination-items"> - [<li class="pagination-item"><a - href='[(#ENV{url}|parametre_url{#ENV{debut},''}|ancre_url{#ENV{ancre}})]' - class='pagination-lien lien_pagination' - rel='nofollow'>(#GET{premiere}|>{1}|?{0})</a></li><li - class="pagination-item tbc disabled"><span class="pagination-lien">...</span></li>] - - <BOUCLE_pages(POUR){tableau #GET{pages}}>[ - (#SET{item, #VALEUR|moins{1}|mult{#ENV{pas}} }) - ][<li class="pagination-item[(#VALEUR|=={#ENV{page_courante}}|oui)on active]">(#ENV{url} - |parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}} - |ancre_url{#ENV{ancre}} - |lien_ou_expose{#GET{item},#VALEUR|=={#ENV{page_courante}}|?{span.pagination-lien},pagination-lien lien_pagination,'',nofollow})</li>] - </BOUCLE_pages> - - [<li class="pagination-item tbc disabled"><span class="pagination-lien">...</span></li> - <li class="pagination-item"><a - href='[(#ENV{url}|parametre_url{#ENV{debut},#ENV{nombre_pages}|moins{1}|mult{#ENV{pas}}}|ancre_url{#ENV{ancre}})]' - class='pagination-lien lien_pagination' - rel='nofollow'>(#GET{derniere}|<{#ENV{nombre_pages}}|?{#ENV{nombre_pages}|moins{1}|mult{#ENV{pas}}})</a></li>] - - [<li class="pagination-item all[(#ENV{page_courante}|=={0}|oui)on active]">(#ENV{url} - |parametre_url{#ENV{debut},-1} - |ancre_url{#ENV{ancre}} - |lien_ou_expose{+,#ENV{page_courante}|=={0}|?{span.pagination-lien},pagination-lien lien_pagination,'',nofollow} - |inserer_attribut{title,<:lien_tout_afficher:>} - )</li>] - </ul> -</B_pages> \ No newline at end of file