diff --git a/.gitattributes b/.gitattributes
index d77f6e7692691ffacdf9082684caf0dd1b689afb..ca100e347c6abdf11633c63fced2d9c58e8c4960 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -583,7 +583,6 @@ prive/squelettes/inclure/head.html -text
prive/squelettes/inclure/menu-navigation_fonctions.php -text
prive/squelettes/inclure/pied.html -text
prive/squelettes/inclure/pied_fonctions.php -text
-prive/squelettes/inclure/plan-articles.html -text
prive/squelettes/inclure/plan-rubriques.html -text
prive/squelettes/navigation/accueil.html -text
prive/squelettes/navigation/admin_tech.html -text
diff --git a/prive/squelettes/contenu/plan.html b/prive/squelettes/contenu/plan.html
index f1e8260ffede049d19d61fdf67fc58b41885bed8..ca877b64adeb89d53d89c19fc1e1ffecc962a439 100644
--- a/prive/squelettes/contenu/plan.html
+++ b/prive/squelettes/contenu/plan.html
@@ -1,14 +1,2 @@
-<BOUCLE_rub(RUBRIQUES){id_rubrique}{statut==.*}>
- #BOITE_OUVRIR{'','note'}
- <a class='annule_filtre[(#EVAL{_AJAX}|oui)ajax]'
- [hreflang="(#ENV{lang}|=={#LANG}|non|?{#LANG})"]
- href='[(#SELF|parametre_url{id_rubrique,''})]' title="<:lien_tout_afficher|attribut_html:>">[(#CHEMIN_IMAGE{fermer-16.png}|balise_img|inserer_attribut{alt,<:lien_tout_afficher:>})]</a>
- <:entree_interieur_rubrique:>
- <h3><a href="[(#ID_RUBRIQUE|generer_url_entite{rubrique})]">[(#TITRE|sinon{<:info_sans_titre:>})]</a></h3>
- #BOITE_FERMER
- <INCLURE{fond=prive/squelettes/inclure/plan-rubriques,id_rubrique=#ENV{id_rubrique},id_parent=#ID_PARENT}>
-</BOUCLE_rub>
- <INCLURE{fond=prive/squelettes/inclure/plan-rubriques,id_parent=0}>
-<//B_rub>
-<a id="reloadmain" href="#SELF" class="ajax none">reload</a>
\ No newline at end of file
+<INCLURE{fond=prive/squelettes/inclure/plan-rubriques, id_parent=0, env, ajax}>
diff --git a/prive/squelettes/inclure/plan-articles.html b/prive/squelettes/inclure/plan-articles.html
deleted file mode 100644
index ea818bcfdffe403c6d118f3a13bfd5710483e716..0000000000000000000000000000000000000000
--- a/prive/squelettes/inclure/plan-articles.html
+++ /dev/null
@@ -1,16 +0,0 @@
-#SET{nomp,artrub#ID_RUBRIQUE}
-#SET{nb,50}
-<B_articles>
- <div class="menu">
- <h4><:articles:></h4>
- [<p class="pagination">[<em>(#VAL{article}|objet_info{texte_objets}|_T)</em>](#PAGINATION{prive})</p>]
- <ul class="menu-items articles">
- <BOUCLE_articles(ARTICLES) {id_rubrique} {par titre}{statut IN #SESSION{statut}|statuts_articles_visibles}{pagination #GET{nb} #GET{nomp}}{lang_select=non}>
- <li class="item"><a href="[(#ID_ARTICLE|generer_url_entite{article})]"
- [hreflang="(#ENV{lang}|=={#LANG}|non|?{#LANG})"]
- title="[(#VAL{article}|objet_info{texte_objet}|_T) #ID_ARTICLE]">[(#STATUT|puce_statut{article,#ID_ARTICLE,#ID_RUBRIQUE}) ][(#TITRE|couper{80}|sinon{<:info_sans_titre:>})]</a></li>
- </BOUCLE_articles>
- </ul>
- [<p class="pagination">[<em>(#VAL{article}|objet_info{texte_objets}|_T)</em>](#PAGINATION{prive})</p>]
- </div>
-</B_articles>
diff --git a/prive/squelettes/inclure/plan-rubriques.html b/prive/squelettes/inclure/plan-rubriques.html
index db555d477fb826f85d2827f66bc5fd1abca58dd2..ca4d8a3aa52361dcbaedca080a82709872117fc3 100644
--- a/prive/squelettes/inclure/plan-rubriques.html
+++ b/prive/squelettes/inclure/plan-rubriques.html
@@ -5,20 +5,12 @@
<ul class="menu-items rubriques">
<BOUCLE_rubriques(RUBRIQUES) {id_parent}{id_rubrique?} {par num titre,titre}{statut==.*}{pagination #GET{nb} #GET{nomp}}>
<li class="item">
- <a href="[(#SELF|parametre_url{id_rubrique,#ID_RUBRIQUE})]"
- [hreflang="(#ENV{lang}|=={#LANG}|non|?{#LANG})"]
- title="[(#VAL{rubrique}|objet_info{texte_objet}|_T) #ID_RUBRIQUE]"
- onclick="jQuery('#reloadmain').attr('href',this.href).followLink();return false;"
- ><strong>[(#STATUT|puce_statut{rubrique}) ][(#TITRE|couper{100}|sinon{<:info_sans_titre:>})]</strong></a>
+ <a href="[(#ID_RUBRIQUE|generer_url_entite{rubrique})]"[ hreflang="(#ENV{lang}|=={#LANG}|non|?{#LANG})"]
+ title="[(#VAL{rubrique}|objet_info{texte_objet}|_T) #ID_RUBRIQUE]">
+ <strong>[(#STATUT|puce_statut{rubrique}) ][(#TITRE|couper{100}|sinon{<:info_sans_titre:>})]</strong>
+ </a>
- <BOUCLE_objets(DATA){source table,#REM|lister_tables_objets_sql}{cle!=spip_rubriques}>
- [(#VALEUR{field}|table_valeur{id_rubrique}|oui)
- #SET{fond,#VAL{prive/squelettes/inclure/plan-}|concat{#VALEUR{table_objet}}}
- [(#GET{fond}|trouver_fond|oui)
- <INCLURE{fond=#GET{fond},id_rubrique=#_rubriques:ID_RUBRIQUE,env,ajax}>
- ]
- ]</BOUCLE_objets>
- <INCLURE{fond=prive/squelettes/inclure/plan-rubriques,id_parent=#ID_RUBRIQUE,id_rubrique='',env,ajax}>
+ <INCLURE{fond=prive/squelettes/inclure/plan-rubriques, id_parent=#ID_RUBRIQUE, id_rubrique='', env, ajax}>
</li>
</BOUCLE_rubriques>
</ul>
diff --git a/prive/themes/spip/lists.css.html b/prive/themes/spip/lists.css.html
index 0246c6599a3d9c538ae7a1a41eaa1a409ab8bfd0..1e395d2f6f277c6dadcef813ff8664134a16496c 100644
--- a/prive/themes/spip/lists.css.html
+++ b/prive/themes/spip/lists.css.html
@@ -142,18 +142,18 @@
/* menus */
/* listes */
.menu-items {list-style:none;margin:1em 0;padding:0;border-top:1px solid #ddd;clear:both;}
-.menu-items .item {border-bottom:1px solid #ddd; padding:0; /*font-size: 10px;*/overflow:hidden;clear:both;}
+.menu-items .item {border-bottom:1px solid #ddd; padding:0; overflow:hidden; clear:both;}
.menu-items .menu-items {margin:0;padding:0;margin-#ENV{left}:11px;}
.menu-items .item >a,.menu-items .item >strong.on {display:block;padding:[(#ENV{margin-bottom}|div{2})em] 0;}
.menu-items .item >a:hover {background-color:[#(#ENV{claire}|couleur_eclaircir|couleur_eclaircir)];}
.menu-items .item >.on {background-color:[#(#ENV{claire}|couleur_eclaircir|couleur_eclaircir)];}
/* plan de site */
-.plan .menu-items,.plan .menu-items .menu-items {border-#ENV{left}:1px solid #ddd;border-top:0;}
-.plan .menu-items .item h4{margin-#ENV{left}:11px;margin-bottom:0;border-#ENV{left}:1px solid #ddd;padding-#ENV{left}:4px;margin-top:0;padding-top:10px;}
+.plan .menu-items { border-top:0; }
+.plan .menu-items .menu-items {border-#ENV{left}:1px solid #ddd;}
.plan .menu-items .item .pagination {margin-#ENV{left}:11px;border-#ENV{left}:1px solid #ddd;}
-.plan .menu-items .item {overflow:visible;border-bottom:0;border-top:1px solid #ddd;padding-#ENV{left}:4px;}
-.plan .menu-items .item>a {padding: 0.25em 0;background-repeat:no-repeat;background-position:center #ENV{left};background-repeat:no-repeat;}
+.plan .menu-items .item {overflow:visible;border-bottom:0;padding-#ENV{left}:6px;}
+.plan .menu-items .item>a {padding: 0.25em 0 0.25em 5px;background-repeat:no-repeat;background-position:center #ENV{left};background-repeat:no-repeat;}
<BOUCLE_objets2(DATA){source table,#REM|lister_tables_objets_sql}{cle!=spip_rubriques}>
.plan .menu-items.[(#VALEUR{table_objet})] .item>a{padding-#ENV{left}:20px;[background-image:url((#CHEMIN_IMAGE{#VALEUR{icone_objet}-16.png}));]}</BOUCLE_objets2>