diff --git a/core/core.php b/core/core.php index bc1c7bd..41aff3a 100644 --- a/core/core.php +++ b/core/core.php @@ -51,7 +51,7 @@ class common const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '1.7.07'; + const ZWII_VERSION = '1.7.08'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; diff --git a/module/workshop/view/config/config.php b/module/workshop/view/config/config.php index 307e6d4..c25c655 100644 --- a/module/workshop/view/config/config.php +++ b/module/workshop/view/config/config.php @@ -26,15 +26,13 @@
-
+
$this->getData(['module', $this->getUrl(0), 'config', 'title']), 'help' => 'Classe CSS de l\'élément en ligne : workshopTitle' ]); ?>
-
-
-
+
$this->getData(['module', $this->getUrl(0), 'config', 'author']), 'help' => 'Classe CSS de l\'élément en ligne : workshopTitle' @@ -42,28 +40,32 @@
-
+
$this->getData(['module', $this->getUrl(0), 'config', 'description']), 'help' => 'Classe CSS de l\'élément en ligne : workshopDescription' ]); ?>
-
-
-
+
$this->getData(['module', $this->getUrl(0), 'config', 'access']), - 'help' => 'Classes CSS de la division workshopAccessContainer, élément en ligne workshopAccess' + 'help' => 'Classe CSS de la division : workshopAccessContainer, élément en ligne : workshopAccess' ]); ?>
-
+
$this->getData(['module', $this->getUrl(0), 'config', 'enrolment']), 'help' => 'Classe CSS de l\'élément en ligne : workshopEnrolment' ]); ?>
+
+ $this->getData(['module', $this->getUrl(0), 'config', 'unsuscribe']), + 'help' => 'Classe CSS de l\'élément en ligne : workshopUnsuscribe' + ]); ?> +
diff --git a/module/workshop/view/index/index.php b/module/workshop/view/index/index.php index 6d7b7a6..2bf0ef9 100644 --- a/module/workshop/view/index/index.php +++ b/module/workshop/view/index/index.php @@ -4,7 +4,7 @@ getData(['module', $this->getUrl(0), 'config', 'category']) !== 'all' && $courseValue['category'] !== $this->getData(['module', $this->getUrl(0), 'config', 'category']) - ): ?> + ): ?> @@ -53,7 +53,7 @@

- +

@@ -92,7 +92,10 @@
- getData(['enrolment', $courseId, $this->getUser('id')])): ?> + getData(['enrolment', $courseId, $this->getUser('id')]) + && $this->getData(['module', $this->getUrl(0), 'config', 'unsuscribe']) === true + ): ?> getData(['module', $this->getUrl(0), 'caption', 'unsuscribe']); ?> diff --git a/module/workshop/workshop.php b/module/workshop/workshop.php index 3cb12de..99909f6 100644 --- a/module/workshop/workshop.php +++ b/module/workshop/workshop.php @@ -15,8 +15,8 @@ class workshop extends common { - const VERSION = '1.0'; - const REALNAME = 'Liste des contenus'; + const VERSION = '1.01'; + const REALNAME = 'Liste des espaces'; const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json) public static $actions = [ @@ -49,7 +49,8 @@ class workshop extends common 'access' => true, 'enrolment' => true, 'layout' => 6, - 'template' => true + 'template' => true, + 'unsuscribe' => false, ), 'caption' => array( 'accessopen' => 'Ouvert', @@ -88,6 +89,7 @@ class workshop extends common 'title' => $this->getInput('coursesConfigShowTitle', helper::FILTER_BOOLEAN), 'author' => $this->getInput('coursesConfigShowAuthor', helper::FILTER_BOOLEAN), 'description' => $this->getInput('coursesConfigShowDescription', helper::FILTER_BOOLEAN), + 'unsuscribe'=> $this->getInput('coursesConfigShowUnsuscribe', helper::FILTER_BOOLEAN), 'access' => $this->getInput('coursesConfigShowAccess', helper::FILTER_BOOLEAN), 'openingdate' => $this->getInput('coursesConfigShowOpeningDate', helper::FILTER_BOOLEAN), 'closingdate' => $this->getInput('coursesConfigShowClosingDate', helper::FILTER_BOOLEAN),