From c20253b2194a2a2f8f6816caeb1169deef68834d Mon Sep 17 00:00:00 2001 From: chankalan Date: Fri, 28 May 2021 10:25:45 +0200 Subject: [PATCH] =?UTF-8?q?v0.2.0=20:=20podlove=20fonctionnel=20et=20avanc?= =?UTF-8?q?e=20d'int=C3=A9gration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/libreavous.php | 1 + formulaires/configurer_libreavous.html | 22 ++++ libreavous_administrations.php | 1 + libreavous_fonctions.php | 47 ++++--- paquet.xml | 6 +- .../contenu/configurer_libreavous.html | 7 + squelettes/content/article-chronique.html | 6 +- squelettes/content/article-emission.html | 124 ++++++++++-------- squelettes/content/chronique.html | 6 +- squelettes/content/importer.html | 2 +- squelettes/head/article-emission.html | 2 - squelettes/inclure/head.html | 30 +++++ squelettes/javascript/podlove/embed.js | 3 +- squelettes/json/podlove.html | 64 +++++++++ squelettes/modeles/importer.html | 6 - squelettes/modeles/rubrique_importer.html | 6 - squelettes/podlove_json.html | 2 + squelettes/scss/base/_typo.scss | 22 +++- squelettes/scss/img/delete.png | Bin 0 -> 169 bytes squelettes/scss/img/star.png | Bin 0 -> 1202 bytes squelettes/scss/styles/_perso.scss | 37 +++++- squelettes/scss/utils/_variables-perso.scss | 3 + 22 files changed, 278 insertions(+), 119 deletions(-) create mode 100644 formulaires/configurer_libreavous.html create mode 100644 prive/squelettes/contenu/configurer_libreavous.html create mode 100644 squelettes/inclure/head.html create mode 100644 squelettes/json/podlove.html delete mode 100644 squelettes/modeles/importer.html delete mode 100644 squelettes/modeles/rubrique_importer.html create mode 100644 squelettes/podlove_json.html create mode 100644 squelettes/scss/img/delete.png create mode 100644 squelettes/scss/img/star.png diff --git a/base/libreavous.php b/base/libreavous.php index 22fc78c..b4fe176 100644 --- a/base/libreavous.php +++ b/base/libreavous.php @@ -196,6 +196,7 @@ function libreavous_declarer_tables_objets_sql($tables) { 'ogg' => 'varchar(255) NOT NULL DEFAULT ""', 'drupal_guid' => 'varchar(255) NOT NULL DEFAULT ""', 'drupal_pubdate' => 'varchar(255) NOT NULL DEFAULT ""', + 'references_sujet' => 'text NOT NULL DEFAULT ""', 'maj' => 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' ), 'key' => array( diff --git a/formulaires/configurer_libreavous.html b/formulaires/configurer_libreavous.html new file mode 100644 index 0000000..67c91a8 --- /dev/null +++ b/formulaires/configurer_libreavous.html @@ -0,0 +1,22 @@ +
+ +

<:libreavous:titre_page_configurer_libreavous:/>

+ + [

(#ENV*{message_ok})

] + [

(#ENV*{message_erreur})

] + +
+
+ #ACTION_FORMULAIRE{#ENV{action}} +
    + + [(#SAISIE{textarea,licence, + label=<:libreavous:licence_label:>, + explication=<:libreavous:licence_explications:>, + inserer_barre=edition})] + +
+

 

+
+
+
diff --git a/libreavous_administrations.php b/libreavous_administrations.php index c105319..188f8e5 100644 --- a/libreavous_administrations.php +++ b/libreavous_administrations.php @@ -58,6 +58,7 @@ function libreavous_upgrade($nom_meta_base_version, $version_cible) { cextras_api_upgrade(libreavous_declarer_champs_extras(), $maj['0.0.1']); $maj['0.1.0'] = array(array('maj_tables', array('spip_chapitres'))); + $maj['0.1.1'] = array(array('maj_tables', array('spip_chapitres'))); include_spip('base/upgrade'); maj_plugin($nom_meta_base_version, $version_cible, $maj); diff --git a/libreavous_fonctions.php b/libreavous_fonctions.php index 11cefee..8c34372 100644 --- a/libreavous_fonctions.php +++ b/libreavous_fonctions.php @@ -13,12 +13,12 @@ function filtre_decode_html($texte) { return html_entity_decode($texte); } -function filtre_mes_supp_numero($texte) { +function filtre_libreavous_supp_numero($texte) { $idx = strpos($texte, "-"); return trim(substr($texte, $idx +1)); } -function balise_MES_IMPORT($p) { +function balise_LIBREAVOUS_IMPORT($p) { $id_rubrique = "''"; $id_secteur = "''"; if (($v = interprete_argument_balise(1,$p))!==NULL){ @@ -27,11 +27,11 @@ $id_secteur = "''"; $id_secteur = $v; } } - $p->code = "mes_Import()"; + $p->code = "libreavous_Import()"; return $p; } -function mes_Import_Historique() { +function libreavous_Import_Historique() { $historique = simplexml_load_file ("/var/www/exemole.fr/libreavous/historique.xml"); foreach ($historique->item as $item) { $code = $item['code']; @@ -62,7 +62,7 @@ function mes_Import_Historique() { } } -function mes_Import($id_rubrique, $id_secteur) { +function libreavous_Import($id_rubrique, $id_secteur) { $emissions = simplexml_load_file ("/var/www/exemole.fr/libreavous/verspip.xml"); foreach ($emissions->emission as $emission) { $code = $emission["code"]; @@ -79,7 +79,7 @@ function mes_Import($id_rubrique, $id_secteur) { 'ps' => "", 'statut' => 'publie', 'accepter_forum' => 'non', - 'date' => mes_toDateIso($emission["code"]), + 'date' => libreavous_toDateIso($emission["code"]), 'podcast_code' => $emission["code"], 'podcast_duree' => $emission["duree"], 'podcast_mp3' => $emission["mp3"], @@ -126,37 +126,22 @@ function mes_Import($id_rubrique, $id_secteur) { } } -function mes_toDateIso($code) { +function libreavous_toDateIso($code) { $texte = substr($code, 0, 4)."-".substr($code,4,2)."-".substr($code,6,2)." 15:30:00"; return $texte; } -function filtre_mes_mio($number) { - $mio = round($number / (1024 * 1024), 1); - if ($mio < 10) { - $mio = round($mio, 2); - return number_format($mio, 2, ',', ' '); - } else if ($mio < 100) { - $mio = round($mio, 1); - return number_format($mio, 1, ',', ' '); - } else { - $mio = round($mio, 0); - return number_format($mio, 0, ',', ' '); - } - return $mio; -} - -function filtre_mes_conversionDrupal($shortdate) { +function filtre_libreavous_conversionDrupal($shortdate) { $annee = substr($shortdate, 0, 4); $mois = substr($shortdate, 4, 2); $jour = substr($shortdate, 6, 2); if (substr($jour, 0, 1) == "0") { $jour = substr($jour, 1, 1); } - return $jour."-".mes_conversionMoisDrupal($mois)."-".$annee; + return $jour."-".libreavous_conversionMoisDrupal($mois)."-".$annee; } -function mes_conversionMoisDrupal($mois) { +function libreavous_conversionMoisDrupal($mois) { switch($mois) { case "01": return "janvier"; @@ -187,4 +172,16 @@ function mes_conversionMoisDrupal($mois) { } } +function libreavous_nomtypesujet($abbr) { + switch($abbr) { + case "CH": + return "Chronique"; + case "SL": + return "Sujet libre"; + case "AN": + return "Annonce"; + default: + return $abbr; + } +} diff --git a/paquet.xml b/paquet.xml index d312bda..2ebc5f4 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,8 +1,8 @@ @@ -28,6 +28,6 @@ - + diff --git a/prive/squelettes/contenu/configurer_libreavous.html b/prive/squelettes/contenu/configurer_libreavous.html new file mode 100644 index 0000000..2d193e7 --- /dev/null +++ b/prive/squelettes/contenu/configurer_libreavous.html @@ -0,0 +1,7 @@ +[(#AUTORISER{configurer,_libreavous}|sinon_interdire_acces)] + +

<:libreavous:titre_page_configurer:/>

+ +
+ #FORMULAIRE_CONFIGURER_LIBREAVOUS +
diff --git a/squelettes/content/article-chronique.html b/squelettes/content/article-chronique.html index 0f92c23..4752468 100644 --- a/squelettes/content/article-chronique.html +++ b/squelettes/content/article-chronique.html @@ -38,15 +38,15 @@

#TITRE

Dans - #[(#SURTITRE)] - [(#TITRE|mes_supp_numero)] + #[(#SURTITRE)] - [(#TITRE|libreavous_supp_numero)]

[

Références

(#REFERENCES_SUJET|propre)]

Fichiers

diff --git a/squelettes/content/article-emission.html b/squelettes/content/article-emission.html index d5c009f..0766524 100644 --- a/squelettes/content/article-emission.html +++ b/squelettes/content/article-emission.html @@ -3,19 +3,19 @@
- -

- - -

#[(#SURTITRE)] - [(#TITRE|mes_supp_numero)][ + +

+ #[(#SURTITRE)] + [Émission du [(#DATE|jour)/][(#DATE|mois)/](#DATE|annee)] +

+ +

[(#TITRE|libreavous_supp_numero)][ (#SOUSTITRE) ]

-

Page originale sur le site de l'April

- -

- [Émission Libre à vous du (#DATE|nom_jour) [(#DATE|affdate)]] -

+ + #FORMULAIRE_NOTATION +
#MODELE{article_traductions} @@ -34,60 +34,66 @@
+
- [
(#CHAPO)
] + + [
+
+ + ] + + + + [
(#CHAPO)
] - [

Transcription

(#PODCAST_TRANSCRIPTION)

] + [

Transcription

(#PODCAST_TRANSCRIPTION)

] - -

Écouter

-
- - - [

Galerie photos

-
(#PODCAST_GALERIEPHOTOS|propre)
- ] - [

Personnes participantes

-
(#PODCAST_PERSONNES|propre)
- ] - [

Pauses musicales

-
(#PODCAST_MUSIQUE|propre)
- ] -

Références

-
- [(#TEXTE)] + [
+

Galerie photos

+
(#PODCAST_GALERIEPHOTOS|propre)
+
] + +
+ + [

Personnes participantes

+
(#PODCAST_PERSONNES|propre)
] + + [

Pauses musicales

+
(#PODCAST_MUSIQUE|propre)
] + + [

Références

+
(#TEXTE)
] + + +

Références des chroniques

+ + [

#TITRE

+ (#REFERENCES_SUJET|propre)] + + + + [(#REM) +

Chapitres

+ + ]
- -

Références des chroniques

- - [

#TITRE

- (#REFERENCES_SUJET|propre)] - - - -

Télécharger

- - -

Chapitres

- -
[