From f33140e39c6e98de007a145941444c81336a8999 Mon Sep 17 00:00:00 2001
From: amandine-sahl <amandine.sahl@cevennes-parcnational.fr>
Date: Wed, 28 Aug 2024 12:53:34 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Formulaire=20m=C3=A9dia:=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apptax/admin/admin_view.py | 17 +++++++++++++++--
 apptax/taxonomie/models.py |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/apptax/admin/admin_view.py b/apptax/admin/admin_view.py
index 175d65e4..a2a19aac 100644
--- a/apptax/admin/admin_view.py
+++ b/apptax/admin/admin_view.py
@@ -257,16 +257,29 @@ def import_cd_nom_view(self, *args, **kwargs):
 
 
 class InlineMediaForm(InlineFormAdmin):
-    form_label = "Médias"
+    form_label = "Média"
     form_extra_fields = {
         "chemin": ImageUploadFieldWithoutDelete(
-            label="Image",
+            label="Téléverser un fichier",
             namegen=taxref_media_file_name,
             endpoint="media_taxhub",
             base_path=Path(current_app.config["MEDIA_FOLDER"], "taxhub").absolute(),
         )
     }
 
+    form_columns = (
+        "types",
+        "url",
+        "chemin",
+        "titre",
+        "auteur",
+        "desc_media",
+        "source",
+        "licence",
+        "is_public",
+    )
+    column_labels = {"is_public": "Média public ?", "types": "Type", "desc_media": "Description"}
+
     def __init__(self):
         return super(InlineMediaForm, self).__init__(TMedias)
 
diff --git a/apptax/taxonomie/models.py b/apptax/taxonomie/models.py
index 6b61e7ec..6bd65811 100644
--- a/apptax/taxonomie/models.py
+++ b/apptax/taxonomie/models.py
@@ -298,7 +298,7 @@ class TMedias(db.Model):
     desc_media = db.Column(db.Text)
     source = db.Column(db.Unicode)
     licence = db.Column(db.Unicode)
-    is_public = db.Column(db.BOOLEAN)
+    is_public = db.Column(db.BOOLEAN, nullable=False, default=True)
     id_type = db.Column(
         db.Integer,
         ForeignKey(BibTypesMedia.id_type),

From a15275d926576868a782e61f93fda25f03a16941 Mon Sep 17 00:00:00 2001
From: amandine-sahl <amandine.sahl@cevennes-parcnational.fr>
Date: Wed, 28 Aug 2024 17:04:00 +0200
Subject: [PATCH 2/3] Placeholder

---
 apptax/admin/admin_view.py                       | 9 ++++++++-
 apptax/admin/templates/admin/details_taxref.html | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apptax/admin/admin_view.py b/apptax/admin/admin_view.py
index a2a19aac..c2e167ab 100644
--- a/apptax/admin/admin_view.py
+++ b/apptax/admin/admin_view.py
@@ -264,13 +264,15 @@ class InlineMediaForm(InlineFormAdmin):
             namegen=taxref_media_file_name,
             endpoint="media_taxhub",
             base_path=Path(current_app.config["MEDIA_FOLDER"], "taxhub").absolute(),
+            description="Téléverser le média que vous souhaitez associer au taxon",
         )
     }
 
     form_columns = (
+        "id_media",
         "types",
-        "url",
         "chemin",
+        "url",
         "titre",
         "auteur",
         "desc_media",
@@ -278,6 +280,11 @@ class InlineMediaForm(InlineFormAdmin):
         "licence",
         "is_public",
     )
+
+    column_descriptions = {
+        "url": "Ou renseignez son URL si le média est déjà disponible en ligne",
+    }
+
     column_labels = {"is_public": "Média public ?", "types": "Type", "desc_media": "Description"}
 
     def __init__(self):
diff --git a/apptax/admin/templates/admin/details_taxref.html b/apptax/admin/templates/admin/details_taxref.html
index bea19cf7..7ad9f75a 100644
--- a/apptax/admin/templates/admin/details_taxref.html
+++ b/apptax/admin/templates/admin/details_taxref.html
@@ -41,7 +41,8 @@ <h5 class="card-title col-1">
                   <a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-lists" role="tab" aria-controls="nav-lists" aria-selected="false">Listes  </a>
                   <a class="nav-item nav-link" id="nav-attributes-tab" data-toggle="tab" href="#nav-attributes" role="tab" aria-controls="nav-attributes" aria-selected="false">Attributs  </a>
                   <a class="nav-item nav-link" id="nav-medias-tab" data-toggle="tab" href="#nav-medias" role="tab" aria-controls="nav-medias" aria-selected="false">Médias</a>
-                  <a class="nav-item nav-link" id="nav-status-tab" data-toggle="tab" href="#nav-status" role="tab" aria-controls="nav-status" aria-selected="false">Status</a>
+                <a class="nav-item nav-link" id="nav-status-tab" data-toggle="tab" href="#nav-status" role="tab"
+                    aria-controls="nav-status" aria-selected="false">Statuts</a>
                   <a class="nav-item nav-link" id="nav-synonymes-tab" data-toggle="tab" href="#nav-synonymes" role="tab" aria-controls="nav-synonymes" aria-selected="false">Synonymes</a>
                 </div>
             </nav>

From 7bebb10f1fbec37d5b8999e3d65ba3e0a8d1b0a7 Mon Sep 17 00:00:00 2001
From: amandine-sahl <amandine.sahl@cevennes-parcnational.fr>
Date: Wed, 28 Aug 2024 17:59:11 +0200
Subject: [PATCH 3/3] Change Url label to URL

---
 apptax/admin/admin_view.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apptax/admin/admin_view.py b/apptax/admin/admin_view.py
index c2e167ab..091e2516 100644
--- a/apptax/admin/admin_view.py
+++ b/apptax/admin/admin_view.py
@@ -285,7 +285,12 @@ class InlineMediaForm(InlineFormAdmin):
         "url": "Ou renseignez son URL si le média est déjà disponible en ligne",
     }
 
-    column_labels = {"is_public": "Média public ?", "types": "Type", "desc_media": "Description"}
+    column_labels = {
+        "url": "URL",
+        "is_public": "Média public ?",
+        "types": "Type",
+        "desc_media": "Description",
+    }
 
     def __init__(self):
         return super(InlineMediaForm, self).__init__(TMedias)