From 7c47f912213979892c83893a8f731d04dd4922f6 Mon Sep 17 00:00:00 2001 From: chankalan Date: Fri, 22 May 2020 10:33:24 +0200 Subject: [PATCH] - sidr + bloc connex + inclure/resume/article + variable-perso + style-perso --- baz_april_fonctions.php | 48 +- paquet.xml | 2 +- squelettes/body.html | 2 +- squelettes/connex/dist.html | 4 +- squelettes/content/rubrique-blog.html | 1 - squelettes/inclure/resume/article.html | 13 + squelettes/javascript/sidr/jquery.sidr.js | 579 ------------------ squelettes/javascript/sidr/jquery.sidr.min.js | 4 - .../sidr/stylesheets/jquery.sidr.bare.css | 5 - .../sidr/stylesheets/jquery.sidr.dark.css | 164 ----- .../sidr/stylesheets/jquery.sidr.dark.min.css | 1 - .../sidr/stylesheets/jquery.sidr.light.css | 164 ----- .../stylesheets/jquery.sidr.light.min.css | 1 - squelettes/scss/blocs/_connex.scss | 4 + squelettes/scss/blocs/_footer.scss | 6 +- squelettes/scss/components/_jquery.sidr.scss | 71 --- squelettes/scss/styles/_perso.scss | 458 +------------- squelettes/scss/theme.scss | 4 +- squelettes/scss/utils/_variables-perso.scss | 1 + squelettes/scss/utils/_variables.scss | 1 + 20 files changed, 67 insertions(+), 1466 deletions(-) create mode 100644 squelettes/inclure/resume/article.html delete mode 100755 squelettes/javascript/sidr/jquery.sidr.js delete mode 100755 squelettes/javascript/sidr/jquery.sidr.min.js delete mode 100755 squelettes/javascript/sidr/stylesheets/jquery.sidr.bare.css delete mode 100755 squelettes/javascript/sidr/stylesheets/jquery.sidr.dark.css delete mode 100755 squelettes/javascript/sidr/stylesheets/jquery.sidr.dark.min.css delete mode 100755 squelettes/javascript/sidr/stylesheets/jquery.sidr.light.css delete mode 100755 squelettes/javascript/sidr/stylesheets/jquery.sidr.light.min.css create mode 100644 squelettes/scss/blocs/_connex.scss delete mode 100755 squelettes/scss/components/_jquery.sidr.scss create mode 100644 squelettes/scss/utils/_variables-perso.scss diff --git a/baz_april_fonctions.php b/baz_april_fonctions.php index 2ae6953..4ac1609 100644 --- a/baz_april_fonctions.php +++ b/baz_april_fonctions.php @@ -1,14 +1,42 @@ 28/02/2007 + * + * @param string $date + * @param int $decalage + * @param string $format + * @return string + */ +function baz_moisdecal($date, $decalage, $format = 'Y-m-d H:i:s') { + include_spip('inc/filtres'); + $date_array = recup_date($date); + $annee = $mois = $jour = NULL; + if ($date_array) { + list($annee, $mois, $jour) = $date_array; + } + if (!$jour) { + $jour = 1; + } + if (!$mois) { + $mois = 1; + } + $mois2 = $mois + $decalage; + $date2 = mktime(1, 1, 1, $mois2, $jour, $annee); + // mois normalement attendu + $mois3 = date('m', mktime(1, 1, 1, $mois2, 1, $annee)); + // et si le mois de la nouvelle date a moins de jours... + $mois2 = date('m', $date2); + if ($mois2 - $mois3) { + $date2 = mktime(1, 1, 1, $mois2, 0, $annee); + } + return date($format, $date2); +} diff --git a/paquet.xml b/paquet.xml index cf48ad4..2cba7fc 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ -