spip
/
spip
31
15
Fork 19
Code Issues 454 Pull Requests 27 Projects Releases Wiki Activity

Ferme #2599 : retablir le passage des parametres au modele de pagination

Browse Source 
#PAGINATION{label='Pages : '}
#PAGINATION{page_precedent_suivant,label='Pages : ',label_precedent='prev',label_suivant='next'}
#PAGINATION{precedent_suivant,label_precedent='prev',label_suivant='next'}

les modeles permetent de surcharger label (non affiché par défaut), label_precedent et label_suivant
+ remise a plat du html modele precedent_suivant pour adopter la meme structure html que les autres modeles
svn/root/tags/spip-3.0.0-rc
Cerdic 12 years ago
parent 73c7899a13
commit eada8da9e2
3 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File

27
ecrire/public/balises.php
Unescape Escape View File

@ -518,16 +518,23 @@ function balise_PAGINATION_dist($p, $liste='true') {
return $p;
}
$__modele = interprete_argument_balise(1,$p);
if ($p->param) {
$params = $p->param;
array_shift($params);
// a priori true
// si false, le compilo va bloquer sur des syntaxes avec un filtre sans argument qui suit la balise
// si true, les arguments simples (sans truc=chose) vont degager
$code_contexte = argumenter_inclure($params, true, $p, $p->boucles, $p->id_boucle, false);
$code_contexte = implode(',',$code_contexte);
} else $code_contexte = '';
// a priori true
// si false, le compilo va bloquer sur des syntaxes avec un filtre sans argument qui suit la balise
// si true, les arguments simples (sans truc=chose) vont degager
$_contexte = argumenter_inclure($p->param, true, $p, $p->boucles, $p->id_boucle, false, false);
if (count($_contexte)){
list($key,$val) = each($_contexte);
if (is_numeric($key)){
array_shift($_contexte);
$__modele = interprete_argument_balise(1,$p);
}
}
if (count($_contexte)){
$code_contexte = implode(',',$_contexte);
}
else
$code_contexte = '';
$connect = $p->boucles[$b]->sql_serveur;
$pas = $p->boucles[$b]->total_parties;

4
prive/modeles/pagination_page_precedent_suivant.html
Unescape Escape View File

@ -14,7 +14,7 @@
class="prev[(#ENV{page_courante}|<={1}|oui)disabled]">(#ENV{url}
|parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}}
|ancre_url{#ENV{ancre}}
|lien_ou_expose{<:public:page_precedente:>,#ENV{page_courante}|<={1},'lien_pagination','',nofollow}
|lien_ou_expose{#ENV{label_precedent,<:public:page_precedente:>},#ENV{page_courante}|<={1},'lien_pagination','',nofollow}
|inserer_attribut{rel,prev}
)[<span
class='sep'>(#GET*{sep})</span>]</span>]<span
@ -46,7 +46,7 @@
class="next[(#ENV{page_courante}|>={#ENV{nombre_pages}}|oui)disabled]">[<span class='sep'>(#GET*{sep})</span>](#ENV{url}
|parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}}
|ancre_url{#ENV{ancre}}
|lien_ou_expose{<:public:page_suivante:>,#ENV{page_courante}|>={#ENV{nombre_pages}},'lien_pagination','',nofollow}
|lien_ou_expose{#ENV{label_suivant,<:public:page_suivante:>},#ENV{page_courante}|>={#ENV{nombre_pages}},'lien_pagination','',nofollow}
|inserer_attribut{rel,next}
)</span>]
</B_pages>

37
prive/modeles/pagination_precedent_suivant.html
Unescape Escape View File

@ -2,18 +2,29 @@
#SET{bornes,#ENV{page_courante}|bornes_pagination{#ENV{nombre_pages},10}}
#SET{premiere, #GET{bornes}|reset}
#SET{derniere, #GET{bornes}|end}
#SET{separateur,#ENV{separateur,'|'}}
#SET{i,#ENV{page_courante}|moins{1}}
#SET{sep,#ENV{separateur,' | '}}
[<span
class='label'>(#ENV{label,''})</span>][
[(#ENV{page_courante}|>{1}|oui)
[(#SET{item, #ENV{page_courante}|moins{2}|mult{#ENV{pas}} })]
[(#ENV{url}|parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}}|ancre_url{#ENV{ancre}}|lien_ou_expose{<:public:page_precedente:>,#ENV{page_courante}|=={1},lien_pagination,'',nofollow})]
(#SET{item, #ENV{page_courante}|moins{2}|mult{#ENV{pas}} })
[(#ENV{page_courante}|<{#ENV{nombre_pages}}|oui)
[<span class='sep separateur'>(#GET*{separateur})</span>]
]
]
[(#ENV{page_courante}|<{#ENV{nombre_pages}}|oui)
[(#SET{item, #ENV{page_courante}|mult{#ENV{pas}} })]
[(#ENV{url}|parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}}|ancre_url{#ENV{ancre}}|lien_ou_expose{<:public:page_suivante:>,#ENV{page_courante}|=={#ENV{nombre_pages}},lien_pagination,'',nofollow})]
]
][<span
class="prev[(#ENV{page_courante}|<={1}|oui)disabled]">(#ENV{url}
|parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}}
|ancre_url{#ENV{ancre}}
|lien_ou_expose{#ENV{label_precedent,<:public:page_precedente:>},#ENV{page_courante}|<={1},'lien_pagination','',nofollow}
|inserer_attribut{rel,prev}
)[<span (#ENV{page_courante}|<{#ENV{nombre_pages}}|et{#GET*{sep}}|oui)
class='sep'>#GET*{sep}</span>]</span>][
(#SET{item, #ENV{page_courante}|mult{#ENV{pas}} })
][<span
class="next[(#ENV{page_courante}|>={#ENV{nombre_pages}}|oui)disabled]">[<span (#ENV{page_courante}|>={#ENV{nombre_pages}}|et{#GET*{sep}}|oui)
class='sep'>#GET*{sep}</span>](#ENV{url}
|parametre_url{#ENV{debut},#GET{item}|?{#GET{item}}}
|ancre_url{#ENV{ancre}}
|lien_ou_expose{#ENV{label_suivant,<:public:page_suivante:>},#ENV{page_courante}|>={#ENV{nombre_pages}},'lien_pagination','',nofollow}
|inserer_attribut{rel,next}
)</span>]
</B_pages>
Write Preview
Loading…
Cancel
Save