From 226fc4352e900dc49095f6f6859b38e228c93c95 Mon Sep 17 00:00:00 2001 From: chankalan Date: Thu, 3 Dec 2020 10:11:26 +0100 Subject: [PATCH] =?UTF-8?q?v2.0.9=20il=20reste=20du=20code=20=C3=A0=20pass?= =?UTF-8?q?er=20de=20librealire=20=C3=A0=20baz=5Fapril,=20au=20moment=20de?= =?UTF-8?q?=20la=20prochaine=20surcharge=20pour=20d=C3=A9terminer=20ce=20q?= =?UTF-8?q?ui=20est=20g=C3=A9n=C3=A9rique=20de=20ce=20qui=20l'est=20moins.?= =?UTF-8?q?..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- baz_april_options.php | 4 +- export_menus/menu-initiatives.yaml | 52 +++++++++++++++++++ export_menus/menu-pied1.yaml | 34 ++++++++++++ lang/baz_april_fr.php | 4 ++ paquet.xml | 5 +- squelettes/content/rubrique-blog.html | 4 +- squelettes/inclure/liste/articles-resume.html | 4 +- squelettes/inclure/resume/article.html | 2 +- squelettes/javascript/script.js | 8 ++- squelettes/modeles/article_appel.html | 11 ++++ squelettes/scss/base/_spip.scss | 12 +++++ squelettes/scss/blocs/_aside.scss | 11 ++++ squelettes/scss/blocs/_content.scss | 3 ++ squelettes/scss/styles/_layout.scss | 6 +-- squelettes/scss/styles/_nav.scss | 29 +++++++++++ 15 files changed, 177 insertions(+), 12 deletions(-) create mode 100644 export_menus/menu-initiatives.yaml create mode 100644 export_menus/menu-pied1.yaml create mode 100644 squelettes/modeles/article_appel.html diff --git a/baz_april_options.php b/baz_april_options.php index b85c544..fdb5a16 100644 --- a/baz_april_options.php +++ b/baz_april_options.php @@ -20,5 +20,5 @@ $GLOBALS['z_blocs'] = array( 'footer', ); -define('_CONTENT_WIDTH', 650); -define('_IMAGE_RATIO', '1.5:1'); +define('_CONTENT_WIDTH', 990); +define('_IMAGE_RATIO', '1:1'); diff --git a/export_menus/menu-initiatives.yaml b/export_menus/menu-initiatives.yaml new file mode 100644 index 0000000..afc2da4 --- /dev/null +++ b/export_menus/menu-initiatives.yaml @@ -0,0 +1,52 @@ +- + type_entree: texte_libre + parametres: + contenu: 'Des initiatives de l''April' + css: titre_initiatives +- + type_entree: lien + parametres: + titre: April + url: 'https://www.april.org' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: Expolibre + url: 'https://www.expolibre.org' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: Chapril + url: 'https://www.chapril.org' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: 'Libre à lire' + url: 'https://www.librealire.org' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: Candidat.fr + url: 'https://www.candidat.fr' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: ... + url: '#' + css: sousinitiatives + css_lien: sousinitiatives + sous_menu: + - { type_entree: lien, parametres: { titre: 'Agenda du libre', url: 'https://agendadulibre.org', css: '', css_lien: '' } } + - { type_entree: lien, parametres: { titre: 'Libre en fête', url: 'https://www.libre-en-fete.net', css: '', css_lien: '' } } + - { type_entree: lien, parametres: { titre: 'Photos April', url: 'https://photos.april.org/', css: '', css_lien: '' } } + - { type_entree: lien, parametres: { titre: 'Libre à vous', url: 'https://www.libreavous.org', css: '', css_lien: '' } } diff --git a/export_menus/menu-pied1.yaml b/export_menus/menu-pied1.yaml new file mode 100644 index 0000000..d7e0216 --- /dev/null +++ b/export_menus/menu-pied1.yaml @@ -0,0 +1,34 @@ +- + type_entree: texte_libre + parametres: + contenu: 'Galaxie April' + css: h4 + sous_menu: { } +- + type_entree: lien + parametres: + titre: agendadulibre.org + url: 'https://agendadulibre.org' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: candidats.fr + url: 'https://candidats.fr' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: chapril.org + url: 'https://chapril.org' + css: '' + css_lien: '' +- + type_entree: lien + parametres: + titre: enventelibre.org + url: 'https://enventelibre.org' + css: '' + css_lien: '' diff --git a/lang/baz_april_fr.php b/lang/baz_april_fr.php index 77624cd..72e3946 100644 --- a/lang/baz_april_fr.php +++ b/lang/baz_april_fr.php @@ -33,6 +33,10 @@ $GLOBALS[ $GLOBALS['idx_lang'] ] = array( 'tags' => 'Tags', 'tri_periodique' => 'Tri périodique', + 'references' => 'Références', + 'signaler_une_erreur'=> 'Signaler une erreur, poser une question', + 'memes_themes' => 'Transcriptions sur les mêmes thèmes :', + 'memes_personnes' => 'Transcriptions avec les mêmes personnes :', ); diff --git a/paquet.xml b/paquet.xml index 75a2bd8..3656ca5 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ - APRIL : base mutualisée des sites SPIP + + APRIL : base mutualisée des sites SPIP chankalan Nicolas Dorigny @@ -39,6 +39,7 @@ + diff --git a/squelettes/content/rubrique-blog.html b/squelettes/content/rubrique-blog.html index 3fd66a4..fc60379 100644 --- a/squelettes/content/rubrique-blog.html +++ b/squelettes/content/rubrique-blog.html @@ -16,7 +16,7 @@ [

