[PLUGINS] ~maj des plugins

[lhc/web/www.git] / www / plugins / menus_1 / menus / rubriques_completes.html

diff --git a/www/plugins/menus_1/menus/rubriques_completes.html b/www/plugins/menus_1/menus/rubriques_completes.html
index 0790dca..41d23e7 100644 (file)
--- a/www/plugins/menus_1/menus/rubriques_completes.html
+++ b/www/plugins/menus_1/menus/rubriques_completes.html
@@ -18,16 +18,21 @@
 [(#SET{articles_max_affiches, #ENV{articles_max_affiches}|intval|?{#ENV{articles_max_affiches},10000}})]\r
 \r
 [(#REM) Tri des rubriques ]\r
-[(#SET{tri_num, #ENV{tri_num}|ou{#ENV{tri_alpha}}|?{#ENV{tri_num},'titre'}})]\r
-[(#SET{tri_alpha, #ENV{tri_num}|ou{#ENV{tri_alpha}}|?{#ENV{tri_alpha},'titre'}})]\r
-[(#SET{tri_num_inverse, #ENV{tri_num_inverse}|=={oui}|?{'1','0'}})]\r
-[(#SET{tri_alpha_inverse, #ENV{tri_alpha_inverse}|=={oui}|?{'1','0'}})]\r
+[(#SET{tri_num, #ENV{tri,titre}|menus_critere_tri{num}})]\r
+[(#SET{tri_alpha, #ENV{tri,titre}|menus_critere_tri{alpha}})]\r
+[(#SET{tri_num_inverse,#GET{tri_num}|match{^!}|oui})]\r
+[(#SET{tri_alpha_inverse,#GET{tri_alpha}|match{^!}|oui})]\r
+[(#SET{tri_num,#GET{tri_num}|ltrim{!}})]\r
+[(#SET{tri_alpha,#GET{tri_alpha}|ltrim{!}})]\r
 \r
 [(#REM) Tri des articles ]\r
-[(#SET{tri_num_articles, #ENV{tri_num_articles}|ou{#ENV{tri_alpha_articles}}|?{#ENV{tri_num_articles},'titre'}})]\r
-[(#SET{tri_alpha_articles, #ENV{tri_num_articles}|ou{#ENV{tri_alpha_articles}}|?{#ENV{tri_alpha_articles},'titre'}})]\r
-[(#SET{tri_num_articles_inverse, #ENV{tri_num_articles_inverse}|=={oui}|?{'1','0'}})]\r
-[(#SET{tri_alpha_articles_inverse, #ENV{tri_alpha_articles_inverse}|=={oui}|?{'1','0'}})]\r
+[(#SET{tri_num_articles, #ENV{tri_articles,titre}|menus_critere_tri{num}})]\r
+[(#SET{tri_alpha_articles, #ENV{tri_articles,titre}|menus_critere_tri{alpha}})]\r
+[(#SET{tri_num_articles_inverse,#GET{tri_num_articles}|match{^!}|oui})]\r
+[(#SET{tri_alpha_articles_inverse,#GET{tri_alpha_articles}|match{^!}|oui})]\r
+[(#SET{tri_num_articles,#GET{tri_num_articles}|ltrim{!}})]\r
+[(#SET{tri_alpha_articles,#GET{tri_alpha_articles}|ltrim{!}})]\r
+\r
 \r
 [(#ENV{appel_formulaire}|oui)\r
        [(#SET{titre, #ENV{id_rubrique}|?{#ENV{id_rubrique}|=={courante}|?{<:menus:info_rubrique_courante:>,#INFO_TITRE{rubrique, #GET{id_rubrique}}}, <:info_racine_site:>}})]\r