diff --git a/baz_april_options.php b/baz_april_options.php index 2b52838..1a85396 100755 --- a/baz_april_options.php +++ b/baz_april_options.php @@ -3,7 +3,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return; // les blocs de baz if (!isset($GLOBALS['z_blocs'])) { - $GLOBALS['z_blocs'] = array('content','aside','extra','head','head_js','header','footer','breadcrumb'); + $GLOBALS['z_blocs'] = array('content','aside','extra','connex','head','head_js','header','footer','breadcrumb'); } // les images de plus de 2000*1000 pixels de haut seront réduites en 2000x1000 maximum diff --git a/footer/dist.html b/footer/dist.html deleted file mode 100755 index feed072..0000000 --- a/footer/dist.html +++ /dev/null @@ -1,30 +0,0 @@ -

-[(#DATE|annee|!={#VAL{Y}|date}|oui)[(#DATE|annee)]]-[(#DATE|annee) ] — #NOM_SITE_SPIP
-<:plan_site:> | -RSS 2.0 - - | - -#TITRE - - - | - -#TITRE - -

-

<:icone_deconnecter:> | <:espace_prive:> - | <:lien_connecter:> - | -SPIP -

\ No newline at end of file diff --git a/inclure/boussole.html b/inclure/boussole.html deleted file mode 100644 index 102450a..0000000 --- a/inclure/boussole.html +++ /dev/null @@ -1,7 +0,0 @@ -
-
- -
-
diff --git a/lang/baz_april_fr.php b/lang/baz_april_fr.php index 7776f1b..e3c88cf 100755 --- a/lang/baz_april_fr.php +++ b/lang/baz_april_fr.php @@ -5,11 +5,18 @@ if (!defined('_ECRIRE_INC_VERSION')) return; $GLOBALS[$GLOBALS['idx_lang']] = array( + 'cfg_baz_april' => 'Configuration du jeu de squelettes
+ APRIL - base', + + 'site_april' => 'Sites April ...', + 'des_initiatives_april' => 'Des initiatives de l’April', + 'actualites' => 'Actualités', 'archives' => 'Archives', 'articles_recents_du_site' => 'Articles publiés récemment sur ce site', 'articles_lies' => 'Articles liés', 'aucun_article_dans_cette_periode' => 'Aucun article durant cette période', 'tags' => 'Tags', - 'tri_periodique' => 'Tri périodique' + 'tri_periodique' => 'Tri périodique', + ); diff --git a/lang/paquet-baz_april_fr.php b/lang/paquet-baz_april_fr.php old mode 100755 new mode 100644 index 42f326b..7a5a539 --- a/lang/paquet-baz_april_fr.php +++ b/lang/paquet-baz_april_fr.php @@ -8,5 +8,5 @@ if (!defined('_ECRIRE_INC_VERSION')) return; $GLOBALS[$GLOBALS['idx_lang']] = array( 'baz_april_description' => 'squelettes HTML5 avec scss et Tiny Typo', -// 'baz_april_slogan' => 'squelettes APRIL', + 'baz_april_slogan' => 'squelettes de base pour les sites APRIL', ); diff --git a/paquet.xml b/paquet.xml index 36378c1..c75a4e6 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,11 +1,10 @@ APRIL - base @@ -18,24 +17,31 @@ GPL 3 pour le squelette SPIP SIL pour les typographies - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + diff --git a/readme.md b/readme.md index fd1df89..8bae76b 100644 --- a/readme.md +++ b/readme.md @@ -41,3 +41,5 @@ git clone https://github.com/nd-/tri_par_rubrique.git git clone https://git.spip.net/spip-contrib-extensions/role_documents.git git clone https://git.spip.net/spip-contrib-extensions/menus.git + +git clone https://git.spip.net/spip-contrib-extensions/prive_fluide_remix.git diff --git a/sociaux_pipelines.php b/sociaux_pipelines.php new file mode 100644 index 0000000..c5d6131 --- /dev/null +++ b/sociaux_pipelines.php @@ -0,0 +1,68 @@ +' . "\n"; + $head .= '' . "\n"; + } + + return $head; +} + +function sociaux_sociaux_lister($flux) { + /** + * On reprend les éléments initiaux de la v1 du plugin : + * facebook, twitter, instagram, blogger, pinterest, linkedin, youtube, rss, email, tripadvisor, vimeo, flickr + * + */ + if (isset($flux['data'])) { + $flux['data']['mail'] = 'E-mail'; + $flux['data']['rss'] = 'RSS'; + $flux['data']['facebook'] = 'Facebook'; + $flux['data']['twitter'] = 'Twitter'; + $flux['data']['mastodon'] = 'Mastodon'; + $flux['data']['instagram'] = 'Instagram'; + $flux['data']['blogger'] = 'Blogger'; + $flux['data']['pinterest'] = 'Pinterest'; + $flux['data']['linkedin'] = 'Linkedin'; + $flux['data']['youtube'] = 'Youtube'; + $flux['data']['tripadvisor'] = 'TripAdvisor'; + $flux['data']['vimeo'] = 'Vimeo'; + $flux['data']['flickr'] = 'Flickr'; + $flux['data']['viber'] = 'Viber'; + $flux['data']['whatsapp'] = 'Whatsapp'; + $flux['data']['skype'] = 'Skype'; + } + + return $flux; +} + +/** + * Ajoute les scripts JS et CSS de saisies dans l'espace privé + * + * @param string $flux + * @return string + **/ +function sociaux_header_prive($flux){ + $css = find_in_path('lib/socicon/style.css'); + $flux .= "\n\n"; + return $flux; +} + diff --git a/401.html b/squelettes/401.html similarity index 100% rename from 401.html rename to squelettes/401.html diff --git a/article.html b/squelettes/article.html similarity index 100% rename from article.html rename to squelettes/article.html diff --git a/aside/dist.html b/squelettes/aside/dist.html similarity index 100% rename from aside/dist.html rename to squelettes/aside/dist.html diff --git a/aside/z_apl.html b/squelettes/aside/z_apl.html similarity index 100% rename from aside/z_apl.html rename to squelettes/aside/z_apl.html diff --git a/auteur.html b/squelettes/auteur.html similarity index 100% rename from auteur.html rename to squelettes/auteur.html diff --git a/backend.html b/squelettes/backend.html similarity index 100% rename from backend.html rename to squelettes/backend.html diff --git a/body.html b/squelettes/body.html similarity index 72% rename from body.html rename to squelettes/body.html index e7eb4c5..710a31e 100755 --- a/body.html +++ b/squelettes/body.html @@ -3,7 +3,6 @@
  • <:baz_april:evitement_contenu:>
  • <:baz_april:evitement_navigation:>
    • -
    [(#REM) La boussole SPIP va s'insérer ici ]
    @@ -11,7 +10,7 @@
    - + [
    ]
    @@ -27,15 +26,12 @@ ]
    + + diff --git a/breadcrumb/401.html b/squelettes/breadcrumb/401.html similarity index 100% rename from breadcrumb/401.html rename to squelettes/breadcrumb/401.html diff --git a/breadcrumb/404.html b/squelettes/breadcrumb/404.html similarity index 100% rename from breadcrumb/404.html rename to squelettes/breadcrumb/404.html diff --git a/breadcrumb/auteur.html b/squelettes/breadcrumb/auteur.html similarity index 100% rename from breadcrumb/auteur.html rename to squelettes/breadcrumb/auteur.html diff --git a/breadcrumb/dist.html b/squelettes/breadcrumb/dist.html similarity index 100% rename from breadcrumb/dist.html rename to squelettes/breadcrumb/dist.html diff --git a/breadcrumb/inc-objet.html b/squelettes/breadcrumb/inc-objet.html similarity index 100% rename from breadcrumb/inc-objet.html rename to squelettes/breadcrumb/inc-objet.html diff --git a/breadcrumb/login.html b/squelettes/breadcrumb/login.html similarity index 100% rename from breadcrumb/login.html rename to squelettes/breadcrumb/login.html diff --git a/breadcrumb/mot.html b/squelettes/breadcrumb/mot.html similarity index 100% rename from breadcrumb/mot.html rename to squelettes/breadcrumb/mot.html diff --git a/breadcrumb/plan.html b/squelettes/breadcrumb/plan.html similarity index 100% rename from breadcrumb/plan.html rename to squelettes/breadcrumb/plan.html diff --git a/breadcrumb/recherche.html b/squelettes/breadcrumb/recherche.html similarity index 100% rename from breadcrumb/recherche.html rename to squelettes/breadcrumb/recherche.html diff --git a/squelettes/connex/dist.html b/squelettes/connex/dist.html new file mode 100644 index 0000000..3b06927 --- /dev/null +++ b/squelettes/connex/dist.html @@ -0,0 +1,3 @@ +[(#REM) charger un fichier different pour chaque page ] + diff --git a/content/401.html b/squelettes/content/401.html similarity index 100% rename from content/401.html rename to squelettes/content/401.html diff --git a/content/404.html b/squelettes/content/404.html similarity index 100% rename from content/404.html rename to squelettes/content/404.html diff --git a/content/article.html b/squelettes/content/article.html similarity index 100% rename from content/article.html rename to squelettes/content/article.html diff --git a/content/auteur.html b/squelettes/content/auteur.html similarity index 100% rename from content/auteur.html rename to squelettes/content/auteur.html diff --git a/squelettes/content/boussole.html b/squelettes/content/boussole.html new file mode 100644 index 0000000..abf5398 --- /dev/null +++ b/squelettes/content/boussole.html @@ -0,0 +1,18 @@ +
    + <:baz_april:des_initiatives_april:> + + +
    + diff --git a/content/login.html b/squelettes/content/login.html similarity index 100% rename from content/login.html rename to squelettes/content/login.html diff --git a/content/mot.html b/squelettes/content/mot.html similarity index 100% rename from content/mot.html rename to squelettes/content/mot.html diff --git a/content/plan.html b/squelettes/content/plan.html similarity index 100% rename from content/plan.html rename to squelettes/content/plan.html diff --git a/content/recherche.html b/squelettes/content/recherche.html similarity index 100% rename from content/recherche.html rename to squelettes/content/recherche.html diff --git a/content/rubrique-blog.html b/squelettes/content/rubrique-blog.html similarity index 100% rename from content/rubrique-blog.html rename to squelettes/content/rubrique-blog.html diff --git a/content/rubrique-blog.xml b/squelettes/content/rubrique-blog.xml similarity index 100% rename from content/rubrique-blog.xml rename to squelettes/content/rubrique-blog.xml diff --git a/content/rubrique-dossier.html b/squelettes/content/rubrique-dossier.html similarity index 100% rename from content/rubrique-dossier.html rename to squelettes/content/rubrique-dossier.html diff --git a/content/rubrique-dossier.xml b/squelettes/content/rubrique-dossier.xml similarity index 100% rename from content/rubrique-dossier.xml rename to squelettes/content/rubrique-dossier.xml diff --git a/content/rubrique-pagerubrique.html b/squelettes/content/rubrique-pagerubrique.html similarity index 100% rename from content/rubrique-pagerubrique.html rename to squelettes/content/rubrique-pagerubrique.html diff --git a/content/rubrique-pagerubrique.xml b/squelettes/content/rubrique-pagerubrique.xml similarity index 100% rename from content/rubrique-pagerubrique.xml rename to squelettes/content/rubrique-pagerubrique.xml diff --git a/content/rubrique.html b/squelettes/content/rubrique.html similarity index 100% rename from content/rubrique.html rename to squelettes/content/rubrique.html diff --git a/content/site.html b/squelettes/content/site.html similarity index 100% rename from content/site.html rename to squelettes/content/site.html diff --git a/content/sommaire.html b/squelettes/content/sommaire.html similarity index 100% rename from content/sommaire.html rename to squelettes/content/sommaire.html diff --git a/content/spip_pass.html b/squelettes/content/spip_pass.html similarity index 100% rename from content/spip_pass.html rename to squelettes/content/spip_pass.html diff --git a/content/z_apl.html b/squelettes/content/z_apl.html similarity index 100% rename from content/z_apl.html rename to squelettes/content/z_apl.html diff --git a/squelettes/csv/boussole.csv b/squelettes/csv/boussole.csv new file mode 100644 index 0000000..8677470 --- /dev/null +++ b/squelettes/csv/boussole.csv @@ -0,0 +1,6 @@ +April,https://www.april.org +Expolibre,https://www.expolibre.org +Chapril,https://www.chapril.org +Libre à vous,https://www.libreavous.org +Libre à lire,https://www.librealire.org +Candidat.fr,https://www.candidat.fr diff --git a/squelettes/csv/boussole_cachee.csv b/squelettes/csv/boussole_cachee.csv new file mode 100644 index 0000000..8677470 --- /dev/null +++ b/squelettes/csv/boussole_cachee.csv @@ -0,0 +1,6 @@ +April,https://www.april.org +Expolibre,https://www.expolibre.org +Chapril,https://www.chapril.org +Libre à vous,https://www.libreavous.org +Libre à lire,https://www.librealire.org +Candidat.fr,https://www.candidat.fr diff --git a/extra/article.html b/squelettes/extra/article.html similarity index 100% rename from extra/article.html rename to squelettes/extra/article.html diff --git a/extra/auteur.html b/squelettes/extra/auteur.html similarity index 100% rename from extra/auteur.html rename to squelettes/extra/auteur.html diff --git a/extra/dist.html b/squelettes/extra/dist.html similarity index 100% rename from extra/dist.html rename to squelettes/extra/dist.html diff --git a/extra/mot.html b/squelettes/extra/mot.html similarity index 100% rename from extra/mot.html rename to squelettes/extra/mot.html diff --git a/extra/rubrique.html b/squelettes/extra/rubrique.html similarity index 100% rename from extra/rubrique.html rename to squelettes/extra/rubrique.html diff --git a/extra/site.html b/squelettes/extra/site.html similarity index 100% rename from extra/site.html rename to squelettes/extra/site.html diff --git a/extra/sommaire.html b/squelettes/extra/sommaire.html similarity index 100% rename from extra/sommaire.html rename to squelettes/extra/sommaire.html diff --git a/extra/z_apl.html b/squelettes/extra/z_apl.html similarity index 100% rename from extra/z_apl.html rename to squelettes/extra/z_apl.html diff --git a/squelettes/footer/dist.html b/squelettes/footer/dist.html new file mode 100755 index 0000000..3c45e0c --- /dev/null +++ b/squelettes/footer/dist.html @@ -0,0 +1,14 @@ +

    + + + + + #TITRE + + + + #TITRE + + <:plan_site:> + +

    diff --git a/head/404.html b/squelettes/head/404.html similarity index 100% rename from head/404.html rename to squelettes/head/404.html diff --git a/head/article.html b/squelettes/head/article.html similarity index 100% rename from head/article.html rename to squelettes/head/article.html diff --git a/head/auteur.html b/squelettes/head/auteur.html similarity index 100% rename from head/auteur.html rename to squelettes/head/auteur.html diff --git a/head/dist.html b/squelettes/head/dist.html similarity index 100% rename from head/dist.html rename to squelettes/head/dist.html diff --git a/head/mot.html b/squelettes/head/mot.html similarity index 100% rename from head/mot.html rename to squelettes/head/mot.html diff --git a/head/plan.html b/squelettes/head/plan.html similarity index 100% rename from head/plan.html rename to squelettes/head/plan.html diff --git a/head/recherche.html b/squelettes/head/recherche.html similarity index 100% rename from head/recherche.html rename to squelettes/head/recherche.html diff --git a/head/rubrique.html b/squelettes/head/rubrique.html similarity index 100% rename from head/rubrique.html rename to squelettes/head/rubrique.html diff --git a/head/site.html b/squelettes/head/site.html similarity index 100% rename from head/site.html rename to squelettes/head/site.html diff --git a/head/sommaire.html b/squelettes/head/sommaire.html similarity index 100% rename from head/sommaire.html rename to squelettes/head/sommaire.html diff --git a/head_js/dist.html b/squelettes/head_js/dist.html similarity index 100% rename from head_js/dist.html rename to squelettes/head_js/dist.html diff --git a/header/dist.html b/squelettes/header/dist.html similarity index 100% rename from header/dist.html rename to squelettes/header/dist.html diff --git a/inclure/archives-mois.html b/squelettes/inclure/archives-mois.html similarity index 100% rename from inclure/archives-mois.html rename to squelettes/inclure/archives-mois.html diff --git a/inclure/article-hero.html b/squelettes/inclure/article-hero.html similarity index 100% rename from inclure/article-hero.html rename to squelettes/inclure/article-hero.html diff --git a/inclure/articles-resume.html b/squelettes/inclure/articles-resume.html similarity index 100% rename from inclure/articles-resume.html rename to squelettes/inclure/articles-resume.html diff --git a/inclure/articles.html b/squelettes/inclure/articles.html similarity index 100% rename from inclure/articles.html rename to squelettes/inclure/articles.html diff --git a/squelettes/inclure/boussole.html b/squelettes/inclure/boussole.html new file mode 100644 index 0000000..3c03f6e --- /dev/null +++ b/squelettes/inclure/boussole.html @@ -0,0 +1,7 @@ +
    +
    + +
    +
    diff --git a/inclure/documents.html b/squelettes/inclure/documents.html similarity index 100% rename from inclure/documents.html rename to squelettes/inclure/documents.html diff --git a/inclure/head.html b/squelettes/inclure/head.html similarity index 91% rename from inclure/head.html rename to squelettes/inclure/head.html index 1201b66..5a4de9b 100755 --- a/inclure/head.html +++ b/squelettes/inclure/head.html @@ -8,8 +8,10 @@ [(#REM) Lien vers le flux RSS du site ] [] -[(#REM) baz css ] +[(#REM) baz scss ] [] +[(#REM) surcharge facile pur css ] +[] #INSERT_HEAD_CSS diff --git a/inclure/liste-articles.html b/squelettes/inclure/liste-articles.html similarity index 100% rename from inclure/liste-articles.html rename to squelettes/inclure/liste-articles.html diff --git a/inclure/liste-rubriques.html b/squelettes/inclure/liste-rubriques.html similarity index 100% rename from inclure/liste-rubriques.html rename to squelettes/inclure/liste-rubriques.html diff --git a/inclure/mots-articles-rubrique.html b/squelettes/inclure/mots-articles-rubrique.html similarity index 100% rename from inclure/mots-articles-rubrique.html rename to squelettes/inclure/mots-articles-rubrique.html diff --git a/inclure/nav-secteurs.html b/squelettes/inclure/nav-secteurs.html similarity index 84% rename from inclure/nav-secteurs.html rename to squelettes/inclure/nav-secteurs.html index 1f74549..0a6bf06 100755 --- a/inclure/nav-secteurs.html +++ b/squelettes/inclure/nav-secteurs.html @@ -1,5 +1,5 @@ -