(#ENV{datetri}|affdate{nom_mois})[(#ENV{datetri}|affdate{Y}|!={[(#VAL{Y}|date)]}|oui)[ (#ENV{datetri}|affdate{Y})]]

]
    = #GET{debut_mois}}{id_rubrique}{!par date}> -
  • #INCLURE{fond=inclure/resume/article,id_article,env,composition=blog}
    • +
  • #INCLURE{fond=inclure/resume/article,id_article,env,composition=blog,h=h3}
@@ -26,7 +26,7 @@ #ANCRE_PAGINATION
    -
  • #INCLURE{fond=inclure/resume/article,id_article,env,composition=blog}
    • +
  • #INCLURE{fond=inclure/resume/article,id_article,env,composition=blog,h=h3}
[] diff --git a/squelettes/inclure/liste/articles-resume.html b/squelettes/inclure/liste/articles-resume.html index 4d26927..a568d7e 100644 --- a/squelettes/inclure/liste/articles-resume.html +++ b/squelettes/inclure/liste/articles-resume.html @@ -2,9 +2,11 @@
#ANCRE_PAGINATION [

(#ENV{titre})

] - +
+ #INCLURE{fond=inclure/resume/article, id_article, env, couper=#ENV{couper}, compteur=#COMPTEUR_BOUCLE} +
[] [(#ENV{voirtous}|oui)#MODELE{bouton,lienobjet=#ENV{objetlienvoirtous}|sinon{rubrique},lienidobjet=#ENV{lienvoirtous}|sinon{#ENV{id_rubrique}}|sinon{#ENV{id_secteur}},align=right,icone=fa-angle-right,texte=#ENV{voirtous}}]
diff --git a/squelettes/inclure/resume/article.html b/squelettes/inclure/resume/article.html index 9e82b1b..9d71fea 100644 --- a/squelettes/inclure/resume/article.html +++ b/squelettes/inclure/resume/article.html @@ -1,7 +1,7 @@

#TITRE

diff --git a/squelettes/javascript/script.js b/squelettes/javascript/script.js index bbc0634..de3d40f 100644 --- a/squelettes/javascript/script.js +++ b/squelettes/javascript/script.js @@ -21,7 +21,13 @@ $(function() { $(this).toggleClass('actif').siblings('.nav').toggleClass('ouvert'); $('.principale .btn-nav').removeClass('actif').siblings('.nav-list').removeClass('ouvert'); }); - + // un sous-menu dans initiatives : .menu-entree.sousinitiatives > .menu-items__lien.sousinitiatives + // .menu-entree.sousinitiatives > ul > li > a + $('.menu-items__lien.sousinitiatives').on('click', function(){ + $(this).toggleClass('actif'); + $(this).siblings('ul').toggleClass('ouvert'); + }); + // placer le html du bouton du menu, visible < medium $('.nav.principale').prepend(''); // afficher/masquer le menu diff --git a/squelettes/modeles/article_appel.html b/squelettes/modeles/article_appel.html new file mode 100644 index 0000000..585556f --- /dev/null +++ b/squelettes/modeles/article_appel.html @@ -0,0 +1,11 @@ + +
+ +
+ diff --git a/squelettes/scss/base/_spip.scss b/squelettes/scss/base/_spip.scss index 388710a..977a4cc 100644 --- a/squelettes/scss/base/_spip.scss +++ b/squelettes/scss/base/_spip.scss @@ -99,3 +99,15 @@ html .spip-admin-bloc, html .spip-admin-float { border-radius: 0.3em !important; padding: 0.5em !important; } + +.spip_poesie { + border:0; + > div { + margin:0; + text-indent:0; + } +} +blockquote { + padding:($spacer*1.5); + margin:($spacer*2) 0; +} diff --git a/squelettes/scss/blocs/_aside.scss b/squelettes/scss/blocs/_aside.scss index 9ad8a92..0e92aa8 100644 --- a/squelettes/scss/blocs/_aside.scss +++ b/squelettes/scss/blocs/_aside.scss @@ -1,2 +1,13 @@ .page_aside { + > ul { + margin-left:0; + list-style-type: none; + .article-resume { + padding:2.2em 1em 1em; + margin-bottom:1rem; + .article-resume__titre { + font-size:1.3em; + } + } + } } diff --git a/squelettes/scss/blocs/_content.scss b/squelettes/scss/blocs/_content.scss index 3a40732..2963664 100644 --- a/squelettes/scss/blocs/_content.scss +++ b/squelettes/scss/blocs/_content.scss @@ -41,6 +41,9 @@ .mots { margin:0; } +.article__notes { + margin:($spacer*2) 0; +} //--------------------------------------- diff --git a/squelettes/scss/styles/_layout.scss b/squelettes/scss/styles/_layout.scss index 9cd23e6..a6b0fca 100644 --- a/squelettes/scss/styles/_layout.scss +++ b/squelettes/scss/styles/_layout.scss @@ -52,11 +52,11 @@ html, body { justify-content: space-between; } .page_aside { - min-width: em(320px); - width: em(320px); + min-width: em(430px); + width: em(430px); } .page_content { - margin-right: 3em; + margin-right: 5em; width: 100%; } } diff --git a/squelettes/scss/styles/_nav.scss b/squelettes/scss/styles/_nav.scss index c89aebe..8a9e404 100644 --- a/squelettes/scss/styles/_nav.scss +++ b/squelettes/scss/styles/_nav.scss @@ -238,4 +238,33 @@ display:none; } } + // un sous-menu dans initiatives : .menu-entree.sousinitiatives > .menu-items__lien.sousinitiatives + .menu-entree.sousinitiatives { + position:relative; + > ul { + @include media($bp-medium-up) { + position:absolute; + top:-999em; + left:0; + width:150px; + z-index:9; + transition:all 0.3s ease-in-out; + &.ouvert { + top:25px; + li { + display:block; + background:$couleurPrincipale; + a { + display:block; + } + } + } + } + } + @include media($bp-medium) { + .menu-items__lien.sousinitiatives { + display:none; + } + } + } }