From c3665d834cba0851fd89da63d68d02f552699340 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Tue, 2 Nov 2021 14:43:25 +0100
Subject: [PATCH] dev #143672 OpenAgenda articles : add class oa-infos and
oa-registration
---
VERSIONS_WIP/143672 | 1 +
library/Class/ExternalAgenda/OpenAgenda.php | 10 ++++++++--
.../ArticlesMultipleTimingsOpenAgendaImportTest.php | 2 +-
.../ExternalAgendas/ExternalAgendasOpenAgendaTest.php | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
create mode 100644 VERSIONS_WIP/143672
diff --git a/VERSIONS_WIP/143672 b/VERSIONS_WIP/143672
new file mode 100644
index 00000000000..bf6a60ecb34
--- /dev/null
+++ b/VERSIONS_WIP/143672
@@ -0,0 +1 @@
+ - ticket #143672 : Import OpenAgenda : ajout des classes css "oa-infos" et "oa-registration" respectivement pour les paragraphes "Infos pratiques" et "Pour s'inscrire"
\ No newline at end of file
diff --git a/library/Class/ExternalAgenda/OpenAgenda.php b/library/Class/ExternalAgenda/OpenAgenda.php
index 3bebd71e9d8..a01839f9a8f 100644
--- a/library/Class/ExternalAgenda/OpenAgenda.php
+++ b/library/Class/ExternalAgenda/OpenAgenda.php
@@ -172,6 +172,7 @@ class Class_ExternalAgenda_OpenAgenda_Event {
: $this->get('uid');
}
+
public function getInfosTag() {
$infos = '';
@@ -181,7 +182,9 @@ class Class_ExternalAgenda_OpenAgenda_Event {
if (!$infos)
return '';
- return '<p>' . $this->_('Infos pratiques :') . '</p><dl>' . $infos . '</dl>';
+ return sprintf('<p class="oa-infos">%s</p><dl>%s</dl>',
+ $this->_('Infos pratiques :'),
+ $infos);
}
@@ -214,9 +217,12 @@ class Class_ExternalAgenda_OpenAgenda_Event {
if (!$contacts)
return '';
- return '<p>' . $this->_('Pour s\'inscrire :') . '</p><dl>' . implode('', $contacts) . '</dl>';
+ return sprintf('<p class="oa-registration">%s</p><dl>%s</dl>',
+ $this->_('Pour s\'inscrire :'),
+ implode('', $contacts));
}
+
protected function _prepareRegistrationValue($registration){
switch ($registration['type']) {
case 'email' :
diff --git a/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsOpenAgendaImportTest.php b/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsOpenAgendaImportTest.php
index 366cba091f2..5e3f13b6ab4 100644
--- a/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsOpenAgendaImportTest.php
+++ b/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsOpenAgendaImportTest.php
@@ -67,7 +67,7 @@ class ArticlesMultipleTimingsOpenAgendaImportTest extends ExternalAgendasOpenAge
/** @test */
public function firstArticleImageShouldContainsHTMLAndImage() {
- $this->assertEquals('<figure><img src="https://cibul.s3.amazonaws.com/9c3729cce33140c5a011056c8168ec5b.base.image.jpg" alt=""/><figcaption>Credits : moi</figcaption></figure><p>Voyons ça dans une session de coding dojo</p><p>Infos pratiques :</p><dl><dt>Conditions</dt><dd>être geek</dd><dt>Âge</dt><dd>de 6 à 99 ans</dd></dl><p>Pour s\'inscrire :</p><dl><dt>Courriel</dt><dd><a href="mailto:llaffont@afi-sa.fr">llaffont@afi-sa.fr</a></dd><dt>Téléphone</dt><dd><a href="tel:0123456789">0123456789</a></dd><dt>Site</dt><dd><a href="https://www.website.org">https://www.website.org</a></dd><dt>Lien</dt><dd><a href="https://registration.website.org/">https://registration.website.org/</a></dd></dl>',
+ $this->assertEquals('<figure><img src="https://cibul.s3.amazonaws.com/9c3729cce33140c5a011056c8168ec5b.base.image.jpg" alt=""/><figcaption>Credits : moi</figcaption></figure><p>Voyons ça dans une session de coding dojo</p><p class="oa-infos">Infos pratiques :</p><dl><dt>Conditions</dt><dd>être geek</dd><dt>Âge</dt><dd>de 6 à 99 ans</dd></dl><p class="oa-registration">Pour s\'inscrire :</p><dl><dt>Courriel</dt><dd><a href="mailto:llaffont@afi-sa.fr">llaffont@afi-sa.fr</a></dd><dt>Téléphone</dt><dd><a href="tel:0123456789">0123456789</a></dd><dt>Site</dt><dd><a href="https://www.website.org">https://www.website.org</a></dd><dt>Lien</dt><dd><a href="https://registration.website.org/">https://registration.website.org/</a></dd></dl>',
Class_Article::find(1)->getContenu());
}
diff --git a/tests/scenarios/ExternalAgendas/ExternalAgendasOpenAgendaTest.php b/tests/scenarios/ExternalAgendas/ExternalAgendasOpenAgendaTest.php
index df81548be02..6a4099a5545 100644
--- a/tests/scenarios/ExternalAgendas/ExternalAgendasOpenAgendaTest.php
+++ b/tests/scenarios/ExternalAgendas/ExternalAgendasOpenAgendaTest.php
@@ -229,7 +229,7 @@ class ExternalAgendasOpenAgendaImportTest extends ExternalAgendasOpenAgendaImpor
/** @test */
public function firstArticleImageShouldContainsHTMLAndImage() {
- $this->assertEquals('<figure><img src="https://cibul.s3.amazonaws.com/9c3729cce33140c5a011056c8168ec5b.base.image.jpg" alt=""/><figcaption>Credits : moi</figcaption></figure><p>Voyons ça dans une session de coding dojo</p><p>Infos pratiques :</p><dl><dt>Conditions</dt><dd>être geek</dd><dt>Âge</dt><dd>de 6 à 99 ans</dd></dl><p>Pour s\'inscrire :</p><dl><dt>Courriel</dt><dd><a href="mailto:llaffont@afi-sa.fr">llaffont@afi-sa.fr</a></dd><dt>Téléphone</dt><dd><a href="tel:0123456789">0123456789</a></dd><dt>Site</dt><dd><a href="https://www.website.org">https://www.website.org</a></dd><dt>Lien</dt><dd><a href="https://registration.website.org/">https://registration.website.org/</a></dd></dl>',
+ $this->assertEquals('<figure><img src="https://cibul.s3.amazonaws.com/9c3729cce33140c5a011056c8168ec5b.base.image.jpg" alt=""/><figcaption>Credits : moi</figcaption></figure><p>Voyons ça dans une session de coding dojo</p><p class="oa-infos">Infos pratiques :</p><dl><dt>Conditions</dt><dd>être geek</dd><dt>Âge</dt><dd>de 6 à 99 ans</dd></dl><p class="oa-registration">Pour s\'inscrire :</p><dl><dt>Courriel</dt><dd><a href="mailto:llaffont@afi-sa.fr">llaffont@afi-sa.fr</a></dd><dt>Téléphone</dt><dd><a href="tel:0123456789">0123456789</a></dd><dt>Site</dt><dd><a href="https://www.website.org">https://www.website.org</a></dd><dt>Lien</dt><dd><a href="https://registration.website.org/">https://registration.website.org/</a></dd></dl>',
Class_Article::find(1)->getContenu());
}
--
GitLab