From c86f350daf412d4b36602f13beed26011d832af1 Mon Sep 17 00:00:00 2001
From: Thomas Fradet <t.fradet8@gmail.com>
Date: Mon, 27 May 2019 16:01:30 +0200
Subject: [PATCH] mod descr amelioration
---
CHANGELOG.md | 3 +++
view/view_career_unit.php | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98a8209..27c7296 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,5 +54,8 @@ Nettoyage de CSS inutile.
Non inclusion de scripts inutiles dans la page career_unit.php.
+#### Affichage de la description des ressources
+
+Réaffichage de la description des ressources précédemment masqué, et amélioration de leur apparence. Les descriptions vides ou non contenant que des lignes sautées n'apparaissent pas.
diff --git a/view/view_career_unit.php b/view/view_career_unit.php
index c1bcad5..eab6e77 100644
--- a/view/view_career_unit.php
+++ b/view/view_career_unit.php
@@ -75,12 +75,20 @@ $cours_url = $CFG->wwwroot . "/course/view.php?id=" . $COURSE->id;
<?php if($value->section->id == $section->id) : ?>
<a href="<?php echo "$value->link&career=$careerId" ?>" class="list-group-item list-group-item-action flex-column align-items-start">
<div class="d-flex w-100 justify-content-between">
- <h5 class="mb-1">
+ <h5 style="margin-bottom: 0;">
<?php echo $value->name;?>
</h5>
<img class="" alt="" src="<?php echo $CFG->wwwroot ?>/theme/image.php/boost/<?php echo $value->type ?>/1/icon>">
</div>
- <div><?php echo $value->descrition;?></div>
+ <?php
+ $descr = $value->descrition;
+ $to_delete = array('<p>', '</p>', '<br>', '</br>', ' ');
+ $descr = str_replace($to_delete, '', $descr);
+ $descr = preg_replace('/\s+/', '', $descr);
+ if ( $descr != "" ) {
+ echo "<div style='margin-top: 0.25rem;'>" . $value->descrition . "</div>";
+ }
+ ?>
</a>
<?php endif;?>
<?php endforeach;?>
--
GitLab