From 10fa29f4d0ffd2681f39affa8f49594fb8808c27 Mon Sep 17 00:00:00 2001 From: "dominique.lepaisant@ac-caen.fr" <> Date: Sun, 22 Dec 2019 13:46:31 +0000 Subject: [PATCH] =?UTF-8?q?Suppression=20des=20bidouilles=20suite=20=C3=A0?= =?UTF-8?q?=20rev=20118559=20sur=20n-core.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 -- inclure/conteneur_fermer.html | 1 - inclure/conteneur_ouvrir.html | 1 - inclure/yaml/conf_avancee.yaml | 49 ------------------- lang/sdnnoisettes_fr.php | 4 -- noisettes/article-contenu.yaml | 9 ---- noisettes/article-documents.yaml | 9 ---- noisettes/article-forum.yaml | 9 ---- noisettes/article-metas.yaml | 9 ---- .../article-rubrique_articles_freres.yaml | 9 ---- noisettes/carousel.html | 2 - noisettes/carousel.yaml | 9 ---- noisettes/liste_articles.html | 2 - noisettes/liste_articles.yaml | 9 ---- noisettes/liste_breves.html | 4 +- noisettes/liste_breves.yaml | 9 ---- noisettes/liste_evenements.html | 2 - noisettes/liste_evenements.yaml | 9 ---- noisettes/liste_sites.html | 2 - noisettes/liste_sites.yaml | 9 ---- noisettes/liste_syndics.html | 4 +- noisettes/liste_syndics.yaml | 9 ---- noisettes/liste_videos.html | 2 - noisettes/menu.yaml | 9 ---- noisettes/nuage.yaml | 9 ---- noisettes/tweets.yaml | 9 ---- paquet.xml | 2 +- 27 files changed, 3 insertions(+), 201 deletions(-) delete mode 100644 inclure/conteneur_fermer.html delete mode 100644 inclure/conteneur_ouvrir.html delete mode 100644 inclure/yaml/conf_avancee.yaml diff --git a/.gitattributes b/.gitattributes index 71d1f0f..3fd0ffd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,15 +29,12 @@ formulaires/layer_page.html -text formulaires/layer_page.php -text inclure/agenda-evenements-une.html -text inclure/article-resume-image.html -text -inclure/conteneur_fermer.html -text -inclure/conteneur_ouvrir.html -text inclure/documents.html -text inclure/footer_login.html -text inclure/listes-sites-syndics.html -text inclure/resume/article.html -text inclure/resume/evenement.html -text inclure/resume/site.html -text -inclure/yaml/conf_avancee.yaml -text lang/paquet-sdn_fr.php -text lang/sdn_fr.php -text lang/sdnnoisettes_fr.php -text diff --git a/inclure/conteneur_fermer.html b/inclure/conteneur_fermer.html deleted file mode 100644 index ea295a7..0000000 --- a/inclure/conteneur_fermer.html +++ /dev/null @@ -1 +0,0 @@ -[(#CONFIG{sdn/conf_avancee}|et{#ENV{fermer_conteneur}}|oui)[]] diff --git a/inclure/conteneur_ouvrir.html b/inclure/conteneur_ouvrir.html deleted file mode 100644 index 3cf1688..0000000 --- a/inclure/conteneur_ouvrir.html +++ /dev/null @@ -1 +0,0 @@ -[(#CONFIG{sdn/conf_avancee}|et{#ENV{ouvrir_conteneur}}|oui)[<(#ENV{sdn_conteneur})[ class="(#ENV{sdn_conteneur_class})"]>]] \ No newline at end of file diff --git a/inclure/yaml/conf_avancee.yaml b/inclure/yaml/conf_avancee.yaml deleted file mode 100644 index 112306f..0000000 --- a/inclure/yaml/conf_avancee.yaml +++ /dev/null @@ -1,49 +0,0 @@ -- - saisie: 'oui_non' - options: - nom: '_utiliser_conteneur' - label: '<:sdnnoisettes:label_utiliser_sdn_conteneur:>' - conteneur_class: 'long_label' - defaut: '' -- - saisie: 'selection' - options: - nom: 'sdn_conteneur' - label: '<:sdnnoisettes:label_sdn_conteneur:>' - datas: - div: 'div' - section: 'section' - article: 'article' - aside: 'aside' - header: 'header' - footer: 'footer' - p: 'p' - defaut: '' - masquer_option_intro: '' - conteneur_class: 'long_label' - afficher_si: '@_utiliser_conteneur@ != ""' - class: 'chosen' - -- - saisie: 'oui_non' - options: - nom: 'ouvrir_conteneur' - label: '<:sdnnoisettes:label_sdn_conteneur_ouvrir:>' - conteneur_class: 'long_label' - defaut: 'on' - afficher_si: '@sdn_conteneur@ != ""' -- - saisie: 'oui_non' - options: - nom: 'fermer_conteneur' - label: '<:sdnnoisettes:label_sdn_conteneur_fermer:>' - conteneur_class: 'long_label' - defaut: 'on' - afficher_si: '@sdn_conteneur@ != ""' -- - saisie: 'input' - options: - nom: 'sdn_conteneur_class' - label: '<:sdnnoisettes:label_sdn_conteneur_class:>' - conteneur_class: 'long_label' - afficher_si: '@sdn_conteneur@ != ""' diff --git a/lang/sdnnoisettes_fr.php b/lang/sdnnoisettes_fr.php index bc77407..1af2265 100755 --- a/lang/sdnnoisettes_fr.php +++ b/lang/sdnnoisettes_fr.php @@ -120,10 +120,6 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'label_picto'=>'Nom du pictogramme', 'label_rubriques_exclues'=>'Rubriques exclues', 'label_span'=>'Nombre de colonnes', -'label_sdn_conteneur'=>'Nom du conteneur', -'label_sdn_conteneur_ouvrir'=>'Ouvrir le conteneur', -'label_sdn_conteneur_fermer'=>'Fermer le conteneur', -'label_sdn_conteneur_class'=>'Classes css du conteneur', 'label_sites_partenaires'=>'Identifiants des sites des partenaires', 'label_titre'=>'Titre', 'label_uai' => 'Code UAI de l\'établissement', diff --git a/noisettes/article-contenu.yaml b/noisettes/article-contenu.yaml index c0d0cd6..40b6953 100755 --- a/noisettes/article-contenu.yaml +++ b/noisettes/article-contenu.yaml @@ -18,12 +18,3 @@ parametres: nom: 'masquer_logo' label: '<:sdnnoisettes:label_masquer_logo:>' defaut: '' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdnnoisettes:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/article-documents.yaml b/noisettes/article-documents.yaml index 2dc8fb1..cc89767 100644 --- a/noisettes/article-documents.yaml +++ b/noisettes/article-documents.yaml @@ -53,12 +53,3 @@ parametres: conteneur_class: 'long_label' verifier: type: 'entier' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/article-forum.yaml b/noisettes/article-forum.yaml index 0eecebc..f6c76ef 100644 --- a/noisettes/article-forum.yaml +++ b/noisettes/article-forum.yaml @@ -5,12 +5,3 @@ ajax: 'non' contexte: - 'id_article' parametres: - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/article-metas.yaml b/noisettes/article-metas.yaml index f9c5c8c..c30b9e1 100755 --- a/noisettes/article-metas.yaml +++ b/noisettes/article-metas.yaml @@ -27,12 +27,3 @@ parametres: nom: 'masquer_mots' label: '<:sdnnoisettes:label_masquer_mots:>' defaut: '' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/article-rubrique_articles_freres.yaml b/noisettes/article-rubrique_articles_freres.yaml index cdd6470..208939a 100644 --- a/noisettes/article-rubrique_articles_freres.yaml +++ b/noisettes/article-rubrique_articles_freres.yaml @@ -55,12 +55,3 @@ parametres: conteneur_class: 'long_label' verifier: type: 'entier' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/carousel.html b/noisettes/carousel.html index 378fbc7..d7a95ef 100644 --- a/noisettes/carousel.html +++ b/noisettes/carousel.html @@ -4,7 +4,6 @@ [(#ID_RUBRIQUE|>{0}|oui)#SET{id_rubrique,#ID_RUBRIQUE}] [(#ID_RUBRIQUE|>{0}|non)#SET{id_rubrique,0}] #SET{masquer_h2, #ENV{masquer_titre}|et{#ENV{masquer_picto}}|oui|?{on,''}} -
[(#ENV{masquer_h2}|non)

[(#ENV{masquer_titre}|non)[(#ENV{titre,<:spipr_dane:a_la_une:>})]][(#ENV{masquer_picto}|non)]

] @@ -45,4 +44,3 @@
- diff --git a/noisettes/carousel.yaml b/noisettes/carousel.yaml index 6c4c877..4a5fba5 100755 --- a/noisettes/carousel.yaml +++ b/noisettes/carousel.yaml @@ -94,12 +94,3 @@ parametres: defaut: '' class: 'palette'' conteneur_class: 'long_label' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/liste_articles.html b/noisettes/liste_articles.html index 89fc448..e2c1a28 100755 --- a/noisettes/liste_articles.html +++ b/noisettes/liste_articles.html @@ -6,9 +6,7 @@ #SET{span, #ENV{liste_span}|?{#ENV{span}, ''}} #SET{masquer_h2, #ENV{masquer_titre}|et{#ENV{masquer_picto}}|oui|?{on,''}} -
- \ No newline at end of file diff --git a/noisettes/liste_articles.yaml b/noisettes/liste_articles.yaml index 658ec4c..9db2ee9 100755 --- a/noisettes/liste_articles.yaml +++ b/noisettes/liste_articles.yaml @@ -222,12 +222,3 @@ parametres: cacher_option_intro: 'oui' conteneur_class: 'long_label' afficher_si: '@liste_span@ == "on"' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdnnoisettes:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/liste_breves.html b/noisettes/liste_breves.html index e8320a9..e42c9e5 100755 --- a/noisettes/liste_breves.html +++ b/noisettes/liste_breves.html @@ -1,3 +1 @@ -[(#CONFIG{sdn/conf_avancee}|et{#ENV{ouvrir_conteneur}}|oui)[<(#ENV{sdn_conteneur})[ class="(#ENV{sdn_conteneur_class})"]>]] - },nb=#ENV{nb,5}, largeur_logo=#ENV{largeur_logo,150}, hauteur_logo=#ENV{largeur_logo,100},ajax,env} /> -[(#CONFIG{sdn/conf_avancee}|et{#ENV{fermer_conteneur_}}|oui)[]] + },nb=#ENV{nb,5}, largeur_logo=#ENV{largeur_logo,150}, hauteur_logo=#ENV{largeur_logo,100},ajax} /> diff --git a/noisettes/liste_breves.yaml b/noisettes/liste_breves.yaml index 89bd540..726117e 100755 --- a/noisettes/liste_breves.yaml +++ b/noisettes/liste_breves.yaml @@ -64,12 +64,3 @@ parametres: verifier: type: 'entier' min: 1 - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdnnoisettes:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/liste_evenements.html b/noisettes/liste_evenements.html index 2680737..e4108fb 100755 --- a/noisettes/liste_evenements.html +++ b/noisettes/liste_evenements.html @@ -1,5 +1,3 @@ -
- diff --git a/noisettes/liste_evenements.yaml b/noisettes/liste_evenements.yaml index b690dd6..14b25f1 100755 --- a/noisettes/liste_evenements.yaml +++ b/noisettes/liste_evenements.yaml @@ -109,12 +109,3 @@ parametres: label: '<:sdnnoisettes:label_masquer_mots:>' defaut: '' conteneur_class: 'long_label' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdnnoisettes:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/liste_sites.html b/noisettes/liste_sites.html index 5da8861..2c8df42 100644 --- a/noisettes/liste_sites.html +++ b/noisettes/liste_sites.html @@ -11,8 +11,6 @@ #SET{rubriques_exclues,#ENV{rubriques_exclues}|explode{','}} #SET{span, #ENV{liste_span}|?{#ENV{span}, ''}} #SET{masquer_h2, #ENV{masquer_titre}|et{#ENV{masquer_picto}}|oui|?{on,''}} -
- diff --git a/noisettes/liste_sites.yaml b/noisettes/liste_sites.yaml index 3b1d0a7..a38e1a6 100644 --- a/noisettes/liste_sites.yaml +++ b/noisettes/liste_sites.yaml @@ -142,12 +142,3 @@ parametres: cacher_option_intro: 'oui' conteneur_class: 'long_label' afficher_si: '@liste_span@ == "on"' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdnnoisettes:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/liste_syndics.html b/noisettes/liste_syndics.html index 9648e77..92af030 100755 --- a/noisettes/liste_syndics.html +++ b/noisettes/liste_syndics.html @@ -1,4 +1,2 @@ #SET{masquer_h2, #ENV{masquer_titre}|et{#ENV{masquer_picto}}|oui|?{on,''}} - -
- \ No newline at end of file +
\ No newline at end of file diff --git a/noisettes/liste_syndics.yaml b/noisettes/liste_syndics.yaml index 5ec0e69..32847f4 100755 --- a/noisettes/liste_syndics.yaml +++ b/noisettes/liste_syndics.yaml @@ -47,12 +47,3 @@ parametres: label: '<:sdnnoisettes:label_afficher_nom_site:>' defaut: '' conteneur_class: 'long_label' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdnnoisettes:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/liste_videos.html b/noisettes/liste_videos.html index f161acf..31f0a18 100755 --- a/noisettes/liste_videos.html +++ b/noisettes/liste_videos.html @@ -1,4 +1,3 @@ -
#ANCRE_PAGINATION @@ -14,4 +13,3 @@ []
- diff --git a/noisettes/menu.yaml b/noisettes/menu.yaml index 39a2126..5e160fa 100644 --- a/noisettes/menu.yaml +++ b/noisettes/menu.yaml @@ -45,12 +45,3 @@ parametres: defaut: 'bars' afficher_si: '@masquer_picto@ != "on"' conteneur_class: 'long_label' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/nuage.yaml b/noisettes/nuage.yaml index 0d95f94..2460f86 100644 --- a/noisettes/nuage.yaml +++ b/noisettes/nuage.yaml @@ -36,12 +36,3 @@ parametres: defaut: 'tags' afficher_si: '@masquer_picto@ != "on"' conteneur_class: 'long_label' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/noisettes/tweets.yaml b/noisettes/tweets.yaml index 8b34130..de88ec0 100755 --- a/noisettes/tweets.yaml +++ b/noisettes/tweets.yaml @@ -47,12 +47,3 @@ parametres: nom: 'hauteur' label: '<:sdnnoisettes:label_hauteur_bloc:>' defaut: '300' - - - saisie: 'fieldset' - options: - nom: 'fieldset_conf_avancee' - label: '<:sdn:label_conf_avancee_noisettes:>' - explication: '<:sdn:explication_conf_avancee_noisettes:>' - afficher_si: '@config:sdn:conf_avancee@ == "on"' - saisies: - - 'inclure:inclure/yaml/conf_avancee.yaml' diff --git a/paquet.xml b/paquet.xml index 22165b3..1ad722e 100755 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@